[spring-extensions] 04/05: IDP-1047 Add @Parameter annotations as indicated by the logging

[Ian Young]

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

iay 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=e982514e9058a16ac7bce228b91c906f34cd2e91

commit e982514e9058a16ac7bce228b91c906f34cd2e91
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue May 8 15:21:28 2018 +0100

    IDP-1047 Add @Parameter annotations as indicated by the logging
    
    https://issues.shibboleth.net/jira/browse/IDP-1047
    
    Also turn down the logging for the discoverer.
---
 .../ext/spring/service/ClassBasedServiceStrategy.java        | 12 +++++++-----
 .../ext/spring/util/AnnotationParameterNameDiscoverer.java   |  6 +++---
 2 files changed, 10 insertions(+), 8 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 0b8c6e9..f0f2bea 100644
--- a/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java
+++ b/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java
@@ -22,14 +22,15 @@ import java.util.Collection;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.service.ServiceException;
-import net.shibboleth.utilities.java.support.service.ServiceableComponent;
-
 import org.springframework.context.ApplicationContext;
 
 import com.google.common.base.Function;
 
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.service.ServiceException;
+import net.shibboleth.utilities.java.support.service.ServiceableComponent;
+
 /**
  * Strategy to create {@link ServiceableComponent}s from the {@link ApplicationContext}.
  * 
@@ -52,7 +53,8 @@ public class ClassBasedServiceStrategy<T> implements Function<ApplicationContext
      * 
      * @param serviceableClaz what to look for.
      */
-    public ClassBasedServiceStrategy(final Class<? extends ServiceableComponent> serviceableClaz) {
+    public ClassBasedServiceStrategy(
+            @ParameterName(name="serviceableClaz") final Class<? extends ServiceableComponent> serviceableClaz) {
         serviceClaz = Constraint.isNotNull(serviceableClaz, "Serviceable Class cannot be null");
     }
 
diff --git a/src/main/java/net/shibboleth/ext/spring/util/AnnotationParameterNameDiscoverer.java b/src/main/java/net/shibboleth/ext/spring/util/AnnotationParameterNameDiscoverer.java
index 499cd1c..bd6871e 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/AnnotationParameterNameDiscoverer.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/AnnotationParameterNameDiscoverer.java
@@ -23,13 +23,13 @@ import java.lang.reflect.Method;
 
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.ParameterNameDiscoverer;
 
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
+
 /**
  * An implementation of {@link ParameterNameDiscoverer} that is driven by the {@link ParameterName} Annotation.
  *
@@ -94,7 +94,7 @@ public class AnnotationParameterNameDiscoverer extends DefaultParameterNameDisco
 
             log.debug("Constructor for class '{}' with {} parameters: "
                     + "Not all parameters are annotated with @ParameterName", className, annotationsArray.length);
-            log.debug("Types : {}", (Object)ctor.getParameterTypes());
+            log.trace("Types : {}", (Object)ctor.getParameterTypes());
             return super.getParameterNames(ctor);
         }
         log.trace("Constructor for class '{}' with {} parameters called {}", className, names.length, names);

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