From f1988045046ad7e8124b74d82fbeabbeda746e60 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Tue, 24 Feb 2015 18:11:47 -0600
Subject: [PATCH] SEC-2825: Polish

---
 .../matcher/AbstractMessageMatcherComposite.java   | 11 ++++-------
 .../messaging/util/matcher/AndMessageMatcher.java  | 14 +++++++-------
 .../messaging/util/matcher/OrMessageMatcher.java   | 14 +++++++-------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java
index b4b5821fa0..b102c6089f 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java
@@ -28,8 +28,8 @@ import org.apache.commons.logging.Log;
  *
  * @since 4.0
  */
-public abstract class AbstractMessageMatcherComposite<T> implements MessageMatcher<T> {
-    private final Log logger = getLog(getClass());
+abstract class AbstractMessageMatcherComposite<T> implements MessageMatcher<T> {
+    protected final Log LOGGER = getLog(getClass());
 
     private final List<MessageMatcher<T>> messageMatchers;
 
@@ -53,17 +53,14 @@ public abstract class AbstractMessageMatcherComposite<T> implements MessageMatch
      * @param messageMatchers the {@link MessageMatcher} instances to try
      */
     @SafeVarargs
-    public AbstractMessageMatcherComposite(MessageMatcher<T>... messagetMatchers) {
-        this(asList(messagetMatchers));
+    public AbstractMessageMatcherComposite(MessageMatcher<T>... messageMatchers) {
+        this(asList(messageMatchers));
     }
 
     public List<MessageMatcher<T>> getMessageMatchers() {
         return messageMatchers;
     }
 
-    public Log getLogger() {
-        return logger;
-    }
     @Override
     public String toString() {
         return getClass().getSimpleName()+ "[messageMatchers=" + messageMatchers + "]";
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java
index 13ebe3deb4..d786eacc07 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java
@@ -24,7 +24,7 @@ import org.springframework.messaging.Message;
  *
  * @since 4.0
  */
-public class AndMessageMatcher<T> extends AbstractMessageMatcherComposite<T> {
+public final class AndMessageMatcher<T> extends AbstractMessageMatcherComposite<T> {
     /**
      * Creates a new instance
      *
@@ -40,23 +40,23 @@ public class AndMessageMatcher<T> extends AbstractMessageMatcherComposite<T> {
      * @param messageMatchers the {@link MessageMatcher} instances to try
      */
     @SafeVarargs
-    public AndMessageMatcher(MessageMatcher<T>... messagetMatchers) {
-        super(messagetMatchers);
+    public AndMessageMatcher(MessageMatcher<T>... messageMatchers) {
+        super(messageMatchers);
 
     }
 
     @Override
     public boolean matches(Message<? extends T> message) {
         for (MessageMatcher<T> matcher : getMessageMatchers()) {
-            if (getLogger().isDebugEnabled()) {
-                getLogger().debug("Trying to match using " + matcher);
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("Trying to match using " + matcher);
             }
             if (!matcher.matches(message)) {
-                getLogger().debug("Did not match");
+                LOGGER.debug("Did not match");
                 return false;
             }
         }
-        getLogger().debug("All messagetMatchers returned true");
+        LOGGER.debug("All messageMatchers returned true");
         return true;
     }
 }
\ No newline at end of file
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java
index ad51de41a4..8675eb9999 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java
@@ -24,7 +24,7 @@ import org.springframework.messaging.Message;
  *
  * @since 4.0
  */
-public class OrMessageMatcher<T> extends AbstractMessageMatcherComposite<T> {
+public final class OrMessageMatcher<T> extends AbstractMessageMatcherComposite<T> {
     /**
      * Creates a new instance
      *
@@ -40,23 +40,23 @@ public class OrMessageMatcher<T> extends AbstractMessageMatcherComposite<T> {
      * @param messageMatchers the {@link MessageMatcher} instances to try
      */
     @SafeVarargs
-    public OrMessageMatcher(MessageMatcher<T>... messagetMatchers) {
-        super(messagetMatchers);
+    public OrMessageMatcher(MessageMatcher<T>... messageMatchers) {
+        super(messageMatchers);
 
     }
 
     @Override
     public boolean matches(Message<? extends T> message) {
         for (MessageMatcher<T> matcher : getMessageMatchers()) {
-            if (getLogger().isDebugEnabled()) {
-                getLogger().debug("Trying to match using " + matcher);
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("Trying to match using " + matcher);
             }
             if (matcher.matches(message)) {
-                getLogger().debug("matched");
+                LOGGER.debug("matched");
                 return true;
             }
         }
-        getLogger().debug("No matches found");
+        LOGGER.debug("No matches found");
         return false;
     }
 }