[java-opensaml COMMIT] in /trunk: opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct 11 05:58:18 2016
New Revision: 4527

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4527&view=rev
Log:
IDP-1047 Annotations to Constructor Parameters

https://issues.shibboleth.net/jira/browse/IDP-1047

Also some finals as collateral damage.

Modified:
    trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/MetadataCredentialResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolver.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/ChainingSignaturePrevalidator.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/ChainingSignatureTrustEngine.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngine.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngine.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java?rev=4527&r1=4526&r2=4527&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java	(original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/metrics/LoggerDrivenMetricFilter.java	Tue Oct 11 05:58:18 2016
@@ -24,16 +24,17 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.codahale.metrics.Metric;
 import com.codahale.metrics.MetricFilter;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * {@link MetricFilter} that evaluates a metric by prefixing the name and then evaluating
@@ -73,7 +74,7 @@
      *
      * @param prefix prefix to attach to metric name before evaluating
      */
-    public LoggerDrivenMetricFilter(@Nonnull @NotEmpty final String prefix) {
+    public LoggerDrivenMetricFilter(@Nonnull @NotEmpty @ParameterName(name="prefix") final String prefix) {
         this(prefix, Collections.<String,Level>emptyMap());
     }
     
@@ -83,8 +84,8 @@
      * @param prefix prefix to attach to metric name before evaluating
      * @param map map of metric names to logging levels
      */
-    public LoggerDrivenMetricFilter(@Nonnull @NotEmpty final String prefix,
-            @Nullable @NonnullElements final Map<String,Level> map) {
+    public LoggerDrivenMetricFilter(@Nonnull @NotEmpty @ParameterName(name="prefix") final String prefix,
+            @Nullable @NonnullElements @ParameterName(name="map") final Map<String,Level> map) {
         loggerPrefix = Constraint.isNotNull(StringSupport.trimOrNull(prefix), "Prefix cannot be null or empty.");
         
         if (map == null || map.isEmpty()) {
@@ -101,6 +102,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     public boolean matches(final String name, final Metric metric) {
         final Logger logger = LoggerFactory.getLogger(loggerPrefix + name);
         final Level level = levelMap.get(logger.getName());

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java?rev=4527&r1=4526&r2=4527&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java	(original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java	Tue Oct 11 05:58:18 2016
@@ -24,6 +24,7 @@
 import javax.annotation.concurrent.ThreadSafe;
 import javax.xml.validation.Schema;
 
+import net.shibboleth.utilities.java.support.annotation.ParameterName;

[... 809 lines stripped ...]