[jboss-cvs] JBossAS SVN: r102277 - in projects/jboss-cl/trunk/classloader/src: main/java/org/jboss/classloader/spi/filter and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 11 06:30:23 EST 2010
Author: alesj
Date: 2010-03-11 06:30:23 -0500 (Thu, 11 Mar 2010)
New Revision: 102277
Added:
projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/plugins/filter/NegatingClassFilter.java
Modified:
projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/filter/ClassFilterUtils.java
projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/filter/test/FilterUnitTestCase.java
Log:
[JBCL-157]; negating class filter.
Copied: projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/plugins/filter/NegatingClassFilter.java (from rev 102085, projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/plugins/filter/CombiningClassFilter.java)
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/plugins/filter/NegatingClassFilter.java (rev 0)
+++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/plugins/filter/NegatingClassFilter.java 2010-03-11 11:30:23 UTC (rev 102277)
@@ -0,0 +1,60 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.classloader.plugins.filter;
+
+import org.jboss.classloader.spi.filter.ClassFilter;
+
+/**
+ * NegatingClassFilter.
+ *
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
+ */
+public class NegatingClassFilter implements ClassFilter
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ /** The filter to negate */
+ private ClassFilter filter;
+
+ public NegatingClassFilter(ClassFilter filter)
+ {
+ if (filter == null)
+ throw new IllegalArgumentException("Null filter");
+ this.filter = filter;
+ }
+
+ public boolean matchesClassName(String className)
+ {
+ return filter.matchesClassName(className) == false;
+ }
+
+ public boolean matchesResourcePath(String resourcePath)
+ {
+ return filter.matchesResourcePath(resourcePath) == false;
+ }
+
+ public boolean matchesPackageName(String packageName)
+ {
+ return filter.matchesPackageName(packageName) == false;
+ }
+}
\ No newline at end of file
Modified: projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/filter/ClassFilterUtils.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/filter/ClassFilterUtils.java 2010-03-11 11:27:39 UTC (rev 102276)
+++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/filter/ClassFilterUtils.java 2010-03-11 11:30:23 UTC (rev 102277)
@@ -23,15 +23,13 @@
import java.util.List;
-import org.jboss.classloader.plugins.filter.EverythingClassFilter;
-import org.jboss.classloader.plugins.filter.JavaOnlyClassFilter;
-import org.jboss.classloader.plugins.filter.NothingButJavaClassFilter;
-import org.jboss.classloader.plugins.filter.NothingClassFilter;
+import org.jboss.classloader.plugins.filter.*;
/**
* ClassFilterUtils.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public class ClassFilterUtils
@@ -121,4 +119,16 @@
{
return RecursivePackageClassFilter.createRecursivePackageClassFilter(packageNames);
}
+
+ /**
+ * Create negating class filter.
+ *
+ * @param filter the filter
+ * @return negating filter for @param filter
+ * @throws IllegalArgumentException for filter
+ */
+ public static ClassFilter negatingClassFilter(ClassFilter filter)
+ {
+ return new NegatingClassFilter(filter);
+ }
}
Modified: projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/filter/test/FilterUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/filter/test/FilterUnitTestCase.java 2010-03-11 11:27:39 UTC (rev 102276)
+++ projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/filter/test/FilterUnitTestCase.java 2010-03-11 11:30:23 UTC (rev 102277)
@@ -21,16 +21,17 @@
*/
package org.jboss.test.classloader.filter.test;
-import junit.framework.Test;
-
import org.jboss.classloader.spi.filter.ClassFilter;
import org.jboss.classloader.spi.filter.ClassFilterUtils;
import org.jboss.test.classloader.AbstractClassLoaderTestWithSecurity;
+import junit.framework.Test;
+
/**
* FilterUnitTestCase.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public class FilterUnitTestCase extends AbstractClassLoaderTestWithSecurity
@@ -124,4 +125,56 @@
assertFilterNoMatchPackageName("", filter);
assertFilterNoMatchPackageName(null, filter);
}
+
+ public void testNegating() throws Exception
+ {
+ ClassFilter filter = ClassFilterUtils.negatingClassFilter(ClassFilterUtils.JAVA_ONLY);
+ assertFilterNoMatchClassName("java.x", filter);
+ assertFilterNoMatchClassName("java.lang.Object", filter);
+ assertFilterNoMatchClassName("java.lang.ref.Method", filter);
+ assertFilterNoMatchClassName("java.util.Collection", filter);
+ assertFilterNoMatchClassName("javax.x", filter);
+ assertFilterNoMatchClassName("javax.naming.Context", filter);
+ assertFilterMatchesClassName("java.", filter);
+ assertFilterMatchesClassName("java", filter);
+ assertFilterMatchesClassName("javaa.", filter);
+ assertFilterMatchesClassName("javaa.whatever", filter);
+ assertFilterMatchesClassName("javax", filter);
+ assertFilterMatchesClassName("javax.", filter);
+ assertFilterMatchesClassName("javaxa.", filter);
+ assertFilterMatchesClassName("javaxa.whatever", filter);
+ assertFilterMatchesClassName("gibberish", filter);
+ assertFilterMatchesClassName("", filter);
+ assertFilterMatchesClassName(null, filter);
+ assertFilterNoMatchResourcePath("java/x", filter);
+ assertFilterNoMatchResourcePath("java/lang/Object", filter);
+ assertFilterNoMatchResourcePath("java/lang/ref/Method", filter);
+ assertFilterNoMatchResourcePath("java/util/Collection", filter);
+ assertFilterNoMatchResourcePath("javax/x", filter);
+ assertFilterNoMatchResourcePath("javax/naming/Context", filter);
+ assertFilterMatchesResourcePath("java/", filter);
+ assertFilterMatchesResourcePath("java", filter);
+ assertFilterMatchesResourcePath("javaa.", filter);
+ assertFilterMatchesResourcePath("javaa/whatever", filter);
+ assertFilterMatchesResourcePath("javax", filter);
+ assertFilterMatchesResourcePath("javax/", filter);
+ assertFilterMatchesResourcePath("javaxa/", filter);
+ assertFilterMatchesResourcePath("javaxa/whatever", filter);
+ assertFilterMatchesResourcePath("gibberish", filter);
+ assertFilterMatchesResourcePath("", filter);
+ assertFilterMatchesResourcePath(null, filter);
+ assertFilterNoMatchPackageName("java", filter);
+ assertFilterNoMatchPackageName("java.lang", filter);
+ assertFilterNoMatchPackageName("java.lang.ref", filter);
+ assertFilterNoMatchPackageName("java.util", filter);
+ assertFilterNoMatchPackageName("javax", filter);
+ assertFilterNoMatchPackageName("javax.naming", filter);
+ assertFilterMatchesPackageName("javaa.", filter);
+ assertFilterMatchesPackageName("javaa.whatever", filter);
+ assertFilterMatchesPackageName("javaxa.", filter);
+ assertFilterMatchesPackageName("javaxa.whatever", filter);
+ assertFilterMatchesPackageName("gibberish", filter);
+ assertFilterMatchesPackageName("", filter);
+ assertFilterMatchesPackageName(null, filter);
+ }
}
More information about the jboss-cvs-commits
mailing list