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/10/24 20:07:07 UTC
svn commit: r1844790 - in /turbine/fulcrum/trunk/yaafi/src:
java/org/apache/fulcrum/yaafi/framework/interceptor/
java/org/apache/fulcrum/yaafi/interceptor/baseservice/
test/org/apache/fulcrum/yaafi/interceptor/util/
Author: painter
Date: Wed Oct 24 20:07:07 2018
New Revision: 1844790
URL: http://svn.apache.org/viewvc?rev=1844790&view=rev
Log:
Cleaning up some generics
Modified:
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorContext.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorContextImpl.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorFactory.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/baseservice/BaseInterceptorServiceImpl.java
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/interceptor/util/ArgumentToStringBuilderTest.java
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorContext.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorContext.java?rev=1844790&r1=1844789&r2=1844790&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorContext.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorContext.java Wed Oct 24 20:07:07 2018
@@ -36,7 +36,7 @@ public interface AvalonInterceptorContex
/**
* @return Returns the context for the given request.
*/
- Map getRequestContext();
+ Map<String, Object> getRequestContext();
/**
* @return Returns the serviceDelegate.
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorContextImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorContextImpl.java?rev=1844790&r1=1844789&r2=1844790&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorContextImpl.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorContextImpl.java Wed Oct 24 20:07:07 2018
@@ -63,7 +63,7 @@ public class AvalonInterceptorContextImp
private Object[] args;
/** context information associated with the current invocation */
- private HashMap requestContext;
+ private Map<String, Object> requestContext;
/** context information associated with the current thread */
private static ThreadLocalStorageImpl tls = new ThreadLocalStorageImpl();
@@ -97,13 +97,13 @@ public class AvalonInterceptorContextImp
this.serviceDelegate = serviceDelegate;
this.method = method;
this.args = args;
- this.requestContext = new HashMap();
+ this.requestContext = new HashMap<String, Object>();
}
/**
* @return Returns the context for the given request.
*/
- public final Map getRequestContext()
+ public final Map<String, Object> getRequestContext()
{
return requestContext;
}
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorFactory.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorFactory.java?rev=1844790&r1=1844789&r2=1844790&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorFactory.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/framework/interceptor/AvalonInterceptorFactory.java Wed Oct 24 20:07:07 2018
@@ -65,9 +65,9 @@ public class AvalonInterceptorFactory
Object result;
- Class clazz = serviceDelegate.getClass();
+ Class<? extends Object> clazz = serviceDelegate.getClass();
ClassLoader classLoader = clazz.getClassLoader();
- List interfaceList = Clazz.getAllInterfaces(clazz);
+ List<?> interfaceList = Clazz.getAllInterfaces(clazz);
// get the service interfaces to avoid look-ups
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/baseservice/BaseInterceptorServiceImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/baseservice/BaseInterceptorServiceImpl.java?rev=1844790&r1=1844789&r2=1844790&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/baseservice/BaseInterceptorServiceImpl.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/baseservice/BaseInterceptorServiceImpl.java Wed Oct 24 20:07:07 2018
@@ -48,7 +48,7 @@ public class BaseInterceptorServiceImpl
private static final String WILDCARD = "*";
/** contains the services being monitored by the interceptor */
- private HashSet serviceSet;
+ private HashSet<String> serviceSet;
/** is the interceptor service enabled */
private boolean isEnabled;
@@ -78,7 +78,7 @@ public class BaseInterceptorServiceImpl
*/
public BaseInterceptorServiceImpl()
{
- this.serviceSet = new HashSet();
+ this.serviceSet = new HashSet<String>();
}
/**
@@ -270,7 +270,7 @@ public class BaseInterceptorServiceImpl
/**
* @return Returns the serviceMap.
*/
- private HashSet getServiceSet()
+ private HashSet<String> getServiceSet()
{
return serviceSet;
}
Modified: turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/interceptor/util/ArgumentToStringBuilderTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/interceptor/util/ArgumentToStringBuilderTest.java?rev=1844790&r1=1844789&r2=1844790&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/interceptor/util/ArgumentToStringBuilderTest.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/interceptor/util/ArgumentToStringBuilderTest.java Wed Oct 24 20:07:07 2018
@@ -233,7 +233,7 @@ public class ArgumentToStringBuilderTest
*/
public void testArrayList()
{
- ArrayList target = new ArrayList();
+ ArrayList<String> target = new ArrayList<>();
target.add("foo");
target.add("bar");