Use PropertiesBuilder in all modules (apache#23308)

* Use PropertiesBuilder in agent module * Use PropertiesBuilder in distsql module * Use PropertiesBuilder in binder module * Use PropertiesBuilder in common module * Use PropertiesBuilder in context module * Use PropertiesBuilder in util module * Use PropertiesBuilder in authority module * Use PropertiesBuilder in data-pipeline module * Use PropertiesBuilder in traffic module * Use PropertiesBuilder in transaction module * Use PropertiesBuilder in mode module * Use PropertiesBuilder in proxy module * Use PropertiesBuilder in test module * Use PropertiesBuilder in test module * Use PropertiesBuilder in all modules * For code format
Byeongcheol-Kim · Jan 3, 2023 · e02e0e4 · e02e0e4
1 parent 56c416c
commit e02e0e4
Show file tree

Hide file tree

Showing 84 changed files with 489 additions and 454 deletions.
diff --git a/agent/plugins/metrics/type/prometheus/pom.xml b/agent/plugins/metrics/type/prometheus/pom.xml
@@ -64,6 +64,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-test-util</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient</artifactId>

diff --git a/...pache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginBootServiceTest.java b/...pache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginBootServiceTest.java
@@ -31,13 +31,14 @@
 import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
 import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
 import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
+import org.apache.shardingsphere.test.util.PropertiesBuilder;
+import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
 import org.junit.After;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.util.Properties;
 
 import static org.mockito.Mockito.mock;
 
@@ -57,13 +58,7 @@ public void assertStart() throws IOException {
                 new ComputeNodeInstance(mock(InstanceMetaData.class)), new StandaloneWorkerIdGenerator(), new ModeConfiguration("Standalone", null),
                 mock(ModeContextManager.class), mock(LockContext.class), new EventBusContext());
         ProxyContext.init(new ContextManager(metaDataContexts, instanceContext));
-        pluginBootService.start(new PluginConfiguration("localhost", 8090, "", createProperties()), true);
+        pluginBootService.start(new PluginConfiguration("localhost", 8090, "", PropertiesBuilder.build(new Property("JVM_INFORMATION_COLLECTOR_ENABLED", Boolean.TRUE.toString()))), true);
         new Socket().connect(new InetSocketAddress("localhost", 8090));
     }
-
-    private Properties createProperties() {
-        Properties result = new Properties();
-        result.setProperty("JVM_INFORMATION_COLLECTOR_ENABLED", Boolean.TRUE.toString());
-        return result;
-    }
 }
diff --git a/agent/plugins/tracing/type/jaeger/pom.xml b/agent/plugins/tracing/type/jaeger/pom.xml
@@ -32,6 +32,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-test-util</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.opentracing</groupId>
             <artifactId>opentracing-api</artifactId>

diff --git a/...apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootServiceTest.java b/...apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootServiceTest.java
@@ -20,6 +20,8 @@
 import io.opentracing.noop.NoopTracerFactory;
 import io.opentracing.util.GlobalTracer;
 import org.apache.shardingsphere.agent.api.PluginConfiguration;
+import org.apache.shardingsphere.test.util.PropertiesBuilder;
+import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
 import org.junit.After;
 import org.junit.Test;
 import org.mockito.internal.configuration.plugins.Plugins;
@@ -40,16 +42,12 @@ public void close() throws ReflectiveOperationException {
 
     @Test
     public void assertStart() {
-        pluginBootService.start(new PluginConfiguration("localhost", 5775, "", createProperties()), true);
+        Properties props = PropertiesBuilder.build(
+                new Property("JAEGER_SAMPLER_TYPE", "const"),
+                new Property("JAEGER_SAMPLER_PARAM", "1"),
+                new Property("JAEGER_REPORTER_LOG_SPANS", Boolean.TRUE.toString()),
+                new Property("JAEGER_REPORTER_FLUSH_INTERVAL", "1"));
+        pluginBootService.start(new PluginConfiguration("localhost", 5775, "", props), true);
         assertTrue(GlobalTracer.isRegistered());
     }
-
-    private Properties createProperties() {
-        Properties result = new Properties();
-        result.setProperty("JAEGER_SAMPLER_TYPE", "const");
-        result.setProperty("JAEGER_SAMPLER_PARAM", "1");
-        result.setProperty("JAEGER_REPORTER_LOG_SPANS", Boolean.TRUE.toString());
-        result.setProperty("JAEGER_REPORTER_FLUSH_INTERVAL", "1");
-        return result;
-    }
 }
diff --git a/agent/plugins/tracing/type/opentelemetry/pom.xml b/agent/plugins/tracing/type/opentelemetry/pom.xml
@@ -33,6 +33,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-test-util</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-api</artifactId>

diff --git a/...gsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootServiceTest.java b/...gsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootServiceTest.java
@@ -19,34 +19,28 @@
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import org.apache.shardingsphere.agent.api.PluginConfiguration;
+import org.apache.shardingsphere.test.util.PropertiesBuilder;
+import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
 import org.junit.After;
 import org.junit.Test;
 
-import java.util.Properties;
-
 import static org.junit.Assert.assertNotNull;
 
 public final class OpenTelemetryTracingPluginBootServiceTest {
 
     private final OpenTelemetryTracingPluginBootService pluginBootService = new OpenTelemetryTracingPluginBootService();
 
-    @Test
-    public void assertStart() {
-        pluginBootService.start(new PluginConfiguration(null, 0, null, createProperties()), true);
-        assertNotNull(GlobalOpenTelemetry.getTracerProvider());
-        assertNotNull(GlobalOpenTelemetry.getTracer("shardingsphere-agent"));
-    }
-
-    private Properties createProperties() {
-        Properties result = new Properties();
-        result.setProperty("otel.resource.attributes", "service.name=shardingsphere-agent");
-        result.setProperty("otel.traces.exporter", "zipkin");
-        return result;
-    }
-
     @After
     public void close() {
         pluginBootService.close();
         GlobalOpenTelemetry.resetForTest();
     }
+
+    @Test
+    public void assertStart() {
+        pluginBootService.start(new PluginConfiguration(null, 0, null,
+                PropertiesBuilder.build(new Property("otel.resource.attributes", "service.name=shardingsphere-agent"), new Property("otel.traces.exporter", "zipkin"))), true);
+        assertNotNull(GlobalOpenTelemetry.getTracerProvider());
+        assertNotNull(GlobalOpenTelemetry.getTracer("shardingsphere-agent"));
+    }
 }
diff --git a/agent/plugins/tracing/type/opentracing/pom.xml b/agent/plugins/tracing/type/opentracing/pom.xml
@@ -28,6 +28,13 @@
     <name>${project.artifactId}</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-test-util</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.opentracing</groupId>
             <artifactId>opentracing-api</artifactId>

diff --git a/...che/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootServiceTest.java b/...che/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootServiceTest.java
@@ -19,11 +19,11 @@
 
 import io.opentracing.util.GlobalTracer;
 import org.apache.shardingsphere.agent.api.PluginConfiguration;
+import org.apache.shardingsphere.test.util.PropertiesBuilder;
+import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
 import org.junit.After;
 import org.junit.Test;
 
-import java.util.Properties;
-
 import static org.junit.Assert.assertTrue;
 
 public final class OpenTracingPluginBootServiceTest {
@@ -37,13 +37,7 @@ public void close() {
 
     @Test
     public void assertStart() {
-        pluginBootService.start(new PluginConfiguration("localhost", 8090, "", createProperties()), true);
+        pluginBootService.start(new PluginConfiguration("localhost", 8090, "", PropertiesBuilder.build(new Property("opentracing-tracer-class-name", "io.opentracing.mock.MockTracer"))), true);
         assertTrue(GlobalTracer.isRegistered());
     }
-
-    private Properties createProperties() {
-        Properties result = new Properties();
-        result.setProperty("opentracing-tracer-class-name", "io.opentracing.mock.MockTracer");
-        return result;
-    }
 }
diff --git a/distsql/statement/pom.xml b/distsql/statement/pom.xml
@@ -38,5 +38,12 @@
             <artifactId>shardingsphere-sql-parser-statement</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-test-util</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...ache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java b/...ache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java
@@ -22,6 +22,8 @@
 import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment;
 import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
 import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
+import org.apache.shardingsphere.test.util.PropertiesBuilder;
+import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -47,8 +49,7 @@ public void assertConvert() {
 
     private Collection<DataSourceSegment> createDataSourceSegments() {
         Collection<DataSourceSegment> result = new LinkedList<>();
-        Properties customPoolProps = new Properties();
-        customPoolProps.setProperty("maxPoolSize", "30");
+        Properties customPoolProps = PropertiesBuilder.build(new Property("maxPoolSize", "30"));
         result.add(new HostnameAndPortBasedDataSourceSegment("ds0", "127.0.0.1", "3306", "demo_ds_0", "root0", "root0", customPoolProps));
         result.add(new URLBasedDataSourceSegment("ds1", "jdbc:mysql://127.0.0.1:3306/demo_ds_1?useSSL=false", "root1", "root1", customPoolProps));
         return result;

diff --git a/.../org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java b/.../org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
@@ -293,7 +293,7 @@ private TableRuleSegment createCompleteTableRule() {
         Properties props = new Properties();
         result.setTableStrategySegment(new ShardingStrategySegment("hint", "product_id", new AlgorithmSegment("CORE.HINT.FIXTURE", props)));
         result.setDatabaseStrategySegment(new ShardingStrategySegment("hint", "product_id", new AlgorithmSegment("CORE.HINT.FIXTURE", props)));
-        result.setKeyGenerateStrategySegment(new KeyGenerateStrategySegment("product_id", new AlgorithmSegment("DISTSQL.FIXTURE", new Properties())));
+        result.setKeyGenerateStrategySegment(new KeyGenerateStrategySegment("product_id", new AlgorithmSegment("DISTSQL.FIXTURE", props)));
         return result;
     }
 }
diff --git a/infra/binder/pom.xml b/infra/binder/pom.xml
@@ -38,7 +38,6 @@
             <artifactId>shardingsphere-sql-parser-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>shardingsphere-infra-parser</artifactId>
@@ -49,5 +48,12 @@
             <artifactId>shardingsphere-infra-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-test-util</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...org/apache/shardingsphere/infra/binder/decider/engine/SQLFederationDeciderEngineTest.java b/...org/apache/shardingsphere/infra/binder/decider/engine/SQLFederationDeciderEngineTest.java
@@ -32,6 +32,8 @@
 import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
 import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
 import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
+import org.apache.shardingsphere.test.util.PropertiesBuilder;
+import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -74,9 +76,8 @@ public void assertDecideWhenNotConfigSqlFederationEnabled() {
     @Test
     public void assertDecideWhenExecuteNotSelectStatement() {
         Collection<ShardingSphereRule> rules = Collections.singletonList(new SQLFederationDeciderRuleMatchFixture());
-        Properties props = new Properties();
-        props.put(ConfigurationPropertyKey.SQL_FEDERATION_TYPE.getKey(), "ORIGINAL");
-        SQLFederationDeciderEngine deciderEngine = new SQLFederationDeciderEngine(rules, new ConfigurationProperties(props));
+        SQLFederationDeciderEngine deciderEngine = new SQLFederationDeciderEngine(rules,
+                new ConfigurationProperties(PropertiesBuilder.build(new Property(ConfigurationPropertyKey.SQL_FEDERATION_TYPE.getKey(), "ORIGINAL"))));
         QueryContext queryContext = new QueryContext(mock(CommonSQLStatementContext.class), "", Collections.emptyList());
         ShardingSphereDatabase database = new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME,
                 mock(DatabaseType.class), mock(ShardingSphereResourceMetaData.class, RETURNS_DEEP_STUBS), new ShardingSphereRuleMetaData(rules), Collections.emptyMap());
@@ -87,9 +88,8 @@ public void assertDecideWhenExecuteNotSelectStatement() {
     @Test
     public void assertDecideWhenConfigSingleMatchedRule() {
         Collection<ShardingSphereRule> rules = Collections.singletonList(new SQLFederationDeciderRuleMatchFixture());
-        Properties props = new Properties();
-        props.put(ConfigurationPropertyKey.SQL_FEDERATION_TYPE.getKey(), "ORIGINAL");
-        SQLFederationDeciderEngine deciderEngine = new SQLFederationDeciderEngine(rules, new ConfigurationProperties(props));
+        SQLFederationDeciderEngine deciderEngine = new SQLFederationDeciderEngine(rules,
+                new ConfigurationProperties(PropertiesBuilder.build(new Property(ConfigurationPropertyKey.SQL_FEDERATION_TYPE.getKey(), "ORIGINAL"))));
         QueryContext queryContext = new QueryContext(mock(SelectStatementContext.class, RETURNS_DEEP_STUBS), "", Collections.emptyList());
         ShardingSphereDatabase database = new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME,
                 mock(DatabaseType.class), mock(ShardingSphereResourceMetaData.class, RETURNS_DEEP_STUBS), new ShardingSphereRuleMetaData(rules), Collections.emptyMap());
@@ -100,9 +100,8 @@ public void assertDecideWhenConfigSingleMatchedRule() {
     @Test
     public void assertDecideWhenConfigSingleNotMatchedRule() {
         Collection<ShardingSphereRule> rules = Collections.singletonList(new SQLFederationDeciderRuleNotMatchFixture());
-        Properties props = new Properties();
-        props.put(ConfigurationPropertyKey.SQL_FEDERATION_TYPE.getKey(), "ORIGINAL");
-        SQLFederationDeciderEngine deciderEngine = new SQLFederationDeciderEngine(rules, new ConfigurationProperties(props));
+        SQLFederationDeciderEngine deciderEngine = new SQLFederationDeciderEngine(rules,
+                new ConfigurationProperties(PropertiesBuilder.build(new Property(ConfigurationPropertyKey.SQL_FEDERATION_TYPE.getKey(), "ORIGINAL"))));
         QueryContext queryContext = new QueryContext(mock(SelectStatementContext.class, RETURNS_DEEP_STUBS), "", Collections.emptyList());
         ShardingSphereDatabase database = new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME,
                 mock(DatabaseType.class), mock(ShardingSphereResourceMetaData.class, RETURNS_DEEP_STUBS), new ShardingSphereRuleMetaData(rules), Collections.emptyMap());
@@ -113,9 +112,8 @@ public void assertDecideWhenConfigSingleNotMatchedRule() {
     @Test
     public void assertDecideWhenConfigMultiRule() {
         Collection<ShardingSphereRule> rules = Arrays.asList(new SQLFederationDeciderRuleNotMatchFixture(), new SQLFederationDeciderRuleMatchFixture());
-        Properties props = new Properties();
-        props.put(ConfigurationPropertyKey.SQL_FEDERATION_TYPE.getKey(), "ORIGINAL");
-        SQLFederationDeciderEngine deciderEngine = new SQLFederationDeciderEngine(rules, new ConfigurationProperties(props));
+        SQLFederationDeciderEngine deciderEngine = new SQLFederationDeciderEngine(rules,
+                new ConfigurationProperties(PropertiesBuilder.build(new Property(ConfigurationPropertyKey.SQL_FEDERATION_TYPE.getKey(), "ORIGINAL"))));
         QueryContext queryContext = new QueryContext(mock(SelectStatementContext.class, RETURNS_DEEP_STUBS), "", Collections.emptyList());
         ShardingSphereDatabase database = new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME,
                 mock(DatabaseType.class), mock(ShardingSphereResourceMetaData.class, RETURNS_DEEP_STUBS), new ShardingSphereRuleMetaData(rules), Collections.emptyMap());

diff --git a/infra/common/pom.xml b/infra/common/pom.xml
@@ -46,6 +46,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-test-util</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.h2database</groupId>

diff --git a/...st/java/org/apache/shardingsphere/infra/algorithm/ShardingSphereAlgorithmFactoryTest.java b/...st/java/org/apache/shardingsphere/infra/algorithm/ShardingSphereAlgorithmFactoryTest.java
@@ -19,10 +19,10 @@
 
 import org.apache.shardingsphere.infra.algorithm.fixture.ShardingSphereAlgorithmFixture;
 import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
+import org.apache.shardingsphere.test.util.PropertiesBuilder;
+import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
 import org.junit.Test;
 
-import java.util.Properties;
-
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -31,9 +31,8 @@ public final class ShardingSphereAlgorithmFactoryTest {
 
     @Test
     public void assertCreateAlgorithm() {
-        Properties props = new Properties();
-        props.setProperty("key", "value");
-        ShardingSphereAlgorithm actual = ShardingSphereAlgorithmFactory.createAlgorithm(new AlgorithmConfiguration("FIXTURE", props), ShardingSphereAlgorithm.class);
+        ShardingSphereAlgorithm actual = ShardingSphereAlgorithmFactory.createAlgorithm(
+                new AlgorithmConfiguration("FIXTURE", PropertiesBuilder.build(new Property("key", "value"))), ShardingSphereAlgorithm.class);
         assertThat(actual, instanceOf(ShardingSphereAlgorithmFixture.class));
         assertThat(((ShardingSphereAlgorithmFixture) actual).getTestValue(), is("value"));
     }