[java-identity-provider COMMIT] in /trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Sep  9 05:35:13 2016
New Revision: 8378

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8378&view=rev
Log:
Checktyle.  Guava constraints are deprecated.  These constraints have never fired and we are out of development.  So remove

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContext.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java?rev=8378&r1=8377&r2=8378&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java	(original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java	Fri Sep  9 05:35:13 2016
@@ -38,7 +38,6 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicates;
-import com.google.common.collect.MapConstraints;
 
 /** A context supplying input to the {@link net.shibboleth.idp.attribute.filter.AttributeFilter} interface. */
 @NotThreadSafe
@@ -71,10 +70,8 @@
 
     /** Constructor. */
     public AttributeFilterContext() {
-        prefilteredAttributes =
-                MapConstraints.constrainedMap(new HashMap<String, IdPAttribute>(), MapConstraints.notNull());
-        filteredAttributes =
-                MapConstraints.constrainedMap(new HashMap<String, IdPAttribute>(), MapConstraints.notNull());
+        prefilteredAttributes = new HashMap<String, IdPAttribute>();
+        filteredAttributes = new HashMap<String, IdPAttribute>();
     }
 
     /**
@@ -92,12 +89,10 @@
      * @param attributes attributes which are to be filtered
      */
     public void setPrefilteredIdPAttributes(@Nullable @NullableElements final Collection<IdPAttribute> attributes) {
-        Collection<IdPAttribute> checkedAttributes = new ArrayList<>();
+        final Collection<IdPAttribute> checkedAttributes = new ArrayList<>();
         CollectionSupport.addIf(checkedAttributes, attributes, Predicates.notNull());
 
-        prefilteredAttributes =
-                MapConstraints.constrainedMap(new HashMap<String, IdPAttribute>(checkedAttributes.size()),
-                        MapConstraints.notNull());
+        prefilteredAttributes = new HashMap<String, IdPAttribute>(checkedAttributes.size());
 
         for (final IdPAttribute attribute : checkedAttributes) {
             prefilteredAttributes.put(attribute.getId(), attribute);
@@ -119,12 +114,10 @@
      * @param attributes attributes that have been filtered
      */
     public void setFilteredIdPAttributes(@Nullable @NullableElements final Collection<IdPAttribute> attributes) {
-        Collection<IdPAttribute> checkedAttributes = new ArrayList<>();
+        final Collection<IdPAttribute> checkedAttributes = new ArrayList<>();
         CollectionSupport.addIf(checkedAttributes, attributes, Predicates.notNull());
 
-        filteredAttributes =
-                MapConstraints.constrainedMap(new HashMap<String, IdPAttribute>(checkedAttributes.size()),
-                        MapConstraints.notNull());
+        filteredAttributes = new HashMap<String, IdPAttribute>(checkedAttributes.size());
 
         for (final IdPAttribute attribute : checkedAttributes) {
             filteredAttributes.put(attribute.getId(), attribute);
@@ -145,7 +138,7 @@
      * 
      * @param who The principal to set.
      */
-    public void setPrincipal(String who) {
+    public void setPrincipal(final String who) {
         principal = who;
     }
 

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContext.java?rev=8378&r1=8377&r2=8378&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContext.java	(original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContext.java	Fri Sep  9 05:35:13 2016
@@ -39,8 +39,6 @@
 
 import org.opensaml.messaging.context.BaseContext;
 
-import com.google.common.collect.MapConstraints;
-
 /**
  * A context which carries and collects information through the attribute filtering process, and coordinates data
  * between the filter implementation and the various resolver MatchFunctor implementations.
@@ -60,10 +58,8 @@
 
     /** Constructor. */
     public AttributeFilterWorkContext() {

[... 57 lines stripped ...]