Merge pull request #461 from garcia-jj/ot-paranamercaching

Moving internal cache to paranamer own cache

vraptor-core/src/main/java/br/com/caelum/vraptor/http/ParanamerNameProvider.java

@@ -17,19 +17,15 @@
 package br.com.caelum.vraptor.http;
 
 import java.lang.reflect.AccessibleObject;
-import java.util.concurrent.Callable;
 
 import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import br.com.caelum.vraptor.cache.CacheStore;
-import br.com.caelum.vraptor.cache.LRU;
-
 import com.thoughtworks.paranamer.AnnotationParanamer;
 import com.thoughtworks.paranamer.BytecodeReadingParanamer;
+import com.thoughtworks.paranamer.CachingParanamer;
 import com.thoughtworks.paranamer.ParameterNamesNotFoundException;
 import com.thoughtworks.paranamer.Paranamer;
 
@@ -43,42 +39,25 @@
 public class ParanamerNameProvider implements ParameterNameProvider {
 	private static final Logger logger = LoggerFactory.getLogger(ParanamerNameProvider.class);
 
-	@LRU(capacity = 50)
-	private final CacheStore<AccessibleObject, Parameter[]> cache;
-	private final Paranamer info = new AnnotationParanamer(new BytecodeReadingParanamer());
-
-	protected ParanamerNameProvider() {
-		this(null);
-	}
-
-	@Inject
-	public ParanamerNameProvider(CacheStore<AccessibleObject, Parameter[]> cache) {
-		this.cache = cache;
-	}
+	private final Paranamer info = new CachingParanamer(new AnnotationParanamer(new BytecodeReadingParanamer()));
 
 	@Override
 	public Parameter[] parametersFor(final AccessibleObject executable) {
-		Parameter[] params = cache.fetch(executable, new Callable<Parameter[]>() {
-			@Override
-			public Parameter[] call() throws Exception {
-				try {
-					String[] names = info.lookupParameterNames(executable);
-					Parameter[] params = new Parameter[names.length];
-					logger.debug("Found parameter names with paranamer for {} as {}", executable, (Object) names);
-
-					for (int i = 0; i < names.length; i++) {
-						params[i] = new Parameter(i, names[i], executable);
-					}
-
-					return params;
-				} catch (ParameterNamesNotFoundException e) {
-					throw new IllegalStateException("Paranamer were not able to find your parameter names for " + executable
-							+ "You must compile your code with debug information (javac -g), or using @Named on "
-							+ "each method parameter.", e);
-				}
+		try {
+			String[] names = info.lookupParameterNames(executable);
+			Parameter[] params = new Parameter[names.length];
+			logger.debug("Found parameter names with paranamer for {} as {}", executable, (Object) names);
+
+			for (int i = 0; i < names.length; i++) {
+				params[i] = new Parameter(i, names[i], executable);
 			}
-		});
-		return defensiveCopy(params);
+
+			return defensiveCopy(params);
+		} catch (ParameterNamesNotFoundException e) {
+			throw new IllegalStateException("Paranamer were not able to find your parameter names for " + executable
+					+ "You must compile your code with debug information (javac -g), or using @Named on "
+					+ "each method parameter.", e);
+		}
 	}
 
 	private Parameter[] defensiveCopy(Parameter[] src) {

vraptor-core/src/test/java/br/com/caelum/vraptor/http/ParametersProviderTest.java

@@ -34,7 +34,6 @@
 import br.com.caelum.vraptor.converter.PrimitiveLongConverter;
 import br.com.caelum.vraptor.converter.StringConverter;
 import br.com.caelum.vraptor.core.Converters;
-import br.com.caelum.vraptor.factory.Factories;
 import br.com.caelum.vraptor.ioc.Container;
 import br.com.caelum.vraptor.validator.DefaultValidationException;
 import br.com.caelum.vraptor.validator.Message;
@@ -72,7 +71,7 @@ public abstract class ParametersProviderTest {
 	@Before
 	public void setup() throws Exception {
 		MockitoAnnotations.initMocks(this);
-		nameProvider = Factories.createParameterNameProvider();
+		nameProvider = new ParanamerNameProvider();
 		this.provider = getProvider();
 		this.errors = new ArrayList<>();
 

vraptor-core/src/test/java/br/com/caelum/vraptor/http/ParanamerNameProviderTest.java

@@ -21,28 +21,17 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 
-import java.lang.reflect.AccessibleObject;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Named;
 
-import org.junit.Before;
 import org.junit.Test;
 
-import br.com.caelum.vraptor.cache.CacheStore;
-import br.com.caelum.vraptor.cache.DefaultCacheStore;
-
 public class ParanamerNameProviderTest {
 
-	private ParanamerNameProvider provider;
+	private ParanamerNameProvider provider = new ParanamerNameProvider();
 
-	@Before
-	public void setup() {
-		CacheStore<AccessibleObject, Parameter[]> cache = new DefaultCacheStore<>();
-		provider = new ParanamerNameProvider(cache);
-	}
-
 	private List<String> toNames(Parameter[] parameters) {
 		List<String> out = new ArrayList<>();
 		for (Parameter p : parameters)

vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultParametersControlTest.java

@@ -36,10 +36,10 @@
 
 import br.com.caelum.vraptor.TwoWayConverter;
 import br.com.caelum.vraptor.core.Converters;
-import br.com.caelum.vraptor.factory.Factories;
 import br.com.caelum.vraptor.http.EncodingHandler;
 import br.com.caelum.vraptor.http.MutableRequest;
 import br.com.caelum.vraptor.http.ParameterNameProvider;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 
 public class DefaultParametersControlTest {
 
@@ -55,7 +55,7 @@ public void setup() {
 		MockitoAnnotations.initMocks(this);
 		when(encodingHandler.getEncoding()).thenReturn("UTF-8");
 		evaluator = new JavaEvaluator();
-		nameProvider = Factories.createParameterNameProvider();
+		nameProvider = new ParanamerNameProvider();
 	}
 
 	@Test

vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultRouterTest.java

@@ -49,9 +49,9 @@
 import br.com.caelum.vraptor.controller.DefaultControllerMethod;
 import br.com.caelum.vraptor.controller.HttpMethod;
 import br.com.caelum.vraptor.core.Converters;
-import br.com.caelum.vraptor.factory.Factories;
 import br.com.caelum.vraptor.http.EncodingHandler;
 import br.com.caelum.vraptor.http.ParameterNameProvider;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 import br.com.caelum.vraptor.http.VRaptorRequest;
 import br.com.caelum.vraptor.interceptor.VRaptorMatchers;
 import br.com.caelum.vraptor.proxy.JavassistProxifier;
@@ -79,7 +79,7 @@ public void setup() {
 		this.method = mock(ControllerMethod.class);
 		this.converters = mock(Converters.class);
 		this.encodingHandler = mock(EncodingHandler.class);
-		this.nameProvider = Factories.createParameterNameProvider();
+		this.nameProvider = new ParanamerNameProvider();
 		this.cache = new DefaultCacheStore<>();
 
 		router = new DefaultRouter(proxifier, new NoTypeFinder(), converters, nameProvider, new JavaEvaluator(), encodingHandler,cache);

vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultTypeFinderTest.java

@@ -26,16 +26,16 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import br.com.caelum.vraptor.factory.Factories;
 import br.com.caelum.vraptor.http.ParameterNameProvider;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 
 public class DefaultTypeFinderTest {
 
 	private ParameterNameProvider provider;
 
 	@Before
 	public void setup() {
-		provider = Factories.createParameterNameProvider();
+		provider = new ParanamerNameProvider();
 	}
 
 	public static class AController {

vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/PathAnnotationRoutesParserTest.java

@@ -50,9 +50,9 @@
 import br.com.caelum.vraptor.controller.DefaultBeanClass;
 import br.com.caelum.vraptor.controller.HttpMethod;
 import br.com.caelum.vraptor.core.Converters;
-import br.com.caelum.vraptor.factory.Factories;
 import br.com.caelum.vraptor.http.EncodingHandler;
 import br.com.caelum.vraptor.http.ParameterNameProvider;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 import br.com.caelum.vraptor.proxy.JavassistProxifier;
 import br.com.caelum.vraptor.proxy.Proxifier;
 
@@ -73,7 +73,7 @@ public void setup() {
 
 		this.proxifier = new JavassistProxifier();
 		this.typeFinder = new NoTypeFinder();
-		this.nameProvider = Factories.createParameterNameProvider();
+		this.nameProvider = new ParanamerNameProvider();
 
 		when(router.builderFor(anyString())).thenAnswer(new Answer<DefaultRouteBuilder>() {
 

vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/RouteBuilderTest.java

@@ -34,9 +34,9 @@
 import br.com.caelum.vraptor.controller.DefaultBeanClass;
 import br.com.caelum.vraptor.controller.DefaultControllerMethod;
 import br.com.caelum.vraptor.core.Converters;
-import br.com.caelum.vraptor.factory.Factories;
 import br.com.caelum.vraptor.http.EncodingHandler;
 import br.com.caelum.vraptor.http.ParameterNameProvider;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 import br.com.caelum.vraptor.proxy.JavassistProxifier;
 import br.com.caelum.vraptor.proxy.Proxifier;
 
@@ -61,7 +61,7 @@ public void method(String abc, Integer def, BigDecimal ghi) {
 	public void setUp() throws Exception {
 		MockitoAnnotations.initMocks(this);
 
-		provider = Factories.createParameterNameProvider();
+		provider = new ParanamerNameProvider();
 
 		method = new DefaultControllerMethod(new DefaultBeanClass(MyResource.class), MyResource.class.getMethod(
 				"method", String.class, Integer.class, BigDecimal.class));

vraptor-core/src/test/java/br/com/caelum/vraptor/observer/DeserializingObserverTest.java

@@ -20,7 +20,7 @@
 import br.com.caelum.vraptor.controller.DefaultControllerMethod;
 import br.com.caelum.vraptor.core.MethodInfo;
 import br.com.caelum.vraptor.events.InterceptorsReady;
-import br.com.caelum.vraptor.factory.Factories;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 import br.com.caelum.vraptor.ioc.Container;
 import br.com.caelum.vraptor.serialization.Deserializer;
 import br.com.caelum.vraptor.serialization.Deserializers;
@@ -43,7 +43,7 @@ public class DeserializingObserverTest {
 	public void setUp() throws Exception {
 		MockitoAnnotations.initMocks(this);
 
-		methodInfo = new MethodInfo(Factories.createParameterNameProvider());
+		methodInfo = new MethodInfo(new ParanamerNameProvider());
 
 		observer = new DeserializingObserver(deserializers, container);
 		consumeXml = new DefaultControllerMethod(null, DummyResource.class.getDeclaredMethod("consumeXml", String.class, String.class));

vraptor-core/src/test/java/br/com/caelum/vraptor/observer/ParametersInstantiatorTest.java

@@ -45,17 +45,17 @@
 import br.com.caelum.vraptor.controller.DefaultControllerMethod;
 import br.com.caelum.vraptor.core.MethodInfo;
 import br.com.caelum.vraptor.events.InterceptorsReady;
-import br.com.caelum.vraptor.factory.Factories;
 import br.com.caelum.vraptor.http.MutableRequest;
 import br.com.caelum.vraptor.http.ParametersProvider;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 import br.com.caelum.vraptor.validator.Message;
 import br.com.caelum.vraptor.validator.SimpleMessage;
 import br.com.caelum.vraptor.validator.Validator;
 import br.com.caelum.vraptor.view.FlashScope;
 
 public class ParametersInstantiatorTest {
 
-	private MethodInfo methodInfo = new MethodInfo(Factories.createParameterNameProvider());
+	private MethodInfo methodInfo = new MethodInfo(new ParanamerNameProvider());
 	private @Mock ParametersProvider parametersProvider;
 	private @Mock Validator validator;
 	private @Mock ResourceBundle bundle;

vraptor-core/src/test/java/br/com/caelum/vraptor/serialization/gson/GsonDeserializerTest.java

@@ -31,8 +31,8 @@
 import br.com.caelum.vraptor.controller.ControllerMethod;
 import br.com.caelum.vraptor.controller.DefaultBeanClass;
 import br.com.caelum.vraptor.controller.DefaultControllerMethod;
-import br.com.caelum.vraptor.factory.Factories;
 import br.com.caelum.vraptor.http.ParameterNameProvider;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 import br.com.caelum.vraptor.util.test.MockInstanceImpl;
 import br.com.caelum.vraptor.view.GenericController;
 
@@ -57,7 +57,7 @@ public class GsonDeserializerTest {
 
 	@Before
 	public void setUp() throws Exception {
-		provider = Factories.createParameterNameProvider();
+		provider = new ParanamerNameProvider();
 		request = mock(HttpServletRequest.class);
 
 		List<JsonDeserializer<?>> jsonDeserializers = new ArrayList<>();

vraptor-core/src/test/java/br/com/caelum/vraptor/serialization/xstream/XStreamXmlDeserializerTest.java

@@ -18,8 +18,8 @@
 import br.com.caelum.vraptor.controller.ControllerMethod;
 import br.com.caelum.vraptor.controller.DefaultBeanClass;
 import br.com.caelum.vraptor.controller.DefaultControllerMethod;
-import br.com.caelum.vraptor.factory.Factories;
 import br.com.caelum.vraptor.http.ParameterNameProvider;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
@@ -35,7 +35,7 @@ public class XStreamXmlDeserializerTest {
 
 	@Before
 	public void setUp() throws Exception {
-		provider = Factories.createParameterNameProvider();
+		provider = new ParanamerNameProvider();
 
 		deserializer = new XStreamXMLDeserializer(provider, cleanInstance(new CalendarConverter()));
 		BeanClass controllerClass = new DefaultBeanClass(DogController.class);

vraptor-core/src/test/java/br/com/caelum/vraptor/validator/MethodValidatorTest.java

@@ -23,7 +23,7 @@
 import br.com.caelum.vraptor.controller.DefaultControllerInstance;
 import br.com.caelum.vraptor.core.MethodInfo;
 import br.com.caelum.vraptor.events.MethodReady;
-import br.com.caelum.vraptor.factory.Factories;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 import br.com.caelum.vraptor.util.test.MockValidator;
 import br.com.caelum.vraptor.validator.beanvalidation.MessageInterpolatorFactory;
 import br.com.caelum.vraptor.validator.beanvalidation.MethodValidator;
@@ -45,7 +45,7 @@ public class MethodValidatorTest {
 	private ControllerMethod withoutConstraint;
 	private DefaultControllerInstance instance;
 
-	private MethodInfo methodInfo = new MethodInfo(Factories.createParameterNameProvider());
+	private MethodInfo methodInfo = new MethodInfo(new ParanamerNameProvider());
 
 	@Before
 	public void setup() throws Exception {

vraptor-core/src/test/java/br/com/caelum/vraptor/validator/ReplicatorOutjectorTest.java

@@ -13,12 +13,12 @@
 import br.com.caelum.vraptor.controller.ControllerMethod;
 import br.com.caelum.vraptor.controller.DefaultControllerMethod;
 import br.com.caelum.vraptor.core.MethodInfo;
-import br.com.caelum.vraptor.factory.Factories;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 
 public class ReplicatorOutjectorTest {
 
 	private @Mock Result result;
-	private MethodInfo methodInfo = new MethodInfo(Factories.createParameterNameProvider());
+	private MethodInfo methodInfo = new MethodInfo(new ParanamerNameProvider());
 	private Outjector outjector;
 
 	@Before

vraptor-core/src/test/java/br/com/caelum/vraptor/view/DefaultLogicResultTest.java

@@ -49,9 +49,9 @@
 import br.com.caelum.vraptor.controller.ControllerMethod;
 import br.com.caelum.vraptor.controller.DefaultControllerMethod;
 import br.com.caelum.vraptor.core.MethodInfo;
-import br.com.caelum.vraptor.factory.Factories;
 import br.com.caelum.vraptor.http.MutableRequest;
 import br.com.caelum.vraptor.http.MutableResponse;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 import br.com.caelum.vraptor.http.route.Router;
 import br.com.caelum.vraptor.interceptor.TypeNameExtractor;
 import br.com.caelum.vraptor.ioc.Container;
@@ -112,7 +112,7 @@ public void setup() {
 		MockitoAnnotations.initMocks(this);
 
 		proxifier = new JavassistProxifier();
-		methodInfo = new MethodInfo(Factories.createParameterNameProvider());
+		methodInfo = new MethodInfo(new ParanamerNameProvider());
 		this.logicResult = new DefaultLogicResult(proxifier, router, request, response, container,
 				resolver, extractor, flash, methodInfo);
 	}

vraptor-core/src/test/java/br/com/caelum/vraptor/view/DefaultPageResultTest.java

@@ -38,9 +38,9 @@
 import br.com.caelum.vraptor.controller.ControllerMethod;
 import br.com.caelum.vraptor.controller.DefaultControllerMethod;
 import br.com.caelum.vraptor.core.MethodInfo;
-import br.com.caelum.vraptor.factory.Factories;
 import br.com.caelum.vraptor.http.MutableRequest;
 import br.com.caelum.vraptor.http.MutableResponse;
+import br.com.caelum.vraptor.http.ParanamerNameProvider;
 import br.com.caelum.vraptor.interceptor.ApplicationLogicException;
 import br.com.caelum.vraptor.proxy.JavassistProxifier;
 import br.com.caelum.vraptor.proxy.Proxifier;
@@ -62,7 +62,7 @@ public void setup() {
 		MockitoAnnotations.initMocks(this);
 		method = DefaultControllerMethod.instanceFor(AnyResource.class, AnyResource.class.getDeclaredMethods()[0]);
 		proxifier = new JavassistProxifier();
-		methodInfo = new MethodInfo(Factories.createParameterNameProvider());
+		methodInfo = new MethodInfo(new ParanamerNameProvider());
 		methodInfo.setControllerMethod(method);
 		fixedResolver = new PathResolver() {
 			@Override