From 2bea0f2136333cbba7574de2eb27f82822b58d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Mon, 24 Mar 2014 21:45:11 -0300 Subject: [PATCH] Moving internal cache to paranamer own cache --- .../vraptor/http/ParanamerNameProvider.java | 53 ++++++------------- .../com/caelum/vraptor/factory/Factories.java | 17 ------ .../vraptor/http/ParametersProviderTest.java | 3 +- .../http/ParanamerNameProviderTest.java | 13 +---- .../route/DefaultParametersControlTest.java | 4 +- .../vraptor/http/route/DefaultRouterTest.java | 4 +- .../http/route/DefaultTypeFinderTest.java | 4 +- .../route/PathAnnotationRoutesParserTest.java | 4 +- .../vraptor/http/route/RouteBuilderTest.java | 4 +- .../observer/DeserializingObserverTest.java | 4 +- .../observer/ParametersInstantiatorTest.java | 4 +- .../gson/GsonDeserializerTest.java | 4 +- .../xstream/XStreamXmlDeserializerTest.java | 4 +- .../validator/MethodValidatorTest.java | 4 +- .../validator/ReplicatorOutjectorTest.java | 4 +- .../vraptor/view/DefaultLogicResultTest.java | 4 +- .../vraptor/view/DefaultPageResultTest.java | 4 +- 17 files changed, 44 insertions(+), 94 deletions(-) delete mode 100644 vraptor-core/src/test/java/br/com/caelum/vraptor/factory/Factories.java diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/http/ParanamerNameProvider.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/http/ParanamerNameProvider.java index 4b21b7da9..763b58fd2 100644 --- a/vraptor-core/src/main/java/br/com/caelum/vraptor/http/ParanamerNameProvider.java +++ b/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 cache; - private final Paranamer info = new AnnotationParanamer(new BytecodeReadingParanamer()); - - protected ParanamerNameProvider() { - this(null); - } - - @Inject - public ParanamerNameProvider(CacheStore 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() { - @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) { diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/factory/Factories.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/factory/Factories.java deleted file mode 100644 index 7f816d2fc..000000000 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/factory/Factories.java +++ /dev/null @@ -1,17 +0,0 @@ -package br.com.caelum.vraptor.factory; - -import java.lang.reflect.AccessibleObject; - -import br.com.caelum.vraptor.cache.CacheStore; -import br.com.caelum.vraptor.cache.DefaultCacheStore; -import br.com.caelum.vraptor.http.Parameter; -import br.com.caelum.vraptor.http.ParameterNameProvider; -import br.com.caelum.vraptor.http.ParanamerNameProvider; - -public class Factories { - - public static ParameterNameProvider createParameterNameProvider() { - CacheStore cache = new DefaultCacheStore<>(); - return new ParanamerNameProvider(cache); - } -} diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/ParametersProviderTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/http/ParametersProviderTest.java index 040cf2b61..09f823a5d 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/ParametersProviderTest.java +++ b/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<>(); diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/ParanamerNameProviderTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/http/ParanamerNameProviderTest.java index 8421f8911..802093347 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/ParanamerNameProviderTest.java +++ b/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 cache = new DefaultCacheStore<>(); - provider = new ParanamerNameProvider(cache); - } - private List toNames(Parameter[] parameters) { List out = new ArrayList<>(); for (Parameter p : parameters) diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultParametersControlTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultParametersControlTest.java index 310862cf0..0345be7e3 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultParametersControlTest.java +++ b/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 diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultRouterTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultRouterTest.java index 9d5c1191b..a8b9619c5 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultRouterTest.java +++ b/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); diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultTypeFinderTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultTypeFinderTest.java index 9407cfcbd..6144b0dff 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultTypeFinderTest.java +++ b/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/DefaultTypeFinderTest.java @@ -26,8 +26,8 @@ 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 { @@ -35,7 +35,7 @@ public class DefaultTypeFinderTest { @Before public void setup() { - provider = Factories.createParameterNameProvider(); + provider = new ParanamerNameProvider(); } public static class AController { diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/PathAnnotationRoutesParserTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/PathAnnotationRoutesParserTest.java index ee7161316..8f07e00bb 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/PathAnnotationRoutesParserTest.java +++ b/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() { diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/RouteBuilderTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/RouteBuilderTest.java index 15cf1ad67..d07da2c43 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/http/route/RouteBuilderTest.java +++ b/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)); diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/observer/DeserializingObserverTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/observer/DeserializingObserverTest.java index c04a2b2bd..362690fa1 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/observer/DeserializingObserverTest.java +++ b/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)); diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/observer/ParametersInstantiatorTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/observer/ParametersInstantiatorTest.java index 6fbf98983..9bf29e673 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/observer/ParametersInstantiatorTest.java +++ b/vraptor-core/src/test/java/br/com/caelum/vraptor/observer/ParametersInstantiatorTest.java @@ -45,9 +45,9 @@ 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; @@ -55,7 +55,7 @@ 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; diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/serialization/gson/GsonDeserializerTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/serialization/gson/GsonDeserializerTest.java index 8afb1fe6b..215708b83 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/serialization/gson/GsonDeserializerTest.java +++ b/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> jsonDeserializers = new ArrayList<>(); diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/serialization/xstream/XStreamXmlDeserializerTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/serialization/xstream/XStreamXmlDeserializerTest.java index a974f4b54..1fb17ebd7 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/serialization/xstream/XStreamXmlDeserializerTest.java +++ b/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); diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/validator/MethodValidatorTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/validator/MethodValidatorTest.java index c235adca4..f9004427d 100755 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/validator/MethodValidatorTest.java +++ b/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 { diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/validator/ReplicatorOutjectorTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/validator/ReplicatorOutjectorTest.java index cc3c35d94..143cb9715 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/validator/ReplicatorOutjectorTest.java +++ b/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 diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/view/DefaultLogicResultTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/view/DefaultLogicResultTest.java index e4b9bbc54..231703d40 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/view/DefaultLogicResultTest.java +++ b/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); } diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/view/DefaultPageResultTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/view/DefaultPageResultTest.java index a0b1ddb3b..3ce3dc754 100644 --- a/vraptor-core/src/test/java/br/com/caelum/vraptor/view/DefaultPageResultTest.java +++ b/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