[spring-extensions] branch master updated: Patch around difference between Eclipse and Java compilers.

[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=243f9dd45e83c0c201aef74405abf42a2c828df2

The following commit(s) were added to refs/heads/master by this push:
       new  243f9dd   Patch around difference between Eclipse and Java compilers.
243f9dd is described below

commit 243f9dd45e83c0c201aef74405abf42a2c828df2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jul 23 13:25:13 2019 -0400

    Patch around difference between Eclipse and Java compilers.
---
 .../shibboleth/ext/spring/service/ClassBasedServiceStrategy.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java b/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java
index c44ec83..96a64ba 100644
--- a/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java
+++ b/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java
@@ -38,13 +38,13 @@ import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 public class ClassBasedServiceStrategy<T> implements Function<ApplicationContext, ServiceableComponent<T>> {
 
     /** The class we are looking for. */
-    @Nonnull private final Class<? extends ServiceableComponent<T>> serviceClaz;
+    @Nonnull private final Class<ServiceableComponent> serviceClaz;
 
     /**
      * Constructor.
      */
     public ClassBasedServiceStrategy() {
-        serviceClaz = (Class<? extends ServiceableComponent<T>>) ServiceableComponent.class;
+        serviceClaz = ServiceableComponent.class;
     }
 
     /**
@@ -53,13 +53,13 @@ public class ClassBasedServiceStrategy<T> implements Function<ApplicationContext
      * @param serviceableClaz what to look for.
      */
     public ClassBasedServiceStrategy(
-            @ParameterName(name="serviceableClaz") final Class<? extends ServiceableComponent<T>> serviceableClaz) {
+            @ParameterName(name="serviceableClaz") final Class<ServiceableComponent> serviceableClaz) {
         serviceClaz = Constraint.isNotNull(serviceableClaz, "Serviceable Class cannot be null");
     }
 
     /** {@inheritDoc} */
     @Nullable public ServiceableComponent<T> apply(@Nullable final ApplicationContext appContext) {
-        final Collection<? extends ServiceableComponent<T>> components =
+        final Collection<ServiceableComponent> components =
                 appContext.getBeansOfType(serviceClaz).values();
 
         if (components.size() == 0) {
@@ -71,4 +71,5 @@ public class ClassBasedServiceStrategy<T> implements Function<ApplicationContext
 
         return components.iterator().next();
     }
+    
 }
\ No newline at end of file

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