Move ClassDefinitionUtils and ClassUtils where they are used (close #79)

easymock · Mar 6, 2021 · 7c2a514 · 7c2a514
1 parent 203cec8
commit 7c2a514
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 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
@@ -23,10 +23,10 @@
 import org.objenesis.instantiator.ObjectInstantiator;
 import org.objenesis.instantiator.annotations.Instantiator;
 import org.objenesis.instantiator.annotations.Typology;
-import org.objenesis.instantiator.util.ClassDefinitionUtils;
-import org.objenesis.instantiator.util.ClassUtils;
+import org.objenesis.instantiator.exotic.util.ClassDefinitionUtils;
+import org.objenesis.instantiator.exotic.util.ClassUtils;
 
-import static org.objenesis.instantiator.util.ClassDefinitionUtils.*;
+import static org.objenesis.instantiator.exotic.util.ClassDefinitionUtils.*;
 
 /**
  * This instantiator will correctly bypass the constructors by instantiating the class using the default

diff --git a/exotic/src/main/java/org/objenesis/instantiator/exotic/NewInstanceInstantiator.java b/exotic/src/main/java/org/objenesis/instantiator/exotic/NewInstanceInstantiator.java
@@ -18,7 +18,7 @@
 import org.objenesis.instantiator.ObjectInstantiator;
 import org.objenesis.instantiator.annotations.Instantiator;
 import org.objenesis.instantiator.annotations.Typology;
-import org.objenesis.instantiator.util.ClassUtils;
+import org.objenesis.instantiator.exotic.util.ClassUtils;
 
 /**
  * The simplest instantiator - simply calls Class.newInstance(). This can deal with default public

diff --git a/exotic/src/main/java/org/objenesis/instantiator/exotic/ProxyingInstantiator.java b/exotic/src/main/java/org/objenesis/instantiator/exotic/ProxyingInstantiator.java
@@ -23,10 +23,10 @@
 import org.objenesis.instantiator.ObjectInstantiator;
 import org.objenesis.instantiator.annotations.Instantiator;
 import org.objenesis.instantiator.annotations.Typology;
-import org.objenesis.instantiator.util.ClassDefinitionUtils;
-import org.objenesis.instantiator.util.ClassUtils;
+import org.objenesis.instantiator.exotic.util.ClassDefinitionUtils;
+import org.objenesis.instantiator.exotic.util.ClassUtils;
 
-import static org.objenesis.instantiator.util.ClassDefinitionUtils.*;
+import static org.objenesis.instantiator.exotic.util.ClassDefinitionUtils.*;
 
 /**
  * This instantiator creates a class by dynamically extending it. It will skip the call to the parent constructor

diff --git a/...stantiator/util/ClassDefinitionUtils.java → ...tor/exotic/util/ClassDefinitionUtils.java b/...stantiator/util/ClassDefinitionUtils.java → ...tor/exotic/util/ClassDefinitionUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.util;
+package org.objenesis.instantiator.exotic.util;
 
 import java.io.BufferedOutputStream;
 import java.io.FileOutputStream;

diff --git a/...jenesis/instantiator/util/ClassUtils.java → .../instantiator/exotic/util/ClassUtils.java b/...jenesis/instantiator/util/ClassUtils.java → .../instantiator/exotic/util/ClassUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.util;
+package org.objenesis.instantiator.exotic.util;
 
 import org.objenesis.ObjenesisException;
 

diff --git a/.../instantiator/util/DefineClassHelper.java → ...tiator/exotic/util/DefineClassHelper.java b/.../instantiator/util/DefineClassHelper.java → ...tiator/exotic/util/DefineClassHelper.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.util;
+package org.objenesis.instantiator.exotic.util;
 
+import org.objenesis.instantiator.util.UnsafeUtils;
 import sun.misc.Unsafe;
 import org.objenesis.ObjenesisException;
 import org.objenesis.strategy.PlatformDescription;

diff --git a/.../test/java/org/objenesis/ClassReader.java → ...esis/instantiator/exotic/ClassReader.java b/.../test/java/org/objenesis/ClassReader.java → ...esis/instantiator/exotic/ClassReader.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis;
+package org.objenesis.instantiator.exotic;
 
-import org.objenesis.instantiator.util.ClassUtils;
+import org.objenesis.instantiator.exotic.util.ClassUtils;
 
 import java.io.DataInputStream;
 import java.io.FileInputStream;
@@ -24,7 +24,7 @@
 import java.util.Arrays;
 
 import static org.junit.Assert.*;
-import static org.objenesis.instantiator.util.ClassDefinitionUtils.*;
+import static org.objenesis.instantiator.exotic.util.ClassDefinitionUtils.*;
 
 /**
  * @author Henri Tremblay

diff --git a/...tiator/util/ClassDefinitionUtilsTest.java → ...exotic/util/ClassDefinitionUtilsTest.java b/...tiator/util/ClassDefinitionUtilsTest.java → ...exotic/util/ClassDefinitionUtilsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.util;
+package org.objenesis.instantiator.exotic.util;
 
 import org.junit.Test;
 import org.objenesis.Objenesis;

diff --git a/...sis/instantiator/util/ClassUtilsTest.java → ...tantiator/exotic/util/ClassUtilsTest.java b/...sis/instantiator/util/ClassUtilsTest.java → ...tantiator/exotic/util/ClassUtilsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.util;
+package org.objenesis.instantiator.exotic.util;
 
 import org.junit.Test;
 import org.objenesis.ObjenesisException;