From b9406951f5db046e1f6e2df88ef6b3b7195005e6 Mon Sep 17 00:00:00 2001 From: Akvel Date: Mon, 25 Sep 2023 17:31:55 +0300 Subject: [PATCH] Fixed pre-commit checks Signed-off-by: Akvel Amended by ostrya --- .../java/com/tngtech/keycloakmock/api/ServerConfig.java | 6 ++---- .../tngtech/keycloakmock/impl/helper/TokenHelper.java | 9 ++++----- .../keycloakmock/impl/helper/TokenHelperTest.java | 8 ++++++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/mock/src/main/java/com/tngtech/keycloakmock/api/ServerConfig.java b/mock/src/main/java/com/tngtech/keycloakmock/api/ServerConfig.java index 83ab7e6..f324985 100644 --- a/mock/src/main/java/com/tngtech/keycloakmock/api/ServerConfig.java +++ b/mock/src/main/java/com/tngtech/keycloakmock/api/ServerConfig.java @@ -1,7 +1,6 @@ package com.tngtech.keycloakmock.api; import com.tngtech.keycloakmock.impl.Protocol; - import java.time.Duration; import java.util.ArrayList; import java.util.Collections; @@ -382,12 +381,11 @@ public Builder withDefaultScope(@Nonnull final String defaultScope) { } /** - * Set default access token lifespan ("exp" filed will be set as issuedAt + tokenLifespan) - * By default lifespan 10 hours. + * Set default access token lifespan ("exp" filed will be set as issuedAt + tokenLifespan). + By + * default lifespan 10 hours. * * @param tokenLifespan as duration * @return builder - * */ @Nonnull public Builder withTokenLifespan(@Nonnull final Duration tokenLifespan) { diff --git a/mock/src/main/java/com/tngtech/keycloakmock/impl/helper/TokenHelper.java b/mock/src/main/java/com/tngtech/keycloakmock/impl/helper/TokenHelper.java index 6ea2a65..dff30ae 100644 --- a/mock/src/main/java/com/tngtech/keycloakmock/impl/helper/TokenHelper.java +++ b/mock/src/main/java/com/tngtech/keycloakmock/impl/helper/TokenHelper.java @@ -7,7 +7,6 @@ import com.tngtech.keycloakmock.impl.UrlConfiguration; import com.tngtech.keycloakmock.impl.session.Session; import com.tngtech.keycloakmock.impl.session.UserData; - import java.time.Duration; import java.util.List; import java.util.Map; @@ -32,10 +31,10 @@ public class TokenHelper { @Inject TokenHelper( - @Nonnull TokenGenerator tokenGenerator, - @Nonnull @Named("resources") List resourcesToMapRolesTo, - @Nonnull @Named("scopes") Set defaultScopes, - @Nonnull @Named("tokenLifespan") Duration tokenLifespan) { + @Nonnull TokenGenerator tokenGenerator, + @Nonnull @Named("resources") List resourcesToMapRolesTo, + @Nonnull @Named("scopes") Set defaultScopes, + @Nonnull @Named("tokenLifespan") Duration tokenLifespan) { this.tokenGenerator = tokenGenerator; this.resourcesToMapRolesTo = resourcesToMapRolesTo; this.defaultScopes = defaultScopes; diff --git a/mock/src/test/java/com/tngtech/keycloakmock/impl/helper/TokenHelperTest.java b/mock/src/test/java/com/tngtech/keycloakmock/impl/helper/TokenHelperTest.java index 95da198..cfc5e31 100644 --- a/mock/src/test/java/com/tngtech/keycloakmock/impl/helper/TokenHelperTest.java +++ b/mock/src/test/java/com/tngtech/keycloakmock/impl/helper/TokenHelperTest.java @@ -56,7 +56,9 @@ void setup() { @Test void token_is_correctly_generated() { - uut = new TokenHelper(tokenGenerator, Collections.emptyList(), Collections.emptySet(), Duration.ofHours(100)); + uut = + new TokenHelper( + tokenGenerator, Collections.emptyList(), Collections.emptySet(), Duration.ofHours(100)); uut.getToken(session, urlConfiguration); @@ -83,7 +85,9 @@ void token_is_correctly_generated() { @Test void resource_roles_are_used_if_configured() { - uut = new TokenHelper(tokenGenerator, CONFIGURED_RESOURCES, Collections.emptySet(), Duration.ofHours(10)); + uut = + new TokenHelper( + tokenGenerator, CONFIGURED_RESOURCES, Collections.emptySet(), Duration.ofHours(10)); uut.getToken(session, urlConfiguration);