[java-identity-provider] branch master updated: Removal of IdentifiableComponent from component subclasses.

[Scott Cantor]

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

scantor 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=e8f43c2743438aaf95c4b9b8707614f7b87b5a96

The following commit(s) were added to refs/heads/master by this push:
       new  e8f43c2   Removal of IdentifiableComponent from component subclasses.
e8f43c2 is described below

commit e8f43c2743438aaf95c4b9b8707614f7b87b5a96
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jan 14 16:34:46 2019 -0500

    Removal of IdentifiableComponent from component subclasses.
---
 .../idp/attribute/resolver/impl/AttributeResolverImpl.java     |  6 ------
 .../net/shibboleth/idp/cas/service/PatternServiceRegistry.java |  8 +-------
 .../impl/DefaultRelyingPartyConfigurationResolver.java         |  8 +-------
 .../saml/nameid/impl/NameIdentifierGenerationServiceImpl.java  | 10 +---------
 4 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
index ab2c71f..c8a9731 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
@@ -59,7 +59,6 @@ import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContex
 import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
 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.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 import net.shibboleth.utilities.java.support.collection.LazyList;
@@ -109,11 +108,6 @@ public class AttributeResolverImpl extends AbstractServiceableComponent<Attribut
         profileContextStrategy = new ParentContextLookup<>();
     }
     
-    /** {@inheritDoc} */
-    @Override public void setId(@Nonnull @NotEmpty final String resolverId) {
-        super.setId(resolverId);
-    }
-    
     /** Sets the attribute definitions for this resolver.
      * @param definitions attribute definitions loaded in to this resolver
      */
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java
index ac03b64..be99127 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java
@@ -28,7 +28,6 @@ import javax.annotation.Nullable;
 
 import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,7 +41,7 @@ import org.slf4j.LoggerFactory;
  * @author Marvin S. Addison
  */
 public class PatternServiceRegistry extends AbstractServiceableComponent<ServiceRegistry>
-        implements IdentifiableComponent, ServiceRegistry {
+        implements ServiceRegistry {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(PatternServiceRegistry.class);
@@ -52,11 +51,6 @@ public class PatternServiceRegistry extends AbstractServiceableComponent<Service
     @NonnullElements
     private Map<ServiceDefinition, Pattern> definitions = Collections.emptyMap();
 
-    @Override
-    public void setId(@Nonnull final String componentId) {
-        super.setId(componentId);
-    }
-
     /**
      * Sets the list of service definitions that back the registry.
      * 
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
index 472ee8b..d63a0f7 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
@@ -39,7 +39,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -64,7 +63,7 @@ import com.google.common.collect.ImmutableMap;
  */
 public class DefaultRelyingPartyConfigurationResolver
         extends AbstractServiceableComponent<RelyingPartyConfigurationResolver>
-        implements RelyingPartyConfigurationResolver, IdentifiableComponent {
+        implements RelyingPartyConfigurationResolver {
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(DefaultRelyingPartyConfigurationResolver.class);
@@ -368,11 +367,6 @@ public class DefaultRelyingPartyConfigurationResolver
     }
 
     /** {@inheritDoc} */
-    @Override public void setId(@Nonnull final String componentId) {
-        super.setId(componentId);
-    }
-
-    /** {@inheritDoc} */
     @Override @Nonnull public RelyingPartyConfigurationResolver getComponent() {
         return this;
     }
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierGenerationServiceImpl.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierGenerationServiceImpl.java
index 79e820d..76d7bba 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierGenerationServiceImpl.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/NameIdentifierGenerationServiceImpl.java
@@ -25,26 +25,18 @@ import org.opensaml.saml.saml2.profile.SAML2NameIDGenerator;
 import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
 import net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 /** Implementation of {@link NameIdentifierGenerationService}. */
 public class NameIdentifierGenerationServiceImpl extends AbstractServiceableComponent<NameIdentifierGenerationService>
-        implements NameIdentifierGenerationService, IdentifiableComponent {
+        implements NameIdentifierGenerationService {
 
     /** SAML 1 generator. */
     @NonnullAfterInit private SAML1NameIdentifierGenerator saml1Generator;
 
     /** SAML 2 generator. */
     @NonnullAfterInit private SAML2NameIDGenerator saml2Generator;
-
-    /** {@inheritDoc} */
-    @Override
-    public void setId(@Nonnull @NotEmpty final String id) {
-        super.setId(id);
-    }
     
     /**
      * Set the {@link SAML1NameIdentifierGenerator} to use.

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