[java-support] branch master updated: CheckStyle

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-support.

View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=99a137e14226fec0344dc0fb2f32ae048bba578d

The following commit(s) were added to refs/heads/master by this push:
       new  99a137e   CheckStyle
99a137e is described below

commit 99a137e14226fec0344dc0fb2f32ae048bba578d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Sep 2 14:17:28 2016 +0100

    CheckStyle
---
 .../java/support/resolver/CriterionPredicateRegistry.java         | 8 +++++---
 .../utilities/java/support/resolver/ResolverSupport.java          | 2 +-
 .../shibboleth/utilities/java/support/xml/BasicParserPool.java    | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
index 4fb598a..809f126 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/CriterionPredicateRegistry.java
@@ -28,14 +28,14 @@ import java.util.Properties;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+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.google.common.base.Predicate;
 
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 /**
  * A registry which manages mappings from types of {@link Criterion} to types of {@link Predicate}
  * which can evaluate that criterion's data against a particular target type.
@@ -146,6 +146,7 @@ public class CriterionPredicateRegistry<T> {
         registry.clear();
     }
 
+//CheckStyle: ReturnCount OFF
     /**
      * Load criterion -> predicate mappings from a classpath resource.
      * 
@@ -167,6 +168,7 @@ public class CriterionPredicateRegistry<T> {
             return;
         }
     }
+  //CheckStyle: ReturnCount ON
 
     /**
      * Load a set of criterion -> predicate mappings from the supplied properties set.
diff --git a/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java b/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java
index a48e740..a1a4b19 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/resolver/ResolverSupport.java
@@ -106,7 +106,7 @@ public final class ResolverSupport {
             }
         }
         
-        Predicate<T> predicate;
+        final Predicate<T> predicate;
         if (satisfyAny) {
             predicate = Predicates.or(predicates);
         } else {
diff --git a/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java b/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
index 036b6f9..3502014 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
@@ -171,9 +171,9 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
         throw new XMLParserException("Unable to obtain a DocumentBuilder");
     }
 
+//CheckStyle: ReturnCount OFF
     /** {@inheritDoc} */
-    @Override
-    public void returnBuilder(@Nullable final DocumentBuilder builder) {
+    @Override public void returnBuilder(@Nullable final DocumentBuilder builder) {
         checkInitializedNotDestroyed();
 
         if (builder == null || !(builder instanceof DocumentBuilderProxy)) {
@@ -207,6 +207,7 @@ public class BasicParserPool extends AbstractInitializableComponent implements P
             }
         }
     }
+  //CheckStyle: ReturnCount ON
 
     /** {@inheritDoc} */
     @Override

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