[shardingsphere] branch master updated: Refactor TypedSPILoader (#27873)

[panjuan]

This is an automated email from the ASF dual-hosted git repository.

panjuan 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 2281434c42a Refactor TypedSPILoader (#27873)
2281434c42a is described below

commit 2281434c42a7851777b212e63b994730750228dd
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Aug 3 11:07:35 2023 +0800

    Refactor TypedSPILoader (#27873)
---
 .../core/connector/fixture/ConnectionPropertiesParserFixture.java       | 2 +-
 .../core/metadata/data/loader/MetaDataLoaderConnectionTest.java         | 2 +-
 .../database/core/spi/fixture/impl/FooDatabaseTypedSPIFixture.java      | 2 +-
 .../org/apache/shardingsphere/infra/spi/type/typed/TypedSPILoader.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/connector/fixture/ConnectionPropertiesParserFixture.java
 
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/connector/fixture/ConnectionPropertiesParserFixture.java
index c266e752cd1..04b038e9d4d 100644
--- 
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/connector/fixture/ConnectionPropertiesParserFixture.java
+++ 
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/connector/fixture/ConnectionPropertiesParserFixture.java
@@ -37,6 +37,6 @@ public final class ConnectionPropertiesParserFixture 
implements ConnectionProper
     
     @Override
     public String getDatabaseType() {
-        return "FIXTURE";
+        return "TRUNK";
     }
 }
diff --git 
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderConnectionTest.java
 
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderConnectionTest.java
index 6a39a1158ac..35b6275dcf5 100644
--- 
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderConnectionTest.java
+++ 
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderConnectionTest.java
@@ -39,7 +39,7 @@ class MetaDataLoaderConnectionTest {
     
     private static final String TEST_SCHEMA = "schema";
     
-    private final DatabaseType databaseType = 
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
+    private final DatabaseType databaseType = 
TypedSPILoader.getService(DatabaseType.class, "TRUNK");
     
     @Mock
     private Connection connection;
diff --git 
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/spi/fixture/impl/FooDatabaseTypedSPIFixture.java
 
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/spi/fixture/impl/FooDatabaseTypedSPIFixture.java
index bb5d47155e2..0bae54f1d8d 100644
--- 
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/spi/fixture/impl/FooDatabaseTypedSPIFixture.java
+++ 
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/spi/fixture/impl/FooDatabaseTypedSPIFixture.java
@@ -23,6 +23,6 @@ public final class FooDatabaseTypedSPIFixture implements 
DatabaseTypedSPIFixture
     
     @Override
     public String getDatabaseType() {
-        return "FIXTURE";
+        return "TRUNK";
     }
 }
diff --git 
a/infra/spi/src/main/java/org/apache/shardingsphere/infra/spi/type/typed/TypedSPILoader.java
 
b/infra/spi/src/main/java/org/apache/shardingsphere/infra/spi/type/typed/TypedSPILoader.java
index 875aa20b0f2..c7bd6617e75 100644
--- 
a/infra/spi/src/main/java/org/apache/shardingsphere/infra/spi/type/typed/TypedSPILoader.java
+++ 
b/infra/spi/src/main/java/org/apache/shardingsphere/infra/spi/type/typed/TypedSPILoader.java
@@ -119,7 +119,7 @@ public final class TypedSPILoader {
      * @return service
      */
     public static <T extends TypedSPI> T getService(final Class<T> 
serviceInterface, final Object type, final Properties props) {
-        return findService(serviceInterface, type, props).orElseGet(() -> 
findDefaultService(serviceInterface).orElseThrow(() -> new 
ServiceProviderNotFoundException(serviceInterface, type)));
+        return findService(serviceInterface, type, props).orElseThrow(() -> 
new ServiceProviderNotFoundException(serviceInterface, type));
     }
     
     /**