[jboss-svn-commits] JBoss Common SVN: r3345 - in jboss-logmanager/trunk/src: test/java/org/jboss/logmanager and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-07-08 21:03:44 -0400 (Wed, 08 Jul 2009)
New Revision: 3345

Modified:
   jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/filters/SubstituteFilter.java
   jboss-logmanager/trunk/src/test/java/org/jboss/logmanager/FilterTests.java
Log:
Substitute filter should not have a nested filter; instead use any or all to select it

Modified: jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/filters/SubstituteFilter.java
===================================================================
--- jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/filters/SubstituteFilter.java	2009-07-09 00:29:58 UTC (rev 3344)
+++ jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/filters/SubstituteFilter.java	2009-07-09 01:03:44 UTC (rev 3345)
@@ -32,7 +32,7 @@
  * A filter which applies a text substitution on the message if the nested filter matches.
  */
 public final class SubstituteFilter implements Filter {
-    private final Filter matchFilter;
+
     private final Pattern pattern;
     private final String replacement;
     private final boolean replaceAll;
@@ -40,14 +40,11 @@
     /**
      * Construct a new instance.
      *
-     * @param matchFilter the filter to check
      * @param pattern the pattern to match
      * @param replacement the string replacement
      * @param replaceAll {@code true} if all occurrances should be replaced; {@code false} if only the first occurrance
-     *      should be replaced
      */
-    public SubstituteFilter(final Filter matchFilter, final Pattern pattern, final String replacement, final boolean replaceAll) {
-        this.matchFilter = matchFilter;
+    public SubstituteFilter(final Pattern pattern, final String replacement, final boolean replaceAll) {
         this.pattern = pattern;
         this.replacement = replacement;
         this.replaceAll = replaceAll;
@@ -60,13 +57,11 @@
      * @return {@code true} always
      */
     public boolean isLoggable(final LogRecord record) {
-        if (matchFilter.isLoggable(record)) {
-            final Matcher matcher = pattern.matcher(record.getMessage());
-            if (replaceAll) {
-                record.setMessage(matcher.replaceAll(replacement));
-            } else {
-                record.setMessage(matcher.replaceFirst(replacement));
-            }
+        final Matcher matcher = pattern.matcher(record.getMessage());
+        if (replaceAll) {
+            record.setMessage(matcher.replaceAll(replacement));
+        } else {
+            record.setMessage(matcher.replaceFirst(replacement));
         }
         return true;
     }

Modified: jboss-logmanager/trunk/src/test/java/org/jboss/logmanager/FilterTests.java
===================================================================
--- jboss-logmanager/trunk/src/test/java/org/jboss/logmanager/FilterTests.java	2009-07-09 00:29:58 UTC (rev 3344)
+++ jboss-logmanager/trunk/src/test/java/org/jboss/logmanager/FilterTests.java	2009-07-09 01:03:44 UTC (rev 3345)
@@ -398,7 +398,7 @@
     }
 
     public void testSubstitueFilter0() {
-        final Filter filter = new SubstituteFilter(AcceptAllFilter.getInstance(), Pattern.compile("test"), "lunch", true);
+        final Filter filter = new SubstituteFilter(Pattern.compile("test"), "lunch", true);
         final AtomicReference<String> result = new AtomicReference<String>();
         final Handler handler = new MessageCheckingHandler(result);
         final Logger logger = Logger.getLogger("filterTest");
@@ -412,7 +412,7 @@
     }
 
     public void testSubstitueFilter1() {
-        final Filter filter = new SubstituteFilter(AcceptAllFilter.getInstance(), Pattern.compile("test"), "lunch", false);
+        final Filter filter = new SubstituteFilter(Pattern.compile("test"), "lunch", false);
         final AtomicReference<String> result = new AtomicReference<String>();
         final Handler handler = new MessageCheckingHandler(result);
         final Logger logger = Logger.getLogger("filterTest");
@@ -426,7 +426,7 @@
     }
 
     public void testSubstitueFilter2() {
-        final Filter filter = new SubstituteFilter(AcceptAllFilter.getInstance(), Pattern.compile("t(es)t"), "lunch$1", true);
+        final Filter filter = new SubstituteFilter(Pattern.compile("t(es)t"), "lunch$1", true);
         final AtomicReference<String> result = new AtomicReference<String>();
         final Handler handler = new MessageCheckingHandler(result);
         final Logger logger = Logger.getLogger("filterTest");