This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 752fc6ba746 Remove unnecessary static. (#17081)
752fc6ba746 is described below
commit 752fc6ba7464ba5560b0c5df351dafd7884fe14a
Author: yx9o <yangx_s...@163.com>
AuthorDate: Mon Apr 25 21:37:48 2022 +0800
Remove unnecessary static. (#17081)
* Remove unnecessary static.
* Update.
---
.../ShardingDatabasesAndTablesConfigurationPrecise.java | 6 +++---
.../config/ShardingDatabasesAndTablesConfigurationRange.java | 10 +++++-----
.../jdbc/config/ShardingDatabasesConfigurationPrecise.java | 12 ++++++------
.../raw/jdbc/config/ShardingDatabasesConfigurationRange.java | 8 ++++----
.../raw/jdbc/config/ShardingTablesConfigurationPrecise.java | 8 ++++----
.../raw/jdbc/config/ShardingTablesConfigurationRange.java | 8 ++++----
6 files changed, 26 insertions(+), 26 deletions(-)
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesAndTablesConfigurationPrecise.java
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesAndTablesConfigurationPrecise.java
index b1578f0e91e..1c0b2420b6b 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesAndTablesConfigurationPrecise.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesAndTablesConfigurationPrecise.java
@@ -56,19 +56,19 @@ public final class
ShardingDatabasesAndTablesConfigurationPrecise implements Exa
return result;
}
- private static ShardingTableRuleConfiguration
getOrderTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration getOrderTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order", "demo_ds_${0..1}.t_order_${[0, 1]}");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_id", "snowflake"));
return result;
}
- private static ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order_item",
"demo_ds_${0..1}.t_order_item_${[0, 1]}");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_item_id", "snowflake"));
return result;
}
- private static Map<String, DataSource> createDataSourceMap() {
+ private Map<String, DataSource> createDataSourceMap() {
Map<String, DataSource> result = new HashMap<>();
result.put("demo_ds_0", DataSourceUtil.createDataSource("demo_ds_0"));
result.put("demo_ds_1", DataSourceUtil.createDataSource("demo_ds_1"));
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesAndTablesConfigurationRange.java
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesAndTablesConfigurationRange.java
index 4b5a029301f..56e07b74bd9 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesAndTablesConfigurationRange.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesAndTablesConfigurationRange.java
@@ -48,25 +48,25 @@ public final class
ShardingDatabasesAndTablesConfigurationRange implements Examp
result.getBroadcastTables().add("t_address");
result.setDefaultDatabaseShardingStrategy(new
StandardShardingStrategyConfiguration("user_id", "standard_test_db"));
result.setDefaultTableShardingStrategy(new
StandardShardingStrategyConfiguration("order_id", "standard_test_tbl"));
- result.getShardingAlgorithms() .put("standard_test_db", new
ShardingSphereAlgorithmConfiguration("STANDARD_TEST_DB", new Properties()));
- result.getShardingAlgorithms() .put("standard_test_tbl", new
ShardingSphereAlgorithmConfiguration("STANDARD_TEST_TBL", new Properties()));
+ result.getShardingAlgorithms().put("standard_test_db", new
ShardingSphereAlgorithmConfiguration("STANDARD_TEST_DB", new Properties()));
+ result.getShardingAlgorithms().put("standard_test_tbl", new
ShardingSphereAlgorithmConfiguration("STANDARD_TEST_TBL", new Properties()));
result.getKeyGenerators().put("snowflake", new
ShardingSphereAlgorithmConfiguration("SNOWFLAKE", new Properties()));
return result;
}
- private static ShardingTableRuleConfiguration
getOrderTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration getOrderTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order", "demo_ds_${0..1}.t_order_${[0, 1]}");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_id", "snowflake"));
return result;
}
- private static ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order_item",
"demo_ds_${0..1}.t_order_item_${[0, 1]}");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_item_id", "snowflake"));
return result;
}
- private static Map<String, DataSource> createDataSourceMap() {
+ private Map<String, DataSource> createDataSourceMap() {
Map<String, DataSource> result = new HashMap<>();
result.put("demo_ds_0", DataSourceUtil.createDataSource("demo_ds_0"));
result.put("demo_ds_1", DataSourceUtil.createDataSource("demo_ds_1"));
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationPrecise.java
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationPrecise.java
index 71e2ea60f47..50e9b594f42 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationPrecise.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationPrecise.java
@@ -50,29 +50,29 @@ public final class ShardingDatabasesConfigurationPrecise
implements ExampleConfi
result.setDefaultDatabaseShardingStrategy(new
StandardShardingStrategyConfiguration("user_id", "inline"));
Properties props = new Properties();
props.setProperty("algorithm-expression", "demo_ds_${user_id % 2}");
- result.getShardingAlgorithms() .put("inline", new
ShardingSphereAlgorithmConfiguration("INLINE", props));
+ result.getShardingAlgorithms().put("inline", new
ShardingSphereAlgorithmConfiguration("INLINE", props));
result.getKeyGenerators().put("snowflake", new
ShardingSphereAlgorithmConfiguration("SNOWFLAKE", new Properties()));
return result;
}
- private static ModeConfiguration createModeConfiguration() {
+ private ModeConfiguration createModeConfiguration() {
return new ModeConfiguration("Standalone", new
StandalonePersistRepositoryConfiguration("File", new Properties()), true);
}
- private static ShardingTableRuleConfiguration
getOrderTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration getOrderTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_id", "snowflake"));
return result;
}
- private static ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order_item");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_item_id", "snowflake"));
return result;
}
- private static Map<String, DataSource> createDataSourceMap() {
- Map<String, DataSource> result = new HashMap<>(2, 1);
+ private Map<String, DataSource> createDataSourceMap() {
+ Map<String, DataSource> result = new HashMap<>();
result.put("demo_ds_0", DataSourceUtil.createDataSource("demo_ds_0"));
result.put("demo_ds_1", DataSourceUtil.createDataSource("demo_ds_1"));
return result;
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationRange.java
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationRange.java
index 923d1004b57..fdfed850f14 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationRange.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationRange.java
@@ -51,24 +51,24 @@ public final class ShardingDatabasesConfigurationRange
implements ExampleConfigu
result.getTables().add(getOrderItemTableRuleConfiguration());
result.getBroadcastTables().add("t_address");
result.setDefaultDatabaseShardingStrategy(new
StandardShardingStrategyConfiguration("user_id", "standard_test_db"));
- result.getShardingAlgorithms() .put("standard_test_db", new
ShardingSphereAlgorithmConfiguration("STANDARD_TEST_DB", new Properties()));
+ result.getShardingAlgorithms().put("standard_test_db", new
ShardingSphereAlgorithmConfiguration("STANDARD_TEST_DB", new Properties()));
result.getKeyGenerators().put("snowflake", new
ShardingSphereAlgorithmConfiguration("SNOWFLAKE", new Properties()));
return result;
}
- private static ShardingTableRuleConfiguration
getOrderTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration getOrderTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_id", "snowflake"));
return result;
}
- private static ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order_item");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_item_id", "snowflake"));
return result;
}
- private static Map<String, DataSource> createDataSourceMap() {
+ private Map<String, DataSource> createDataSourceMap() {
Map<String, DataSource> result = new HashMap<>();
result.put("demo_ds_0", DataSourceUtil.createDataSource("demo_ds_0"));
result.put("demo_ds_1", DataSourceUtil.createDataSource("demo_ds_1"));
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingTablesConfigurationPrecise.java
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingTablesConfigurationPrecise.java
index b85671cae52..671c5831c43 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingTablesConfigurationPrecise.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingTablesConfigurationPrecise.java
@@ -47,24 +47,24 @@ public final class ShardingTablesConfigurationPrecise
implements ExampleConfigur
result.getBindingTableGroups().add("t_order, t_order_item");
result.getBroadcastTables().add("t_address");
result.setDefaultTableShardingStrategy(new
StandardShardingStrategyConfiguration("order_id", "standard_test_tbl"));
- result.getShardingAlgorithms() .put("standard_test_tbl", new
ShardingSphereAlgorithmConfiguration("STANDARD_TEST_TBL", new Properties()));
+ result.getShardingAlgorithms().put("standard_test_tbl", new
ShardingSphereAlgorithmConfiguration("STANDARD_TEST_TBL", new Properties()));
result.getKeyGenerators().put("snowflake", new
ShardingSphereAlgorithmConfiguration("SNOWFLAKE", new Properties()));
return result;
}
- private static ShardingTableRuleConfiguration
getOrderTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration getOrderTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order", "demo_ds.t_order_${[0, 1]}");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_id", "snowflake"));
return result;
}
- private static ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order_item", "demo_ds.t_order_item_${[0,
1]}");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_item_id", "snowflake"));
return result;
}
- private static Map<String, DataSource> createDataSourceMap() {
+ private Map<String, DataSource> createDataSourceMap() {
Map<String, DataSource> result = new HashMap<>();
result.put("demo_ds", DataSourceUtil.createDataSource("demo_ds"));
return result;
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingTablesConfigurationRange.java
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingTablesConfigurationRange.java
index c7860129941..daefd29afbf 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingTablesConfigurationRange.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingTablesConfigurationRange.java
@@ -47,24 +47,24 @@ public final class ShardingTablesConfigurationRange
implements ExampleConfigurat
result.getBindingTableGroups().add("t_order, t_order_item");
result.getBroadcastTables().add("t_address");
result.setDefaultTableShardingStrategy(new
StandardShardingStrategyConfiguration("order_id", "standard_test_tbl"));
- result.getShardingAlgorithms() .put("standard_test_tbl", new
ShardingSphereAlgorithmConfiguration("STANDARD_TEST_TBL", new Properties()));
+ result.getShardingAlgorithms().put("standard_test_tbl", new
ShardingSphereAlgorithmConfiguration("STANDARD_TEST_TBL", new Properties()));
result.getKeyGenerators().put("snowflake", new
ShardingSphereAlgorithmConfiguration("SNOWFLAKE", new Properties()));
return result;
}
- private static ShardingTableRuleConfiguration
getOrderTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration getOrderTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order", "demo_ds.t_order_${[0, 1]}");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_id", "snowflake"));
return result;
}
- private static ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
+ private ShardingTableRuleConfiguration
getOrderItemTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order_item", "demo_ds.t_order_item_${[0,
1]}");
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_item_id", "snowflake"));
return result;
}
- private static Map<String, DataSource> createDataSourceMap() {
+ private Map<String, DataSource> createDataSourceMap() {
Map<String, DataSource> result = new HashMap<>();
result.put("demo_ds", DataSourceUtil.createDataSource("demo_ds"));
return result;
