cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf-fediz git commit: JDK7 refactoring
Date Tue, 05 May 2015 14:30:09 GMT
JDK7 refactoring


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/77e537fa
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/77e537fa
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/77e537fa

Branch: refs/heads/master
Commit: 77e537fa408618bb38e12f85320cb7a13dfda4e1
Parents: 5ad84a6
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue May 5 14:29:00 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue May 5 15:29:52 2015 +0100

----------------------------------------------------------------------
 .../cxf/fediz/core/FederationConstants.java     |  2 +-
 .../fediz/core/config/FedizConfigurator.java    |  2 +-
 .../cxf/fediz/core/config/FedizContext.java     |  4 ++--
 .../apache/cxf/fediz/core/config/Protocol.java  |  4 ++--
 .../core/processor/RedirectionResponse.java     |  2 +-
 .../fediz/core/saml/CertConstraintsParser.java  |  4 ++--
 .../core/saml/FedizSignatureTrustValidator.java |  2 +-
 .../cxf/fediz/core/saml/SAMLTokenValidator.java | 18 +++++++--------
 .../fediz/core/saml/SamlAssertionValidator.java |  2 +-
 .../samlsso/DefaultSAMLPRequestBuilder.java     |  2 +-
 .../samlsso/SAMLProtocolResponseValidator.java  |  2 +-
 .../samlsso/SamlpRequestComponentBuilder.java   |  6 ++---
 .../cxf/fediz/core/util/ClassLoaderUtils.java   |  2 +-
 .../apache/cxf/fediz/core/util/DOMUtils.java    |  8 +++----
 .../cxf/fediz/core/util/SignatureUtils.java     |  4 ++--
 .../apache/cxf/fediz/core/util/StringUtils.java |  4 ++--
 .../fediz/core/AbstractSAMLCallbackHandler.java |  4 ++--
 .../cxf/fediz/core/KeystoreCallbackHandler.java |  2 +-
 .../fediz/core/config/TestCallbackHandler.java  |  4 ++--
 .../fediz/cxf/plugin/FedizSecurityContext.java  |  2 +-
 ...AuthoritiesUserDetailsFederationService.java |  2 +-
 ...AuthoritiesUserDetailsFederationService.java |  2 +-
 .../was/mapper/DefaultRoleToGroupMapper.java    |  2 +-
 .../was/mapper/FileBasedRoleToGroupMapper.java  |  6 ++---
 .../cxf/fediz/was/tai/FedizInterceptor.java     |  2 +-
 pom.xml                                         |  2 +-
 .../service/idp/STSAuthenticationProvider.java  | 12 +++++-----
 .../idp/beans/SigninParametersCacheAction.java  |  6 ++---
 .../fediz/service/idp/domain/Application.java   |  2 +-
 .../cxf/fediz/service/idp/domain/Idp.java       | 12 +++++-----
 .../cxf/fediz/service/idp/domain/Role.java      |  2 +-
 .../fediz/service/idp/domain/TrustedIdp.java    |  2 +-
 .../cxf/fediz/service/idp/model/IDPConfig.java  |  5 ++--
 .../ApplicationProtocolControllerImpl.java      |  2 +-
 .../TrustedIdpProtocolControllerImpl.java       |  2 +-
 .../idp/service/ConfigServiceSpring.java        |  4 ++--
 .../idp/service/jpa/ApplicationDAOJPAImpl.java  |  2 +-
 .../idp/service/jpa/ApplicationEntity.java      |  2 +-
 .../idp/service/jpa/ClaimDAOJPAImpl.java        |  2 +-
 .../idp/service/jpa/ConfigServiceJPA.java       |  2 +-
 .../service/idp/service/jpa/DBLoaderImpl.java   |  6 ++---
 .../idp/service/jpa/EntitlementDAOJPAImpl.java  |  2 +-
 .../service/idp/service/jpa/IdpDAOJPAImpl.java  |  2 +-
 .../service/idp/service/jpa/IdpEntity.java      | 12 +++++-----
 .../service/idp/service/jpa/RoleDAOJPAImpl.java |  2 +-
 .../service/idp/service/jpa/RoleEntity.java     |  2 +-
 .../idp/service/jpa/TrustedIdpDAOJPAImpl.java   |  2 +-
 .../idp/service/jpa/TrustedIdpEntity.java       |  2 +-
 .../security/GrantedAuthorityEntitlements.java  |  2 +-
 .../service/idp/service/jpa/IdpDAOJPATest.java  | 24 ++++++++++----------
 .../apache/cxf/fediz/sts/AbstractSTSTest.java   |  6 ++---
 .../cxf/fediz/sts/realms/ITCrossRealmTest.java  |  4 ++--
 .../samlsso/example/SAML2CallbackHandler.java   |  2 +-
 .../AbstractClientCertTests.java                |  2 +-
 54 files changed, 111 insertions(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java
index 1ca70b0..b8f7d70 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java
@@ -153,7 +153,7 @@ public final class FederationConstants extends FedizConstants {
 
     public static final Map<String, URI> AUTH_TYPE_MAP;
     static {
-        Map<String, URI> aMap = new HashMap<String, URI>();
+        Map<String, URI> aMap = new HashMap<>();
         aMap.put("UNKNOWN", FederationConstants.AUTH_TYPE_UNKNOWN);
         aMap.put("DEFAULT", FederationConstants.AUTH_TYPE_DEFAULT);
         aMap.put("SSL", FederationConstants.AUTH_TYPE_SSL);

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
index d69b73a..3652a01 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
@@ -52,7 +52,7 @@ public class FedizConfigurator {
     }
     
     private void parseFedizContextList() {
-        fedizContextList = new ArrayList<FedizContext>();
+        fedizContextList = new ArrayList<>();
         for (ContextConfig config : rootConfig.getContextConfig()) {
             fedizContextList.add(new FedizContext(config));            
         }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
index 1084b96..06476fe 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
@@ -92,7 +92,7 @@ public class FedizContext implements Closeable {
     public List<TrustedIssuer> getTrustedIssuers() {
         TrustedIssuers issuers = config.getTrustedIssuers();
         List<TrustedIssuerType> trustManagers =  issuers.getIssuer();
-        List<TrustedIssuer> trustedIssuers = new ArrayList<TrustedIssuer>();
+        List<TrustedIssuer> trustedIssuers = new ArrayList<>();
         for (TrustedIssuerType manager:trustManagers) {
             trustedIssuers.add(new TrustedIssuer(manager));
         }
@@ -103,7 +103,7 @@ public class FedizContext implements Closeable {
         if (certificateStores != null) {
             return certificateStores;
         }
-        certificateStores = new ArrayList<TrustManager>();
+        certificateStores = new ArrayList<>();
         CertificateStores certStores = config.getCertificateStores();
         List<TrustManagersType> trustManagers = certStores.getTrustManager();
         for (TrustManagersType manager : trustManagers) {

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
index 8f82cdf..7468e76 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
@@ -41,7 +41,7 @@ public abstract class Protocol {
     private ClassLoader classloader;
     private Object issuer;
     private Object realm;
-    private List<TokenValidator> validators = new ArrayList<TokenValidator>();
+    private List<TokenValidator> validators = new ArrayList<>();
 
     public Protocol(ProtocolType protocolType) {
         super();
@@ -188,7 +188,7 @@ public abstract class Protocol {
 
     public List<Claim> getClaimTypesRequested() {
         ClaimTypesRequested claimsRequested = getProtocolType().getClaimTypesRequested();
-        List<Claim> claims = new ArrayList<Claim>();
+        List<Claim> claims = new ArrayList<>();
         if (claimsRequested != null) {
             for (ClaimType c : claimsRequested.getClaimType()) {
                 claims.add(new Claim(c));

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/RedirectionResponse.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/RedirectionResponse.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/RedirectionResponse.java
index c3358ee..96589a0 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/RedirectionResponse.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/RedirectionResponse.java
@@ -33,7 +33,7 @@ public class RedirectionResponse implements Serializable {
     private static final long serialVersionUID = 3182350165552249151L;
     
     private String redirectionURL;
-    private Map<String, String> headers = new HashMap<String, String>();
+    private Map<String, String> headers = new HashMap<>();
     private RequestState requestState;
     
     public String getRedirectionURL() {

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/CertConstraintsParser.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/CertConstraintsParser.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/CertConstraintsParser.java
index 2a54de3..34bda56 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/CertConstraintsParser.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/CertConstraintsParser.java
@@ -35,7 +35,7 @@ public class CertConstraintsParser {
     /**
      * a collection of compiled regular expression patterns for the subject DN
      */
-    private Collection<Pattern> subjectDNPatterns = new ArrayList<Pattern>();
+    private Collection<Pattern> subjectDNPatterns = new ArrayList<>();
 
     /**
      * Set a list of Strings corresponding to regular expression constraints on
@@ -43,7 +43,7 @@ public class CertConstraintsParser {
      */
     public void setSubjectConstraints(List<String> constraints) {
         if (constraints != null) {
-            subjectDNPatterns = new ArrayList<Pattern>();
+            subjectDNPatterns = new ArrayList<>();
             for (String constraint : constraints) {
                 try {
                     subjectDNPatterns.add(Pattern.compile(constraint.trim()));

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/FedizSignatureTrustValidator.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/FedizSignatureTrustValidator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/FedizSignatureTrustValidator.java
index 5ee33eb..8c8798f 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/FedizSignatureTrustValidator.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/FedizSignatureTrustValidator.java
@@ -54,7 +54,7 @@ public class FedizSignatureTrustValidator implements Validator {
     /**
      * a collection of compiled regular expression patterns for the subject DN
      */
-    private Collection<Pattern> subjectDNPatterns = new ArrayList<Pattern>();
+    private Collection<Pattern> subjectDNPatterns = new ArrayList<>();
     
     
     /**

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
index 81f73f8..0432183 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
@@ -136,7 +136,7 @@ public class SAMLTokenValidator implements TokenValidator {
             List<TrustedIssuer> trustedIssuers = config.getTrustedIssuers();
             for (TrustedIssuer ti : trustedIssuers) {
                 Pattern subjectConstraint = ti.getCompiledSubject();
-                List<Pattern> subjectConstraints = new ArrayList<Pattern>(1);
+                List<Pattern> subjectConstraints = new ArrayList<>(1);
                 if (subjectConstraint != null) {
                     subjectConstraints.add(subjectConstraint);
                 }
@@ -261,8 +261,8 @@ public class SAMLTokenValidator implements TokenValidator {
             LOG.debug("No attribute statements found");
             return Collections.emptyList();
         }
-        List<Claim> collection = new ArrayList<Claim>();
-        Map<String, Claim> claimsMap = new HashMap<String, Claim>();
+        List<Claim> collection = new ArrayList<>();
+        Map<String, Claim> claimsMap = new HashMap<>();
 
         for (org.opensaml.saml1.core.AttributeStatement statement : attributeStatements) {
             LOG.debug("parsing statement: {}", statement.getElementQName());
@@ -299,7 +299,7 @@ public class SAMLTokenValidator implements TokenValidator {
                 } else {
                     c.setClaimType(URI.create(attribute.getAttributeName()));
                 }
-                List<String> valueList = new ArrayList<String>();
+                List<String> valueList = new ArrayList<>();
                 for (XMLObject attributeValue : attribute.getAttributeValues()) {
                     Element attributeValueElement = attributeValue.getDOM();
                     String value = attributeValueElement.getTextContent();
@@ -324,8 +324,8 @@ public class SAMLTokenValidator implements TokenValidator {
             return Collections.emptyList();
         }
 
-        List<Claim> collection = new ArrayList<Claim>();
-        Map<String, Claim> claimsMap = new HashMap<String, Claim>();
+        List<Claim> collection = new ArrayList<>();
+        Map<String, Claim> claimsMap = new HashMap<>();
 
         for (org.opensaml.saml2.core.AttributeStatement statement : attributeStatements) {
             LOG.debug("parsing statement: {}", statement.getElementQName());
@@ -349,7 +349,7 @@ public class SAMLTokenValidator implements TokenValidator {
                 }
                 c.setIssuer(assertion.getIssuer().getNameQualifier());
                 
-                List<String> valueList = new ArrayList<String>();
+                List<String> valueList = new ArrayList<>();
                 for (XMLObject attributeValue : attribute.getAttributeValues()) {
                     Element attributeValueElement = attributeValue.getDOM();
                     String value = attributeValueElement.getTextContent();
@@ -372,7 +372,7 @@ public class SAMLTokenValidator implements TokenValidator {
             Object oValue = t.getValue();
             if (oValue instanceof String) {
                 //one child element AttributeValue only
-                List<String> values = new ArrayList<String>();
+                List<String> values = new ArrayList<>();
                 values.add((String)oValue); //add existing value
                 values.addAll(valueList);
                 t.setValue(values);
@@ -398,7 +398,7 @@ public class SAMLTokenValidator implements TokenValidator {
     }
     
     protected List<String> parseRoles(String value, String delim) {
-        List<String> roles = new ArrayList<String>();
+        List<String> roles = new ArrayList<>();
         StringTokenizer st = new StringTokenizer(value, delim);
         while (st.hasMoreTokens()) {
             String role = st.nextToken();

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SamlAssertionValidator.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SamlAssertionValidator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SamlAssertionValidator.java
index 0b9df6e..be35c7a 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SamlAssertionValidator.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SamlAssertionValidator.java
@@ -42,7 +42,7 @@ public class SamlAssertionValidator extends org.apache.wss4j.dom.validate.SamlAs
     /**
      * a collection of compiled regular expression patterns for the subject DN
      */
-    private Collection<Pattern> subjectDNPatterns = new ArrayList<Pattern>();
+    private Collection<Pattern> subjectDNPatterns = new ArrayList<>();
     
     /**
      * Set a list of Strings corresponding to regular expression constraints on

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/DefaultSAMLPRequestBuilder.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/DefaultSAMLPRequestBuilder.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/DefaultSAMLPRequestBuilder.java
index 6ef8eb5..75f04bd 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/DefaultSAMLPRequestBuilder.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/DefaultSAMLPRequestBuilder.java
@@ -118,7 +118,7 @@ public class DefaultSAMLPRequestBuilder implements SAMLPRequestBuilder {
             SamlpRequestComponentBuilder.createIssuer(issuerId);
         
         NameID nameID = null;
-        List<String> sessionIndices = new ArrayList<String>();
+        List<String> sessionIndices = new ArrayList<>();
         
         if (authenticatedAssertion != null) {
             if (authenticatedAssertion.getSaml2() != null) {

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java
index c674f9e..3bcf807 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java
@@ -231,7 +231,7 @@ public class SAMLProtocolResponseValidator {
         List<TrustedIssuer> trustedIssuers = config.getTrustedIssuers();
         for (TrustedIssuer ti : trustedIssuers) {
             Pattern subjectConstraint = ti.getCompiledSubject();
-            List<Pattern> subjectConstraints = new ArrayList<Pattern>(1);
+            List<Pattern> subjectConstraints = new ArrayList<>(1);
             if (subjectConstraint != null) {
                 subjectConstraints.add(subjectConstraint);
             }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SamlpRequestComponentBuilder.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SamlpRequestComponentBuilder.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SamlpRequestComponentBuilder.java
index 12bec45..883eca2 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SamlpRequestComponentBuilder.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SamlpRequestComponentBuilder.java
@@ -185,7 +185,7 @@ public final class SamlpRequestComponentBuilder {
         if (authnCtxClassRefList != null) {
             List<AuthnContextClassRef> classRefList = authnCtx.getAuthnContextClassRefs();
             if (classRefList == null) {
-                classRefList = new ArrayList<AuthnContextClassRef>();
+                classRefList = new ArrayList<>();
             }
             classRefList.addAll(authnCtxClassRefList);
         }
@@ -193,7 +193,7 @@ public final class SamlpRequestComponentBuilder {
         if (authnCtxDeclRefList != null) {
             List<AuthnContextDeclRef> declRefList = authnCtx.getAuthnContextDeclRefs();
             if (declRefList == null) {
-                declRefList = new ArrayList<AuthnContextDeclRef>();
+                declRefList = new ArrayList<>();
             }
             declRefList.addAll(authnCtxDeclRefList);
         }
@@ -215,4 +215,4 @@ public final class SamlpRequestComponentBuilder {
         return authnCtxClassRef;
     }
     
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/ClassLoaderUtils.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/ClassLoaderUtils.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/ClassLoaderUtils.java
index 062a1ac..64b8553 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/ClassLoaderUtils.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/ClassLoaderUtils.java
@@ -142,7 +142,7 @@ public final class ClassLoaderUtils {
      * @param callingClass The Class object of the calling object
      */
     public static List<URL> getResources(String resourceName, Class<?> callingClass) {
-        List<URL> ret = new ArrayList<URL>();
+        List<URL> ret = new ArrayList<>();
         Enumeration<URL> urls = new Enumeration<URL>() {
             public boolean hasMoreElements() {
                 return false;

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/DOMUtils.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/DOMUtils.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/DOMUtils.java
index 5efc6e1..83c6f73 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/DOMUtils.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/DOMUtils.java
@@ -331,7 +331,7 @@ public final class DOMUtils {
      * @param localName
      */
     public static List<Element> getChildrenWithName(Element parent, String ns, String localName) {
-        List<Element> r = new ArrayList<Element>();
+        List<Element> r = new ArrayList<>();
         for (Node n = parent.getFirstChild(); n != null; n = n.getNextSibling()) {
             if (n instanceof Element) {
                 Element e = (Element)n;
@@ -352,7 +352,7 @@ public final class DOMUtils {
      * @return all child elements with specified namespace
      */
     public static List<Element> getChildrenWithNamespace(Element parent, String ns) {
-        List<Element> r = new ArrayList<Element>();
+        List<Element> r = new ArrayList<>();
         for (Node n = parent.getFirstChild(); n != null; n = n.getNextSibling()) {
             if (n instanceof Element) {
                 Element e = (Element)n;
@@ -617,7 +617,7 @@ public final class DOMUtils {
     }
 
     public static List<Element> findAllElementsByTagNameNS(Element elem, String nameSpaceURI, String localName) {
-        List<Element> ret = new LinkedList<Element>();
+        List<Element> ret = new LinkedList<>();
         findAllElementsByTagNameNS(elem, nameSpaceURI, localName, ret);
         return ret;
     }
@@ -636,7 +636,7 @@ public final class DOMUtils {
     }
 
     public static List<Element> findAllElementsByTagName(Element elem, String tagName) {
-        List<Element> ret = new LinkedList<Element>();
+        List<Element> ret = new LinkedList<>();
         findAllElementsByTagName(elem, tagName, ret);
         return ret;
     }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/SignatureUtils.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/SignatureUtils.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/SignatureUtils.java
index 9107e6b..e9de9e3 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/SignatureUtils.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/SignatureUtils.java
@@ -107,7 +107,7 @@ public final class SignatureUtils {
             throw new RuntimeException("Unsupported signature method: " + cert.getSigAlgName());
         }
         
-        List<Transform> transformList = new ArrayList<Transform>();
+        List<Transform> transformList = new ArrayList<>();
         transformList.add(XML_SIGNATURE_FACTORY.newTransform(Transform.ENVELOPED, (TransformParameterSpec)null));
         transformList.add(XML_SIGNATURE_FACTORY.newCanonicalizationMethod(CanonicalizationMethod.EXCLUSIVE,
                                                              (C14NMethodParameterSpec)null));
@@ -136,7 +136,7 @@ public final class SignatureUtils {
         
         // Create the KeyInfo containing the X509Data.
         KeyInfoFactory kif = XML_SIGNATURE_FACTORY.getKeyInfoFactory();
-        List<Object> x509Content = new ArrayList<Object>();
+        List<Object> x509Content = new ArrayList<>();
         x509Content.add(cert.getSubjectX500Principal().getName());
         x509Content.add(cert);
         X509Data xd = kif.newX509Data(x509Content);

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/StringUtils.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/StringUtils.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/StringUtils.java
index 6f5d0b3..9ece30b 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/StringUtils.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/util/StringUtils.java
@@ -117,7 +117,7 @@ public final class StringUtils {
     }
 
     public static List<String> getParts(String str, String sperator) {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         List<String> parts = Arrays.asList(str.split("/"));
         for (String part : parts) {
             if (!isEmpty(part)) {
@@ -153,7 +153,7 @@ public final class StringUtils {
         if (isEmpty(regex) || isEmpty(contents)) {
             return null;
         }
-        List<String> results = new ArrayList<String>();
+        List<String> results = new ArrayList<>();
         Pattern pattern = Pattern.compile(regex, Pattern.UNICODE_CASE);
         Matcher matcher = pattern.matcher(contents);
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/test/java/org/apache/cxf/fediz/core/AbstractSAMLCallbackHandler.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/AbstractSAMLCallbackHandler.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/AbstractSAMLCallbackHandler.java
index 238a88c..1c7d693 100644
--- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/AbstractSAMLCallbackHandler.java
+++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/AbstractSAMLCallbackHandler.java
@@ -239,7 +239,7 @@ public abstract class AbstractSAMLCallbackHandler implements CallbackHandler {
                 return;
             }
             
-            List<AttributeBean> attributeList = new ArrayList<AttributeBean>();
+            List<AttributeBean> attributeList = new ArrayList<>();
                         
             if (this.multiValueType.equals(MultiValue.MULTI_VALUE)
                 || this.multiValueType.equals(MultiValue.ENC_VALUE)) {
@@ -294,7 +294,7 @@ public abstract class AbstractSAMLCallbackHandler implements CallbackHandler {
 //                <saml:AttributeValue>Value2</saml:AttributeValue>
 //              </saml:Attribute>
                 
-                //List<AttributeBean> attrBeans = new ArrayList<AttributeBean>();
+                //List<AttributeBean> attrBeans = new ArrayList<>();
                 for (String role: roles) {
                     AttributeBean attributeBean = new AttributeBean();
                     if (subjectBean != null) {

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/test/java/org/apache/cxf/fediz/core/KeystoreCallbackHandler.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/KeystoreCallbackHandler.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/KeystoreCallbackHandler.java
index 7b09315..880c94d 100644
--- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/KeystoreCallbackHandler.java
+++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/KeystoreCallbackHandler.java
@@ -35,7 +35,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
  */
 public class KeystoreCallbackHandler implements CallbackHandler {
     
-    private Map<String, String> users = new HashMap<String, String>();
+    private Map<String, String> users = new HashMap<>();
     
     public KeystoreCallbackHandler() {
         users.put("mystskey", "stskpass");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/TestCallbackHandler.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/TestCallbackHandler.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/TestCallbackHandler.java
index 6f13a89..5c73d00 100644
--- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/TestCallbackHandler.java
+++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/TestCallbackHandler.java
@@ -66,7 +66,7 @@ public class TestCallbackHandler implements CallbackHandler {
                 callback.setIssuerUrl(new URL(TEST_IDP));
             } else if (callbacks[i] instanceof SignInQueryCallback) {
                 SignInQueryCallback callback = (SignInQueryCallback) callbacks[i];
-                Map<String, String> queryParamMap = new HashMap<String, String>();
+                Map<String, String> queryParamMap = new HashMap<>();
                 queryParamMap.put("pubid", "myid");
                 queryParamMap.put("testenc", "<=>");
                 callback.setSignInQueryParamMap(queryParamMap);
@@ -76,4 +76,4 @@ public class TestCallbackHandler implements CallbackHandler {
         }
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizSecurityContext.java
----------------------------------------------------------------------
diff --git a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizSecurityContext.java b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizSecurityContext.java
index d20aa71..89adc17 100644
--- a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizSecurityContext.java
+++ b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizSecurityContext.java
@@ -34,7 +34,7 @@ public class FedizSecurityContext implements SecurityContext {
     public FedizSecurityContext(Principal principal,
                                 Collection<String> roles) {
         this.principal = principal;
-        this.roles = new HashSet<Principal>();
+        this.roles = new HashSet<>();
         if (roles != null) {
             for (String role : roles) {
                 this.roles.add(new SimplePrincipal(role));

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java
----------------------------------------------------------------------
diff --git a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java
index cbe270e..50db700 100644
--- a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java
+++ b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java
@@ -39,7 +39,7 @@ public class GrantedAuthoritiesUserDetailsFederationService
     @Override
     protected UserDetails loadUserDetails(FedizResponse response) {
         
-        final List<GrantedAuthority> grantedAuthorities = new ArrayList<GrantedAuthority>();
+        final List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
         
         if (response.getRoles() != null) {
             for (final String role : response.getRoles()) {

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java
----------------------------------------------------------------------
diff --git a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java
index 15df380..770916d 100644
--- a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java
+++ b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java
@@ -39,7 +39,7 @@ public class GrantedAuthoritiesUserDetailsFederationService
     @Override
     protected UserDetails loadUserDetails(FedizResponse response) {
         
-        List<GrantedAuthority> grantedAuthorities = new ArrayList<GrantedAuthority>();
+        List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
         
         if (response.getRoles() != null) {
             for (final String role : response.getRoles()) {

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/mapper/DefaultRoleToGroupMapper.java
----------------------------------------------------------------------
diff --git a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/mapper/DefaultRoleToGroupMapper.java b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/mapper/DefaultRoleToGroupMapper.java
index 5bbaac4..02af59d 100644
--- a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/mapper/DefaultRoleToGroupMapper.java
+++ b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/mapper/DefaultRoleToGroupMapper.java
@@ -51,7 +51,7 @@ public class DefaultRoleToGroupMapper implements RoleToGroupMapper {
         if (template == null || roles == null) {
             return roles;
         } else {
-            List<String> renamedRoles = new ArrayList<String>();
+            List<String> renamedRoles = new ArrayList<>();
             for (String role : roles) {
                 String renamedRole = template.replace(ROLE_MAPPING_PLACEHOLDER, role);
                 renamedRoles.add(renamedRole);

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/mapper/FileBasedRoleToGroupMapper.java
----------------------------------------------------------------------
diff --git a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/mapper/FileBasedRoleToGroupMapper.java b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/mapper/FileBasedRoleToGroupMapper.java
index 03a497d..ce28b7b 100644
--- a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/mapper/FileBasedRoleToGroupMapper.java
+++ b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/mapper/FileBasedRoleToGroupMapper.java
@@ -73,7 +73,7 @@ public class FileBasedRoleToGroupMapper implements RoleToGroupMapper {
     private String groupMappingFilename = "./mapping.xml";
     private int refreshRateMillisec = 30 * 1000;
     private boolean doLoop = true;
-    private Map<String, List<String>> mappings = new HashMap<String, List<String>>(10);
+    private Map<String, List<String>> mappings = new HashMap<>(10);
     private long mappingFileLastModificationDate = -1;
 
     @Override
@@ -82,7 +82,7 @@ public class FileBasedRoleToGroupMapper implements RoleToGroupMapper {
             return null;
         }
         
-        List<String> groups = new ArrayList<String>(20);
+        List<String> groups = new ArrayList<>(20);
         for (String key : roles) {
             List<String> groupList = mappings.get(key);
             if (groupList != null) {
@@ -172,7 +172,7 @@ public class FileBasedRoleToGroupMapper implements RoleToGroupMapper {
         JAXBContext context = JAXBContext.newInstance(Mapping.class);
         Mapping localmappings = (Mapping) context.createUnmarshaller().unmarshal(input);
 
-        Map<String, List<String>> map = new HashMap<String, List<String>>(10);
+        Map<String, List<String>> map = new HashMap<>(10);
 
         Iterator<SamlToJ2EE> i = localmappings.getSamlToJ2EE().iterator();
         while (i.hasNext()) {

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
----------------------------------------------------------------------
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 fd76e61..28d6cd0 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
@@ -452,7 +452,7 @@ public class FedizInterceptor implements TrustAssociationInterceptor {
 
         List<String> localGroups = mapper.groupsFromRoles(federationResponse.getRoles());
         int size = (localGroups == null) ? 0 : localGroups.size();
-        List<String> groupIds = new ArrayList<String>(size);
+        List<String> groupIds = new ArrayList<>(size);
 
         if (size > 0) {
             if (directGroupMapping) {

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7030c67..f0758b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,7 +288,7 @@
                     <version>2.10.1</version>
                     <configuration>
                         <attach>true</attach>
-                        <source>1.5</source>
+                        <source>${jdk.version}</source>
                         <quiet>true</quiet>
                         <bottom>Apache Fediz</bottom>
                         <encoding>UTF-8</encoding>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSAuthenticationProvider.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSAuthenticationProvider.java
index ab84b11..846b5e3 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSAuthenticationProvider.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSAuthenticationProvider.java
@@ -81,10 +81,10 @@ public abstract class STSAuthenticationProvider implements AuthenticationProvide
     //Required to get IDP roles to use the IDP application, used in future release
     protected String roleURI;
     
-    protected Map<String, Object> properties = new HashMap<String, Object>();
+    protected Map<String, Object> properties = new HashMap<>();
     
     protected List<GrantedAuthority> createAuthorities(SecurityToken token) throws WSSecurityException {
-        List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
+        List<GrantedAuthority> authorities = new ArrayList<>();
         //authorities.add(new SimpleGrantedAuthority("ROLE_AUTHENTICATED"));
         //Not needed because AuthenticatedVoter has been added for SecurityFlowExecutionListener
         if (roleURI != null) {
@@ -190,8 +190,8 @@ public abstract class STSAuthenticationProvider implements AuthenticationProvide
             return Collections.emptyList();
         }
 
-        List<Claim> collection = new ArrayList<Claim>();
-        Map<String, Claim> claimsMap = new HashMap<String, Claim>();
+        List<Claim> collection = new ArrayList<>();
+        Map<String, Claim> claimsMap = new HashMap<>();
 
         for (org.opensaml.saml2.core.AttributeStatement statement : attributeStatements) {
             LOG.debug("parsing statement: {}", statement.getElementQName());
@@ -213,7 +213,7 @@ public abstract class STSAuthenticationProvider implements AuthenticationProvide
                 }
                 c.setIssuer(assertion.getIssuer().getNameQualifier());
 
-                List<String> valueList = new ArrayList<String>();
+                List<String> valueList = new ArrayList<>();
                 for (XMLObject attributeValue : attribute.getAttributeValues()) {
                     Element attributeValueElement = attributeValue.getDOM();
                     String value = attributeValueElement.getTextContent();
@@ -236,7 +236,7 @@ public abstract class STSAuthenticationProvider implements AuthenticationProvide
             Object oValue = t.getValue();
             if (oValue instanceof String) {
                 //one child element AttributeValue only
-                List<String> values = new ArrayList<String>();
+                List<String> values = new ArrayList<>();
                 values.add((String)oValue); //add existing value
                 values.addAll(valueList);
                 t.setValue(values);

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
index 69b1d0e..a822d1b 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
@@ -42,7 +42,7 @@ public class SigninParametersCacheAction {
     private static final Logger LOG = LoggerFactory.getLogger(SigninParametersCacheAction.class);
 
     public void store(RequestContext context) {
-        Map<String, Object> signinParams = new HashMap<String, Object>();
+        Map<String, Object> signinParams = new HashMap<>();
         String uuidKey = UUID.randomUUID().toString();
         
         Object value = WebUtils.getAttributeFromFlowScope(context, FederationConstants.PARAM_REPLY);
@@ -151,7 +151,7 @@ public class SigninParametersCacheAction {
                         .getAttributeFromExternalContext(context, REALM_URL_MAP);
 
         if (rum == null) {
-            rum = new HashMap<String, String>();
+            rum = new HashMap<>();
             WebUtils.putAttributeInExternalContext(context, REALM_URL_MAP, rum);
         }
 
@@ -160,4 +160,4 @@ public class SigninParametersCacheAction {
             rum.put(wtrealm, url);
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Application.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Application.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Application.java
index 5f14f5b..58ff214 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Application.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Application.java
@@ -57,7 +57,7 @@ public class Application implements Serializable {
     protected String encryptionCertificate;
     
     // Could be read from Metadata, fed:ClaimTypesRequested
-    protected List<RequestClaim> requestedClaims = new ArrayList<RequestClaim>();
+    protected List<RequestClaim> requestedClaims = new ArrayList<>();
     
     //Could be read from Metadata, ServiceDisplayName
     //usage for list of application where user is logged in

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
index 389348b..f19cac8 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Idp.java
@@ -83,28 +83,28 @@ public class Idp implements Serializable {
     // "http://docs.oasis-open.org/wsfed/federation/200706"
     // "http://docs.oasis-open.org/ws-sx/ws-trust/200512"
     // Could be more in the future
-    protected List<String> supportedProtocols = new ArrayList<String>();
+    protected List<String> supportedProtocols = new ArrayList<>();
 
     // list of RPs and RP-IDPs from whom we accept SignInResponse
     // which includes RP IDPs
     // key: wtrealm
-    protected List<Application> applications = new ArrayList<Application>();
+    protected List<Application> applications = new ArrayList<>();
 
     // list of trusted IDP from whom we accept SignInResponse
     // key: whr
-    protected List<TrustedIdp> trustedIdpList = new ArrayList<TrustedIdp>();
+    protected List<TrustedIdp> trustedIdpList = new ArrayList<>();
 
     // which URI to redirect for authentication
     // fediz-idp/<IDP uri>/login/auth/<auth URI>
     // wauth to auth URI mapping
-    protected Map<String, String> authenticationURIs = new HashMap<String, String>();
+    protected Map<String, String> authenticationURIs = new HashMap<>();
 
     // required to create Federation Metadata document
     // fed:TokenTypesOffered
-    protected List<String> tokenTypesOffered = new ArrayList<String>();
+    protected List<String> tokenTypesOffered = new ArrayList<>();
 
     // fed:ClaimTypesOffered
-    protected List<Claim> claimTypesOffered = new ArrayList<Claim>();
+    protected List<Claim> claimTypesOffered = new ArrayList<>();
 
     // ServiceDisplayName
     protected String serviceDisplayName;

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Role.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Role.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Role.java
index 65cb724..f403546 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Role.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Role.java
@@ -36,7 +36,7 @@ public class Role implements Serializable {
     protected String description;
     protected int id;
     
-    protected List<Entitlement> entitlements = new ArrayList<Entitlement>();
+    protected List<Entitlement> entitlements = new ArrayList<>();
     
     @XmlAttribute
     public int getId() {

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/TrustedIdp.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/TrustedIdp.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/TrustedIdp.java
index 803d75f..262914d 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/TrustedIdp.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/TrustedIdp.java
@@ -72,7 +72,7 @@ public class TrustedIdp implements Serializable {
     protected String logo;
     
     // Additional (possibly protocol specific parameters)
-    protected Map<String, String> parameters = new HashMap<String, String>();
+    protected Map<String, String> parameters = new HashMap<>();
 
     
     @XmlAttribute

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
index f8c34f3..c318c86 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
@@ -23,17 +23,16 @@ 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 {
 
     private static final long serialVersionUID = -5570301342547139039L;
 
     public void setServices(Map<String, Application> applications) {
-        this.applications = new ArrayList<Application>(applications.values());
+        this.applications = new ArrayList<>(applications.values());
     }
     
     public void setTrustedIDPs(Map<String, TrustedIDPConfig> trustedIDPs) {
-        this.trustedIdpList = new ArrayList<TrustedIdp>(trustedIDPs.values());
+        this.trustedIdpList = new ArrayList<>(trustedIDPs.values());
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationProtocolControllerImpl.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationProtocolControllerImpl.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationProtocolControllerImpl.java
index 4f55141..3cd583e 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationProtocolControllerImpl.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationProtocolControllerImpl.java
@@ -50,7 +50,7 @@ public class ApplicationProtocolControllerImpl implements ProtocolController<App
     
     @Override
     public List<String> getProtocols() {
-        List<String> protocols = new ArrayList<String>();
+        List<String> protocols = new ArrayList<>();
         for (ApplicationProtocolHandler protocolHandler : protocolHandlers) {
             protocols.add(protocolHandler.getProtocol());
         }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpProtocolControllerImpl.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpProtocolControllerImpl.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpProtocolControllerImpl.java
index f357793..31bc572 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpProtocolControllerImpl.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpProtocolControllerImpl.java
@@ -50,7 +50,7 @@ public class TrustedIdpProtocolControllerImpl implements ProtocolController<Trus
     
     @Override
     public List<String> getProtocols() {
-        List<String> protocols = new ArrayList<String>();
+        List<String> protocols = new ArrayList<>();
         for (TrustedIdpProtocolHandler protocolHandler : protocolHandlers) {
             protocols.add(protocolHandler.getProtocol());
         }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/ConfigServiceSpring.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/ConfigServiceSpring.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/ConfigServiceSpring.java
index 29601b8..8545af3 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/ConfigServiceSpring.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/ConfigServiceSpring.java
@@ -30,8 +30,8 @@ import org.apache.cxf.fediz.service.idp.model.ServiceConfig;
 
 public class ConfigServiceSpring implements ConfigService {
 
-    private Map<String, Application> serviceConfigs = new HashMap<String, Application>();
-    private Map<String, Idp> idpConfigs = new HashMap<String, Idp>();
+    private Map<String, Application> serviceConfigs = new HashMap<>();
+    private Map<String, Idp> idpConfigs = new HashMap<>();
 
 
     @Override

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPAImpl.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPAImpl.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPAImpl.java
index 17499fe..2771392 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPAImpl.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPAImpl.java
@@ -58,7 +58,7 @@ public class ApplicationDAOJPAImpl implements ApplicationDAO {
     
     @Override
     public List<Application> getApplications(int start, int size, List<String> expandList) {
-        List<Application> list = new ArrayList<Application>();
+        List<Application> list = new ArrayList<>();
         
         Query query = null;
         query = em.createQuery("select a from Application a");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java
index c6af8b2..f78e08d 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java
@@ -54,7 +54,7 @@ public class ApplicationEntity {
     
     // Could be read from Metadata, fed:ClaimTypesRequested
     @OneToMany(mappedBy = "application", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<ApplicationClaimEntity> requestedClaims = new ArrayList<ApplicationClaimEntity>();
+    private List<ApplicationClaimEntity> requestedClaims = new ArrayList<>();
     
     //Could be read from Metadata, ServiceDisplayName
     //usage for list of application where user is logged in

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPAImpl.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPAImpl.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPAImpl.java
index b18ae8e..ea3e675 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPAImpl.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPAImpl.java
@@ -50,7 +50,7 @@ public class ClaimDAOJPAImpl implements ClaimDAO {
     
     @Override
     public List<Claim> getClaims(int start, int size) {
-        List<Claim> list = new ArrayList<Claim>();
+        List<Claim> list = new ArrayList<>();
         
         Query query = null;
         query = em.createQuery("select c from Claim c");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ConfigServiceJPA.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ConfigServiceJPA.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ConfigServiceJPA.java
index 209052b..03f70b9 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ConfigServiceJPA.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ConfigServiceJPA.java
@@ -47,7 +47,7 @@ public class ConfigServiceJPA implements ConfigService {
     public Idp getIDP(String realm) {
         Authentication currentAuthentication = SecurityContextHolder.getContext().getAuthentication();
         try {
-            final Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>();
+            final Set<GrantedAuthority> authorities = new HashSet<>();
             
             if (realm == null || realm.length() == 0) {
                 authorities.add(new SimpleGrantedAuthority("IDP_LIST"));

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java
index 377b48b..2c6ab15 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java
@@ -137,10 +137,10 @@ public class DBLoaderImpl implements DBLoader {
             idpEntity.setServiceDescription("IDP of Realm A");
             idpEntity.setUri("realma");
             idpEntity.setProvideIdpList(true);
-            Map<String, String> authUris = new HashMap<String, String>();
+            Map<String, String> authUris = new HashMap<>();
             authUris.put("default", "/login/default");
             idpEntity.setAuthenticationURIs(authUris);
-            List<String> protocols = new ArrayList<String>();
+            List<String> protocols = new ArrayList<>();
             protocols.add("http://docs.oasis-open.org/wsfed/federation/200706");
             protocols.add("http://docs.oasis-open.org/ws-sx/ws-trust/200512");
             idpEntity.setSupportedProtocols(protocols);
@@ -148,7 +148,7 @@ public class DBLoaderImpl implements DBLoader {
             idpEntity.getClaimTypesOffered().add(claimEntity2);
             idpEntity.getClaimTypesOffered().add(claimEntity3);
             idpEntity.getClaimTypesOffered().add(claimEntity4);
-            List<String> tokenTypes = new ArrayList<String>();
+            List<String> tokenTypes = new ArrayList<>();
             tokenTypes.add(WSConstants.SAML2_NS);
             tokenTypes.add(WSConstants.SAML_NS);
             idpEntity.setTokenTypesOffered(tokenTypes);

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPAImpl.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPAImpl.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPAImpl.java
index 3e76da0..47a484e 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPAImpl.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPAImpl.java
@@ -49,7 +49,7 @@ public class EntitlementDAOJPAImpl implements EntitlementDAO {
     
     @Override
     public List<Entitlement> getEntitlements(int start, int size) {
-        List<Entitlement> list = new ArrayList<Entitlement>();
+        List<Entitlement> list = new ArrayList<>();
         
         Query query = null;
         query = em.createQuery("select e from Entitlement e");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java
index c8ec6ad..92b8bdb 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java
@@ -54,7 +54,7 @@ public class IdpDAOJPAImpl implements IdpDAO {
     
     @Override
     public List<Idp> getIdps(int start, int size, List<String> expandList) {
-        List<Idp> list = new ArrayList<Idp>();
+        List<Idp> list = new ArrayList<>();
         
         Query query = null;
         query = em.createQuery("select i from IDP i");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java
index 1eda135..986b28d 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java
@@ -93,18 +93,18 @@ public class IdpEntity {
     @ElementCollection
     @CollectionTable(name = "idp_protocols")
     @Column(name = "protocol")
-    private List<String> supportedProtocols = new ArrayList<String>();
+    private List<String> supportedProtocols = new ArrayList<>();
 
     // list of RPs and RP-IDPs from whom we accept SignInResponse
     // which includes RP IDPs
     // key: wtrealm
     @ManyToMany(cascade = CascadeType.ALL)
-    private List<ApplicationEntity> applications = new ArrayList<ApplicationEntity>();
+    private List<ApplicationEntity> applications = new ArrayList<>();
 
     // list of trusted IDP from whom we accept SignInResponse
     // key: whr
     @ManyToMany(cascade = CascadeType.ALL)
-    private List<TrustedIdpEntity> trustedIdps = new ArrayList<TrustedIdpEntity>();
+    private List<TrustedIdpEntity> trustedIdps = new ArrayList<>();
 
     // which URI to redirect for authentication
     // fediz-idp/<IDP uri>/login/auth/<auth URI>
@@ -113,7 +113,7 @@ public class IdpEntity {
     @MapKeyColumn(name = "name")
     @Column(name = "value")
     @CollectionTable(name = "idp_auth_uris", joinColumns = @JoinColumn(name = "idp_id"))
-    private Map<String, String> authenticationURIs = new HashMap<String, String>();
+    private Map<String, String> authenticationURIs = new HashMap<>();
 
     // required to create Federation Metadata document
     // fed:TokenTypesOffered
@@ -122,11 +122,11 @@ public class IdpEntity {
     @ElementCollection
     @CollectionTable(name = "idp_tokentypes")
     @Column(name = "tokentype")
-    private List<String> tokenTypesOffered = new ArrayList<String>();
+    private List<String> tokenTypesOffered = new ArrayList<>();
 
     // fed:ClaimTypesOffered
     @ManyToMany(cascade = CascadeType.ALL)
-    private List<ClaimEntity> claimTypesOffered = new ArrayList<ClaimEntity>();
+    private List<ClaimEntity> claimTypesOffered = new ArrayList<>();
 
     // ServiceDisplayName
     @NotNull

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleDAOJPAImpl.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleDAOJPAImpl.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleDAOJPAImpl.java
index 30ec39e..fa6ad90 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleDAOJPAImpl.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleDAOJPAImpl.java
@@ -51,7 +51,7 @@ public class RoleDAOJPAImpl implements RoleDAO {
     
     @Override
     public List<Role> getRoles(int start, int size, List<String> expandList) {
-        List<Role> list = new ArrayList<Role>();
+        List<Role> list = new ArrayList<>();
         
         Query query = null;
         query = em.createQuery("select r from Role r");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleEntity.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleEntity.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleEntity.java
index 978230a..3b515c3 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleEntity.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleEntity.java
@@ -40,7 +40,7 @@ public class RoleEntity {
     private String description;
     
     @ManyToMany(cascade = CascadeType.ALL)
-    private List<EntitlementEntity> entitlements = new ArrayList<EntitlementEntity>();
+    private List<EntitlementEntity> entitlements = new ArrayList<>();
     
     public int getId() {
         return id;

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPAImpl.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPAImpl.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPAImpl.java
index b95af01..f24e6a0 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPAImpl.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPAImpl.java
@@ -49,7 +49,7 @@ public class TrustedIdpDAOJPAImpl implements TrustedIdpDAO {
     
     @Override
     public List<TrustedIdp> getTrustedIDPs(int start, int size) {
-        List<TrustedIdp> list = new ArrayList<TrustedIdp>();
+        List<TrustedIdp> list = new ArrayList<>();
         
         Query query = null;
         query = em.createQuery("select t from TrustedIDP t");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpEntity.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpEntity.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpEntity.java
index 22ac57a..848bbfb 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpEntity.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpEntity.java
@@ -89,7 +89,7 @@ public class TrustedIdpEntity {
     @MapKeyColumn(name = "name")
     @Column(name = "value")
     @CollectionTable(name = "trusted_idp_parameters", joinColumns = @JoinColumn(name = "trusted_idp_id"))
-    private Map<String, String> parameters = new HashMap<String, String>();
+    private Map<String, String> parameters = new HashMap<>();
     
 
     public int getId() {

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java
index 2893cbe..d8c7bae 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java
@@ -62,7 +62,7 @@ public class GrantedAuthorityEntitlements extends GenericFilterBean {
                 return;
             }
             
-            final Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>();
+            final Set<GrantedAuthority> authorities = new HashSet<>();
             if (currentAuth.getAuthorities() != null) {
                 authorities.addAll(currentAuth.getAuthorities());
             }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
----------------------------------------------------------------------
diff --git a/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java b/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
index a624725..11f5d77 100644
--- a/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
+++ b/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
@@ -166,14 +166,14 @@ public class IdpDAOJPATest {
         idp.setServiceDescription("IDP of New Realm");
         idp.setUri("realmn");
         idp.setProvideIdpList(true);
-        Map<String, String> authUris = new HashMap<String, String>();
+        Map<String, String> authUris = new HashMap<>();
         authUris.put("default", "/login/default");
         idp.setAuthenticationURIs(authUris);
-        List<String> protocols = new ArrayList<String>();
+        List<String> protocols = new ArrayList<>();
         protocols.add("http://docs.oasis-open.org/wsfed/federation/200706");
         protocols.add("http://docs.oasis-open.org/ws-sx/ws-trust/200512");
         idp.setSupportedProtocols(protocols);
-        List<String> tokenTypes = new ArrayList<String>();
+        List<String> tokenTypes = new ArrayList<>();
         tokenTypes.add(WSConstants.SAML2_NS);
         tokenTypes.add(WSConstants.SAML_NS);
         idp.setTokenTypesOffered(tokenTypes);
@@ -261,13 +261,13 @@ public class IdpDAOJPATest {
         idp.setServiceDescription("UIDP of New Realm");
         idp.setUri("Urealmn");
         idp.setProvideIdpList(true);
-        Map<String, String> authUris = new HashMap<String, String>();
+        Map<String, String> authUris = new HashMap<>();
         authUris.put("default", "/login/default");
         idp.setAuthenticationURIs(authUris);
-        List<String> protocols = new ArrayList<String>();
+        List<String> protocols = new ArrayList<>();
         protocols.add("http://docs.oasis-open.org/wsfed/federation/200706");
         idp.setSupportedProtocols(protocols);
-        List<String> tokenTypes = new ArrayList<String>();
+        List<String> tokenTypes = new ArrayList<>();
         tokenTypes.add(WSConstants.SAML2_NS);
         idp.setTokenTypesOffered(tokenTypes);
         idp.setUseCurrentIdp(false);
@@ -329,13 +329,13 @@ public class IdpDAOJPATest {
         idp.setServiceDescription("UIDP of New Realm");
         idp.setUri("Urealmn");
         idp.setProvideIdpList(true);
-        Map<String, String> authUris = new HashMap<String, String>();
+        Map<String, String> authUris = new HashMap<>();
         authUris.put("default", "/login/default");
         idp.setAuthenticationURIs(authUris);
-        List<String> protocols = new ArrayList<String>();
+        List<String> protocols = new ArrayList<>();
         protocols.add("http://docs.oasis-open.org/wsfed/federation/200706");
         idp.setSupportedProtocols(protocols);
-        List<String> tokenTypes = new ArrayList<String>();
+        List<String> tokenTypes = new ArrayList<>();
         tokenTypes.add(WSConstants.SAML2_NS);
         idp.setTokenTypesOffered(tokenTypes);
         idp.setUseCurrentIdp(false);
@@ -623,14 +623,14 @@ public class IdpDAOJPATest {
         idp.setServiceDescription("IDP of New Realm");
         idp.setUri("realma");
         idp.setProvideIdpList(true);
-        Map<String, String> authUris = new HashMap<String, String>();
+        Map<String, String> authUris = new HashMap<>();
         authUris.put("default", "/login/default");
         idp.setAuthenticationURIs(authUris);
-        List<String> protocols = new ArrayList<String>();
+        List<String> protocols = new ArrayList<>();
         protocols.add("http://docs.oasis-open.org/wsfed/federation/200706");
         protocols.add("http://docs.oasis-open.org/ws-sx/ws-trust/200512");
         idp.setSupportedProtocols(protocols);
-        List<String> tokenTypes = new ArrayList<String>();
+        List<String> tokenTypes = new ArrayList<>();
         tokenTypes.add(WSConstants.SAML2_NS);
         tokenTypes.add(WSConstants.SAML_NS);
         idp.setTokenTypesOffered(tokenTypes);

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/sts/src/test/java/org/apache/cxf/fediz/sts/AbstractSTSTest.java
----------------------------------------------------------------------
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 328fab0..832ec35 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
@@ -138,7 +138,7 @@ public abstract class AbstractSTSTest {
         TLSClientParameters tlsParameters = http.getTlsClientParameters();
         Assert.assertNotNull("the http conduit's tlsParameters should not be null", tlsParameters);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(SecurityConstants.USERNAME, username);
         properties.put(SecurityConstants.PASSWORD, password);
         properties.put(SecurityConstants.IS_BSP_COMPLIANT, "false");
@@ -169,7 +169,7 @@ public abstract class AbstractSTSTest {
         TLSClientParameters tlsParameters = http.getTlsClientParameters();
         Assert.assertNotNull("the http conduit's tlsParameters should not be null", tlsParameters);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(SecurityConstants.IS_BSP_COMPLIANT, "false");
 
         Assert.assertNotNull("supportingToken must not be null", supportingToken);
@@ -303,4 +303,4 @@ public abstract class AbstractSTSTest {
                           issuer.toUpperCase().contains(realm.toUpperCase()));
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/services/sts/src/test/java/org/apache/cxf/fediz/sts/realms/ITCrossRealmTest.java
----------------------------------------------------------------------
diff --git a/services/sts/src/test/java/org/apache/cxf/fediz/sts/realms/ITCrossRealmTest.java b/services/sts/src/test/java/org/apache/cxf/fediz/sts/realms/ITCrossRealmTest.java
index fab0d4d..48ff9a6 100644
--- a/services/sts/src/test/java/org/apache/cxf/fediz/sts/realms/ITCrossRealmTest.java
+++ b/services/sts/src/test/java/org/apache/cxf/fediz/sts/realms/ITCrossRealmTest.java
@@ -101,7 +101,7 @@ public class ITCrossRealmTest extends AbstractSTSTest {
         List<String> claimsList = null;
         String claims = testProps.getProperty(PROPERTY_CLAIMS);
         if (claims != null && claims.length() > 0) {
-            claimsList = new ArrayList<String>();
+            claimsList = new ArrayList<>();
             StringTokenizer st = new StringTokenizer(claims, ";");
             while (st.hasMoreTokens()) {
                 claimsList.add(st.nextToken());
@@ -187,7 +187,7 @@ public class ITCrossRealmTest extends AbstractSTSTest {
         List<String> claimsList = null;
         String claims = testProps.getProperty(PROPERTY_CLAIMS);
         if (claims != null && claims.length() > 0) {
-            claimsList = new ArrayList<String>();
+            claimsList = new ArrayList<>();
             StringTokenizer st = new StringTokenizer(claims, ";");
             while (st.hasMoreTokens()) {
                 claimsList.add(st.nextToken());

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/SAML2CallbackHandler.java
----------------------------------------------------------------------
diff --git a/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/SAML2CallbackHandler.java b/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/SAML2CallbackHandler.java
index 39065b6..cb5bce9 100644
--- a/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/SAML2CallbackHandler.java
+++ b/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/SAML2CallbackHandler.java
@@ -59,7 +59,7 @@ public class SAML2CallbackHandler implements CallbackHandler {
         callback.setAuthenticationStatementData(Collections.singletonList(authBean));
 
         // Add roles for certain users
-        List<Object> roles = new ArrayList<Object>();
+        List<Object> roles = new ArrayList<>();
         if ("alice".equals(subjectName)) {
             roles.add("boss");
             roles.add("employee");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/77e537fa/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
index 1a5fe6c..cbb9c85 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
@@ -155,7 +155,7 @@ public abstract class AbstractClientCertTests {
         
         WebRequest request = new WebRequest(new URL(url), HttpMethod.POST);
 
-        request.setRequestParameters(new ArrayList<NameValuePair>());
+        request.setRequestParameters(new ArrayList<>());
         request.getRequestParameters().add(new NameValuePair("wctx", wctx));
         request.getRequestParameters().add(new NameValuePair("wa", wa));
         request.getRequestParameters().add(new NameValuePair("wtrealm", wtrealm));


Mime
View raw message