Move back these two instantiators to be less disruptive

easymock · Mar 7, 2021 · eb17cf8 · eb17cf8
1 parent f60be30
commit eb17cf8
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/exotic/src/main/java/org/objenesis/instantiator/exotic/MagicInstantiator.java b/exotic/src/main/java/org/objenesis/instantiator/exotic/MagicInstantiator.java
@@ -24,7 +24,7 @@
 import org.objenesis.instantiator.annotations.Instantiator;
 import org.objenesis.instantiator.annotations.Typology;
 import org.objenesis.instantiator.exotic.util.ClassDefinitionUtils;
-import org.objenesis.instantiator.exotic.util.ClassUtils;
+import org.objenesis.instantiator.util.ClassUtils;
 
 import static org.objenesis.instantiator.exotic.util.ClassDefinitionUtils.*;
 

diff --git a/exotic/src/main/java/org/objenesis/instantiator/exotic/ProxyingInstantiator.java b/exotic/src/main/java/org/objenesis/instantiator/exotic/ProxyingInstantiator.java
@@ -24,7 +24,7 @@
 import org.objenesis.instantiator.annotations.Instantiator;
 import org.objenesis.instantiator.annotations.Typology;
 import org.objenesis.instantiator.exotic.util.ClassDefinitionUtils;
-import org.objenesis.instantiator.exotic.util.ClassUtils;
+import org.objenesis.instantiator.util.ClassUtils;
 
 import static org.objenesis.instantiator.exotic.util.ClassDefinitionUtils.*;
 

diff --git a/exotic/src/main/java/org/objenesis/instantiator/exotic/util/ClassDefinitionUtils.java b/exotic/src/main/java/org/objenesis/instantiator/exotic/util/ClassDefinitionUtils.java
@@ -15,6 +15,8 @@
  */
 package org.objenesis.instantiator.exotic.util;
 
+import org.objenesis.instantiator.util.ClassUtils;
+
 import java.io.BufferedOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;

diff --git a/exotic/src/test/java/org/objenesis/instantiator/exotic/ClassReader.java b/exotic/src/test/java/org/objenesis/instantiator/exotic/ClassReader.java
@@ -15,7 +15,7 @@
  */
 package org.objenesis.instantiator.exotic;
 
-import org.objenesis.instantiator.exotic.util.ClassUtils;
+import org.objenesis.instantiator.util.ClassUtils;
 
 import java.io.DataInputStream;
 import java.io.FileInputStream;

diff --git a/exotic/src/test/java/org/objenesis/instantiator/exotic/util/ClassUtilsTest.java b/exotic/src/test/java/org/objenesis/instantiator/exotic/util/ClassUtilsTest.java
@@ -17,6 +17,7 @@
 
 import org.junit.Test;
 import org.objenesis.ObjenesisException;
+import org.objenesis.instantiator.util.ClassUtils;
 
 import java.util.ArrayList;
 

diff --git a/...iator/exotic/NewInstanceInstantiator.java → ...tiator/basic/NewInstanceInstantiator.java b/...iator/exotic/NewInstanceInstantiator.java → ...tiator/basic/NewInstanceInstantiator.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.exotic;
+package org.objenesis.instantiator.basic;
 
 import org.objenesis.instantiator.ObjectInstantiator;
 import org.objenesis.instantiator.annotations.Instantiator;
 import org.objenesis.instantiator.annotations.Typology;
-import org.objenesis.instantiator.exotic.util.ClassUtils;
+import org.objenesis.instantiator.util.ClassUtils;
 
 /**
  * The simplest instantiator - simply calls Class.newInstance(). This can deal with default public

diff --git a/...instantiator/exotic/NullInstantiator.java → .../instantiator/basic/NullInstantiator.java b/...instantiator/exotic/NullInstantiator.java → .../instantiator/basic/NullInstantiator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.exotic;
+package org.objenesis.instantiator.basic;
 
 import org.objenesis.instantiator.ObjectInstantiator;
 import org.objenesis.instantiator.annotations.Instantiator;

diff --git a/.../instantiator/exotic/util/ClassUtils.java → ...jenesis/instantiator/util/ClassUtils.java b/.../instantiator/exotic/util/ClassUtils.java → ...jenesis/instantiator/util/ClassUtils.java
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.exotic.util;
+package org.objenesis.instantiator.util;
 
 import org.objenesis.ObjenesisException;
 
 /**
- * Helper class for to play with classes. It contains everything needed to play with a class
- * except the dodgy (Java 8) code you will find in {@link ClassDefinitionUtils}.
+ * Helper class for to play with classes.
  *
  * @author Henri Tremblay
  */