You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/11/13 18:12:45 UTC
[6/7] isis git commit: ISIS-928: removing very old commented out code
in JavassistImposteriser.
ISIS-928: removing very old commented out code in JavassistImposteriser.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ad8e6b88
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ad8e6b88
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ad8e6b88
Branch: refs/heads/master
Commit: ad8e6b8838571791c16b5551f78a78718449a929
Parents: 235c18f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Nov 13 14:25:18 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Nov 13 14:25:18 2014 +0000
----------------------------------------------------------------------
.../jmocking/JavassistImposteriser.java | 67 --------------------
1 file changed, 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ad8e6b88/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JavassistImposteriser.java
----------------------------------------------------------------------
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JavassistImposteriser.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JavassistImposteriser.java
index df56eb5..fdeb449 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JavassistImposteriser.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JavassistImposteriser.java
@@ -110,61 +110,9 @@ public class JavassistImposteriser implements Imposteriser {
proxyFactory.setInterfaces(ancilliaryTypes);
return proxyFactory.createClass();
-
- // original cglib code:
-
- // final Enhancer enhancer = new Enhancer() {
- // @Override
- // @SuppressWarnings("unchecked")
- // protected void filterConstructors(Class sc, List constructors) {
- // // Don't filter
- // }
- // };
- // enhancer.setClassLoader(SearchingClassLoader.combineLoadersOf(mockedType, ancilliaryTypes));
- // enhancer.setUseFactory(true);
- // if (mockedType.isInterface()) {
- // enhancer.setSuperclass(Object.class);
- // enhancer.setInterfaces(prepend(mockedType, ancilliaryTypes));
- // }
- // else {
- // enhancer.setSuperclass(mockedType);
- // enhancer.setInterfaces(ancilliaryTypes);
- // }
- // enhancer.setCallbackTypes(new Class[]{InvocationHandler.class, NoOp.class});
- // enhancer.setCallbackFilter(IGNORE_BRIDGE_METHODS);
- // if (mockedType.getSigners() != null) {
- // enhancer.setNamingPolicy(NAMING_POLICY_THAT_ALLOWS_IMPOSTERISATION_OF_CLASSES_IN_SIGNED_PACKAGES);
- // }
- //
- // try {
- // return enhancer.createClass();
- // }
- // catch (CodeGenerationException e) {
- // // Note: I've only been able to manually test this. It exists to help people writing
- // // Eclipse plug-ins or using other environments that have sophisticated class loader
- // // structures.
- // throw new IllegalArgumentException("could not imposterise " + mockedType, e);
- // }
-
}
- // original cglib code:
-
- // private static final NamingPolicy NAMING_POLICY_THAT_ALLOWS_IMPOSTERISATION_OF_CLASSES_IN_SIGNED_PACKAGES = new DefaultNamingPolicy() {
- // @Override
- // public String getClassName(String prefix, String source, Object key, Predicate names) {
- // return "org.jmock.codegen." + super.getClassName(prefix, source, key, names);
- // }
- // };
- //
- // private static final CallbackFilter IGNORE_BRIDGE_METHODS = new CallbackFilter() {
- // public int accept(Method method) {
- // return method.isBridge() ? 1 : 0;
- // }
- // };
-
-
private Object proxy(Class<?> proxyClass, final Invokable mockObject) {
final ProxyObject proxyObject = (ProxyObject) objenesis.newInstance(proxyClass);
@@ -176,19 +124,6 @@ public class JavassistImposteriser implements Imposteriser {
});
return proxyObject;
-
- // original cglib code:
-
- // final Factory proxy = (Factory)objenesis.newInstance(proxyClass);
- // proxy.setCallbacks(new Callback[] {
- // new InvocationHandler() {
- // public Object invoke(Object receiver, Method method, Object[] args) throws Throwable {
- // return mockObject.invoke(new Invocation(receiver, method, args));
- // }
- // },
- // NoOp.INSTANCE
- // });
- // return proxy;
}
private static Class<?>[] combine(Class<?> first, Class<?>... rest) {
@@ -197,6 +132,4 @@ public class JavassistImposteriser implements Imposteriser {
System.arraycopy(rest, 0, all, 1, rest.length);
return all;
}
-
- //public static class ClassWithSuperclassToWorkAroundCglibBug {}
}