refactor: fix Sonar issues (#943)

micronaut-projects · Mar 4, 2022 · 2b276d4 · 2b276d4
1 parent 6a87d92
commit 2b276d4
Show file tree

Hide file tree

Showing 412 changed files with 1,022 additions and 1,498 deletions.
diff --git a/...y-annotations/src/main/java/io/micronaut/security/annotation/DenyAllAnnotationMapper.java b/...y-annotations/src/main/java/io/micronaut/security/annotation/DenyAllAnnotationMapper.java
@@ -19,7 +19,6 @@
 import io.micronaut.core.annotation.Internal;
 import io.micronaut.inject.annotation.NamedAnnotationMapper;
 import io.micronaut.inject.visitor.VisitorContext;
-
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...annotations/src/main/java/io/micronaut/security/annotation/PermitAllAnnotationMapper.java b/...annotations/src/main/java/io/micronaut/security/annotation/PermitAllAnnotationMapper.java
@@ -19,7 +19,6 @@
 import io.micronaut.core.annotation.Internal;
 import io.micronaut.inject.annotation.NamedAnnotationMapper;
 import io.micronaut.inject.visitor.VisitorContext;
-
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...otations/src/main/java/io/micronaut/security/annotation/RolesAllowedAnnotationMapper.java b/...otations/src/main/java/io/micronaut/security/annotation/RolesAllowedAnnotationMapper.java
@@ -19,7 +19,6 @@
 import io.micronaut.core.annotation.Internal;
 import io.micronaut.inject.annotation.NamedAnnotationMapper;
 import io.micronaut.inject.visitor.VisitorContext;
-
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../src/main/java/io/micronaut/security/token/jwt/bearer/AccessRefreshTokenLoginHandler.java b/.../src/main/java/io/micronaut/security/token/jwt/bearer/AccessRefreshTokenLoginHandler.java
@@ -19,14 +19,13 @@
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MutableHttpResponse;
+import io.micronaut.security.authentication.Authentication;
 import io.micronaut.security.authentication.AuthenticationException;
 import io.micronaut.security.authentication.AuthenticationResponse;
-import io.micronaut.security.authentication.Authentication;
 import io.micronaut.security.config.SecurityConfigurationProperties;
 import io.micronaut.security.handlers.LoginHandler;
 import io.micronaut.security.token.jwt.generator.AccessRefreshTokenGenerator;
 import io.micronaut.security.token.jwt.render.AccessRefreshToken;
-
 import jakarta.inject.Singleton;
 import java.util.Optional;
 

diff --git a/...ty-jwt/src/main/java/io/micronaut/security/token/jwt/bearer/BearerTokenConfiguration.java b/...ty-jwt/src/main/java/io/micronaut/security/token/jwt/bearer/BearerTokenConfiguration.java
@@ -29,6 +29,7 @@ public interface BearerTokenConfiguration extends Toggleable {
      *
      * @return a boolean flag indicating whether BearerTokenReader bean should be enabled or not
      */
+    @Override
     boolean isEnabled();
 
     /**

diff --git a/.../main/java/io/micronaut/security/token/jwt/bearer/BearerTokenConfigurationProperties.java b/.../main/java/io/micronaut/security/token/jwt/bearer/BearerTokenConfigurationProperties.java
@@ -38,7 +38,7 @@ public class BearerTokenConfigurationProperties implements BearerTokenConfigurat
 
     private boolean enabled = DEFAULT_ENABLED;
     private String headerName = HttpHeaders.AUTHORIZATION;
-    private String prefix = HttpHeaderValues.AUTHORIZATION_PREFIX_BEARER;
+    private String headerPrefix = HttpHeaderValues.AUTHORIZATION_PREFIX_BEARER;
 
     @Override
     public boolean isEnabled() {
@@ -47,7 +47,7 @@ public boolean isEnabled() {
 
     @Override
     public String getPrefix() {
-        return prefix;
+        return headerPrefix;
     }
 
     @Override
@@ -75,9 +75,9 @@ public void setHeaderName(String headerName) {
 
     /**
      * Sets the prefix to use for the auth token. Default value Bearer.
-     * @param prefix The prefix to use
+     * @param headerPrefix The prefix to use
      */
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
+    public void setPrefix(String headerPrefix) {
+        this.headerPrefix = headerPrefix;
     }
 }
diff --git a/security-jwt/src/main/java/io/micronaut/security/token/jwt/bearer/BearerTokenReader.java b/security-jwt/src/main/java/io/micronaut/security/token/jwt/bearer/BearerTokenReader.java
@@ -20,7 +20,6 @@
 import io.micronaut.security.token.jwt.cookie.JwtCookieTokenReader;
 import io.micronaut.security.token.reader.HttpHeaderTokenReader;
 import io.micronaut.security.token.reader.TokenReader;
-
 import jakarta.inject.Singleton;
 
 /**

diff --git a/security-jwt/src/main/java/io/micronaut/security/token/jwt/config/JwtConfiguration.java b/security-jwt/src/main/java/io/micronaut/security/token/jwt/config/JwtConfiguration.java
@@ -29,5 +29,6 @@ public interface JwtConfiguration extends Toggleable {
      *
      * @return a boolean flag indicating whether JWT beans should be enabled or not
      */
+    @Override
     boolean isEnabled();
 }
diff --git a/...y-jwt/src/main/java/io/micronaut/security/token/jwt/converters/JWEAlgorithmConverter.java b/...y-jwt/src/main/java/io/micronaut/security/token/jwt/converters/JWEAlgorithmConverter.java
@@ -18,7 +18,6 @@
 import com.nimbusds.jose.JWEAlgorithm;
 import io.micronaut.core.convert.ConversionContext;
 import io.micronaut.core.convert.TypeConverter;
-
 import jakarta.inject.Singleton;
 import java.util.Optional;
 

diff --git a/...y-jwt/src/main/java/io/micronaut/security/token/jwt/converters/JWSAlgorithmConverter.java b/...y-jwt/src/main/java/io/micronaut/security/token/jwt/converters/JWSAlgorithmConverter.java
@@ -18,7 +18,6 @@
 import com.nimbusds.jose.JWSAlgorithm;
 import io.micronaut.core.convert.ConversionContext;
 import io.micronaut.core.convert.TypeConverter;
-
 import jakarta.inject.Singleton;
 import java.util.Optional;
 

diff --git a/security-jwt/src/main/java/io/micronaut/security/token/jwt/converters/KeyTypeConverter.java b/security-jwt/src/main/java/io/micronaut/security/token/jwt/converters/KeyTypeConverter.java
@@ -18,7 +18,6 @@
 import com.nimbusds.jose.jwk.KeyType;
 import io.micronaut.core.convert.ConversionContext;
 import io.micronaut.core.convert.TypeConverter;
-
 import jakarta.inject.Singleton;
 import java.util.Optional;
 

diff --git a/security-jwt/src/main/java/io/micronaut/security/token/jwt/cookie/CookieLoginHandler.java b/security-jwt/src/main/java/io/micronaut/security/token/jwt/cookie/CookieLoginHandler.java
@@ -22,8 +22,8 @@
 import io.micronaut.http.HttpStatus;
 import io.micronaut.http.MutableHttpResponse;
 import io.micronaut.http.cookie.Cookie;
-import io.micronaut.security.authentication.AuthenticationResponse;
 import io.micronaut.security.authentication.Authentication;
+import io.micronaut.security.authentication.AuthenticationResponse;
 import io.micronaut.security.config.RedirectConfiguration;
 import io.micronaut.security.config.RefreshRedirectConfiguration;
 import io.micronaut.security.errors.PriorToLoginPersistence;

diff --git a/...rc/main/java/io/micronaut/security/token/jwt/cookie/JwtCookieConfigurationProperties.java b/...rc/main/java/io/micronaut/security/token/jwt/cookie/JwtCookieConfigurationProperties.java
@@ -17,12 +17,12 @@
 
 import io.micronaut.context.annotation.ConfigurationProperties;
 import io.micronaut.context.annotation.Requires;
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.http.cookie.SameSite;
 import io.micronaut.security.authentication.CookieBasedAuthenticationModeCondition;
 import io.micronaut.security.token.jwt.config.JwtConfigurationProperties;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
 import java.time.Duration;
 import java.time.temporal.TemporalAmount;
 import java.util.Optional;

diff --git a/security-jwt/src/main/java/io/micronaut/security/token/jwt/cookie/JwtCookieLoginHandler.java b/security-jwt/src/main/java/io/micronaut/security/token/jwt/cookie/JwtCookieLoginHandler.java
@@ -15,8 +15,8 @@
  */
 package io.micronaut.security.token.jwt.cookie;
 
-import io.micronaut.core.annotation.Nullable;
 import io.micronaut.context.annotation.Requires;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.cookie.Cookie;

diff --git a/...ava/io/micronaut/security/token/jwt/cookie/RefreshTokenCookieConfigurationProperties.java b/...ava/io/micronaut/security/token/jwt/cookie/RefreshTokenCookieConfigurationProperties.java
@@ -15,17 +15,16 @@
  */
 package io.micronaut.security.token.jwt.cookie;
 
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
 import io.micronaut.context.annotation.ConfigurationProperties;
 import io.micronaut.context.annotation.Property;
 import io.micronaut.context.annotation.Requires;
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.http.cookie.SameSite;
 import io.micronaut.security.authentication.CookieBasedAuthenticationModeCondition;
 import io.micronaut.security.token.config.TokenConfigurationProperties;
 import io.micronaut.security.token.jwt.endpoints.OauthControllerConfigurationProperties;
-
 import java.time.Duration;
 import java.time.temporal.TemporalAmount;
 import java.util.Optional;

diff --git a/...main/java/io/micronaut/security/token/jwt/encryption/AbstractEncryptionConfiguration.java b/...main/java/io/micronaut/security/token/jwt/encryption/AbstractEncryptionConfiguration.java
@@ -15,7 +15,14 @@
  */
 package io.micronaut.security.token.jwt.encryption;
 
-import com.nimbusds.jose.*;
+import com.nimbusds.jose.EncryptionMethod;
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.JWEAlgorithm;
+import com.nimbusds.jose.JWEDecrypter;
+import com.nimbusds.jose.JWEEncrypter;
+import com.nimbusds.jose.JWEHeader;
+import com.nimbusds.jose.JWEObject;
+import com.nimbusds.jose.Payload;
 import com.nimbusds.jwt.EncryptedJWT;
 import com.nimbusds.jwt.JWT;
 import com.nimbusds.jwt.SignedJWT;

diff --git a/security-jwt/src/main/java/io/micronaut/security/token/jwt/encryption/ec/ECEncryption.java b/security-jwt/src/main/java/io/micronaut/security/token/jwt/encryption/ec/ECEncryption.java
@@ -22,9 +22,9 @@
 import com.nimbusds.jose.JWEEncrypter;
 import com.nimbusds.jose.crypto.ECDHDecrypter;
 import com.nimbusds.jose.crypto.ECDHEncrypter;
-import io.micronaut.security.token.jwt.encryption.AbstractEncryptionConfiguration;
-
+import com.nimbusds.jose.crypto.impl.ECDHCryptoProvider;
 import io.micronaut.core.annotation.NonNull;
+import io.micronaut.security.token.jwt.encryption.AbstractEncryptionConfiguration;
 import java.security.interfaces.ECPrivateKey;
 import java.security.interfaces.ECPublicKey;
 
@@ -54,7 +54,7 @@ public ECEncryption(ECEncryptionConfiguration ecEncryptionConfiguration) {
     @Override
     public boolean supports(final JWEAlgorithm algorithm, final EncryptionMethod method) {
         if (algorithm != null && method != null) {
-            return ECDHDecrypter.SUPPORTED_ALGORITHMS.contains(algorithm) && ECDHDecrypter.SUPPORTED_ENCRYPTION_METHODS.contains(method);
+            return ECDHCryptoProvider.SUPPORTED_ALGORITHMS.contains(algorithm) && ECDHCryptoProvider.SUPPORTED_ENCRYPTION_METHODS.contains(method);
         }
         return false;
     }

diff --git a/...rc/main/java/io/micronaut/security/token/jwt/encryption/ec/ECEncryptionConfiguration.java b/...rc/main/java/io/micronaut/security/token/jwt/encryption/ec/ECEncryptionConfiguration.java
@@ -17,7 +17,6 @@
 
 import com.nimbusds.jose.EncryptionMethod;
 import com.nimbusds.jose.JWEAlgorithm;
-
 import java.security.interfaces.ECPrivateKey;
 import java.security.interfaces.ECPublicKey;
 

diff --git a/security-jwt/src/main/java/io/micronaut/security/token/jwt/encryption/rsa/RSAEncryption.java b/security-jwt/src/main/java/io/micronaut/security/token/jwt/encryption/rsa/RSAEncryption.java
@@ -21,9 +21,9 @@
 import com.nimbusds.jose.JWEEncrypter;
 import com.nimbusds.jose.crypto.RSADecrypter;
 import com.nimbusds.jose.crypto.RSAEncrypter;
-import io.micronaut.security.token.jwt.encryption.AbstractEncryptionConfiguration;
-
+import com.nimbusds.jose.crypto.impl.RSACryptoProvider;
 import io.micronaut.core.annotation.NonNull;
+import io.micronaut.security.token.jwt.encryption.AbstractEncryptionConfiguration;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 
@@ -53,7 +53,7 @@ public RSAEncryption(RSAEncryptionConfiguration rsaEncryptionConfiguration) {
     @Override
     public boolean supports(final JWEAlgorithm algorithm, final EncryptionMethod method) {
         if (algorithm != null && method != null) {
-            return RSADecrypter.SUPPORTED_ALGORITHMS.contains(algorithm) && RSADecrypter.SUPPORTED_ENCRYPTION_METHODS.contains(method);
+            return RSACryptoProvider.SUPPORTED_ALGORITHMS.contains(algorithm) && RSACryptoProvider.SUPPORTED_ENCRYPTION_METHODS.contains(method);
         }
         return false;
     }

diff --git a/.../main/java/io/micronaut/security/token/jwt/encryption/rsa/RSAEncryptionConfiguration.java b/.../main/java/io/micronaut/security/token/jwt/encryption/rsa/RSAEncryptionConfiguration.java
@@ -17,7 +17,6 @@
 
 import com.nimbusds.jose.EncryptionMethod;
 import com.nimbusds.jose.JWEAlgorithm;
-
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 

diff --git a/...jwt/src/main/java/io/micronaut/security/token/jwt/encryption/secret/SecretEncryption.java b/...jwt/src/main/java/io/micronaut/security/token/jwt/encryption/secret/SecretEncryption.java
@@ -15,6 +15,8 @@
  */
 package io.micronaut.security.token.jwt.encryption.secret;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import com.nimbusds.jose.EncryptionMethod;
 import com.nimbusds.jose.JWEAlgorithm;
 import com.nimbusds.jose.JWEDecrypter;
@@ -24,11 +26,11 @@
 import com.nimbusds.jose.crypto.AESEncrypter;
 import com.nimbusds.jose.crypto.DirectDecrypter;
 import com.nimbusds.jose.crypto.DirectEncrypter;
+import com.nimbusds.jose.crypto.impl.AESCryptoProvider;
+import com.nimbusds.jose.crypto.impl.DirectCryptoProvider;
 import io.micronaut.context.exceptions.ConfigurationException;
 import io.micronaut.security.token.jwt.encryption.AbstractEncryptionConfiguration;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 /**
  * Secret encryption configuration.
  *
@@ -65,10 +67,10 @@ public SecretEncryption(SecretEncryptionConfiguration secretEncryptionConfigurat
     @Override
     public boolean supports(final JWEAlgorithm algorithm, final EncryptionMethod method) {
         if (algorithm != null && method != null) {
-            final boolean isDirect = DirectDecrypter.SUPPORTED_ALGORITHMS.contains(algorithm)
-                    && DirectDecrypter.SUPPORTED_ENCRYPTION_METHODS.contains(method);
-            final boolean isAes = AESDecrypter.SUPPORTED_ALGORITHMS.contains(algorithm)
-                    && AESDecrypter.SUPPORTED_ENCRYPTION_METHODS.contains(method);
+            final boolean isDirect = DirectCryptoProvider.SUPPORTED_ALGORITHMS.contains(algorithm)
+                    && DirectCryptoProvider.SUPPORTED_ENCRYPTION_METHODS.contains(method);
+            final boolean isAes = AESCryptoProvider.SUPPORTED_ALGORITHMS.contains(algorithm)
+                    && AESCryptoProvider.SUPPORTED_ENCRYPTION_METHODS.contains(method);
             return isDirect || isAes;
         }
         return false;
@@ -85,7 +87,7 @@ public String supportedAlgorithmsMessage() {
 
     @Override
     protected JWEEncrypter buildEncrypter() throws KeyLengthException {
-        if (DirectDecrypter.SUPPORTED_ALGORITHMS.contains(algorithm)) {
+        if (DirectCryptoProvider.SUPPORTED_ALGORITHMS.contains(algorithm)) {
             return new DirectEncrypter(this.secret);
         } else {
             return new AESEncrypter(this.secret);
@@ -94,7 +96,7 @@ protected JWEEncrypter buildEncrypter() throws KeyLengthException {
 
     @Override
     protected JWEDecrypter buildDecrypter() throws KeyLengthException {
-        if (DirectDecrypter.SUPPORTED_ALGORITHMS.contains(algorithm)) {
+        if (DirectCryptoProvider.SUPPORTED_ALGORITHMS.contains(algorithm)) {
             return new DirectDecrypter(this.secret);
         } else {
             return new AESDecrypter(this.secret);

diff --git a/security-jwt/src/main/java/io/micronaut/security/token/jwt/endpoints/JwkProvider.java b/security-jwt/src/main/java/io/micronaut/security/token/jwt/endpoints/JwkProvider.java
@@ -16,7 +16,6 @@
 package io.micronaut.security.token.jwt.endpoints;
 
 import com.nimbusds.jose.jwk.JWK;
-
 import java.util.List;
 
 /**

diff --git a/security-jwt/src/main/java/io/micronaut/security/token/jwt/endpoints/KeysController.java b/security-jwt/src/main/java/io/micronaut/security/token/jwt/endpoints/KeysController.java
@@ -27,16 +27,15 @@
 import io.micronaut.security.annotation.Secured;
 import io.micronaut.security.rules.SecurityRule;
 import jakarta.inject.Inject;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
 import org.reactivestreams.Publisher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-
 /**
  * Endpoint which exposes a JSON Web Key Set built with the JWK provided by {@link io.micronaut.security.token.jwt.endpoints.JwkProvider} beans.
  *

diff --git a/security-jwt/src/main/java/io/micronaut/security/token/jwt/endpoints/OauthController.java b/security-jwt/src/main/java/io/micronaut/security/token/jwt/endpoints/OauthController.java
@@ -15,9 +15,9 @@
  */
 package io.micronaut.security.token.jwt.endpoints;
 
+import io.micronaut.context.annotation.Requires;
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.annotation.Nullable;
-import io.micronaut.context.annotation.Requires;
 import io.micronaut.core.async.annotation.SingleResult;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.http.HttpRequest;
@@ -39,11 +39,10 @@
 import io.micronaut.security.token.refresh.RefreshTokenPersistence;
 import io.micronaut.security.token.validator.RefreshTokenValidator;
 import io.micronaut.validation.Validated;
+import java.util.Optional;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Mono;
 
-import java.util.Optional;
-
 /**
  *
  * A controller that handles token refresh.

diff --git a/...rity-jwt/src/main/java/io/micronaut/security/token/jwt/endpoints/TokenRefreshRequest.java b/...rity-jwt/src/main/java/io/micronaut/security/token/jwt/endpoints/TokenRefreshRequest.java
@@ -17,7 +17,6 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.micronaut.core.annotation.Introspected;
-
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 

diff --git a/.../src/main/java/io/micronaut/security/token/jwt/generator/AccessRefreshTokenGenerator.java b/.../src/main/java/io/micronaut/security/token/jwt/generator/AccessRefreshTokenGenerator.java
@@ -15,11 +15,10 @@
  */
 package io.micronaut.security.token.jwt.generator;
 
-import io.micronaut.core.annotation.NonNull;
 import io.micronaut.context.annotation.DefaultImplementation;
+import io.micronaut.core.annotation.NonNull;
 import io.micronaut.security.authentication.Authentication;
 import io.micronaut.security.token.jwt.render.AccessRefreshToken;
-
 import java.util.Map;
 import java.util.Optional;
 

diff --git a/...in/java/io/micronaut/security/token/jwt/generator/AccessTokenConfigurationProperties.java b/...in/java/io/micronaut/security/token/jwt/generator/AccessTokenConfigurationProperties.java
@@ -15,8 +15,8 @@
  */
 package io.micronaut.security.token.jwt.generator;
 
-import io.micronaut.core.annotation.NonNull;
 import io.micronaut.context.annotation.ConfigurationProperties;
+import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.util.ArgumentUtils;
 import io.micronaut.security.token.jwt.config.JwtConfigurationProperties;