You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/07 06:23:43 UTC
[shardingsphere] branch master updated: Unify SPI fixture package names (#22713)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 500b4bfcbfc Unify SPI fixture package names (#22713)
500b4bfcbfc is described below
commit 500b4bfcbfc3ac7c17528bd22ef603ffc57f3e2b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Dec 7 14:23:34 2022 +0800
Unify SPI fixture package names (#22713)
---
.../infra/util/spi/ShardingSphereServiceLoaderTest.java | 10 +++++-----
.../infra/util/spi/fixture/{ => empty}/EmptySPIFixture.java | 2 +-
.../util/spi/fixture/{ => multiton}/MultitonSPIFixture.java | 2 +-
.../fixture/{ => multiton}/impl/MultitonSPIFixtureImpl.java | 4 ++--
.../util/spi/fixture/{ => singleton}/SingletonSPIFixture.java | 2 +-
.../fixture/{ => singleton}/impl/SingletonSPIFixtureImpl.java | 4 ++--
.../optional/fixture/{ => impl}/OptionalSPIFixtureImpl.java | 4 +++-
.../infra/util/spi/type/ordered/OrderedSPIRegistryTest.java | 4 ++--
.../util/spi/type/ordered/cache/OrderedServicesCacheTest.java | 4 ++--
.../fixture/{ => impl}/OrderedInterfaceFixtureImpl.java | 4 +++-
.../type/ordered/fixture/{ => impl}/OrderedSPIFixtureImpl.java | 4 +++-
.../infra/util/spi/type/required/RequiredSPIRegistryTest.java | 10 +++++-----
.../MultitonRequiredSPIFixture.java} | 4 ++--
.../impl/DefaultMultitonRequiredSPIFixtureImpl.java} | 6 ++++--
.../impl/NotDefaultMultitonRequiredSPIFixtureImpl.java} | 6 ++++--
.../single/{ => impl}/SingleRequiredSPIFixtureImpl.java | 4 +++-
.../infra/util/spi/type/typed/TypedSPIRegistryTest.java | 2 +-
.../spi/type/typed/fixture/{ => impl}/TypedSPIFixtureImpl.java | 3 ++-
...gsphere.infra.util.spi.fixture.multiton.MultitonSPIFixture} | 2 +-
...phere.infra.util.spi.fixture.singleton.SingletonSPIFixture} | 2 +-
...ere.infra.util.spi.type.optional.fixture.OptionalSPIFixture | 2 +-
...phere.infra.util.spi.type.ordered.fixture.OrderedSPIFixture | 2 +-
....type.required.fixture.multiton.MultitonRequiredSPIFixture} | 4 ++--
...l.spi.type.required.fixture.single.SingleRequiredSPIFixture | 2 +-
...ingsphere.infra.util.spi.type.typed.fixture.TypedSPIFixture | 2 +-
25 files changed, 54 insertions(+), 41 deletions(-)
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/ShardingSphereServiceLoaderTest.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/ShardingSphereServiceLoaderTest.java
index fbae5a90ef1..2f3b9d2d404 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/ShardingSphereServiceLoaderTest.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/ShardingSphereServiceLoaderTest.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.infra.util.spi;
-import org.apache.shardingsphere.infra.util.spi.fixture.EmptySPIFixture;
-import org.apache.shardingsphere.infra.util.spi.fixture.MultitonSPIFixture;
-import org.apache.shardingsphere.infra.util.spi.fixture.SingletonSPIFixture;
-import org.apache.shardingsphere.infra.util.spi.fixture.impl.MultitonSPIFixtureImpl;
-import org.apache.shardingsphere.infra.util.spi.fixture.impl.SingletonSPIFixtureImpl;
+import org.apache.shardingsphere.infra.util.spi.fixture.empty.EmptySPIFixture;
+import org.apache.shardingsphere.infra.util.spi.fixture.multiton.MultitonSPIFixture;
+import org.apache.shardingsphere.infra.util.spi.fixture.singleton.SingletonSPIFixture;
+import org.apache.shardingsphere.infra.util.spi.fixture.multiton.impl.MultitonSPIFixtureImpl;
+import org.apache.shardingsphere.infra.util.spi.fixture.singleton.impl.SingletonSPIFixtureImpl;
import org.junit.Test;
import java.util.Collection;
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/EmptySPIFixture.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/empty/EmptySPIFixture.java
similarity index 92%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/EmptySPIFixture.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/empty/EmptySPIFixture.java
index 33e54b051a6..c63b9bf55d0 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/EmptySPIFixture.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/empty/EmptySPIFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.fixture;
+package org.apache.shardingsphere.infra.util.spi.fixture.empty;
public interface EmptySPIFixture {
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/MultitonSPIFixture.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/multiton/MultitonSPIFixture.java
similarity index 92%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/MultitonSPIFixture.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/multiton/MultitonSPIFixture.java
index 24142527860..5c6e052e8a7 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/MultitonSPIFixture.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/multiton/MultitonSPIFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.fixture;
+package org.apache.shardingsphere.infra.util.spi.fixture.multiton;
public interface MultitonSPIFixture {
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/impl/MultitonSPIFixtureImpl.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/multiton/impl/MultitonSPIFixtureImpl.java
similarity index 84%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/impl/MultitonSPIFixtureImpl.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/multiton/impl/MultitonSPIFixtureImpl.java
index f919d46353b..5b45525c5f1 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/impl/MultitonSPIFixtureImpl.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/multiton/impl/MultitonSPIFixtureImpl.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.fixture.impl;
+package org.apache.shardingsphere.infra.util.spi.fixture.multiton.impl;
-import org.apache.shardingsphere.infra.util.spi.fixture.MultitonSPIFixture;
+import org.apache.shardingsphere.infra.util.spi.fixture.multiton.MultitonSPIFixture;
public final class MultitonSPIFixtureImpl implements MultitonSPIFixture {
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/SingletonSPIFixture.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/singleton/SingletonSPIFixture.java
similarity index 93%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/SingletonSPIFixture.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/singleton/SingletonSPIFixture.java
index d6453ae439d..2bf74e68f7b 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/SingletonSPIFixture.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/singleton/SingletonSPIFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.fixture;
+package org.apache.shardingsphere.infra.util.spi.fixture.singleton;
import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/impl/SingletonSPIFixtureImpl.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/singleton/impl/SingletonSPIFixtureImpl.java
similarity index 84%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/impl/SingletonSPIFixtureImpl.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/singleton/impl/SingletonSPIFixtureImpl.java
index 85192618799..a6766eafcaf 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/impl/SingletonSPIFixtureImpl.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/fixture/singleton/impl/SingletonSPIFixtureImpl.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.fixture.impl;
+package org.apache.shardingsphere.infra.util.spi.fixture.singleton.impl;
-import org.apache.shardingsphere.infra.util.spi.fixture.SingletonSPIFixture;
+import org.apache.shardingsphere.infra.util.spi.fixture.singleton.SingletonSPIFixture;
public final class SingletonSPIFixtureImpl implements SingletonSPIFixture {
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/optional/fixture/OptionalSPIFixtureImpl.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/optional/fixture/impl/OptionalSPIFixtureImpl.java
similarity index 90%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/optional/fixture/OptionalSPIFixtureImpl.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/optional/fixture/impl/OptionalSPIFixtureImpl.java
index 7bba9409bbe..f79cd0d5ee9 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/optional/fixture/OptionalSPIFixtureImpl.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/optional/fixture/impl/OptionalSPIFixtureImpl.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.type.optional.fixture;
+package org.apache.shardingsphere.infra.util.spi.type.optional.fixture.impl;
+
+import org.apache.shardingsphere.infra.util.spi.type.optional.fixture.OptionalSPIFixture;
public class OptionalSPIFixtureImpl implements OptionalSPIFixture {
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/OrderedSPIRegistryTest.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/OrderedSPIRegistryTest.java
index 751359f1266..5962f8c3ca0 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/OrderedSPIRegistryTest.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/OrderedSPIRegistryTest.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.infra.util.spi.type.ordered;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedInterfaceFixture;
-import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedInterfaceFixtureImpl;
+import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.impl.OrderedInterfaceFixtureImpl;
import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedSPIFixture;
-import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedSPIFixtureImpl;
+import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.impl.OrderedSPIFixtureImpl;
import org.apache.shardingsphere.infra.util.spi.type.ordered.cache.OrderedServicesCache;
import org.junit.After;
import org.junit.Test;
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/cache/OrderedServicesCacheTest.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/cache/OrderedServicesCacheTest.java
index 4a31546e4be..4e24fc4696a 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/cache/OrderedServicesCacheTest.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/cache/OrderedServicesCacheTest.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.infra.util.spi.type.ordered.cache;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedInterfaceFixture;
-import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedInterfaceFixtureImpl;
+import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.impl.OrderedInterfaceFixtureImpl;
import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedSPIFixture;
-import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedSPIFixtureImpl;
+import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.impl.OrderedSPIFixtureImpl;
import org.junit.After;
import org.junit.Test;
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/OrderedInterfaceFixtureImpl.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/impl/OrderedInterfaceFixtureImpl.java
similarity index 89%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/OrderedInterfaceFixtureImpl.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/impl/OrderedInterfaceFixtureImpl.java
index bf3b5d0befd..a663df878dd 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/OrderedInterfaceFixtureImpl.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/impl/OrderedInterfaceFixtureImpl.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.type.ordered.fixture;
+package org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.impl;
+
+import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedInterfaceFixture;
public final class OrderedInterfaceFixtureImpl implements OrderedInterfaceFixture {
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/OrderedSPIFixtureImpl.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/impl/OrderedSPIFixtureImpl.java
similarity index 92%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/OrderedSPIFixtureImpl.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/impl/OrderedSPIFixtureImpl.java
index 8f50ebf92d1..4cbb7445fae 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/OrderedSPIFixtureImpl.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/ordered/fixture/impl/OrderedSPIFixtureImpl.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.type.ordered.fixture;
+package org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.impl;
+
+import org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedSPIFixture;
public final class OrderedSPIFixtureImpl implements OrderedSPIFixture<OrderedInterfaceFixtureImpl> {
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/RequiredSPIRegistryTest.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/RequiredSPIRegistryTest.java
index 2e62f13c32a..faa0ce3c347 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/RequiredSPIRegistryTest.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/RequiredSPIRegistryTest.java
@@ -20,10 +20,10 @@ package org.apache.shardingsphere.infra.util.spi.type.required;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.util.spi.exception.ServiceProviderNotFoundServerException;
import org.apache.shardingsphere.infra.util.spi.type.required.fixture.empty.EmptyRequiredSPIFixture;
-import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.DefaultMultipleRequiredSPIFixtureImpl;
-import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.MultipleRequiredSPIFixture;
+import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.impl.DefaultMultitonRequiredSPIFixtureImpl;
+import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture;
import org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.SingleRequiredSPIFixture;
-import org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.SingleRequiredSPIFixtureImpl;
+import org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.impl.SingleRequiredSPIFixtureImpl;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -34,7 +34,7 @@ public final class RequiredSPIRegistryTest {
static {
ShardingSphereServiceLoader.register(EmptyRequiredSPIFixture.class);
ShardingSphereServiceLoader.register(SingleRequiredSPIFixture.class);
- ShardingSphereServiceLoader.register(MultipleRequiredSPIFixture.class);
+ ShardingSphereServiceLoader.register(MultitonRequiredSPIFixture.class);
}
@Test(expected = ServiceProviderNotFoundServerException.class)
@@ -49,6 +49,6 @@ public final class RequiredSPIRegistryTest {
@Test
public void assertRegisteredServiceWithMoreImplementations() {
- assertThat(RequiredSPIRegistry.getRegisteredService(MultipleRequiredSPIFixture.class), instanceOf(DefaultMultipleRequiredSPIFixtureImpl.class));
+ assertThat(RequiredSPIRegistry.getRegisteredService(MultitonRequiredSPIFixture.class), instanceOf(DefaultMultitonRequiredSPIFixtureImpl.class));
}
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/MultipleRequiredSPIFixture.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/MultitonRequiredSPIFixture.java
similarity index 92%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/MultipleRequiredSPIFixture.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/MultitonRequiredSPIFixture.java
index 13b5ab07da8..21ef5d1fa3a 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/MultipleRequiredSPIFixture.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/MultitonRequiredSPIFixture.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple;
+package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton;
import org.apache.shardingsphere.infra.util.spi.type.required.RequiredSPI;
-public interface MultipleRequiredSPIFixture extends RequiredSPI {
+public interface MultitonRequiredSPIFixture extends RequiredSPI {
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/DefaultMultipleRequiredSPIFixtureImpl.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/DefaultMultitonRequiredSPIFixtureImpl.java
similarity index 80%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/DefaultMultipleRequiredSPIFixtureImpl.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/DefaultMultitonRequiredSPIFixtureImpl.java
index 237579c27a5..73249839137 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/DefaultMultipleRequiredSPIFixtureImpl.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/DefaultMultitonRequiredSPIFixtureImpl.java
@@ -15,9 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple;
+package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.impl;
-public final class DefaultMultipleRequiredSPIFixtureImpl implements MultipleRequiredSPIFixture {
+import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture;
+
+public final class DefaultMultitonRequiredSPIFixtureImpl implements MultitonRequiredSPIFixture {
@Override
public boolean isDefault() {
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/NotDefaultMultipleRequiredSPIFixtureImpl.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/NotDefaultMultitonRequiredSPIFixtureImpl.java
similarity index 79%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/NotDefaultMultipleRequiredSPIFixtureImpl.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/NotDefaultMultitonRequiredSPIFixtureImpl.java
index 77147740e48..0332ff91122 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiple/NotDefaultMultipleRequiredSPIFixtureImpl.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/multiton/impl/NotDefaultMultitonRequiredSPIFixtureImpl.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple;
+package org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.impl;
-public final class NotDefaultMultipleRequiredSPIFixtureImpl implements MultipleRequiredSPIFixture {
+import org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture;
+
+public final class NotDefaultMultitonRequiredSPIFixtureImpl implements MultitonRequiredSPIFixture {
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/single/SingleRequiredSPIFixtureImpl.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/single/impl/SingleRequiredSPIFixtureImpl.java
similarity index 88%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/single/SingleRequiredSPIFixtureImpl.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/single/impl/SingleRequiredSPIFixtureImpl.java
index 996de9fdef3..c6b98cd0cd9 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/single/SingleRequiredSPIFixtureImpl.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/required/fixture/single/impl/SingleRequiredSPIFixtureImpl.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.type.required.fixture.single;
+package org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.impl;
+
+import org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.SingleRequiredSPIFixture;
public final class SingleRequiredSPIFixtureImpl implements SingleRequiredSPIFixture {
}
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/typed/TypedSPIRegistryTest.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/typed/TypedSPIRegistryTest.java
index b5cc431592d..8078388ff72 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/typed/TypedSPIRegistryTest.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/typed/TypedSPIRegistryTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.util.spi.type.typed;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.util.spi.exception.ServiceProviderNotFoundServerException;
import org.apache.shardingsphere.infra.util.spi.type.typed.fixture.TypedSPIFixture;
-import org.apache.shardingsphere.infra.util.spi.type.typed.fixture.TypedSPIFixtureImpl;
+import org.apache.shardingsphere.infra.util.spi.type.typed.fixture.impl.TypedSPIFixtureImpl;
import org.junit.Test;
import java.util.Properties;
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/typed/fixture/TypedSPIFixtureImpl.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/typed/fixture/impl/TypedSPIFixtureImpl.java
similarity index 93%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/typed/fixture/TypedSPIFixtureImpl.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/typed/fixture/impl/TypedSPIFixtureImpl.java
index f5cef160c07..ef39e5313c6 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/typed/fixture/TypedSPIFixtureImpl.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/spi/type/typed/fixture/impl/TypedSPIFixtureImpl.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.spi.type.typed.fixture;
+package org.apache.shardingsphere.infra.util.spi.type.typed.fixture.impl;
import lombok.Getter;
+import org.apache.shardingsphere.infra.util.spi.type.typed.fixture.TypedSPIFixture;
import java.util.Collection;
import java.util.Collections;
diff --git a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.SingletonSPIFixture b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.multiton.MultitonSPIFixture
similarity index 90%
rename from infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.SingletonSPIFixture
rename to infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.multiton.MultitonSPIFixture
index fe6cb31e885..c1869d1e9b0 100644
--- a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.SingletonSPIFixture
+++ b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.multiton.MultitonSPIFixture
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.util.spi.fixture.impl.SingletonSPIFixtureImpl
+org.apache.shardingsphere.infra.util.spi.fixture.multiton.impl.MultitonSPIFixtureImpl
diff --git a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.MultitonSPIFixture b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.singleton.SingletonSPIFixture
similarity index 89%
rename from infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.MultitonSPIFixture
rename to infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.singleton.SingletonSPIFixture
index 6654c6bcdf5..00dfac9ad94 100644
--- a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.MultitonSPIFixture
+++ b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.fixture.singleton.SingletonSPIFixture
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.util.spi.fixture.impl.MultitonSPIFixtureImpl
+org.apache.shardingsphere.infra.util.spi.fixture.singleton.impl.SingletonSPIFixtureImpl
diff --git a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.optional.fixture.OptionalSPIFixture b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.optional.fixture.OptionalSPIFixture
index be4ad32de10..f6dabaf30e6 100644
--- a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.optional.fixture.OptionalSPIFixture
+++ b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.optional.fixture.OptionalSPIFixture
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.util.spi.type.optional.fixture.OptionalSPIFixtureImpl
+org.apache.shardingsphere.infra.util.spi.type.optional.fixture.impl.OptionalSPIFixtureImpl
diff --git a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedSPIFixture b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedSPIFixture
index 5e1636bd110..15856daba05 100644
--- a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedSPIFixture
+++ b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedSPIFixture
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.OrderedSPIFixtureImpl
+org.apache.shardingsphere.infra.util.spi.type.ordered.fixture.impl.OrderedSPIFixtureImpl
diff --git a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.MultipleRequiredSPIFixture b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture
similarity index 89%
rename from infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.MultipleRequiredSPIFixture
rename to infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture
index d3b7df3edc1..d36af6613cf 100644
--- a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.MultipleRequiredSPIFixture
+++ b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.MultitonRequiredSPIFixture
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.DefaultMultipleRequiredSPIFixtureImpl
-org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiple.NotDefaultMultipleRequiredSPIFixtureImpl
+org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.impl.DefaultMultitonRequiredSPIFixtureImpl
+org.apache.shardingsphere.infra.util.spi.type.required.fixture.multiton.impl.NotDefaultMultitonRequiredSPIFixtureImpl
diff --git a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.SingleRequiredSPIFixture b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.SingleRequiredSPIFixture
index 29ef4c8b5a8..15a8c3f5871 100644
--- a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.SingleRequiredSPIFixture
+++ b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.SingleRequiredSPIFixture
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.SingleRequiredSPIFixtureImpl
+org.apache.shardingsphere.infra.util.spi.type.required.fixture.single.impl.SingleRequiredSPIFixtureImpl
diff --git a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.typed.fixture.TypedSPIFixture b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.typed.fixture.TypedSPIFixture
index 60176b78ae9..1b83660944d 100644
--- a/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.typed.fixture.TypedSPIFixture
+++ b/infra/util/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.util.spi.type.typed.fixture.TypedSPIFixture
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.util.spi.type.typed.fixture.TypedSPIFixtureImpl
+org.apache.shardingsphere.infra.util.spi.type.typed.fixture.impl.TypedSPIFixtureImpl