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 2018/10/22 18:37:53 UTC
[cxf-fediz] branch master updated: Removing some redundant type
declarations
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new 3c45d52 Removing some redundant type declarations
3c45d52 is described below
commit 3c45d5234aeffa9687e06890dd32daa2618e8505
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 22 13:20:32 2018 +0100
Removing some redundant type declarations
---
.../main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java | 4 ++--
.../java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java | 3 +--
.../org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java | 2 +-
.../apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java | 2 +-
.../cxf/fediz/service/oidc/clients/ClientRegistrationService.java | 8 ++++----
.../org/apache/cxf/fediz/service/oidc/clients/ClientTokens.java | 4 ++--
.../cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java | 2 +-
.../src/test/java/org/apache/cxf/fediz/sts/AbstractSTSTest.java | 4 ++--
8 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
index e31e61f..be13d0e 100644
--- a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
+++ b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
@@ -245,7 +245,7 @@ public class FedizInterceptor implements TrustAssociationInterceptor {
}
// Handle Signin requests
- SigninHandler<TAIResult> signinHandler = new SigninHandler<TAIResult>(fedCtx);
+ SigninHandler<TAIResult> signinHandler = new SigninHandler<>(fedCtx);
if (signinHandler.canHandleRequest(req)) {
LOG.debug("SignIn request detected");
return true;
@@ -341,7 +341,7 @@ public class FedizInterceptor implements TrustAssociationInterceptor {
}
// Handle Signin requests
- SigninHandler<TAIResult> signinHandler = new SigninHandler<TAIResult>(fedCtx) {
+ SigninHandler<TAIResult> signinHandler = new SigninHandler<>(fedCtx) {
@Override
protected TAIResult createPrincipal(HttpServletRequest request, HttpServletResponse response,
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
index 8ffa6a9..ef06999 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
@@ -23,7 +23,6 @@ import java.util.Map;
import org.apache.cxf.fediz.service.idp.domain.Application;
import org.apache.cxf.fediz.service.idp.domain.Idp;
-import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
public class IDPConfig extends Idp {
@@ -34,7 +33,7 @@ public class IDPConfig extends Idp {
}
public void setTrustedIdps(Map<String, TrustedIDPConfig> trustedIdps) {
- this.trustedIdpList = new ArrayList<TrustedIdp>(trustedIdps.values());
+ this.trustedIdpList = new ArrayList<>(trustedIdps.values());
}
@Deprecated
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
index eeb6364..6058361 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
@@ -149,7 +149,7 @@ public class FedizSubjectCreator implements SubjectCreator {
idToken.setExpiryTime(currentTimeInSecs + DEFAULT_TIME_TO_LIVE);
}
- List<String> requestedClaimsList = new ArrayList<String>();
+ List<String> requestedClaimsList = new ArrayList<>();
// Derive claims from scope
String requestedScope = params.getFirst(OAuthConstants.SCOPE);
if (requestedScope != null && !requestedScope.isEmpty()) {
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java
index 280141e..8520908 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java
@@ -26,7 +26,7 @@ import org.apache.cxf.rs.security.oauth2.grants.code.ServerAuthorizationCodeGran
public class ClientCodeGrants {
private Client client;
- private List<ServerAuthorizationCodeGrant> codeGrants = new LinkedList<ServerAuthorizationCodeGrant>();
+ private List<ServerAuthorizationCodeGrant> codeGrants = new LinkedList<>();
public ClientCodeGrants(Client c, List<ServerAuthorizationCodeGrant> codeGrants) {
this.client = c;
this.codeGrants = codeGrants;
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
index 7cdd9a8..4a5bda1 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
@@ -313,7 +313,7 @@ public class ClientRegistrationService {
// Client Redirect URIs
if (!StringUtils.isEmpty(redirectURI)) {
String[] allUris = redirectURI.trim().split(" ");
- List<String> redirectUris = new LinkedList<String>();
+ List<String> redirectUris = new LinkedList<>();
for (String uri : allUris) {
if (!StringUtils.isEmpty(uri)) {
if (!isValidURI(uri, false)) {
@@ -341,7 +341,7 @@ public class ClientRegistrationService {
// Client Audience URIs
if (!StringUtils.isEmpty(audience)) {
String[] auds = audience.trim().split(" ");
- List<String> registeredAuds = new LinkedList<String>();
+ List<String> registeredAuds = new LinkedList<>();
for (String aud : auds) {
if (!StringUtils.isEmpty(aud)) {
if (!isValidURI(aud, true)) {
@@ -438,7 +438,7 @@ public class ClientRegistrationService {
clientNames.put(userName, names);
} else if (names.contains(newClient.getApplicationName())) {
String newName = newClient.getApplicationName();
- SortedSet<Integer> numbers = new TreeSet<Integer>();
+ SortedSet<Integer> numbers = new TreeSet<>();
for (String name : names) {
if (name.startsWith(newName) && !name.equals(newName)) {
try {
@@ -467,7 +467,7 @@ public class ClientRegistrationService {
protected Collection<Client> getClientRegistrations(String userName) {
Collection<Client> userClientRegs = registrations.get(userName);
if (userClientRegs == null) {
- userClientRegs = new TreeSet<Client>(new ClientComparator());
+ userClientRegs = new TreeSet<>(new ClientComparator());
registrations.put(userName, userClientRegs);
}
return userClientRegs;
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientTokens.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientTokens.java
index 2932823..03f6a1b 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientTokens.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientTokens.java
@@ -27,8 +27,8 @@ import org.apache.cxf.rs.security.oauth2.tokens.refresh.RefreshToken;
public class ClientTokens {
private Client client;
- private List<ServerAccessToken> accessTokens = new LinkedList<ServerAccessToken>();
- private List<RefreshToken> refreshTokens = new LinkedList<RefreshToken>();
+ private List<ServerAccessToken> accessTokens = new LinkedList<>();
+ private List<RefreshToken> refreshTokens = new LinkedList<>();
public ClientTokens(Client c,
List<ServerAccessToken> accessTokens,
List<RefreshToken> refreshTokens) {
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
index 2283bc8..76a74b7 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
@@ -59,7 +59,7 @@ public class BackChannelLogoutHandler extends JoseJwtProducer {
// in cases when ATs have expired or been revoked or Implicit id_token flow is used.
// Most likely a 'visited sites' cookie as suggested by the spec will need to be used.
List<ServerAccessToken> accessTokens = dataProvider.getAccessTokens(null, subject);
- Set<String> processedClients = new HashSet<String>();
+ Set<String> processedClients = new HashSet<>();
for (ServerAccessToken at : accessTokens) {
Client atClient = at.getClient();
if (client.getClientId().equals(atClient.getClientId())
diff --git a/services/sts/src/test/java/org/apache/cxf/fediz/sts/AbstractSTSTest.java b/services/sts/src/test/java/org/apache/cxf/fediz/sts/AbstractSTSTest.java
index 2e77c66..0d638f3 100644
--- a/services/sts/src/test/java/org/apache/cxf/fediz/sts/AbstractSTSTest.java
+++ b/services/sts/src/test/java/org/apache/cxf/fediz/sts/AbstractSTSTest.java
@@ -101,14 +101,14 @@ public abstract class AbstractSTSTest {
PasswordString passwordString = new PasswordString();
passwordString.setValue(password);
passwordString.setType(WSConstants.PASSWORD_TEXT);
- JAXBElement<PasswordString> passwordType = new JAXBElement<PasswordString>(
+ JAXBElement<PasswordString> passwordType = new JAXBElement<>(
QNameConstants.PASSWORD,
PasswordString.class,
passwordString);
usernameToken.getAny().add(passwordType);
}
- JAXBElement<UsernameTokenType> tokenType = new JAXBElement<UsernameTokenType>(
+ JAXBElement<UsernameTokenType> tokenType = new JAXBElement<>(
QNameConstants.USERNAME_TOKEN,
UsernameTokenType.class,
usernameToken);