You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2022/09/30 07:33:08 UTC
[cxf] 02/03: Fixing some PMD/checkstyle issues
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8b9b36eb126cb625bda820aafe82be75b7a7ffe9
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Sep 29 16:39:12 2022 +0100
Fixing some PMD/checkstyle issues
(cherry picked from commit 5dab76961afaebd2e71aeeee9356a6878ee2e4f1)
(cherry picked from commit ac508a47694779eb0fd6275afc03f88e384ab6d5)
---
.../security/oauth2/provider/AbstractOAuthDataProvider.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
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 d136fc8bc3..6844c97cab 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
@@ -100,7 +100,8 @@ public abstract class AbstractOAuthDataProvider implements OAuthDataProvider, Cl
return at;
}
- protected ServerAccessToken doCreateAccessToken(List<String> audiences,
+ //CHECKSTYLE:OFF
+ protected ServerAccessToken doCreateAccessToken(List<String> audiences, //NOPMD
Client client,
String clientCodeVerifier,
Map<String, String> extraProperties,
@@ -110,6 +111,7 @@ public abstract class AbstractOAuthDataProvider implements OAuthDataProvider, Cl
String responseType,
List<OAuthPermission> scopes,
UserSubject userSubject) {
+ //CHECKSTYLE:ON
ServerAccessToken at =
createNewAccessToken(client, userSubject);
@@ -424,8 +426,8 @@ public abstract class AbstractOAuthDataProvider implements OAuthDataProvider, Cl
List<OAuthPermission> theNewScopes = null;
if (restrictedScopes.isEmpty()) {
- theNewScopes = oldRefreshToken.getScopes() != null ?
- new ArrayList<OAuthPermission>(oldRefreshToken.getScopes()) : null;
+ theNewScopes = oldRefreshToken.getScopes() != null
+ ? new ArrayList<OAuthPermission>(oldRefreshToken.getScopes()) : null;
} else {
theNewScopes = convertScopeToPermissions(client, restrictedScopes);
if (!oldRefreshToken.getScopes().containsAll(theNewScopes)) {
@@ -435,8 +437,8 @@ public abstract class AbstractOAuthDataProvider implements OAuthDataProvider, Cl
ServerAccessToken at =
doCreateAccessToken(
- oldRefreshToken.getAudiences() != null ?
- new ArrayList<String>(oldRefreshToken.getAudiences()) : null,
+ oldRefreshToken.getAudiences() != null
+ ? new ArrayList<String>(oldRefreshToken.getAudiences()) : null,
client, oldRefreshToken.getClientCodeVerifier(),
oldRefreshToken.getExtraProperties(), oldRefreshToken.getGrantCode(),
oldRefreshToken.getGrantType(), oldRefreshToken.getNonce(),