From 203cec82dbb05c2dbfa2c3e656ab08b22d65d57f Mon Sep 17 00:00:00 2001 From: Henri Tremblay Date: Thu, 4 Mar 2021 21:16:33 -0500 Subject: [PATCH] Since these classes are now in a new Java module, they need to be in a different package --- .../instantiator/{sun => exotic}/MagicInstantiator.java | 2 +- .../{basic => exotic}/NewInstanceInstantiator.java | 2 +- .../instantiator/{basic => exotic}/NullInstantiator.java | 2 +- .../{basic => exotic}/ProxyingInstantiator.java | 2 +- .../instantiator/{sun => exotic}/MagicInstantiatorTest.java | 6 +++--- .../{basic => exotic}/ProxyingInstantiatorTest.java | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) rename exotic/src/main/java/org/objenesis/instantiator/{sun => exotic}/MagicInstantiator.java (99%) rename exotic/src/main/java/org/objenesis/instantiator/{basic => exotic}/NewInstanceInstantiator.java (96%) rename exotic/src/main/java/org/objenesis/instantiator/{basic => exotic}/NullInstantiator.java (96%) rename exotic/src/main/java/org/objenesis/instantiator/{basic => exotic}/ProxyingInstantiator.java (99%) rename exotic/src/test/java/org/objenesis/instantiator/{sun => exotic}/MagicInstantiatorTest.java (93%) rename exotic/src/test/java/org/objenesis/instantiator/{basic => exotic}/ProxyingInstantiatorTest.java (94%) diff --git a/exotic/src/main/java/org/objenesis/instantiator/sun/MagicInstantiator.java b/exotic/src/main/java/org/objenesis/instantiator/exotic/MagicInstantiator.java similarity index 99% rename from exotic/src/main/java/org/objenesis/instantiator/sun/MagicInstantiator.java rename to exotic/src/main/java/org/objenesis/instantiator/exotic/MagicInstantiator.java index 83603eac7..cf0e6607e 100644 --- a/exotic/src/main/java/org/objenesis/instantiator/sun/MagicInstantiator.java +++ b/exotic/src/main/java/org/objenesis/instantiator/exotic/MagicInstantiator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.objenesis.instantiator.sun; +package org.objenesis.instantiator.exotic; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/exotic/src/main/java/org/objenesis/instantiator/basic/NewInstanceInstantiator.java b/exotic/src/main/java/org/objenesis/instantiator/exotic/NewInstanceInstantiator.java similarity index 96% rename from exotic/src/main/java/org/objenesis/instantiator/basic/NewInstanceInstantiator.java rename to exotic/src/main/java/org/objenesis/instantiator/exotic/NewInstanceInstantiator.java index 7814a8a84..3c02b304c 100644 --- a/exotic/src/main/java/org/objenesis/instantiator/basic/NewInstanceInstantiator.java +++ b/exotic/src/main/java/org/objenesis/instantiator/exotic/NewInstanceInstantiator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.objenesis.instantiator.basic; +package org.objenesis.instantiator.exotic; import org.objenesis.instantiator.ObjectInstantiator; import org.objenesis.instantiator.annotations.Instantiator; diff --git a/exotic/src/main/java/org/objenesis/instantiator/basic/NullInstantiator.java b/exotic/src/main/java/org/objenesis/instantiator/exotic/NullInstantiator.java similarity index 96% rename from exotic/src/main/java/org/objenesis/instantiator/basic/NullInstantiator.java rename to exotic/src/main/java/org/objenesis/instantiator/exotic/NullInstantiator.java index 6616d3e94..16e194759 100644 --- a/exotic/src/main/java/org/objenesis/instantiator/basic/NullInstantiator.java +++ b/exotic/src/main/java/org/objenesis/instantiator/exotic/NullInstantiator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.objenesis.instantiator.basic; +package org.objenesis.instantiator.exotic; import org.objenesis.instantiator.ObjectInstantiator; import org.objenesis.instantiator.annotations.Instantiator; diff --git a/exotic/src/main/java/org/objenesis/instantiator/basic/ProxyingInstantiator.java b/exotic/src/main/java/org/objenesis/instantiator/exotic/ProxyingInstantiator.java similarity index 99% rename from exotic/src/main/java/org/objenesis/instantiator/basic/ProxyingInstantiator.java rename to exotic/src/main/java/org/objenesis/instantiator/exotic/ProxyingInstantiator.java index 9907c3923..0c5a68202 100644 --- a/exotic/src/main/java/org/objenesis/instantiator/basic/ProxyingInstantiator.java +++ b/exotic/src/main/java/org/objenesis/instantiator/exotic/ProxyingInstantiator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.objenesis.instantiator.basic; +package org.objenesis.instantiator.exotic; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/exotic/src/test/java/org/objenesis/instantiator/sun/MagicInstantiatorTest.java b/exotic/src/test/java/org/objenesis/instantiator/exotic/MagicInstantiatorTest.java similarity index 93% rename from exotic/src/test/java/org/objenesis/instantiator/sun/MagicInstantiatorTest.java rename to exotic/src/test/java/org/objenesis/instantiator/exotic/MagicInstantiatorTest.java index 28806046a..b3b909b2b 100644 --- a/exotic/src/test/java/org/objenesis/instantiator/sun/MagicInstantiatorTest.java +++ b/exotic/src/test/java/org/objenesis/instantiator/exotic/MagicInstantiatorTest.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.objenesis.instantiator.sun; +package org.objenesis.instantiator.exotic; import org.junit.Before; import org.junit.Test; -import org.objenesis.EmptyClass; +import org.objenesis.test.EmptyClass; import org.objenesis.instantiator.ObjectInstantiator; import org.objenesis.strategy.PlatformDescription; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import static org.junit.Assume.*; /** diff --git a/exotic/src/test/java/org/objenesis/instantiator/basic/ProxyingInstantiatorTest.java b/exotic/src/test/java/org/objenesis/instantiator/exotic/ProxyingInstantiatorTest.java similarity index 94% rename from exotic/src/test/java/org/objenesis/instantiator/basic/ProxyingInstantiatorTest.java rename to exotic/src/test/java/org/objenesis/instantiator/exotic/ProxyingInstantiatorTest.java index 6976f3457..05305df22 100644 --- a/exotic/src/test/java/org/objenesis/instantiator/basic/ProxyingInstantiatorTest.java +++ b/exotic/src/test/java/org/objenesis/instantiator/exotic/ProxyingInstantiatorTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.objenesis.instantiator.basic; +package org.objenesis.instantiator.exotic; import org.junit.Ignore; import org.junit.Test; -import org.objenesis.EmptyClass; +import org.objenesis.test.EmptyClass; import org.objenesis.instantiator.ObjectInstantiator; import static org.junit.Assert.*;