You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/02/28 08:42:45 UTC
[cxf] branch master updated: avoid null assignment
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 540e471 avoid null assignment
540e471 is described below
commit 540e471660ed79cb88771f6c9a0022cbede241ac
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Fri Feb 28 11:41:58 2020 +0300
avoid null assignment
---
.../security/oauth2/grants/code/JPACMTCodeDataProvider.java | 2 +-
.../security/oauth2/provider/AbstractOAuthDataProvider.java | 11 +++++------
.../oauth2/services/AbstractAccessTokenValidator.java | 2 +-
.../cxf/rs/security/oauth2/services/AccessTokenService.java | 2 +-
.../oauth2/services/AuthorizationCodeGrantService.java | 2 +-
.../oauth2/services/RedirectionBasedGrantService.java | 5 ++---
.../oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java | 2 +-
.../cxf/rs/security/oauth2/utils/AuthorizationUtils.java | 2 +-
.../cxf/rs/security/oidc/idp/IdTokenResponseFilter.java | 2 +-
.../org/apache/cxf/rs/security/oidc/idp/UserInfoService.java | 2 +-
.../cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java | 2 +-
11 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProvider.java
index 4da4cd1..8863894 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProvider.java
@@ -136,7 +136,7 @@ public class JPACMTCodeDataProvider extends JPACodeDataProvider {
@Override
public Void execute(EntityManager em) {
- Map<String, Object> options = null;
+ final Map<String, Object> options;
if (pessimisticLockTimeout > 0) {
options = Collections.singletonMap("javax.persistence.lock.timeout", pessimisticLockTimeout);
} else {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
index dd6d20b..4eb4d17 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
@@ -321,15 +321,14 @@ public abstract class AbstractOAuthDataProvider implements OAuthDataProvider, Cl
&& at.getGrantType().equals(grantType)
&& (sub == null && at.getSubject() == null
|| sub != null && at.getSubject().getLogin().equals(sub.getLogin()))) {
- token = at;
+ if (!OAuthUtils.isExpired(at.getIssuedAt(), at.getExpiresIn())) {
+ token = at;
+ } else {
+ revokeToken(client, at.getTokenKey(), OAuthConstants.ACCESS_TOKEN);
+ }
break;
}
}
- if (token != null
- && OAuthUtils.isExpired(token.getIssuedAt(), token.getExpiresIn())) {
- revokeToken(client, token.getTokenKey(), OAuthConstants.ACCESS_TOKEN);
- token = null;
- }
return token;
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
index 79813d1..d7aa6a2 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
@@ -101,11 +101,11 @@ public abstract class AbstractAccessTokenValidator {
*/
protected AccessTokenValidation getAccessTokenValidation(String authScheme, String authSchemeData,
MultivaluedMap<String, String> extraProps) {
- AccessTokenValidation accessTokenV = null;
if (dataProvider == null && tokenHandlers.isEmpty()) {
throw ExceptionUtils.toInternalServerErrorException(null, null);
}
+ AccessTokenValidation accessTokenV = null;
if (maxValidationDataCacheSize > 0) {
accessTokenV = accessTokenValidations.get(authSchemeData);
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java
index 6979e5a..d4b9742 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java
@@ -119,7 +119,7 @@ public class AccessTokenService extends AbstractTokenService {
}
// Create the access token
- ServerAccessToken serverToken = null;
+ final ServerAccessToken serverToken;
try {
serverToken = handler.createAccessToken(client, params);
} catch (WebApplicationException ex) {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
index 676515a2..f4da8b6 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
@@ -92,7 +92,7 @@ public class AuthorizationCodeGrantService extends RedirectionBasedGrantService
ServerAccessToken preauthorizedToken) {
// in this flow the code is still created, the preauthorized token
// will be retrieved by the authorization code grant handler
- ServerAuthorizationCodeGrant grant = null;
+ final ServerAuthorizationCodeGrant grant;
try {
grant = getGrantRepresentation(state,
client,
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
index 6f1f551..38ddcf7 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
@@ -173,7 +173,7 @@ public abstract class RedirectionBasedGrantService extends AbstractOAuthService
// Get the requested scopes
String providedScope = params.getFirst(OAuthConstants.SCOPE);
final List<String> requestedScope;
- List<OAuthPermission> requestedPermissions = null;
+ final List<OAuthPermission> requestedPermissions;
try {
requestedScope = OAuthUtils.getRequestedScopes(client,
providedScope,
@@ -433,9 +433,8 @@ public abstract class RedirectionBasedGrantService extends AbstractOAuthService
protected UserSubject createUserSubject(SecurityContext securityContext,
MultivaluedMap<String, String> params) {
- UserSubject subject = null;
if (subjectCreator != null) {
- subject = subjectCreator.createUserSubject(getMessageContext(),
+ UserSubject subject = subjectCreator.createUserSubject(getMessageContext(),
params);
if (subject != null) {
return subject;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java
index 2194a0b..e57a100 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java
@@ -62,7 +62,7 @@ public abstract class AbstractHawkAccessTokenValidator implements AccessTokenVal
String macAlgo = atv.getExtraProps().get(OAuthConstants.HAWK_TOKEN_ALGORITHM);
- HttpRequestProperties httpProps = null;
+ final HttpRequestProperties httpProps;
if (extraProps != null && extraProps.containsKey(HTTP_VERB) && extraProps.containsKey(HTTP_URI)) {
httpProps = new HttpRequestProperties(URI.create(extraProps.getFirst(HTTP_URI)),
extraProps.getFirst(HTTP_VERB));
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtils.java
index 33e5a71..b042eb6 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtils.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtils.java
@@ -45,7 +45,7 @@ public final class AuthorizationUtils {
return null;
}
public static String[] getBasicAuthParts(String basicAuthData) {
- String authDecoded = null;
+ final String authDecoded;
try {
authDecoded = new String(Base64Utility.decode(basicAuthData));
} catch (Exception ex) {
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
index cbbc892..428d107 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
@@ -98,7 +98,7 @@ public class IdTokenResponseFilter extends OAuthServerJoseJwtProducer implements
Message m = JAXRSUtils.getCurrentMessage();
if (atHashRequired || cHashRequired) {
Properties props = JwsUtils.loadSignatureOutProperties(false);
- SignatureAlgorithm sigAlgo = null;
+ final SignatureAlgorithm sigAlgo;
if (super.isSignWithClientSecret()) {
sigAlgo = OAuthUtils.getClientSecretSignatureAlgorithm(props);
} else {
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java
index 5112680..64205ca 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoService.java
@@ -78,7 +78,7 @@ public class UserInfoService extends OAuthServerJoseJwtProducer {
return Response.serverError().build();
}
- Object responseEntity = null;
+ final Object responseEntity;
// UserInfo may be returned in a clear form as JSON
if (super.isJwsRequired() || super.isJweRequired()) {
Client client = null;
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
index 9268d78..8f4add8 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
@@ -60,7 +60,7 @@ public class OidcRpAuthenticationFilter implements ContainerRequestFilter {
if (checkSecurityContext(rc)) {
return;
} else if (redirectUri != null) {
- UriBuilder redirectBuilder = null;
+ final UriBuilder redirectBuilder;
if (redirectUri.startsWith("/")) {
String basePath = (String)mc.get("http.base.path");
redirectBuilder = UriBuilder.fromUri(basePath).path(redirectUri);