From 012736a7895aa3ed81e67646adf599e5d30c49a3 Mon Sep 17 00:00:00 2001 From: Aleksandr Balakirev Date: Sun, 15 Dec 2024 15:40:00 +0100 Subject: [PATCH] style: fix import ordering and other minor checkstyle issues --- .../exceptions/CorbadoServerException.java | 6 +- src/main/java/com/corbado/sdk/Config.java | 4 +- .../com/corbado/services/SessionService.java | 16 ++-- .../com/corbado/services/UserService.java | 7 +- .../integration/IdentifierServiceIT.java | 7 +- .../corbado/integration/UserServiceIT.java | 9 ++- .../com/corbado/unit/SessionServiceTest.java | 76 ++++--------------- src/test/java/com/corbado/util/TestUtils.java | 7 +- 8 files changed, 39 insertions(+), 93 deletions(-) diff --git a/src/main/java/com/corbado/exceptions/CorbadoServerException.java b/src/main/java/com/corbado/exceptions/CorbadoServerException.java index 734e352..048fea3 100644 --- a/src/main/java/com/corbado/exceptions/CorbadoServerException.java +++ b/src/main/java/com/corbado/exceptions/CorbadoServerException.java @@ -1,12 +1,10 @@ package com.corbado.exceptions; +import com.corbado.generated.invoker.ApiException; +import com.google.gson.Gson; import java.util.Collections; import java.util.List; import java.util.Optional; - -import com.corbado.generated.invoker.ApiException; -import com.google.gson.Gson; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; diff --git a/src/main/java/com/corbado/sdk/Config.java b/src/main/java/com/corbado/sdk/Config.java index 2786e96..300f716 100644 --- a/src/main/java/com/corbado/sdk/Config.java +++ b/src/main/java/com/corbado/sdk/Config.java @@ -2,14 +2,12 @@ import java.net.MalformedURLException; import java.net.URL; - -import org.apache.commons.lang3.StringUtils; - import lombok.Builder; import lombok.Getter; import lombok.NonNull; import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; /** * Configuration class for setting up project parameters. diff --git a/src/main/java/com/corbado/services/SessionService.java b/src/main/java/com/corbado/services/SessionService.java index 554e623..79fea50 100644 --- a/src/main/java/com/corbado/services/SessionService.java +++ b/src/main/java/com/corbado/services/SessionService.java @@ -1,12 +1,5 @@ package com.corbado.services; -import java.net.MalformedURLException; -import java.net.URL; -import java.security.interfaces.RSAPublicKey; -import java.util.concurrent.TimeUnit; - -import org.apache.commons.lang3.StringUtils; - import com.auth0.jwk.InvalidPublicKeyException; import com.auth0.jwk.Jwk; import com.auth0.jwk.JwkException; @@ -26,10 +19,14 @@ import com.corbado.exceptions.TokenValidationException; import com.corbado.sdk.Config; import com.corbado.utils.ValidationUtils; - +import java.net.MalformedURLException; +import java.net.URL; +import java.security.interfaces.RSAPublicKey; +import java.util.concurrent.TimeUnit; import lombok.Getter; import lombok.NonNull; import lombok.Setter; +import org.apache.commons.lang3.StringUtils; /** * This class provides functionality for managing sessions, including validation and retrieval of @@ -148,7 +145,8 @@ public UserEntity validateToken(final String sessionToken) throws TokenValidatio final JWTVerifier verifier = JWT.require(algorithm).build(); decodedJwt = verifier.verify(sessionToken); } catch (final InvalidPublicKeyException e) { - throw new TokenValidationException(ValidationErrorType.CODE_INVALID_PUBLIC_KEY, e.getMessage(), e); + throw new TokenValidationException( + ValidationErrorType.CODE_INVALID_PUBLIC_KEY, e.getMessage(), e); } catch (final TokenExpiredException e) { throw new TokenValidationException(ValidationErrorType.CODE_JWT_EXPIRED, e.getMessage(), e); diff --git a/src/main/java/com/corbado/services/UserService.java b/src/main/java/com/corbado/services/UserService.java index ae6ea30..dee5024 100644 --- a/src/main/java/com/corbado/services/UserService.java +++ b/src/main/java/com/corbado/services/UserService.java @@ -1,9 +1,5 @@ package com.corbado.services; -import java.util.Objects; - -import javax.annotation.Nullable; - import com.corbado.entities.UserEntity; import com.corbado.exceptions.CorbadoServerException; import com.corbado.generated.api.UsersApi; @@ -11,7 +7,8 @@ import com.corbado.generated.model.UserCreateReq; import com.corbado.generated.model.UserStatus; import com.corbado.services.base.ApiService; - +import java.util.Objects; +import javax.annotation.Nullable; import lombok.NonNull; /** Service for managing users. */ diff --git a/src/test/java/com/corbado/integration/IdentifierServiceIT.java b/src/test/java/com/corbado/integration/IdentifierServiceIT.java index f4f5c27..17b1ef3 100644 --- a/src/test/java/com/corbado/integration/IdentifierServiceIT.java +++ b/src/test/java/com/corbado/integration/IdentifierServiceIT.java @@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; + import com.corbado.base.AbstractSdkTest; import com.corbado.exceptions.CorbadoServerException; import com.corbado.exceptions.StandardException; @@ -18,9 +19,9 @@ import com.corbado.services.IdentifierService; import com.corbado.util.TestUtils; import java.util.List; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import lombok.extern.slf4j.Slf4j; /** The Class UserServiceIT. */ @Slf4j @@ -61,7 +62,7 @@ private void assertValidationErrorEquals( * Sets the up class. * * @throws StandardException the standard exception - * @throws CorbadoServerException + * @throws CorbadoServerException the server side error */ @BeforeAll public void setUpClass() throws StandardException, CorbadoServerException { @@ -220,7 +221,7 @@ void test_updateIdentifier_ExpectSuccess() /** * Test list all emails by user id expect success. * - * @throws CorbadoServerException + * @throws CorbadoServerException the server side error */ @Test void test_listAllEmailsByUserId_expectSuccess() throws CorbadoServerException { diff --git a/src/test/java/com/corbado/integration/UserServiceIT.java b/src/test/java/com/corbado/integration/UserServiceIT.java index 989ef09..ebd046a 100644 --- a/src/test/java/com/corbado/integration/UserServiceIT.java +++ b/src/test/java/com/corbado/integration/UserServiceIT.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; + import com.corbado.base.AbstractSdkTest; import com.corbado.entities.UserEntity; import com.corbado.exceptions.CorbadoServerException; @@ -36,9 +37,9 @@ void test_InstantiateSdk_ExpectNotNull() { } /** - * Test case for user creation with validation error. * + * Test case for user creation with validation error. * - * @throws CorbadoServerException + * @throws CorbadoServerException the standard exception */ @Test void test_UserCreateBlankName_ExpectSuccess() throws CorbadoServerException { @@ -72,7 +73,7 @@ void test_UserGet_ExpectNotFound() { assertThrows( CorbadoServerException.class, () -> { - final UserEntity ret = this.fixture.get("usr-1234567890"); + this.fixture.get("usr-1234567890"); }); assertNotNull(e); assertEquals(400, e.getHttpStatusCode()); @@ -113,7 +114,7 @@ void test_Delete_ExpectUserWillNotBeFound() throws CorbadoServerException, Stand assertThrows( CorbadoServerException.class, () -> { - final UserEntity ret = this.fixture.get(user.getUserID()); + this.fixture.get(user.getUserID()); }); assertNotNull(e); assertEquals(400, e.getHttpStatusCode()); diff --git a/src/test/java/com/corbado/unit/SessionServiceTest.java b/src/test/java/com/corbado/unit/SessionServiceTest.java index fd22167..64572f1 100644 --- a/src/test/java/com/corbado/unit/SessionServiceTest.java +++ b/src/test/java/com/corbado/unit/SessionServiceTest.java @@ -6,6 +6,22 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.anyString; +import com.auth0.jwk.Jwk; +import com.auth0.jwk.JwkException; +import com.auth0.jwk.JwkProvider; +import com.auth0.jwt.JWT; +import com.auth0.jwt.algorithms.Algorithm; +import com.auth0.jwt.exceptions.IncorrectClaimException; +import com.auth0.jwt.exceptions.JWTVerificationException; +import com.corbado.entities.UserEntity; +import com.corbado.enums.exception.ValidationErrorType; +import com.corbado.exceptions.StandardException; +import com.corbado.exceptions.TokenValidationException; +import com.corbado.services.SessionService; +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonSyntaxException; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; @@ -24,7 +40,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -36,23 +51,6 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import com.auth0.jwk.Jwk; -import com.auth0.jwk.JwkException; -import com.auth0.jwk.JwkProvider; -import com.auth0.jwt.JWT; -import com.auth0.jwt.algorithms.Algorithm; -import com.auth0.jwt.exceptions.IncorrectClaimException; -import com.auth0.jwt.exceptions.JWTVerificationException; -import com.corbado.entities.UserEntity; -import com.corbado.enums.exception.ValidationErrorType; -import com.corbado.exceptions.StandardException; -import com.corbado.exceptions.TokenValidationException; -import com.corbado.services.SessionService; -import com.google.gson.Gson; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; -import com.google.gson.JsonSyntaxException; - /** Unit Test for session service. */ @ExtendWith(MockitoExtension.class) public class SessionServiceTest { @@ -205,11 +203,6 @@ void test_getCurrentUser( assertEquals(TEST_NAME, validationResult.getFullName()); assertEquals(TEST_USER_ID, validationResult.getUserID()); } - /** - * Inits the parameters test data. - * - * @return the stream - */ } // ------------------ Test data --------------------- // @@ -227,13 +220,6 @@ static Stream initParametersTestData() { new Object[] {"", "2", false}, // Test empty jwks_uri new Object[] {"s", "", false}); - /** - * Provide jwts. - * - * @return the list - * @throws InvalidKeySpecException the invalid key spec exception - * @throws NoSuchAlgorithmException the no such algorithm exception - */ } /** @@ -366,15 +352,6 @@ static List provideJwts() throws InvalidKeySpecException, NoSuchAlgori }); return testData; - /** - * Read private key. - * - * @param privateKeyPath the private key path - * @return the RSA private key - * @throws IOException Signals that an I/O exception has occurred. - * @throws NoSuchAlgorithmException the no such algorithm exception - * @throws InvalidKeySpecException the invalid key spec exception - */ } // ------------------ Utility functions--------------------- // @@ -402,16 +379,6 @@ private static RSAPrivateKey readPrivateKey(final String privateKeyPath) final KeyFactory keyFactory = KeyFactory.getInstance("RSA"); final PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(encoded); return (RSAPrivateKey) keyFactory.generatePrivate(keySpec); - /** - * Generate jwt. - * - * @param iss the iss - * @param exp the exp - * @param nbf the nbf - * @return the string - * @throws InvalidKeySpecException the invalid key spec exception - * @throws NoSuchAlgorithmException the no such algorithm exception - */ } /** @@ -440,11 +407,6 @@ private static String generateJwt( .withClaim("email", TEST_EMAIL) .withClaim("phone_number", TEST_PHONE_NUMBER) .sign(algorithm); - /** - * Creates the session service. - * - * @return the session service - */ } /** @@ -458,12 +420,6 @@ private static SessionService createSessionService() { 10, false, TEST_PROJECT_ID); // URLs do not matter, url access is mocked - /** - * Read jwks. - * - * @return the json array - * @throws FileNotFoundException the file not found exception - */ } /** diff --git a/src/test/java/com/corbado/util/TestUtils.java b/src/test/java/com/corbado/util/TestUtils.java index 7d01cee..1d6e4e4 100644 --- a/src/test/java/com/corbado/util/TestUtils.java +++ b/src/test/java/com/corbado/util/TestUtils.java @@ -1,9 +1,5 @@ package com.corbado.util; -import java.util.Random; - -import org.apache.commons.lang3.StringUtils; - import com.corbado.entities.UserEntity; import com.corbado.exceptions.CorbadoServerException; import com.corbado.exceptions.StandardException; @@ -11,8 +7,9 @@ import com.corbado.generated.model.UserStatus; import com.corbado.sdk.Config; import com.corbado.sdk.CorbadoSdk; - import io.github.cdimascio.dotenv.Dotenv; +import java.util.Random; +import org.apache.commons.lang3.StringUtils; /** The Class TestUtils. */ public class TestUtils {