[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/collection/ClassIndexe...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Nov 25 12:09:20 2013
New Revision: 480

URL: http://svn.shibboleth.net/view/utilities?rev=480&view=rev
Log:
IdP-316 Some gentle type work.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/LazyList.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/LazyMap.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/LazySet.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMap.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStoreTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/MapTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/PairTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/ValueTypeIndexedMapTest.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java?rev=480&r1=479&r2=480&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassIndexedSet.java Mon Nov 25 12:09:20 2013
@@ -47,8 +47,8 @@
      * 
      */
     public ClassIndexedSet() {
-        set = new HashSet<T>();
-        index = new HashMap<Class<? extends T>, T>();
+        set = new HashSet<>();
+        index = new HashMap<>();
     }
 
     /** {@inheritDoc} */
@@ -137,12 +137,13 @@
      * Get the index class of the specified object. Subclasses may override to use a class index other than the main
      * runtime class of the object.
      * 
+     * @param <X> generic parameter which eliminates need for casting by the caller
      * @param o the object whose class index to determine
      * @return the class index value associated with the object instance
      */
-    @Nonnull protected Class<? extends T> getIndexClass(@Nonnull final Object o) {
+    @Nonnull protected  <X extends T> Class<X> getIndexClass(@Nonnull final X o) {
         Constraint.isNotNull(o, "Object can not be null");
-        return (Class<? extends T>) o.getClass();
+        return (Class<X>) o.getClass();
     }
 
     /**

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java?rev=480&r1=479&r2=480&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java Mon Nov 25 12:09:20 2013
@@ -59,8 +59,8 @@
      * @param isIndexingSupertypes indicates whether supertypes of a value should be indexed
      */
     public ClassToInstanceMultiMap(final boolean isIndexingSupertypes) {
-        backingMap = new HashMap<Class<?>, List<B>>();
-        values = new ArrayList<B>();
+        backingMap = new HashMap<>();
+        values = new ArrayList<>();
         indexSupertypes = isIndexingSupertypes;
     }
 
@@ -163,7 +163,7 @@
             indexValues = backingMap.get(indexKey);
 
             if (indexValues == null) {
-                indexValues = new ArrayList<B>();
+                indexValues = new ArrayList<>();
                 backingMap.put(indexKey, indexValues);
             }
 

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java?rev=480&r1=479&r2=480&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/IndexingObjectStore.java Mon Nov 25 12:09:20 2013
@@ -54,7 +54,7 @@

[... 201 lines stripped ...]