You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by pa...@apache.org on 2018/12/13 15:55:53 UTC
svn commit: r1848860 - in
/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi:
framework/factory/ framework/reflection/ framework/role/ framework/tls/
framework/util/ interceptor/util/
Author: painter
Date: Thu Dec 13 15:55:52 2018
New Revision: 1848860
URL: http://svn.apache.org/viewvc?rev=1848860&view=rev
Log:
More generics cleanup
Modified:
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/factory/ServiceContainerConfiguration.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/factory/ServiceContainerFactory.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/reflection/Clazz.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleConfigurationParserImpl.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleEntry.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleEntryImpl.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/tls/ThreadLocalStorageImpl.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/util/ConfigurationUtil.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/ArgumentToStringBuilderImpl.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/MethodToStringBuilderImpl.java
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/factory/ServiceContainerConfiguration.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/factory/ServiceContainerConfiguration.java?rev=1848860&r1=1848859&r2=1848860&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/factory/ServiceContainerConfiguration.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/factory/ServiceContainerConfiguration.java Thu Dec 13 15:55:52 2018
@@ -150,13 +150,13 @@ public class ServiceContainerConfigurati
* Add a hashtable to the context
* @param hashtable the Hashtable to be added
*/
- public void addToContext( Hashtable hashtable )
+ public void addToContext( Hashtable<?, ?> hashtable )
{
Validate.notNull(hashtable,"hashtable");
String name = null;
Object value = null;
- Enumeration keys = hashtable.keys();
+ Enumeration<?> keys = hashtable.keys();
while( keys.hasMoreElements() )
{
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/factory/ServiceContainerFactory.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/factory/ServiceContainerFactory.java?rev=1848860&r1=1848859&r2=1848860&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/factory/ServiceContainerFactory.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/factory/ServiceContainerFactory.java Thu Dec 13 15:55:52 2018
@@ -71,7 +71,7 @@ public class ServiceContainerFactory
Validate.notNull(context,"context");
String clazzName;
- Class clazz = null;
+ Class<?> clazz = null;
Configuration configuration = null;
ServiceContainer result = null;
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/reflection/Clazz.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/reflection/Clazz.java?rev=1848860&r1=1848859&r2=1848860&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/reflection/Clazz.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/reflection/Clazz.java Thu Dec 13 15:55:52 2018
@@ -61,7 +61,7 @@ public class Clazz
* @return the loaded class
* @throws ClassNotFoundException the class was nout found
*/
- public static Class getClazz( ClassLoader classLoader, String clazzName )
+ public static Class<?> getClazz( ClassLoader classLoader, String clazzName )
throws ClassNotFoundException
{
return classLoader.loadClass( clazzName );
@@ -78,11 +78,11 @@ public class Clazz
* @throws InstantiationException the target class could not be instantiated
* @throws IllegalAccessException an field couldn't be accessed
*/
- public static Object newInstance( Class clazz, Class[] signature, Object[] args )
+ public static Object newInstance( Class<?> clazz, Class[] signature, Object[] args )
throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException
{
Object result = null;
- Constructor constructor = clazz.getConstructor( signature );
+ Constructor<?> constructor = clazz.getConstructor( signature );
result = constructor.newInstance( args );
return result;
}
@@ -119,7 +119,7 @@ public class Clazz
* @throws IllegalAccessException an field couldn't be accessed
*/
- public static Object invoke( Class clazz, String methodName, Class[] signature, Object[] args )
+ public static Object invoke( Class<?> clazz, String methodName, Class[] signature, Object[] args )
throws NoSuchMethodException, InvocationTargetException, IllegalAccessException
{
Object result = null;
@@ -141,13 +141,13 @@ public class Clazz
* @return the <code>List</code> of interfaces in order,
* <code>null</code> if null input
*/
- public static List getAllInterfaces(Class cls)
+ public static List<?> getAllInterfaces(Class<?> cls)
{
if (cls == null)
{
return null;
}
- List list = new ArrayList();
+ List<Object> list = new ArrayList<Object>();
while (cls != null)
{
Class [] interfaces = cls.getInterfaces();
@@ -157,10 +157,10 @@ public class Clazz
{
list.add( interfaces[i] );
}
- List superInterfaces = getAllInterfaces( interfaces[i] );
- for (Iterator it = superInterfaces.iterator(); it.hasNext();)
+ List<?> superInterfaces = getAllInterfaces( interfaces[i] );
+ for (Iterator<?> it = superInterfaces.iterator(); it.hasNext();)
{
- Class intface = (Class) it.next();
+ Class<?> intface = (Class<?>) it.next();
if (list.contains( intface ) == false)
{
list.add( intface );
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleConfigurationParserImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleConfigurationParserImpl.java?rev=1848860&r1=1848859&r2=1848860&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleConfigurationParserImpl.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleConfigurationParserImpl.java Thu Dec 13 15:55:52 2018
@@ -34,137 +34,110 @@ import org.apache.fulcrum.yaafi.framewor
* @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
*/
-public class RoleConfigurationParserImpl
- implements RoleConfigurationParser
-{
- /** The flavour of Avalon container */
- private String containerFlavour;
-
- /**
- * Constructor
- * @param containerFlavour The flavour of Avalon container
- */
- public RoleConfigurationParserImpl( String containerFlavour )
- {
- Validate.notEmpty( containerFlavour, "containerFlavour" );
- this.containerFlavour = containerFlavour;
- }
-
- /**
- * Parses a role configuration file.
- *
- * @param roleConfiguration the role configuration file to parse
- * @return the parsed RoleEntries
- * @throws ConfigurationException the configuration couldn't be processsed
- */
- public RoleEntry[] parse( Configuration roleConfiguration )
- throws ConfigurationException
- {
- Validate.notNull( roleConfiguration, "roleConfiguration" );
-
- if( AvalonYaafiConstants.AVALON_CONTAINER_YAAFI.equals(containerFlavour) )
- {
- return mapFromYaafi(roleConfiguration);
-
- }
- if( AvalonPhoenixConstants.AVALON_CONTAINER_PHOENIX.equals(containerFlavour) )
- {
- return mapFromPhoenix(roleConfiguration);
-
- }
- else if( AvalonFortressConstants.AVALON_CONTAINER_FORTESS.equals(containerFlavour) )
- {
- return mapFromFortress(roleConfiguration);
-
- }
- else
- {
- String msg = "Don't know the following container flavour : " + containerFlavour;
- throw new IllegalArgumentException(msg);
- }
- }
-
- /**
- * Parses a YAAFI role configuration file.
- *
- * @param roleConfiguration the role configuration
- * @return the role entries from the configuration file
- * @throws ConfigurationException the configuration couldn't be processsed
- */
- private RoleEntry[] mapFromYaafi( Configuration roleConfiguration )
- throws ConfigurationException
- {
- Validate.notNull(roleConfiguration, "roleConfiguration");
-
- String clazzName = null;
- String name = null;
- String shorthand = null;
- boolean isEarlyInit = false;
- String description = null;
- String componentType = null;
- String componentFlavour = null;
- boolean hasProxy = false;
- ArrayList interceptorList = null;
- String logCategory = null;
- RoleEntry roleEntry = null;
-
- Configuration[] list = roleConfiguration.getChildren( "role" );
- RoleEntry[] result = new RoleEntry[list.length];
-
- for( int i=0; i<list.length; i++ )
- {
- clazzName = list[i].getAttribute("default-class");
- name = list[i].getAttribute("name",clazzName);
- shorthand = list[i].getAttribute("shorthand",name);
- isEarlyInit = list[i].getAttributeAsBoolean("early-init",true);
- description = list[i].getAttribute("description",null);
- componentType = list[i].getAttribute("component-type","avalon");
- componentFlavour = list[i].getAttribute("component-flavour", AvalonYaafiConstants.AVALON_CONTAINER_YAAFI);
- hasProxy = list[i].getAttributeAsBoolean("has-proxy",true);
- logCategory = list[i].getAttribute("logger",shorthand);
-
- // parse the list of defined interceptors
-
- Configuration[] interceptorConfigList = list[i].getChild("interceptors").getChildren("interceptor");
- interceptorList = new ArrayList();
-
- for( int j=0; j<interceptorConfigList.length; j++ )
- {
- interceptorList.add(interceptorConfigList[j].getValue("interceptor"));
- }
-
- // create a role entry
-
- roleEntry = new RoleEntryImpl(
- name,
- clazzName,
- shorthand,
- isEarlyInit,
- description,
- componentType,
- componentFlavour,
- hasProxy,
- interceptorList,
- logCategory
- );
-
- result[i] = roleEntry;
- }
-
- return result;
- }
-
- private RoleEntry[] mapFromPhoenix( Configuration roleConfiguration )
- throws ConfigurationException
- {
- Validate.notNull(roleConfiguration, "roleConfiguration");
- throw new ConfigurationException("Not supported yet");
- }
-
- private RoleEntry[] mapFromFortress( Configuration roleConfiguration )
- throws ConfigurationException
- {
- Validate.notNull(roleConfiguration, "roleConfiguration");
- throw new ConfigurationException("Not supported yet");
- }
+public class RoleConfigurationParserImpl implements RoleConfigurationParser {
+ /** The flavour of Avalon container */
+ private String containerFlavour;
+
+ /**
+ * Constructor
+ *
+ * @param containerFlavour The flavour of Avalon container
+ */
+ public RoleConfigurationParserImpl(String containerFlavour) {
+ Validate.notEmpty(containerFlavour, "containerFlavour");
+ this.containerFlavour = containerFlavour;
+ }
+
+ /**
+ * Parses a role configuration file.
+ *
+ * @param roleConfiguration the role configuration file to parse
+ * @return the parsed RoleEntries
+ * @throws ConfigurationException the configuration couldn't be processsed
+ */
+ public RoleEntry[] parse(Configuration roleConfiguration) throws ConfigurationException {
+ Validate.notNull(roleConfiguration, "roleConfiguration");
+
+ if (AvalonYaafiConstants.AVALON_CONTAINER_YAAFI.equals(containerFlavour)) {
+ return mapFromYaafi(roleConfiguration);
+
+ }
+ if (AvalonPhoenixConstants.AVALON_CONTAINER_PHOENIX.equals(containerFlavour)) {
+ return mapFromPhoenix(roleConfiguration);
+
+ } else if (AvalonFortressConstants.AVALON_CONTAINER_FORTESS.equals(containerFlavour)) {
+ return mapFromFortress(roleConfiguration);
+
+ } else {
+ String msg = "Don't know the following container flavour : " + containerFlavour;
+ throw new IllegalArgumentException(msg);
+ }
+ }
+
+ /**
+ * Parses a YAAFI role configuration file.
+ *
+ * @param roleConfiguration the role configuration
+ * @return the role entries from the configuration file
+ * @throws ConfigurationException the configuration couldn't be processsed
+ */
+ private RoleEntry[] mapFromYaafi(Configuration roleConfiguration) throws ConfigurationException {
+ Validate.notNull(roleConfiguration, "roleConfiguration");
+
+ String clazzName = null;
+ String name = null;
+ String shorthand = null;
+ boolean isEarlyInit = false;
+ String description = null;
+ String componentType = null;
+ String componentFlavour = null;
+ boolean hasProxy = false;
+ ArrayList<String> interceptorList = null;
+ String logCategory = null;
+ RoleEntry roleEntry = null;
+
+ Configuration[] list = roleConfiguration.getChildren("role");
+ RoleEntry[] result = new RoleEntry[list.length];
+
+ int roleIndex = 0;
+ for (Configuration entry : list) {
+ clazzName = entry.getAttribute("default-class");
+ name = entry.getAttribute("name", clazzName);
+ shorthand = entry.getAttribute("shorthand", name);
+ isEarlyInit = entry.getAttributeAsBoolean("early-init", true);
+ description = entry.getAttribute("description", null);
+ componentType = entry.getAttribute("component-type", "avalon");
+ componentFlavour = entry.getAttribute("component-flavour", AvalonYaafiConstants.AVALON_CONTAINER_YAAFI);
+ hasProxy = entry.getAttributeAsBoolean("has-proxy", true);
+ logCategory = entry.getAttribute("logger", shorthand);
+
+ // parse the list of defined interceptors
+ Configuration[] interceptorConfigList = entry.getChild("interceptors").getChildren("interceptor");
+ interceptorList = new ArrayList<String>();
+
+ for ( Configuration interceptorConfigEntry : interceptorConfigList )
+ {
+ interceptorList.add(interceptorConfigEntry.getValue("interceptor"));
+ }
+
+ // create a role entry
+
+ roleEntry = new RoleEntryImpl(name, clazzName, shorthand, isEarlyInit, description, componentType,
+ componentFlavour, hasProxy, interceptorList, logCategory);
+
+ result[roleIndex++] = roleEntry;
+ }
+
+ return result;
+ }
+
+ private RoleEntry[] mapFromPhoenix(Configuration roleConfiguration) throws ConfigurationException {
+ Validate.notNull(roleConfiguration, "roleConfiguration");
+ throw new ConfigurationException("Not supported yet");
+ }
+
+ private RoleEntry[] mapFromFortress(Configuration roleConfiguration) throws ConfigurationException {
+ Validate.notNull(roleConfiguration, "roleConfiguration");
+ throw new ConfigurationException("Not supported yet");
+ }
}
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleEntry.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleEntry.java?rev=1848860&r1=1848859&r2=1848860&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleEntry.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleEntry.java Thu Dec 13 15:55:52 2018
@@ -78,7 +78,7 @@ public interface RoleEntry
*
* @param collection the interceptors to be added
*/
- public void addInterceptors( Collection collection );
+ public void addInterceptors( Collection<?> collection );
/**
* @return Returns the interceptorList.
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleEntryImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleEntryImpl.java?rev=1848860&r1=1848859&r2=1848860&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleEntryImpl.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/role/RoleEntryImpl.java Thu Dec 13 15:55:52 2018
@@ -194,9 +194,9 @@ public class RoleEntryImpl implements Ro
*
* @param collection the interceptors to be added
*/
- public void addInterceptors(Collection collection) {
+ public void addInterceptors(Collection<?> collection) {
String currInterceptorName = null;
- Iterator iterator = collection.iterator();
+ Iterator<?> iterator = collection.iterator();
while (iterator.hasNext()) {
currInterceptorName = (String) iterator.next();
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/tls/ThreadLocalStorageImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/tls/ThreadLocalStorageImpl.java?rev=1848860&r1=1848859&r2=1848860&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/tls/ThreadLocalStorageImpl.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/tls/ThreadLocalStorageImpl.java Thu Dec 13 15:55:52 2018
@@ -38,7 +38,7 @@ public class ThreadLocalStorageImpl impl
private CleanableThreadLocal local = new CleanableThreadLocal();
- private static class CleanableThreadLocal extends ThreadLocal
+ private static class CleanableThreadLocal extends ThreadLocal<Object>
{
/**
* <p>
@@ -53,7 +53,7 @@ public class ThreadLocalStorageImpl impl
// and used it instead of creating a new map always after initialization (possibly
// overwriting any variables created from within ThreadLocal.initialValue()).
- Map map = new HashMap();
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
map.put(INITIALIZED_KEY, Boolean.TRUE);
return map;
@@ -66,37 +66,33 @@ public class ThreadLocalStorageImpl impl
* within {@link CleanableThreadLocal#initialValue()} because the notifier's thread local
* variable will be overwritten and the listeners for the thread will be lost.
*/
- private Map getThreadLocalVariable()
+ private Map<String, Object> getThreadLocalVariable()
{
- Map map = (Map) local.get();
+ Map<String, Object> map = (Map<String, Object>) local.get();
return map;
}
public Object get(String key)
{
- Map map = getThreadLocalVariable();
-
+ Map<String, Object> map = getThreadLocalVariable();
return map.get(key);
}
public void put(String key, Object value)
{
- Map map = getThreadLocalVariable();
-
+ Map<String, Object> map = getThreadLocalVariable();
map.put(key, value);
}
public boolean containsKey(String key)
{
- Map map = getThreadLocalVariable();
-
+ Map<String, Object> map = getThreadLocalVariable();
return map.containsKey(key);
}
public void clear()
{
- Map map = (Map) local.get();
-
+ Map<?, ?> map = (Map<?, ?>) local.get();
if (map != null)
{
map.clear();
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/util/ConfigurationUtil.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/util/ConfigurationUtil.java?rev=1848860&r1=1848859&r2=1848860&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/util/ConfigurationUtil.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/util/ConfigurationUtil.java Thu Dec 13 15:55:52 2018
@@ -43,7 +43,7 @@ public class ConfigurationUtil
* @param vars the map holding the variables
* @throws ConfigurationException parsing the configuration failed
*/
- public static void expand(Logger logger, DefaultConfiguration defaultConfiguration, Map vars) throws ConfigurationException
+ public static void expand(Logger logger, DefaultConfiguration defaultConfiguration, Map<?, ?> vars) throws ConfigurationException
{
if((vars == null) || (vars.size() == 0))
{
@@ -119,7 +119,7 @@ public class ConfigurationUtil
* @param vars name/value pairs used for substitution
* @return String target string with replacements.
*/
- private static String expand(String argStr, Map vars)
+ private static String expand(String argStr, Map<?, ?> vars)
{
// ignore failures
boolean isLenient = true;
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/ArgumentToStringBuilderImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/ArgumentToStringBuilderImpl.java?rev=1848860&r1=1848859&r2=1848860&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/ArgumentToStringBuilderImpl.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/ArgumentToStringBuilderImpl.java Thu Dec 13 15:55:52 2018
@@ -247,7 +247,7 @@ public class ArgumentToStringBuilderImpl
this.appendClassName(target);
this.appendHashCode(target);
this.appendChar('[');
- this.append( this.toString((Collection) this.target) );
+ this.append( this.toString((Collection<?>) this.target) );
this.appendChar(']');
}
else if( this.target instanceof Dictionary )
@@ -255,7 +255,7 @@ public class ArgumentToStringBuilderImpl
this.appendClassName(target);
this.appendHashCode(target);
this.appendChar('[');
- this.append( this.toString((Dictionary) this.target) );
+ this.append( this.toString((Dictionary<?, ?>) this.target) );
this.appendChar(']');
}
else if( this.target instanceof Throwable )
@@ -672,7 +672,7 @@ public class ArgumentToStringBuilderImpl
* @param collection the collection to print
* @return the result
*/
- protected String toString(Collection collection)
+ protected String toString(Collection<?> collection)
{
int index = 0;
StringBuilder temp = new StringBuilder();
@@ -688,7 +688,7 @@ public class ArgumentToStringBuilderImpl
temp.append(collection.size());
temp.append(',');
- Iterator iterator = collection.iterator();
+ Iterator<?> iterator = collection.iterator();
while (iterator.hasNext())
{
@@ -726,7 +726,7 @@ public class ArgumentToStringBuilderImpl
* @param dictionary the collection to print
* @return the result
*/
- protected String toString(Dictionary dictionary)
+ protected String toString(Dictionary<?, ?> dictionary)
{
StringBuilder temp = new StringBuilder();
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/MethodToStringBuilderImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/MethodToStringBuilderImpl.java?rev=1848860&r1=1848859&r2=1848860&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/MethodToStringBuilderImpl.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/MethodToStringBuilderImpl.java Thu Dec 13 15:55:52 2018
@@ -107,8 +107,8 @@ public class MethodToStringBuilderImpl i
{
StringBuilder buffer = new StringBuilder(BUF_SIZE);
- Class returnType = method.getReturnType();
- Class declaringClass = method.getDeclaringClass();
+ Class<?> returnType = method.getReturnType();
+ Class<?> declaringClass = method.getDeclaringClass();
Class[] params = method.getParameterTypes();
// print return type