[spring-extensions] branch master updated: Add IdentifiableComponent to ServiceableComponent base class.

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=710773988db5b0534a2a4fc0b3dc80f7aa2e4c14

The following commit(s) were added to refs/heads/master by this push:
       new  7107739   Add IdentifiableComponent to ServiceableComponent base class.
7107739 is described below

commit 710773988db5b0534a2a4fc0b3dc80f7aa2e4c14
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jan 14 16:30:07 2019 -0500

    Add IdentifiableComponent to ServiceableComponent base class.
---
 .../ext/spring/service/AbstractServiceableComponent.java         | 4 ++--
 .../spring/service/ApplicationContextServiceableComponent.java   | 6 ------
 .../shibboleth/ext/spring/service/TestServiceableComponent.java  | 9 ++-------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java b/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java
index a9538c3..e892ad8 100644
--- a/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java
+++ b/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java
@@ -22,7 +22,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
@@ -39,7 +39,7 @@ import org.springframework.context.ConfigurableApplicationContext;
  * 
  * @param <T> The type of service.
  */
-public abstract class AbstractServiceableComponent<T> extends AbstractIdentifiedInitializableComponent implements
+public abstract class AbstractServiceableComponent<T> extends AbstractIdentifiableInitializableComponent implements
         ServiceableComponent<T>, ApplicationContextAware {
 
     /** Class logger. */
diff --git a/src/main/java/net/shibboleth/ext/spring/service/ApplicationContextServiceableComponent.java b/src/main/java/net/shibboleth/ext/spring/service/ApplicationContextServiceableComponent.java
index 68d7f72..31abdd1 100644
--- a/src/main/java/net/shibboleth/ext/spring/service/ApplicationContextServiceableComponent.java
+++ b/src/main/java/net/shibboleth/ext/spring/service/ApplicationContextServiceableComponent.java
@@ -21,7 +21,6 @@ import javax.annotation.Nonnull;
 
 import org.springframework.context.ApplicationContext;
 
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 /**
@@ -32,11 +31,6 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
 public class ApplicationContextServiceableComponent extends AbstractServiceableComponent<ApplicationContext> {
     
     /** {@inheritDoc} */
-    public void setId(@Nonnull @NotEmpty final String componentId) {
-        super.setId(componentId);
-    }
-
-    /** {@inheritDoc} */
     @Override
     @Nonnull public ApplicationContext getComponent() {
         final ApplicationContext context = getApplicationContext();
diff --git a/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java b/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java
index dd7d976..c511833 100644
--- a/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java
+++ b/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java
@@ -45,10 +45,5 @@ public class TestServiceableComponent extends AbstractServiceableComponent<TestS
     public void setTheValue(final String theValue) {
         this.theValue = theValue;
     }
-    
-    /** {@inheritDoc} */
-    @Override
-    public void setId(@Nonnull final String componentId) {
-        super.setId(componentId);
-    }
-}
+
+}
\ No newline at end of file

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