Bridge to exotic instantiator to keep compatibility

Author: Henri Tremblay

…tiator/exotic/MagicInstantiatorTest.java …r/exotic/test/MagicInstantiatorTest.javaexotic/src/test/java/org/objenesis/instantiator/exotic/MagicInstantiatorTest.java renamed to exotic/src/test/java/org/objenesis/instantiator/exotic/test/MagicInstantiatorTest.java exotic/src/test/java/org/objenesis/instantiator/exotic/MagicInstantiatorTest.java renamed to exotic/src/test/java/org/objenesis/instantiator/exotic/test/MagicInstantiatorTest.java

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.exotic;
+package org.objenesis.instantiator.exotic.test;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.objenesis.instantiator.sun.MagicInstantiator;
 import org.objenesis.test.EmptyClass;
 import org.objenesis.instantiator.ObjectInstantiator;
 import org.objenesis.strategy.PlatformDescription;
@@ -25,6 +26,8 @@
 import static org.junit.Assume.*;
 
 /**
+ * This test is using the original sun.ProxyInstantiator do make sure the bridging to the new class is working.
+ *
  * @author Henri Tremblay
  */
 public class MagicInstantiatorTest {
@@ -46,9 +49,4 @@ public void testNewInstance() {
       assertEquals(EmptyClass.class, o2.newInstance().getClass());
    }
 
-   @Test
-   public void testInternalInstantiator() {
-      ObjectInstantiator<EmptyClass> o1 = new MagicInstantiator<>(EmptyClass.class).getInstantiator();
-      assertEquals(EmptyClass.class, o1.newInstance().getClass());
-   }
 }

…tor/exotic/ProxyingInstantiatorTest.java …xotic/test/ProxyingInstantiatorTest.javaexotic/src/test/java/org/objenesis/instantiator/exotic/ProxyingInstantiatorTest.java renamed to exotic/src/test/java/org/objenesis/instantiator/exotic/test/ProxyingInstantiatorTest.java exotic/src/test/java/org/objenesis/instantiator/exotic/ProxyingInstantiatorTest.java renamed to exotic/src/test/java/org/objenesis/instantiator/exotic/test/ProxyingInstantiatorTest.java

@@ -13,16 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.exotic;
+package org.objenesis.instantiator.exotic.test;
 
 import org.junit.Ignore;
 import org.junit.Test;
+import org.objenesis.instantiator.basic.ProxyingInstantiator;
 import org.objenesis.test.EmptyClass;
 import org.objenesis.instantiator.ObjectInstantiator;
 
 import static org.junit.Assert.*;
 
 /**
+ * This test is using the original basic.ProxyInstantiator do make sure the bridging to the new class is working.
+ *
  * @author Henri Tremblay
  */
 @Ignore("Because it doesn't work without -Xverify:none")
@@ -32,7 +35,7 @@ public class ProxyingInstantiatorTest {
    public void testNewInstance() {
       ObjectInstantiator<EmptyClass> inst = new ProxyingInstantiator<>(EmptyClass.class);
       EmptyClass c = inst.newInstance();
-      assertEquals("org.objenesis.EmptyClass$$$Objenesis", c.getClass().getName());
+      assertEquals("org.objenesis.test.EmptyClass$$$Objenesis", c.getClass().getName());
    }
 
    @Test

main/src/main/java/org/objenesis/instantiator/basic/DelegatingToExoticInstantiator.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2006-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * Copyright 2006-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.objenesis.instantiator.basic;
+
+import org.objenesis.ObjenesisException;
+import org.objenesis.instantiator.ObjectInstantiator;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * Helper class extended by instantiators for which the implementation was moved to the exotic project.
+ *
+ * @param <T> type of the class instantiated
+ * @author Henri Tremblay
+ */
+public abstract class DelegatingToExoticInstantiator<T> implements ObjectInstantiator<T> {
+
+   private final ObjectInstantiator<T> wrapped;
+
+   protected DelegatingToExoticInstantiator(String className, Class<T> type) {
+      Class<ObjectInstantiator<T>> clazz = instantiatorClass(className);
+      Constructor<ObjectInstantiator<T>> constructor = instantiatorConstructor(className, clazz);
+      wrapped = instantiator(className, type, constructor);
+   }
+
+   private ObjectInstantiator<T> instantiator(String className, Class<T> type, Constructor<ObjectInstantiator<T>> constructor) {
+      try {
+         return constructor.newInstance(type);
+      } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+         throw new RuntimeException("Failed to call constructor of " + className, e);
+      }
+   }
+
+   private Class<ObjectInstantiator<T>> instantiatorClass(String className) {
+      try {
+         @SuppressWarnings("unchecked")
+         Class<ObjectInstantiator<T>> clazz = (Class<ObjectInstantiator<T>>) Class.forName(className);
+         return clazz;
+      } catch (ClassNotFoundException e) {
+         throw new ObjenesisException(getClass().getSimpleName() + " now requires objenesis-exotic to be in the classpath", e);
+      }
+   }
+
+   private Constructor<ObjectInstantiator<T>> instantiatorConstructor(String className, Class<ObjectInstantiator<T>> clazz) {
+      try {
+         return clazz.getConstructor(Class.class);
+      } catch (NoSuchMethodException e) {
+         throw new ObjenesisException("Try to find constructor taking a Class<T> in parameter on " + className + " but can't find it", e);
+      }
+   }
+
+   @Override
+   public T newInstance() {
+      return wrapped.newInstance();
+   }
+}

main/src/main/java/org/objenesis/instantiator/basic/ProxyingInstantiator.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2006-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.objenesis.instantiator.basic;
+
+import org.objenesis.instantiator.annotations.Instantiator;
+import org.objenesis.instantiator.annotations.Typology;
+
+/**
+ * Shell keeping compatibility but delegating to objenesis-exotic which contains the real implementation.
+ *
+ * @param <T> type of the class instantiated
+ */
+@Instantiator(Typology.STANDARD)
+public class ProxyingInstantiator<T> extends DelegatingToExoticInstantiator<T> {
+
+   public ProxyingInstantiator(Class<T> type) {
+      super("org.objenesis.instantiator.exotic.ProxyingInstantiator", type);
+   }
+
+}

main/src/main/java/org/objenesis/instantiator/sun/MagicInstantiator.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2006-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.objenesis.instantiator.sun;
+
+import org.objenesis.instantiator.annotations.Instantiator;
+import org.objenesis.instantiator.annotations.Typology;
+import org.objenesis.instantiator.basic.DelegatingToExoticInstantiator;
+
+/**
+ * Shell keeping compatibility but delegating to objenesis-exotic which contains the real implementation.
+ *
+ * @param <T> type of the class instantiated
+ */
+@Instantiator(Typology.STANDARD)
+public class MagicInstantiator<T> extends DelegatingToExoticInstantiator<T> {
+
+   public MagicInstantiator(Class<T> type) {
+      super("org.objenesis.instantiator.exotic.MagicInstantiator", type);
+   }
+
+}

tck/src/main/java/org/objenesis/tck/search/SearchWorkingInstantiator.java

@@ -22,6 +22,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
 import java.util.SortedSet;
 
 /**
@@ -63,7 +64,7 @@ public void searchForInstantiator(Class<?> toInstantiate) {
              continue;
           }
 
-          if (c.isInterface() || !ObjectInstantiator.class.isAssignableFrom(c)) {
+          if (c.isInterface() || Modifier.isAbstract(c.getModifiers()) || !ObjectInstantiator.class.isAssignableFrom(c)) {
              continue;
           }