This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push: new dc2b6cc cxf-services-sts-core: fix PMD rule: UnusedAssignment dc2b6cc is described below commit dc2b6cc5cc1164f6bb45049bec2373032411f54a Author: Alexey Markevich <buhhu...@gmail.com> AuthorDate: Wed Apr 21 03:40:48 2021 +0300 cxf-services-sts-core: fix PMD rule: UnusedAssignment --- .../cxf/sts/cache/AbstractIdentityCache.java | 2 +- .../apache/cxf/sts/cache/HazelCastTokenStore.java | 2 +- .../org/apache/cxf/sts/claims/ClaimsManager.java | 4 +- .../apache/cxf/sts/claims/LdapClaimsHandler.java | 2 +- .../cxf/sts/claims/LdapGroupClaimsHandler.java | 4 +- .../java/org/apache/cxf/sts/claims/LdapUtils.java | 8 ++-- .../apache/cxf/sts/event/map/MapEventLogger.java | 52 +++++++++++----------- .../cxf/sts/operation/TokenIssueOperation.java | 6 +-- .../cxf/sts/operation/TokenRenewOperation.java | 6 +-- .../cxf/sts/operation/TokenValidateOperation.java | 6 +-- .../org/apache/cxf/sts/request/RequestParser.java | 2 +- .../sts/token/provider/DefaultSubjectProvider.java | 4 +- .../cxf/sts/token/provider/SAMLTokenProvider.java | 6 +-- .../sts/token/provider/SymmetricKeyHandler.java | 2 +- .../provider/jwt/DefaultJWTClaimsProvider.java | 4 +- .../sts/token/provider/jwt/JWTTokenProvider.java | 5 +-- .../cxf/sts/token/renewer/SAMLTokenRenewer.java | 6 +-- .../sts/token/validator/SAMLTokenValidator.java | 6 +-- .../token/validator/UsernameTokenValidator.java | 2 +- .../sts/token/validator/X509TokenValidator.java | 2 +- .../token/validator/jwt/DefaultJWTRoleParser.java | 2 +- .../cxf/sts/common/CustomUserClaimsHandler.java | 4 +- .../apache/cxf/sts/service/StaticServiceTest.java | 4 +- .../sts/token/provider/SAMLProviderRealmTest.java | 1 - .../token/validator/X509TokenValidatorTest.java | 3 +- 25 files changed, 69 insertions(+), 76 deletions(-) diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/AbstractIdentityCache.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/AbstractIdentityCache.java index ffc6bcf..011457a 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/AbstractIdentityCache.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/AbstractIdentityCache.java @@ -51,7 +51,7 @@ public abstract class AbstractIdentityCache implements IdentityCache, IdentityMa public Principal mapPrincipal(String sourceRealm, Principal sourcePrincipal, String targetRealm) { - Principal targetPrincipal = null; + final Principal targetPrincipal; Map<String, String> identities = this.get(sourcePrincipal.getName(), sourceRealm); if (identities != null) { if (LOG.isLoggable(Level.FINE)) { diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java index de35d3b..68fe914 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java @@ -123,7 +123,7 @@ public class HazelCastTokenStore implements TokenStore { } private int getTTL(SecurityToken token) { - int parsedTTL = 0; + int parsedTTL; if (token.getExpires() != null) { Instant expires = token.getExpires(); Instant now = Instant.now(); diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java index d6210c7..acddaa5 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java @@ -163,7 +163,7 @@ public class ClaimsManager { // Consider refactoring to use a CallbackHandler and keep ClaimsManager token independent SamlAssertionWrapper assertion = (SamlAssertionWrapper)parameters.getAdditionalProperties().get(SamlAssertionWrapper.class.getName()); - List<ProcessedClaim> claimList = null; + final List<ProcessedClaim> claimList; if (assertion.getSamlVersion().equals(SAMLVersion.VERSION_20)) { claimList = this.parseClaimsInAssertion(assertion.getSaml2()); } else { @@ -240,7 +240,7 @@ public class ClaimsManager { // do an identity mapping if (handlerRealmSupport.getHandlerRealm() != null && !handlerRealmSupport.getHandlerRealm().equalsIgnoreCase(parameters.getRealm())) { - Principal targetPrincipal = null; + final Principal targetPrincipal; try { if (LOG.isLoggable(Level.FINE)) { LOG.fine("Mapping user '" + parameters.getPrincipal().getName() diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java index 105503e..48a4cef 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java @@ -128,7 +128,7 @@ public class LdapClaimsHandler implements ClaimsHandler, RealmSupport { public ProcessedClaimCollection retrieveClaimValues( ClaimCollection claims, ClaimsParameters parameters) { - String user = null; + final String user; boolean useLdapLookup = false; Principal principal = parameters.getPrincipal(); diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java index 1e7af1f..fef69e8 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java @@ -278,7 +278,7 @@ public class LdapGroupClaimsHandler implements ClaimsHandler, RealmSupport { // Demo_User -> Role=User // Demo_Admin -> Role=Admin String filter = this.groupNameScopedFilter; - String role = null; + final String role; if (isUseFullGroupNameAsValue()) { role = group; } else { @@ -291,7 +291,7 @@ public class LdapGroupClaimsHandler implements ClaimsHandler, RealmSupport { //ex. (default groupNameGlobalFilter) // User -> Role=User // Admin -> Role=Admin - String role = null; + final String role; if (isUseFullGroupNameAsValue()) { role = group; } else { diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java index c6a8b45..8a4cd44 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java @@ -76,16 +76,15 @@ public final class LdapUtils { } }; - List<?> result = null; AndFilter filter = new AndFilter(); filter.and( new EqualsFilter("objectclass", objectClass)).and( new EqualsFilter(filterAttributeName, filterAttributeValue)); - result = ldapTemplate.search((baseDN == null) ? "" : baseDN, filter.toString(), + List<Map<String, Attribute>> result = ldapTemplate.search((baseDN == null) ? "" : baseDN, filter.toString(), SearchControls.SUBTREE_SCOPE, searchAttributes, mapper); if (result != null && !result.isEmpty()) { - ldapAttributes = CastUtils.cast((Map<?, ?>)result.get(0)); + ldapAttributes = result.get(0); } return ldapAttributes; @@ -121,7 +120,6 @@ public final class LdapUtils { String[] searchAttributes = new String[] {searchAttribute}; - List<?> result = null; AndFilter filter = new AndFilter(); filter.and(new EqualsFilter("objectclass", objectClass)); if (filters != null) { @@ -130,7 +128,7 @@ public final class LdapUtils { } } - result = ldapTemplate.search((baseDN == null) ? "" : baseDN, filter.toString(), + List<?> result = ldapTemplate.search((baseDN == null) ? "" : baseDN, filter.toString(), SearchControls.SUBTREE_SCOPE, searchAttributes, mapper); if (result != null && !result.isEmpty()) { ldapAttributes = CastUtils.cast((List<?>)result); diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java index 27ea8f5..4f187ac 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java @@ -21,7 +21,7 @@ package org.apache.cxf.sts.event.map; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Map; @@ -33,36 +33,34 @@ import org.apache.cxf.common.logging.LogUtils; public class MapEventLogger implements MapEventListener { private static final Logger LOG = LogUtils.getL7dLogger(MapEventLogger.class); - private List<String> fieldOrder = new ArrayList<>(); + private List<String> fieldOrder = Arrays.asList( + KEYS.TIME.name(), + KEYS.STATUS.name(), + KEYS.DURATION.name(), + KEYS.REMOTE_HOST.name(), + KEYS.REMOTE_PORT.name(), + KEYS.OPERATION.name(), + KEYS.URL.name(), + KEYS.REALM.name(), + KEYS.WS_SEC_PRINCIPAL.name(), + KEYS.ONBEHALFOF_PRINCIPAL.name(), + KEYS.ACTAS_PRINCIPAL.name(), + KEYS.VALIDATE_PRINCIPAL.name(), + KEYS.CANCEL_PRINCIPAL.name(), + KEYS.RENEW_PRINCIPAL.name(), + KEYS.TOKENTYPE.name(), + KEYS.KEYTYPE.name(), + KEYS.APPLIESTO.name(), + KEYS.CLAIMS_PRIMARY.name(), + KEYS.CLAIMS_SECONDARY.name(), + KEYS.EXCEPTION.name(), + KEYS.STACKTRACE.name() + ); private boolean logStacktrace; private boolean logFieldname; private Level logLevel = Level.FINE; private String format; - public MapEventLogger() { - fieldOrder.add(KEYS.TIME.name()); - fieldOrder.add(KEYS.STATUS.name()); - fieldOrder.add(KEYS.DURATION.name()); - fieldOrder.add(KEYS.REMOTE_HOST.name()); - fieldOrder.add(KEYS.REMOTE_PORT.name()); - fieldOrder.add(KEYS.OPERATION.name()); - fieldOrder.add(KEYS.URL.name()); - fieldOrder.add(KEYS.REALM.name()); - fieldOrder.add(KEYS.WS_SEC_PRINCIPAL.name()); - fieldOrder.add(KEYS.ONBEHALFOF_PRINCIPAL.name()); - fieldOrder.add(KEYS.ACTAS_PRINCIPAL.name()); - fieldOrder.add(KEYS.VALIDATE_PRINCIPAL.name()); - fieldOrder.add(KEYS.CANCEL_PRINCIPAL.name()); - fieldOrder.add(KEYS.RENEW_PRINCIPAL.name()); - fieldOrder.add(KEYS.TOKENTYPE.name()); - fieldOrder.add(KEYS.KEYTYPE.name()); - fieldOrder.add(KEYS.APPLIESTO.name()); - fieldOrder.add(KEYS.CLAIMS_PRIMARY.name()); - fieldOrder.add(KEYS.CLAIMS_SECONDARY.name()); - fieldOrder.add(KEYS.EXCEPTION.name()); - fieldOrder.add(KEYS.STACKTRACE.name()); - } - @Override public void onEvent(MapEvent event) { Map<String, ?> map = event.getProperties(); @@ -86,7 +84,7 @@ public class MapEventLogger implements MapEventListener { if (value instanceof String) { return (String) value; } else if (value instanceof Date) { - DateFormat dateFormat = null; + final DateFormat dateFormat; if (format != null) { dateFormat = new SimpleDateFormat(format); } else { diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java index 4ada2e0..b2f2da1 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java @@ -161,7 +161,7 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera // create token TokenProviderResponse tokenResponse = null; for (TokenProvider tokenProvider : tokenProviders) { - boolean canHandle = false; + final boolean canHandle; if (realm == null) { canHandle = tokenProvider.canHandleToken(tokenType); } else { @@ -286,7 +286,7 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera if (returnReferences) { // RequestedAttachedReference TokenReference attachedReference = tokenResponse.getAttachedReference(); - RequestedReferenceType requestedAttachedReferenceType = null; + final RequestedReferenceType requestedAttachedReferenceType; if (attachedReference != null) { requestedAttachedReferenceType = createRequestedReference(attachedReference, true); } else { @@ -304,7 +304,7 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera // RequestedUnattachedReference TokenReference unAttachedReference = tokenResponse.getUnAttachedReference(); - RequestedReferenceType requestedUnattachedReferenceType = null; + final RequestedReferenceType requestedUnattachedReferenceType; if (unAttachedReference != null) { requestedUnattachedReferenceType = createRequestedReference(unAttachedReference, false); } else { diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java index aa59cc2..e4c251d 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java @@ -149,7 +149,7 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera realm = tokenResponse.getTokenRealm(); for (TokenRenewer tokenRenewer : tokenRenewers) { - boolean canHandle = false; + final boolean canHandle; if (realm == null) { canHandle = tokenRenewer.canHandleToken(tokenResponse.getToken()); } else { @@ -233,7 +233,7 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera if (returnReferences) { // RequestedAttachedReference TokenReference attachedReference = tokenRenewerResponse.getAttachedReference(); - RequestedReferenceType requestedAttachedReferenceType = null; + final RequestedReferenceType requestedAttachedReferenceType; if (attachedReference != null) { requestedAttachedReferenceType = createRequestedReference(attachedReference, true); } else { @@ -251,7 +251,7 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera // RequestedUnattachedReference TokenReference unAttachedReference = tokenRenewerResponse.getUnAttachedReference(); - RequestedReferenceType requestedUnattachedReferenceType = null; + final RequestedReferenceType requestedUnattachedReferenceType; if (unAttachedReference != null) { requestedUnattachedReferenceType = createRequestedReference(unAttachedReference, false); } else { diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java index b7cd0de..066edd4 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java @@ -133,7 +133,7 @@ public class TokenValidateOperation extends AbstractOperation implements Validat } realm = providerParameters.getRealm(); for (TokenProvider tokenProvider : tokenProviders) { - boolean canHandle = false; + final boolean canHandle; if (realm == null) { canHandle = tokenProvider.canHandleToken(tokenType); } else { @@ -242,7 +242,7 @@ public class TokenValidateOperation extends AbstractOperation implements Validat if (returnReferences) { // RequestedAttachedReference TokenReference attachedReference = tokenProviderResponse.getAttachedReference(); - RequestedReferenceType requestedAttachedReferenceType = null; + final RequestedReferenceType requestedAttachedReferenceType; if (attachedReference != null) { requestedAttachedReferenceType = createRequestedReference(attachedReference, true); } else { @@ -260,7 +260,7 @@ public class TokenValidateOperation extends AbstractOperation implements Validat // RequestedUnattachedReference TokenReference unAttachedReference = tokenProviderResponse.getUnAttachedReference(); - RequestedReferenceType requestedUnattachedReferenceType = null; + final RequestedReferenceType requestedUnattachedReferenceType; if (unAttachedReference != null) { requestedUnattachedReferenceType = createRequestedReference(unAttachedReference, false); diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java index f474d14..38000d2 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java @@ -446,7 +446,7 @@ public class RequestParser { * public key. */ private static ReceivedCredential parseKeyInfoElement(Element keyInfoElement) throws STSException { - KeyInfoFactory keyInfoFactory = null; + KeyInfoFactory keyInfoFactory; try { keyInfoFactory = KeyInfoFactory.getInstance("DOM", "ApacheXMLDSig"); } catch (NoSuchProviderException ex) { diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java index c080d4b..3105528 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java @@ -244,7 +244,7 @@ public class DefaultSubjectProvider implements SubjectProvider { throw new STSException("No Encryption Name is configured", STSException.REQUEST_FAILED); } - CryptoType cryptoType = null; + final CryptoType cryptoType; // Check for using of service endpoint (AppliesTo) as certificate identifier if (STSConstants.USE_ENDPOINT_AS_CERT_ALIAS.equals(encryptionName)) { @@ -337,7 +337,7 @@ public class DefaultSubjectProvider implements SubjectProvider { encrKey.setUseThisCert(certificate); encrKey.setKeyEncAlgo(encryptionProperties.getKeyWrapAlgorithm()); - SecretKey symmetricKey = null; + final SecretKey symmetricKey; if (secret != null) { symmetricKey = KeyUtils.prepareSecretKey(encryptionProperties.getEncryptionAlgorithm(), secret); } else { diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java index 9cc2bfc..48de43b 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java @@ -153,8 +153,8 @@ public class SAMLTokenProvider extends AbstractSAMLTokenProvider implements Toke } response.setToken(token); - DateTime validFrom = null; - DateTime validTill = null; + final DateTime validFrom; + final DateTime validTill; if (assertion.getSamlVersion().equals(SAMLVersion.VERSION_20)) { validFrom = assertion.getSaml2().getConditions().getNotBefore(); validTill = assertion.getSaml2().getConditions().getNotOnOrAfter(); @@ -394,7 +394,7 @@ public class SAMLTokenProvider extends AbstractSAMLTokenProvider implements Toke // Also handle "ActAs" via the ActAsAttributeStatementProvider if (!statementAdded) { attrBeanList = new ArrayList<>(); - AttributeStatementProvider attributeProvider = null; + AttributeStatementProvider attributeProvider; if (combineClaimAttributes) { attributeProvider = new CombinedClaimsAttributeStatementProvider(); } else { diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java index 62ead28..ef47df8 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SymmetricKeyHandler.java @@ -42,7 +42,7 @@ public class SymmetricKeyHandler { private static final Logger LOG = LogUtils.getL7dLogger(SymmetricKeyHandler.class); - private int keySize = 256; + private int keySize; private Entropy clientEntropy; private byte[] entropyBytes; private byte[] secret; diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java index 170e876..708f259 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java @@ -181,8 +181,8 @@ public class DefaultJWTClaimsProvider implements JWTClaimsProvider { Lifetime tokenLifetime = providerParameters.getTokenRequirements().getLifetime(); if (lifetime > 0 && acceptClientLifetime && tokenLifetime != null && tokenLifetime.getCreated() != null && tokenLifetime.getExpires() != null) { - Instant creationTime = null; - Instant expirationTime = null; + final Instant creationTime; + Instant expirationTime; try { creationTime = ZonedDateTime.parse(tokenLifetime.getCreated()).toInstant(); expirationTime = ZonedDateTime.parse(tokenLifetime.getExpires()).toInstant(); diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/JWTTokenProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/JWTTokenProvider.java index dd5fc31..cc9ade1 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/JWTTokenProvider.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/JWTTokenProvider.java @@ -101,7 +101,7 @@ public class JWTTokenProvider implements TokenProvider { String realm = tokenParameters.getRealm(); RealmProperties jwtRealm = null; - if (realm != null && realmMap.containsKey(realm)) { + if (realm != null) { jwtRealm = realmMap.get(realm); } @@ -131,9 +131,8 @@ public class JWTTokenProvider implements TokenProvider { if (claims.getIssuedAt() > 0) { response.setCreated(Instant.ofEpochMilli(claims.getIssuedAt() * 1000L)); } - Instant expires = null; if (claims.getExpiryTime() > 0) { - expires = Instant.ofEpochMilli(claims.getExpiryTime() * 1000L); + Instant expires = Instant.ofEpochMilli(claims.getExpiryTime() * 1000L); response.setExpires(expires); } diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java index ddd4aca..ac1e004 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java @@ -218,8 +218,8 @@ public class SAMLTokenRenewer extends AbstractSAMLTokenProvider implements Token response.setToken(token); response.setTokenId(renewedAssertion.getId()); - DateTime validFrom = null; - DateTime validTill = null; + final DateTime validFrom; + final DateTime validTill; if (renewedAssertion.getSamlVersion().equals(SAMLVersion.VERSION_20)) { validFrom = renewedAssertion.getSaml2().getConditions().getNotBefore(); validTill = renewedAssertion.getSaml2().getConditions().getNotOnOrAfter(); @@ -431,7 +431,7 @@ public class SAMLTokenRenewer extends AbstractSAMLTokenProvider implements Token STSPropertiesMBean stsProperties = tokenParameters.getStsProperties(); String realm = tokenParameters.getRealm(); RealmProperties samlRealm = null; - if (realm != null && realmMap.containsKey(realm)) { + if (realm != null) { samlRealm = realmMap.get(realm); } diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java index 30dd1f6..a764ce4 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java @@ -289,9 +289,9 @@ public class SAMLTokenValidator implements TokenValidator { protected boolean validateConditions( SamlAssertionWrapper assertion, ReceivedToken validateTarget ) { - DateTime validFrom = null; - DateTime validTill = null; - DateTime issueInstant = null; + final DateTime validFrom; + final DateTime validTill; + final DateTime issueInstant; if (assertion.getSamlVersion().equals(SAMLVersion.VERSION_20)) { validFrom = assertion.getSaml2().getConditions().getNotBefore(); validTill = assertion.getSaml2().getConditions().getNotOnOrAfter(); diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java index 70292ac..5a8039b 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java @@ -136,7 +136,7 @@ public class UsernameTokenValidator implements TokenValidator { UsernameTokenType usernameTokenType = (UsernameTokenType)validateTarget.getToken(); // Marshall the received JAXB object into a DOM Element - Element usernameTokenElement = null; + final Element usernameTokenElement; try { Set<Class<?>> classes = new HashSet<>(); classes.add(ObjectFactory.class); diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java index 6aee58f..92a4a0c 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java @@ -134,7 +134,7 @@ public class X509TokenValidator implements TokenValidator { validateTarget.setState(STATE.INVALID); response.setToken(validateTarget); - BinarySecurity binarySecurity = null; + final BinarySecurity binarySecurity; if (validateTarget.isBinarySecurityToken()) { BinarySecurityTokenType binarySecurityType = (BinarySecurityTokenType)validateTarget.getToken(); diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/jwt/DefaultJWTRoleParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/jwt/DefaultJWTRoleParser.java index 8b24662..83e6a5e 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/jwt/DefaultJWTRoleParser.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/jwt/DefaultJWTRoleParser.java @@ -51,7 +51,7 @@ public class DefaultJWTRoleParser extends DefaultSubjectRoleParser implements JW return super.parseRolesFromSubject(principal, subject); } - Set<Principal> roles = null; + final Set<Principal> roles; if (roleClaim != null && token != null && token.getClaims().containsProperty(roleClaim)) { roles = new HashSet<>(); String role = token.getClaims().getStringProperty(roleClaim).trim(); diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java index 19a8d71..ee09639 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java @@ -51,9 +51,9 @@ public class CustomUserClaimsHandler implements ClaimsHandler { claim.setClaimType(requestClaim.getClaimType()); if (ClaimTypes.FIRSTNAME.toString().equals(requestClaim.getClaimType())) { - if (parameters.getPrincipal().getName().equalsIgnoreCase("alice")) { + if ("alice".equalsIgnoreCase(parameters.getPrincipal().getName())) { claim.addValue("aliceClaim"); - } else if (parameters.getPrincipal().getName().equalsIgnoreCase("bob")) { + } else if ("bob".equalsIgnoreCase(parameters.getPrincipal().getName())) { claim.addValue("bobClaim"); } } diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/service/StaticServiceTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/service/StaticServiceTest.java index 18ac113..e6d75e1 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/service/StaticServiceTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/service/StaticServiceTest.java @@ -49,12 +49,12 @@ public class StaticServiceTest { service.setEndpoints(endpoints); StringBuilder sb = new StringBuilder("https://localhost:12345/sts"); - IntStream.range(0, 1000).forEach(i -> sb.append("1")); + IntStream.range(0, 1000).forEach(i -> sb.append('1')); // This should be allowed assertTrue(service.isAddressInEndpoints(sb.toString())); - IntStream.range(0, 7000).forEach(i -> sb.append("1")); + IntStream.range(0, 7000).forEach(i -> sb.append('1')); // This address is too long try { diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java index 716fc09..c2af37e 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java @@ -111,7 +111,6 @@ public class SAMLProviderRealmTest { assertTrue(tokenString.contains("Issuer=\"STS\"")); } - @SuppressWarnings("deprecation") @org.junit.Test public void testRealmsUsingOldRealmClass() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java index 014f073..9670441 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java @@ -85,8 +85,7 @@ public class X509TokenValidatorTest { assertTrue(x509TokenValidator.canHandleToken(validateTarget)); // This will fail as the encoding type is not set - TokenValidatorResponse validatorResponse = null; - validatorResponse = x509TokenValidator.validateToken(validatorParameters); + TokenValidatorResponse validatorResponse = x509TokenValidator.validateToken(validatorParameters); assertNotNull(validatorResponse); assertNotNull(validatorResponse.getToken()); assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);