[java-identity-provider] 02/04: IDP-1516 Reduce guava dependence idp-attribute-resolver-api

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=3908776d1e277c2d17b3cc1be7d923bcf19f7b0b

commit 3908776d1e277c2d17b3cc1be7d923bcf19f7b0b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Oct 29 16:44:13 2019 +0000

    IDP-1516 Reduce guava dependence idp-attribute-resolver-api
    
    https://issues.shibboleth.net/jira/browse/IDP-1516
---
 .../idp/attribute/resolver/AbstractResolverPlugin.java      | 12 ++++--------
 .../idp/attribute/resolver/dc/AbstractMappingStrategy.java  |  4 +---
 .../idp/attribute/resolver/AbstractResolverPluginTest.java  |  7 -------
 .../idp/attribute/resolver/MockStaticDataConnector.java     | 13 ++++++-------
 4 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
index 79f3b99..d6b9adb 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
@@ -35,13 +35,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 
 import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
 
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -164,13 +162,12 @@ public abstract class AbstractResolverPlugin<ResolvedType> extends AbstractIdent
      * 
      * @param dependencies unmodifiable list of dependencies for this plugin
      */
-    public void setAttributeDependencies(@Nullable @NullableElements
-            final Set<ResolverAttributeDefinitionDependency> dependencies) {
+    public void setAttributeDependencies(@Nullable final Set<ResolverAttributeDefinitionDependency> dependencies) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 
         if (dependencies != null) {
-            attributeDependencies = Set.copyOf(Collections2.filter(dependencies, Predicates.notNull()));
+            attributeDependencies = Set.copyOf(dependencies);
         } else {
             attributeDependencies = Collections.emptySet(); 
         }
@@ -181,13 +178,12 @@ public abstract class AbstractResolverPlugin<ResolvedType> extends AbstractIdent
      * 
      * @param dependencies unmodifiable list of dependencies for this plugin
      */
-    public void setDataConnectorDependencies(@Nullable @NullableElements
-            final Set<ResolverDataConnectorDependency> dependencies) {
+    public void setDataConnectorDependencies(@Nullable final Set<ResolverDataConnectorDependency> dependencies) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 
         if (dependencies != null) {
-            dataConnectorDependencies = Set.copyOf(Collections2.filter(dependencies, Predicates.notNull()));
+            dataConnectorDependencies = Set.copyOf(dependencies);
         } else {
             dataConnectorDependencies = Collections.emptySet();
         }
diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/AbstractMappingStrategy.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/AbstractMappingStrategy.java
index 1a52957..303e3d2 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/AbstractMappingStrategy.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/AbstractMappingStrategy.java
@@ -23,8 +23,6 @@ import java.util.Map;
 
 import javax.annotation.Nonnull;
 
-import com.google.common.collect.ImmutableMap;
-
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
@@ -58,7 +56,7 @@ public abstract class AbstractMappingStrategy<T> implements MappingStrategy<T> {
      * @return a map of result field names to alternate field names
      */
     @Nonnull @NonnullElements @Unmodifiable @NotLive public Map<String,String> getResultRenamingMap() {
-        return ImmutableMap.copyOf(resultRenamingMap);
+        return Map.copyOf(resultRenamingMap);
     }
     
     /**
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
index 12b68a3..1ef1ad9 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
@@ -106,13 +106,6 @@ public class AbstractResolverPluginTest {
         Assert.assertNotNull(plugin.getDataConnectorDependencies());
         Assert.assertTrue(plugin.getDataConnectorDependencies().isEmpty());
 
-        plugin.setAttributeDependencies(Collections.<ResolverAttributeDefinitionDependency>singleton(null));
-        plugin.setDataConnectorDependencies(Collections.<ResolverDataConnectorDependency>singleton(null));
-        Assert.assertNotNull(plugin.getAttributeDependencies());
-        Assert.assertTrue(plugin.getAttributeDependencies().isEmpty());
-        Assert.assertNotNull(plugin.getDataConnectorDependencies());
-        Assert.assertTrue(plugin.getDataConnectorDependencies().isEmpty());
-
         final ResolverAttributeDefinitionDependency dep1 = new ResolverAttributeDefinitionDependency("foo");
         final ResolverAttributeDefinitionDependency dep2 = new ResolverAttributeDefinitionDependency("foo2");
 
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticDataConnector.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticDataConnector.java
index 0bbf0b5..dfd8662 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticDataConnector.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticDataConnector.java
@@ -25,18 +25,17 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ImmutableMap;
+
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
-import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableMap;
-
 /** An attribute definition that simply returns a static value.   Used for testing only.  This is 
  * a cut and paste job from StaticDataConnector in idp-attribute-resolver-impl */
 @ThreadSafe
@@ -62,7 +61,7 @@ public class MockStaticDataConnector extends AbstractDataConnector {
      * 
      * @param newValues static values returned by this connector
      */
-    public void setValues(@Nullable @NullableElements Collection<IdPAttribute> newValues) {
+    public void setValues(@Nullable Collection<IdPAttribute> newValues) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.