[java-opensaml COMMIT] in /trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo: KeyInfoGeneratorManag...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb  2 21:23:11 2015
New Revision: 4210

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4210&view=rev
Log:
Fix warnings.

Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGeneratorManager.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGeneratorManager.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGeneratorManager.java?rev=4210&r1=4209&r2=4210&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGeneratorManager.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGeneratorManager.java Mon Feb  2 21:23:11 2015
@@ -40,7 +40,7 @@
     
     /** Constructor. */
     public KeyInfoGeneratorManager() {
-        factories = new HashMap<Class<? extends Credential>, KeyInfoGeneratorFactory>(5);
+        factories = new HashMap<>(5);
     }
 
     /**

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java?rev=4210&r1=4209&r2=4210&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java Mon Feb  2 21:23:11 2015
@@ -103,7 +103,7 @@
      * @return a list of key name strings
      */
     @Nonnull public static List<String> getKeyNames(@Nullable final KeyInfo keyInfo) {
-        List<String> keynameList = new LinkedList<String>();
+        List<String> keynameList = new LinkedList<>();
 
         if (keyInfo == null) {
             return keynameList;
@@ -148,7 +148,7 @@
      */
     @Nonnull public static List<X509Certificate> getCertificates(@Nullable final KeyInfo keyInfo)
             throws CertificateException {
-        List<X509Certificate> certList = new LinkedList<X509Certificate>();
+        List<X509Certificate> certList = new LinkedList<>();
 
         if (keyInfo == null) {
             return certList;
@@ -174,7 +174,7 @@
      */
     @Nonnull public static List<X509Certificate> getCertificates(@Nullable final X509Data x509Data)
             throws CertificateException {
-        List<X509Certificate> certList = new LinkedList<X509Certificate>();
+        List<X509Certificate> certList = new LinkedList<>();
 
         if (x509Data == null) {
             return certList;
@@ -221,7 +221,7 @@
      *             s
      */
     @Nonnull public static List<X509CRL> getCRLs(@Nullable final KeyInfo keyInfo) throws CRLException {
-        List<X509CRL> crlList = new LinkedList<X509CRL>();
+        List<X509CRL> crlList = new LinkedList<>();
 
         if (keyInfo == null) {
             return crlList;
@@ -246,7 +246,7 @@
      *             s
      */
     @Nonnull public static List<X509CRL> getCRLs(@Nullable final X509Data x509Data) throws CRLException {
-        List<X509CRL> crlList = new LinkedList<X509CRL>();
+        List<X509CRL> crlList = new LinkedList<>();
 
         if (x509Data == null) {
             return crlList;
@@ -638,7 +638,7 @@
 
         // TODO support ECKeyValue and DEREncodedKeyValue
 
-        List<PublicKey> keys = new LinkedList<PublicKey>();
+        List<PublicKey> keys = new LinkedList<>();
 
         if (keyInfo == null) {
             return keys;

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java?rev=4210&r1=4209&r2=4210&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java Mon Feb  2 21:23:11 2015
@@ -51,7 +51,7 @@
     
     /** Constructor. */
     public NamedKeyInfoGeneratorManager() {
-        managers = new LazyMap<String, KeyInfoGeneratorManager>();
+        managers = new LazyMap<>();
         defaultManager = new KeyInfoGeneratorManager();
         useDefaultManager = true;
     }