[java-identity-provider COMMIT] in /trunk: idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jan 26 09:30:04 2015
New Revision: 7282

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7282&view=rev
Log:
Remove some generic type warnings

Modified:
    trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContext.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnectorTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverWorkContextTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java

Modified: trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java?rev=7282&r1=7281&r2=7282&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java (original)
+++ trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java Mon Jan 26 09:30:04 2015
@@ -94,7 +94,7 @@
         attrib.setDisplayNames(Collections.EMPTY_MAP);
         Assert.assertTrue(attrib.getDisplayNames().isEmpty());
 
-        Map<Locale, String> displayNames = new HashMap<Locale, String>();
+        Map<Locale, String> displayNames = new HashMap<>();
         displayNames.put(null, "wibble");
         attrib.setDisplayNames(displayNames);
         Assert.assertTrue(attrib.getDisplayNames().isEmpty());
@@ -160,7 +160,7 @@
         attrib.setDisplayNames(Collections.EMPTY_MAP);
         Assert.assertTrue(attrib.getDisplayDescriptions().isEmpty());
 
-        Map<Locale, String> displayDescriptions = new HashMap<Locale, String>();
+        Map<Locale, String> displayDescriptions = new HashMap<>();
         displayDescriptions.put(null, "wibble");
         attrib.setDisplayDescriptions(displayDescriptions);
         Assert.assertTrue(attrib.getDisplayDescriptions().isEmpty());
@@ -308,8 +308,8 @@
 
     /** Tests that values are properly added and modified. */
     @Test public void encoders() {
-        AttributeEncoder<String> enc1 = new MockEncoder<String>();
-        AttributeEncoder<String> enc2 = new MockEncoder<String>();
+        AttributeEncoder<String> enc1 = new MockEncoder<>();
+        AttributeEncoder<String> enc2 = new MockEncoder<>();
 
         IdPAttribute attrib = new IdPAttribute("foo");
         Assert.assertTrue(attrib.getEncoders().isEmpty());
@@ -319,7 +319,7 @@
         attrib.setEncoders(collection);
         Assert.assertTrue(attrib.getEncoders().isEmpty());
 
-        Set<AttributeEncoder<?>> attribEncoders = new HashSet<AttributeEncoder<?>>();
+        Set<AttributeEncoder<?>> attribEncoders = new HashSet<>();
 
         // test adding one entry
         Assert.assertTrue(attribEncoders.add(enc1));

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java?rev=7282&r1=7281&r2=7282&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java Mon Jan 26 09:30:04 2015
@@ -84,7 +84,7 @@
 
         rule = Constraint.isNotNull(requirementRule, "Attribute filter policy activiation criterion can not be null");
 

[... 292 lines stripped ...]