Renamed TypeLocator to PoolStrategy in order to normalize the namings.

raphw · Aug 23, 2016 · a33f3b9 · a33f3b9
1 parent b209ec2
commit a33f3b9
Show file tree

Hide file tree

Showing 7 changed files with 166 additions and 171 deletions.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/AgentBuilder.java b/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/AgentBuilder.java
diff --git a/...ddy-dep/src/test/java/net/bytebuddy/agent/builder/AgentBuilderDefaultApplicationTest.java b/...ddy-dep/src/test/java/net/bytebuddy/agent/builder/AgentBuilderDefaultApplicationTest.java
diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/agent/builder/AgentBuilderDefaultTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/agent/builder/AgentBuilderDefaultTest.java
@@ -71,7 +71,7 @@ public class AgentBuilderDefaultTest {
     private AgentBuilder.Transformer transformer;
 
     @Mock
-    private AgentBuilder.TypeLocator typeLocator;
+    private AgentBuilder.PoolStrategy poolStrategy;
 
     @Mock
     private AgentBuilder.TypeStrategy typeStrategy;
@@ -114,7 +114,7 @@ public void setUp() throws Exception {
         when(dynamicType.getLoadedTypeInitializers()).thenReturn(loadedTypeInitializers);
         when(dynamicType.getBytes()).thenReturn(BAZ);
         when(transformer.transform(builder, new TypeDescription.ForLoadedType(REDEFINED), REDEFINED.getClassLoader())).thenReturn((DynamicType.Builder) builder);
-        when(typeLocator.typePool(any(ClassFileLocator.class), any(ClassLoader.class))).thenReturn(typePool);
+        when(poolStrategy.typePool(any(ClassFileLocator.class), any(ClassLoader.class))).thenReturn(typePool);
         when(typePool.describe(REDEFINED.getName())).thenReturn(resolution);
         when(instrumentation.getAllLoadedClasses()).thenReturn(new Class<?>[]{REDEFINED});
         when(initializationStrategy.dispatcher()).thenReturn(dispatcher);
@@ -135,7 +135,7 @@ public void testSuccessfulWithoutExistingClass() throws Exception {
                 .thenReturn(true);
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -174,7 +174,7 @@ public void testSuccessfulWithoutExistingClassConjunction() throws Exception {
                 .thenReturn(true);
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -209,7 +209,7 @@ public void testSuccessfulWithoutExistingClassDisjunction() throws Exception {
                 .thenReturn(true);
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -243,7 +243,7 @@ public void testSuccessfulWithExistingClass() throws Exception {
                 .thenReturn(true);
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -278,7 +278,7 @@ public void testSuccessfulWithRetransformationMatched() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -310,7 +310,7 @@ public void testSkipRetransformationWithNonRedefinable() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -341,7 +341,7 @@ public void testSkipRetransformationWithNonMatched() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -375,7 +375,7 @@ public void testSkipRetransformationWithNonMatchedListenerException() throws Exc
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -409,7 +409,7 @@ public void testSkipRetransformationWithNonMatchedListenerCompleteException() th
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -442,7 +442,7 @@ public void testSuccessfulWithRetransformationMatchedChunked() throws Exception
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION_CHUNKED)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -478,7 +478,7 @@ public void testRetransformationChunkedOneFails() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION_CHUNKED)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -508,7 +508,7 @@ public void testRetransformationNotSupported() throws Exception {
         new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -526,7 +526,7 @@ public void testSuccessfulWithRedefinitionMatched() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -558,7 +558,7 @@ public void testSkipRedefinitionWithNonRedefinable() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -590,7 +590,7 @@ public void testSkipRedefinitionWithNonMatched() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -624,7 +624,7 @@ public void testSkipRedefinitionWithIgnoredType() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -662,7 +662,7 @@ public void testSkipRedefinitionWithIgnoredClassLoader() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -699,7 +699,7 @@ public void testSkipRedefinitionWithIgnoredTypeChainedConjunction() throws Excep
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -734,7 +734,7 @@ public void testSkipRedefinitionWithIgnoredTypeChainedDijunction() throws Except
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -769,7 +769,7 @@ public void testSkipRedefinitionWithNonMatchedListenerException() throws Excepti
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -803,7 +803,7 @@ public void testSkipRedefinitionWithNonMatchedListenerFinishedException() throws
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -836,7 +836,7 @@ public void testSuccessfulWithRedefinitionMatchedChunked() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION_CHUNKED)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -871,7 +871,7 @@ public void testRedefinitionChunkedOneFails() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION_CHUNKED)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -900,7 +900,7 @@ public void testRedefinitionNotSupported() throws Exception {
         new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -918,7 +918,7 @@ public void testTransformationWithError() throws Exception {
                 .thenReturn(true);
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -944,7 +944,7 @@ public void testIgnored() throws Exception {
                 .thenReturn(false);
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -981,7 +981,7 @@ public void testAuxiliaryTypeInitialization() throws Exception {
                 .thenReturn(true);
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -1019,7 +1019,7 @@ public void testRedefinitionConsiderationException() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -1045,7 +1045,7 @@ public void testRetransformationConsiderationException() throws Exception {
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -1072,7 +1072,7 @@ public void testRedefinitionConsiderationExceptionListenerException() throws Exc
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -1099,7 +1099,7 @@ public void testRetransformationConsiderationExceptionListenerException() throws
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
                 .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -1122,7 +1122,7 @@ public void testDecoratedTransformation() throws Exception {
                 .thenReturn(true);
         ClassFileTransformer classFileTransformer = new AgentBuilder.Default(byteBuddy)
                 .with(initializationStrategy)
-                .with(typeLocator)
+                .with(poolStrategy)
                 .with(typeStrategy)
                 .with(installationStrategy)
                 .with(listener)
@@ -1193,7 +1193,7 @@ public void testDisabledBootstrapInjection() throws Exception {
     @SuppressWarnings("unchecked")
     public void testExecutingTransformerHandlesNullValue() throws Exception {
         assertThat(new AgentBuilder.Default.ExecutingTransformer(byteBuddy,
-                typeLocator,
+                poolStrategy,
                 typeStrategy,
                 locationStrategy,
                 listener,

diff --git a/...dy-dep/src/test/java/net/bytebuddy/agent/builder/AgentBuilderDescriptionStrategyTest.java b/...dy-dep/src/test/java/net/bytebuddy/agent/builder/AgentBuilderDescriptionStrategyTest.java
@@ -28,7 +28,7 @@ public class AgentBuilderDescriptionStrategyTest {
     private TypePool typePool;
 
     @Mock
-    private AgentBuilder.TypeLocator typeLocator;
+    private AgentBuilder.PoolStrategy poolStrategy;
 
     @Mock
     private TypeDescription typeDescription;
@@ -58,16 +58,16 @@ public void testDescriptionPoolOnly() throws Exception {
 
     @Test
     public void testLoadedDescriptionHybrid() throws Exception {
-        assertThat(AgentBuilder.DescriptionStrategy.Default.HYBRID.apply(Object.class, typeLocator, locationStrategy), is(TypeDescription.OBJECT));
+        assertThat(AgentBuilder.DescriptionStrategy.Default.HYBRID.apply(Object.class, poolStrategy, locationStrategy), is(TypeDescription.OBJECT));
-        assertThat(AgentBuilder.DescriptionStrategy.Default.HYBRID.apply(Object.class, typeLocator, locationStrategy), instanceOf(TypeDescription.ForLoadedType.class));
+        assertThat(AgentBuilder.DescriptionStrategy.Default.HYBRID.apply(Object.class, poolStrategy, locationStrategy), instanceOf(TypeDescription.ForLoadedType.class));
     }
 
     @Test
     public void testLoadedDescriptionPoolOnly() throws Exception {
-        when(typeLocator.typePool(ClassFileLocator.ForClassLoader.of(Object.class.getClassLoader()), Object.class.getClassLoader())).thenReturn(typePool);
+        when(poolStrategy.typePool(ClassFileLocator.ForClassLoader.of(Object.class.getClassLoader()), Object.class.getClassLoader())).thenReturn(typePool);
         when(typePool.describe(Object.class.getName())).thenReturn(new TypePool.Resolution.Simple(typeDescription));
         when(locationStrategy.classFileLocator(Object.class.getClassLoader(), JavaModule.ofType(Object.class))).thenReturn(ClassFileLocator.ForClassLoader.of(Object.class.getClassLoader()));
-        assertThat(AgentBuilder.DescriptionStrategy.Default.POOL_ONLY.apply(Object.class, typeLocator, locationStrategy), is(typeDescription));
+        assertThat(AgentBuilder.DescriptionStrategy.Default.POOL_ONLY.apply(Object.class, poolStrategy, locationStrategy), is(typeDescription));
     }
 
     @Test