[jboss-cvs] JBossAS SVN: r92882 - in projects/jboss-reflect/trunk/src: main/java/org/jboss/reflect/plugins/javassist and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 27 13:33:49 EDT 2009
Author: flavia.rainone at jboss.com
Date: 2009-08-27 13:33:49 -0400 (Thu, 27 Aug 2009)
New Revision: 92882
Added:
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/DefaultClassPoolFactory.java
Modified:
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ClassInfoImpl.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/ClassPoolFactory.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/SignatureKey.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/ClassInfo.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/DelegateClassInfo.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/MutableClassInfo.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/NumberInfo.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/MethodAccessRestrictionTestCase.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistBodyTestCase.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistConstructorInfoTestCase.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistMutableMethodInfoTestCase.java
Log:
[JBREFLECT-53] Replaced array parameter by varargs on getDeclaredXXX() methods.
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ClassInfoImpl.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ClassInfoImpl.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ClassInfoImpl.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -381,7 +381,7 @@
return genericInterfaces;
}
- public MethodInfo getDeclaredMethod(String methodName, TypeInfo[] parameters)
+ public MethodInfo getDeclaredMethod(String methodName, TypeInfo... parameters)
{
if (methods == UNKNOWN_METHODS)
setDeclaredMethods(classInfoHelper.getMethods(this));
@@ -411,7 +411,7 @@
return fields;
}
- public ConstructorInfo getDeclaredConstructor(TypeInfo[] parameters)
+ public ConstructorInfo getDeclaredConstructor(TypeInfo... parameters)
{
if (methods == UNKNOWN_METHODS)
setDeclaredConstructors(classInfoHelper.getConstructors(this));
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/ClassPoolFactory.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/ClassPoolFactory.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/ClassPoolFactory.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -22,6 +22,7 @@
package org.jboss.reflect.plugins.javassist;
import javassist.ClassPool;
+import javassist.scopedpool.ScopedClassPoolRepository;
/**
* A ClassPoolFactory.
@@ -31,11 +32,23 @@
*/
public interface ClassPoolFactory
{
+ //void setClassPoolRepository(ScopedClassPoolRepository classPoolRepository);
+
+ public ClassPool getPoolForLoader(ClassLoader cl);
+
/**
* Get class pool for class loader.
*
* @param cl the classloader
* @return class pool instance
*/
- ClassPool getPoolForLoader(ClassLoader cl);
+ ClassPool create(ClassLoader cl);
+
+ /**
+ * Get class pool for class loader.
+ *
+ * @param cl the classloader
+ * @return class pool instance
+ */
+ ClassPool create(ClassLoader cl, ClassPool parentPool);
}
Copied: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/DefaultClassPoolFactory.java (from rev 90057, projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/DummyClassPoolFactory.java)
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/DefaultClassPoolFactory.java (rev 0)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/DefaultClassPoolFactory.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.reflect.plugins.javassist;
+
+import javassist.ClassPool;
+
+/**
+ * A default class pool factory. Creates instances of {@code javassist.ClassPool}.
+ *
+ * @author <a href="mailto:stale.pedersen at jboss.org">Stale W. Pedersen</a>
+ * @version $Revision: 1.1 $
+ */
+public class DefaultClassPoolFactory implements ClassPoolFactory
+{
+
+ public ClassPool create(ClassLoader cl)
+ {
+ return ClassPool.getDefault();
+ }
+
+ public ClassPool create(ClassLoader cl, ClassPool parentPool)
+ {
+ return new ClassPool(parentPool);
+ }
+
+ public ClassPool getPoolForLoader(ClassLoader cl){return null;}
+}
\ No newline at end of file
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/JavassistTypeInfo.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -251,7 +251,7 @@
return generateConstructorInfo(key);
}
- public MutableConstructorInfo getDeclaredConstructor(String[] parameters) throws ClassNotFoundException
+ public MutableConstructorInfo getDeclaredConstructor(String... parameters) throws ClassNotFoundException
{
TypeInfo[] typeParams = new TypeInfo[parameters.length];
for(int i=0; i<parameters.length;i++)
@@ -306,7 +306,7 @@
return fieldArray;
}
- public MutableMethodInfo getDeclaredMethod(String methodName, TypeInfo[] parameters)
+ public MutableMethodInfo getDeclaredMethod(String methodName, TypeInfo... parameters)
{
SignatureKey key = new SignatureKey(methodName, parameters);
synchronized (methods)
@@ -320,7 +320,7 @@
return generateMethodInfo(key);
}
- public MutableMethodInfo getDeclaredMethod(String methodName, String[] parameters) throws ClassNotFoundException
+ public MutableMethodInfo getDeclaredMethod(String methodName, String... parameters) throws ClassNotFoundException
{
TypeInfo[] typeParams = new TypeInfo[parameters.length];
for(int i=0; i<parameters.length;i++)
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/SignatureKey.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/SignatureKey.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/javassist/SignatureKey.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -50,7 +50,7 @@
* @param name the name
* @param typeInfos the type infos
*/
- public SignatureKey(String name, TypeInfo[] typeInfos)
+ public SignatureKey(String name, TypeInfo... typeInfos)
{
this.name = name;
if (typeInfos != null && typeInfos.length > 0)
@@ -67,7 +67,7 @@
* @param name the name
* @param params the params
*/
- public SignatureKey(String name, String[] params)
+ public SignatureKey(String name, String... params)
{
this.name = name;
if (params != null && params.length > 0)
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/ClassInfo.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/ClassInfo.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/ClassInfo.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -64,7 +64,7 @@
* @param parameters the parameters
* @return the method info
*/
- MethodInfo getDeclaredMethod(String name, TypeInfo[] parameters);
+ MethodInfo getDeclaredMethod(String name, TypeInfo... parameters);
/**
* Get the declared methods
@@ -101,7 +101,7 @@
* @param parameters the parameters
* @return the constructor
*/
- ConstructorInfo getDeclaredConstructor(TypeInfo[] parameters);
+ ConstructorInfo getDeclaredConstructor(TypeInfo... parameters);
/**
* Get the super class
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/DelegateClassInfo.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/DelegateClassInfo.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/DelegateClassInfo.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -108,7 +108,7 @@
return delegate.getTypeInfoFactory();
}
- public ConstructorInfo getDeclaredConstructor(TypeInfo[] parameters)
+ public ConstructorInfo getDeclaredConstructor(TypeInfo... parameters)
{
return delegate.getDeclaredConstructor(parameters);
}
@@ -128,7 +128,7 @@
return delegate.getDeclaredFields();
}
- public MethodInfo getDeclaredMethod(String name, TypeInfo[] parameters)
+ public MethodInfo getDeclaredMethod(String name, TypeInfo... parameters)
{
return delegate.getDeclaredMethod(name, parameters);
}
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/MutableClassInfo.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/MutableClassInfo.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/MutableClassInfo.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -37,7 +37,7 @@
* @param parameters the parameters
* @return the method info
*/
- MutableMethodInfo getDeclaredMethod(String name, TypeInfo[] parameters);
+ MutableMethodInfo getDeclaredMethod(String name, TypeInfo... parameters);
/**
* Get the declared method
@@ -49,7 +49,7 @@
* @return the method info
* @throws ClassNotFoundException
*/
- MutableMethodInfo getDeclaredMethod(String name, String[] parameters) throws ClassNotFoundException;
+ MutableMethodInfo getDeclaredMethod(String name, String... parameters) throws ClassNotFoundException;
/**
* Get the declared methods
@@ -71,7 +71,7 @@
* @param parameters the parameters
* @return the constructor
*/
- MutableConstructorInfo getDeclaredConstructor(TypeInfo[] parameters);
+ MutableConstructorInfo getDeclaredConstructor(TypeInfo... parameters);
/**
* Get a declared constructor
@@ -82,7 +82,7 @@
* @return the constructor
* @throws ClassNotFoundException
*/
- MutableConstructorInfo getDeclaredConstructor(String[] parameters) throws ClassNotFoundException;
+ MutableConstructorInfo getDeclaredConstructor(String... parameters) throws ClassNotFoundException;
/**
* Get the declared field
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/NumberInfo.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/NumberInfo.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/NumberInfo.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -185,7 +185,7 @@
// --- delegate
- public ConstructorInfo getDeclaredConstructor(TypeInfo[] parameters)
+ public ConstructorInfo getDeclaredConstructor(TypeInfo... parameters)
{
return delegate.getDeclaredConstructor(parameters);
}
@@ -205,7 +205,7 @@
return delegate.getDeclaredFields();
}
- public MethodInfo getDeclaredMethod(String methodName, TypeInfo[] parameters)
+ public MethodInfo getDeclaredMethod(String methodName, TypeInfo... parameters)
{
return delegate.getDeclaredMethod(methodName, parameters);
}
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/MethodAccessRestrictionTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/MethodAccessRestrictionTestCase.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/classinfo/test/MethodAccessRestrictionTestCase.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -79,12 +79,12 @@
protected MethodInfo getSetAnnotatedInfo(ClassInfo info, String member)
{
- return info.getDeclaredMethod(getSetter(member), new TypeInfo[]{configuration.getClassInfo(String.class)});
+ return info.getDeclaredMethod(getSetter(member), configuration.getClassInfo(String.class));
}
protected MethodInfo getGetAnnotatedInfo(ClassInfo info, String member)
{
- return info.getDeclaredMethod(getGetter(member), new TypeInfo[]{});
+ return info.getDeclaredMethod(getGetter(member));
}
protected Method getAccessibleObject(String member) throws NoSuchMethodException
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistBodyTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistBodyTestCase.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistBodyTestCase.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -56,11 +56,11 @@
MutableClassInfo mci = new JavassistTypeInfoFactory().getMutable("org.jboss.test.plugins.javassist.PojoBody", null);
try
{
- MutableMethodInfo mmi = mci.getDeclaredMethod("foo", new TypeInfo[] {(TypeInfo) new JavassistTypeInfoFactory().getMutable("int", null) });
+ MutableMethodInfo mmi = mci.getDeclaredMethod("foo", (TypeInfo) new JavassistTypeInfoFactory().getMutable("int", null));
System.out.println("got method: "+mmi.getName());
mmi.setBody(new InsertBeforeJavassistBody("i = 42;"));
- MutableMethodInfo mmi2 = mci.getDeclaredMethod("bar", new TypeInfo[] {});
+ MutableMethodInfo mmi2 = mci.getDeclaredMethod("bar", new TypeInfo[0]);
System.out.println("mmi2: "+mmi2.getName());
mmi2.setBody(new InsertAfterJavassistBody("s = \"after\" + s; return s;"));
System.out.println("mmi2: "+mmi2.getName());
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistConstructorInfoTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistConstructorInfoTestCase.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistConstructorInfoTestCase.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -20,7 +20,7 @@
MutableClassInfo mci = new JavassistTypeInfoFactoryImpl().getMutable("org.jboss.test.plugins.javassist.PojoConstructor", null);
try
{
- MutableConstructorInfo intConstructor = mci.getDeclaredConstructor(new String[] {"int"});
+ MutableConstructorInfo intConstructor = mci.getDeclaredConstructor("int");
assertNotNull(intConstructor);
}
catch (ClassNotFoundException e)
@@ -39,7 +39,7 @@
MutableConstructorInfo constructor;
try
{
- constructor = mci.getDeclaredConstructor(new String[] {"int"});
+ constructor = mci.getDeclaredConstructor("int");
mci.removeConstructor(constructor);
assertEquals(2, mci.getDeclaredConstructors().length);
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistMutableMethodInfoTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistMutableMethodInfoTestCase.java 2009-08-27 17:21:09 UTC (rev 92881)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/JavassistMutableMethodInfoTestCase.java 2009-08-27 17:33:49 UTC (rev 92882)
@@ -53,7 +53,7 @@
MutableMethodInfo[] methods = mci.getDeclaredMethods();
try
{
- MutableMethodInfo bar = mci.getDeclaredMethod("bar", new String[] {"java.lang.String"});
+ MutableMethodInfo bar = mci.getDeclaredMethod("bar", "java.lang.String");
assertEquals(3, methods.length);
assertEquals("bar", bar.getName());
@@ -72,7 +72,7 @@
try
{
- MutableMethodInfo bar = mci.getDeclaredMethod("bar", new String[] {"java.lang.String"});
+ MutableMethodInfo bar = mci.getDeclaredMethod("bar", "java.lang.String");
mci.removeMethod(bar);
assertEquals(2, mci.getDeclaredMethods().length);
}
@@ -105,7 +105,7 @@
assertEquals(4, theClass.getDeclaredMethods().length);
try
{
- assertNotNull(theClass.getDeclaredMethod("test3", new Class[] { }));
+ assertNotNull(theClass.getDeclaredMethod("test3"));
}
catch (SecurityException e)
{
More information about the jboss-cvs-commits
mailing list