You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/09/18 13:50:28 UTC
[isis] 02/03: ISIS-2435: rename ProxyFactory classes (prefix +
package moved)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit cdeff1b545399643e6e0a4913856df377e77761c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 18 14:48:48 2020 +0200
ISIS-2435: rename ProxyFactory classes (prefix + package moved)
---
.../codegen/ProxyFactory.java => proxy/_ProxyFactory.java} | 6 +++---
.../_ProxyFactoryService.java} | 10 ++++------
.../_ProxyFactoryServiceAbstract.java} | 14 +++++++-------
.../bytebuddy/services/ProxyFactoryServiceByteBuddy.java | 11 +++++------
.../jmocking/ImposteriserUsingCodegenPlugin.java | 4 ++--
.../classsubstitutor/ClassSubstitutorAbstract.java | 4 ++--
.../runtimeservices/wrapper/WrapperFactoryDefault.java | 4 ++--
.../core/runtimeservices/wrapper/proxy/ProxyCreator.java | 8 ++++----
.../runtimeservices/wrapper/WrapperFactoryDefaultTest.java | 4 ++--
.../wrapper/WrapperFactoryDefault_wrappedObject_Test.java | 6 +++---
...WrapperFactoryDefault_wrappedObject_transient_Test.java | 6 +++---
.../core/jmocking/ImposteriserUsingCodegenPlugin.java | 4 ++--
12 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java b/commons/src/main/java/org/apache/isis/commons/internal/proxy/_ProxyFactory.java
similarity index 94%
rename from commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java
rename to commons/src/main/java/org/apache/isis/commons/internal/proxy/_ProxyFactory.java
index c73a19a..4a0a45e 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/proxy/_ProxyFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.plugins.codegen;
+package org.apache.isis.commons.internal.proxy;
import java.lang.reflect.InvocationHandler;
@@ -26,7 +26,7 @@ import java.lang.reflect.InvocationHandler;
* @since 2.0
* @param <T> type of proxy objects this factory creates
*/
-public interface ProxyFactory<T> {
+public interface _ProxyFactory<T> {
// -- INTERFACE
@@ -65,7 +65,7 @@ public interface ProxyFactory<T> {
this.constructorArgTypes = constructorArgTypes;
return this;
}
- public ProxyFactory<T> build(ProxyFactoryService proxyFactoryService) {
+ public _ProxyFactory<T> build(_ProxyFactoryService proxyFactoryService) {
return proxyFactoryService.factory(base, interfaces, constructorArgTypes);
}
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryService.java b/commons/src/main/java/org/apache/isis/commons/internal/proxy/_ProxyFactoryService.java
similarity index 81%
rename from commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryService.java
rename to commons/src/main/java/org/apache/isis/commons/internal/proxy/_ProxyFactoryService.java
index 528039d..14a1d07 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryService.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/proxy/_ProxyFactoryService.java
@@ -16,25 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.plugins.codegen;
+package org.apache.isis.commons.internal.proxy;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.collections._Arrays;
-
/**
* Replaces the former ProxyFactoryPlugin
* @since 2.0
*/
-public interface ProxyFactoryService {
+public interface _ProxyFactoryService {
- <T> ProxyFactory<T> factory(
+ <T> _ProxyFactory<T> factory(
Class<T> base,
@Nullable Class<?>[] interfaces,
@Nullable Class<?>[] constructorArgTypes);
- <T> ProxyFactory<T> factory(Class<T> toProxyClass, Class<?> additionalClass);
+ <T> _ProxyFactory<T> factory(Class<T> toProxyClass, Class<?> additionalClass);
/**
* Marker interface for entities/services that have been enhanced with
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryServiceAbstract.java b/commons/src/main/java/org/apache/isis/commons/internal/proxy/_ProxyFactoryServiceAbstract.java
similarity index 74%
rename from commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryServiceAbstract.java
rename to commons/src/main/java/org/apache/isis/commons/internal/proxy/_ProxyFactoryServiceAbstract.java
index b655d11..0571aeb 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryServiceAbstract.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/proxy/_ProxyFactoryServiceAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.internal.plugins.codegen;
+package org.apache.isis.commons.internal.proxy;
import java.util.Collections;
import java.util.Map;
@@ -31,14 +31,14 @@ import lombok.NonNull;
* Replaces the former ProxyFactoryPlugin
* @since 2.0
*/
-public abstract class ProxyFactoryServiceAbstract implements ProxyFactoryService {
+public abstract class _ProxyFactoryServiceAbstract implements _ProxyFactoryService {
@NonNull
- private final Map<Class<?>, ProxyFactory<?>> proxyFactoryByClass = Collections.synchronizedMap(new WeakHashMap<>());
+ private final Map<Class<?>, _ProxyFactory<?>> proxyFactoryByClass = Collections.synchronizedMap(new WeakHashMap<>());
@Override
- public <T> ProxyFactory<T> factory(Class<T> toProxyClass, Class<?> additionalClass) {
- ProxyFactory<T> proxyFactory = _Casts.uncheckedCast(proxyFactoryByClass.get(toProxyClass));
+ public <T> _ProxyFactory<T> factory(Class<T> toProxyClass, Class<?> additionalClass) {
+ _ProxyFactory<T> proxyFactory = _Casts.uncheckedCast(proxyFactoryByClass.get(toProxyClass));
if(proxyFactory == null) {
proxyFactory = createFactory(toProxyClass, additionalClass);
proxyFactoryByClass.put(toProxyClass, proxyFactory);
@@ -47,7 +47,7 @@ public abstract class ProxyFactoryServiceAbstract implements ProxyFactoryService
}
- private <T> ProxyFactory<T> createFactory(
+ private <T> _ProxyFactory<T> createFactory(
final Class<T> toProxyClass,
final Class<?> additionalClass) {
@@ -55,7 +55,7 @@ public abstract class ProxyFactoryServiceAbstract implements ProxyFactoryService
toProxyClass.getInterfaces(),
ProxyEnhanced.class, additionalClass);
- final ProxyFactory<T> proxyFactory = ProxyFactory.builder(toProxyClass)
+ final _ProxyFactory<T> proxyFactory = _ProxyFactory.builder(toProxyClass)
.interfaces(interfaces)
.build(this);
diff --git a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
index 3e5a836..2862d8f 100644
--- a/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
+++ b/core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
@@ -32,9 +32,8 @@ import org.apache.isis.commons.internal._Constants;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryServiceAbstract;
+import org.apache.isis.commons.internal.proxy._ProxyFactory;
+import org.apache.isis.commons.internal.proxy._ProxyFactoryServiceAbstract;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.NamingStrategy;
@@ -43,12 +42,12 @@ import net.bytebuddy.implementation.InvocationHandlerAdapter;
import net.bytebuddy.matcher.ElementMatchers;
@Service
-public class ProxyFactoryServiceByteBuddy extends ProxyFactoryServiceAbstract {
+public class ProxyFactoryServiceByteBuddy extends _ProxyFactoryServiceAbstract {
private final ClassLoadingStrategyAdvisor strategyAdvisor = new ClassLoadingStrategyAdvisor();
@Override
- public <T> ProxyFactory<T> factory(
+ public <T> _ProxyFactory<T> factory(
Class<T> base,
Class<?>[] interfaces,
Class<?>[] constructorArgTypes) {
@@ -62,7 +61,7 @@ public class ProxyFactoryServiceByteBuddy extends ProxyFactoryServiceAbstract {
.load(_Context.getDefaultClassLoader(), strategyAdvisor.getSuitableStrategy(base))
.getLoaded();
- return new ProxyFactory<T>() {
+ return new _ProxyFactory<T>() {
@Override
public T createInstance(InvocationHandler handler, boolean initialize) {
diff --git a/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/jmocking/ImposteriserUsingCodegenPlugin.java b/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
index 15a76e3..978fd4b 100644
--- a/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
+++ b/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
@@ -26,7 +26,7 @@ import org.jmock.api.Invocation;
import org.jmock.api.Invokable;
import org.jmock.lib.JavaReflectionImposteriser;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
+import org.apache.isis.commons.internal.proxy._ProxyFactory;
import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
class ImposteriserUsingCodegenPlugin implements Imposteriser {
@@ -62,7 +62,7 @@ class ImposteriserUsingCodegenPlugin implements Imposteriser {
}
- final ProxyFactory<T> factory = ProxyFactory.builder(mockedType)
+ final _ProxyFactory<T> factory = _ProxyFactory.builder(mockedType)
.interfaces(ancilliaryTypes)
.build(new ProxyFactoryServiceByteBuddy());
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
index 2c46708..203368d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
+import org.apache.isis.commons.internal.proxy._ProxyFactoryService;
import org.apache.isis.core.metamodel.commons.ClassUtil;
import lombok.NonNull;
@@ -71,7 +71,7 @@ public abstract class ClassSubstitutorAbstract implements ClassSubstitutor {
if(superclass != null && superclass.isEnum()) {
return superclass;
}
- if (ClassUtil.directlyImplements(cls, ProxyFactoryService.ProxyEnhanced.class)) {
+ if (ClassUtil.directlyImplements(cls, _ProxyFactoryService.ProxyEnhanced.class)) {
// REVIEW: arguably this should now go back to the ClassSubstitorRegistry
return getReplacement(cls.getSuperclass());
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index 14a0d86..c132d02 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -76,7 +76,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.collections.ImmutableEnumSet;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
+import org.apache.isis.commons.internal.proxy._ProxyFactoryService;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
@@ -127,7 +127,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
@Inject private IsisInteractionFactory isisInteractionFactory;
@Inject private TransactionService transactionService;
@Inject private CommandExecutorService commandExecutorService;
- @Inject protected ProxyFactoryService proxyFactoryService; // protected to allow JUnit test
+ @Inject protected _ProxyFactoryService proxyFactoryService; // protected to allow JUnit test
@Inject private CommandDtoServiceInternal commandDtoServiceInternal;
@Inject private AsyncControlService asyncControlService;
@Inject private BookmarkService bookmarkService;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
index 8036a06..493b920 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
@@ -24,8 +24,8 @@ import java.lang.reflect.Proxy;
import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
+import org.apache.isis.commons.internal.proxy._ProxyFactory;
+import org.apache.isis.commons.internal.proxy._ProxyFactoryService;
import org.apache.isis.core.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
import lombok.NonNull;
@@ -34,7 +34,7 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public class ProxyCreator {
- @NonNull private final ProxyFactoryService proxyFactoryService;
+ @NonNull private final _ProxyFactoryService proxyFactoryService;
public <T> T instantiateProxy(final DelegatingInvocationHandler<T> handler) {
@@ -45,7 +45,7 @@ public class ProxyCreator {
if (base.isInterface()) {
return (T) Proxy.newProxyInstance(base.getClassLoader(), _Arrays.combine(base, (Class<?>[]) new Class[]{WrappingObject.class}) , handler);
} else {
- final ProxyFactory<T> proxyFactory = proxyFactoryService.factory(base, WrappingObject.class);
+ final _ProxyFactory<T> proxyFactory = proxyFactoryService.factory(base, WrappingObject.class);
return proxyFactory.createInstance(handler, false);
}
}
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
index 81e669c..009fffd 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.wrapper.control.ExecutionMode;
import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.applib.services.wrapper.control.SyncControl;
import org.apache.isis.commons.collections.ImmutableEnumSet;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
+import org.apache.isis.commons.internal.proxy._ProxyFactoryService;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import lombok.RequiredArgsConstructor;
@@ -67,7 +67,7 @@ public class WrapperFactoryDefaultTest {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
- @Mock private ProxyFactoryService mockProxyFactoryService;
+ @Mock private _ProxyFactoryService mockProxyFactoryService;
private WrapperFactoryDefault wrapperFactory;
private DomainObject createProxyCalledWithDomainObject;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index ec6351f..7298a3f 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -51,7 +51,7 @@ import org.apache.isis.applib.services.wrapper.HiddenException;
import org.apache.isis.applib.services.wrapper.InvalidException;
import org.apache.isis.applib.services.wrapper.control.AsyncControlService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
+import org.apache.isis.commons.internal.proxy._ProxyFactoryService;
import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
@@ -139,7 +139,7 @@ public class WrapperFactoryDefault_wrappedObject_Test {
// PRODUCTION
- val proxyFactoryService = (ProxyFactoryService) new ProxyFactoryServiceByteBuddy();
+ val proxyFactoryService = (_ProxyFactoryService) new ProxyFactoryServiceByteBuddy();
metaModelContext = MetaModelContext_forTesting.builder()
.specificationLoader(mockSpecificationLoader)
@@ -276,7 +276,7 @@ public class WrapperFactoryDefault_wrappedObject_Test {
employeeWO = wrapperFactory.wrap(employeeDO);
}
- protected WrapperFactoryDefault createWrapperFactory(ProxyFactoryService proxyFactoryService) {
+ protected WrapperFactoryDefault createWrapperFactory(_ProxyFactoryService proxyFactoryService) {
val wrapperFactory = new WrapperFactoryDefault();
wrapperFactory.proxyFactoryService = proxyFactoryService;
wrapperFactory.init();
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index 98ef0e2..f8d2021 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -50,7 +50,7 @@ import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
+import org.apache.isis.commons.internal.proxy._ProxyFactoryService;
import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
@@ -134,7 +134,7 @@ public class WrapperFactoryDefault_wrappedObject_transient_Test {
// PRODUCTION
- val proxyFactoryService = (ProxyFactoryService) new ProxyFactoryServiceByteBuddy();
+ val proxyFactoryService = (_ProxyFactoryService) new ProxyFactoryServiceByteBuddy();
metaModelContext = MetaModelContext_forTesting.builder()
.specificationLoader(mockSpecificationLoader)
@@ -214,7 +214,7 @@ public class WrapperFactoryDefault_wrappedObject_transient_Test {
employeeWO = wrapperFactory.wrap(employeeDO);
}
- protected WrapperFactoryDefault createWrapperFactory(ProxyFactoryService proxyFactoryService) {
+ protected WrapperFactoryDefault createWrapperFactory(_ProxyFactoryService proxyFactoryService) {
val wrapperFactory = new WrapperFactoryDefault();
wrapperFactory.proxyFactoryService = proxyFactoryService;
wrapperFactory.init();
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/ImposteriserUsingCodegenPlugin.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/ImposteriserUsingCodegenPlugin.java
index 5d17197..ff8b74c 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/ImposteriserUsingCodegenPlugin.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/ImposteriserUsingCodegenPlugin.java
@@ -26,7 +26,7 @@ import org.jmock.api.Invocation;
import org.jmock.api.Invokable;
import org.jmock.lib.JavaReflectionImposteriser;
-import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
+import org.apache.isis.commons.internal.proxy._ProxyFactory;
import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
class ImposteriserUsingCodegenPlugin implements Imposteriser {
@@ -62,7 +62,7 @@ class ImposteriserUsingCodegenPlugin implements Imposteriser {
}
- final ProxyFactory<T> factory = ProxyFactory.builder(mockedType)
+ final _ProxyFactory<T> factory = _ProxyFactory.builder(mockedType)
.interfaces(ancilliaryTypes)
.build(new ProxyFactoryServiceByteBuddy());