This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 735345f Refactor class-based example to facilitate adding more types
of examples. (#15762)
735345f is described below
commit 735345f43d3656c31f16a338c4eee5e85cbf396a
Author: yx9o <[email protected]>
AuthorDate: Wed Mar 2 21:56:31 2022 +0800
Refactor class-based example to facilitate adding more types of examples.
(#15762)
* Refactor class-based example to facilitate adding more types of examples.
* Update.
* Update.
* Update.
---
.../{ => class-based-sharding-raw-jdbc-example}/pom.xml | 4 ++--
.../ClassBasedShardingRawYamlConfigurationExample.java} | 6 +++---
.../sharding/raw/jdbc}/factory/YamlDataSourceFactory.java | 2 +-
.../ClassBasedStandardShardingAlgorithmFixture.java | 2 +-
.../src/main/resources/META-INF/sharding-databases.yaml | 2 +-
.../src/main/resources/logback.xml | 12 ++++++------
.../class-based-sharding-algorithm-example/pom.xml | 15 ++++-----------
7 files changed, 18 insertions(+), 25 deletions(-)
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/pom.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/pom.xml
similarity index 92%
copy from
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/pom.xml
copy to
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/pom.xml
index 3e26169..a4e5aff 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere.example</groupId>
- <artifactId>custom-sharding-algortihm-example</artifactId>
+ <artifactId>class-based-sharding-algorithm-example</artifactId>
<version>${revision}</version>
</parent>
- <artifactId>class-based-sharding-algorithm-example</artifactId>
+ <artifactId>class-based-sharding-raw-jdbc-example</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/java/org/apache/shardingsphere/example/extension/sharding/algortihm/classbased/YamlClassBasedShardingAlgorithmExample.java
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/ma
[...]
similarity index 86%
rename from
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/java/org/apache/shardingsphere/example/extension/sharding/algortihm/classbased/YamlClassBasedShardingAlgorithmExample.java
rename to
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/extension/classbased/sharding/raw/jdbc/ClassBasedShardingRawYamlConfigurationExample.java
index cac71e0..f4efb70 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/java/org/apache/shardingsphere/example/extension/sharding/algortihm/classbased/YamlClassBasedShardingAlgorithmExample.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/extension/classbased/sharding/raw/jdbc/ClassBasedShardingRawYamlConfigurationExample.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.example.extension.sharding.algortihm.classbased;
+package
org.apache.shardingsphere.example.extension.classbased.sharding.raw.jdbc;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
import org.apache.shardingsphere.example.core.jdbc.service.OrderServiceImpl;
-import
org.apache.shardingsphere.example.extension.sharding.algortihm.classbased.factory.YamlDataSourceFactory;
+import
org.apache.shardingsphere.example.extension.classbased.sharding.raw.jdbc.factory.YamlDataSourceFactory;
import org.apache.shardingsphere.example.type.ShardingType;
import javax.sql.DataSource;
import java.io.IOException;
import java.sql.SQLException;
-public final class YamlClassBasedShardingAlgorithmExample {
+public final class ClassBasedShardingRawYamlConfigurationExample {
private static ShardingType shardingType = ShardingType.SHARDING_DATABASES;
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/java/org/apache/shardingsphere/example/extension/sharding/algortihm/classbased/factory/YamlDataSourceFactory.java
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/java/o
[...]
similarity index 94%
rename from
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/java/org/apache/shardingsphere/example/extension/sharding/algortihm/classbased/factory/YamlDataSourceFactory.java
rename to
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/extension/classbased/sharding/raw/jdbc/factory/YamlDataSourceFactory.java
index 0c593cf..2ec827a 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/java/org/apache/shardingsphere/example/extension/sharding/algortihm/classbased/factory/YamlDataSourceFactory.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/extension/classbased/sharding/raw/jdbc/factory/YamlDataSourceFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.example.extension.sharding.algortihm.classbased.factory;
+package
org.apache.shardingsphere.example.extension.classbased.sharding.raw.jdbc.factory;
import
org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
import org.apache.shardingsphere.example.type.ShardingType;
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/java/org/apache/shardingsphere/example/extension/sharding/algortihm/classbased/fixture/ClassBasedStandardShardingAlgorithmFixture.java
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-ex
[...]
similarity index 96%
rename from
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/java/org/apache/shardingsphere/example/extension/sharding/algortihm/classbased/fixture/ClassBasedStandardShardingAlgorithmFixture.java
rename to
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/extension/classbased/sharding/raw/jdbc/fixture/ClassBasedStandardShardingAlgorithmFixture.java
index 099a291..27a068b 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/java/org/apache/shardingsphere/example/extension/sharding/algortihm/classbased/fixture/ClassBasedStandardShardingAlgorithmFixture.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/extension/classbased/sharding/raw/jdbc/fixture/ClassBasedStandardShardingAlgorithmFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.example.extension.sharding.algortihm.classbased.fixture;
+package
org.apache.shardingsphere.example.extension.classbased.sharding.raw.jdbc.fixture;
import com.google.common.base.Preconditions;
import com.google.common.primitives.Ints;
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/resources/META-INF/sharding-databases.yaml
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases.yaml
similarity index 96%
rename from
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/resources/META-INF/sharding-databases.yaml
rename to
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases.yaml
index ec04289..eb4cf78 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/resources/META-INF/sharding-databases.yaml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases.yaml
@@ -58,7 +58,7 @@ rules:
type: CLASS_BASED
props:
strategy: standard
- algorithmClassName:
org.apache.shardingsphere.example.extension.sharding.algortihm.classbased.fixture.ClassBasedStandardShardingAlgorithmFixture
+ algorithmClassName:
org.apache.shardingsphere.example.extension.classbased.sharding.raw.jdbc.fixture.ClassBasedStandardShardingAlgorithmFixture
sharding-count: 2
keyGenerators:
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/resources/logback.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/resources/logback.xml
similarity index 88%
rename from
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/resources/logback.xml
rename to
examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/resources/logback.xml
index 879ec20..161fa97 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/src/main/resources/logback.xml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/resources/logback.xml
@@ -17,18 +17,18 @@
-->
<configuration>
- <property name="log.context.name"
value="class-based-sharding-algorithm-example" />
- <property name="log.charset" value="UTF-8" />
- <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger]
%msg %n" />
+ <property name="log.context.name"
value="class-based-sharding-raw-jdbc-example"/>
+ <property name="log.charset" value="UTF-8"/>
+ <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger]
%msg %n"/>
<contextName>${log.context.name}</contextName>
-
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder charset="${log.charset}">
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
<root>
- <level value="INFO" />
- <appender-ref ref="STDOUT" />
+ <level value="INFO"/>
+ <appender-ref ref="STDOUT"/>
</root>
</configuration>
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/pom.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/pom.xml
index 3e26169..fea81e9 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/pom.xml
@@ -27,16 +27,9 @@
</parent>
<artifactId>class-based-sharding-algorithm-example</artifactId>
<name>${project.artifactId}</name>
+ <packaging>pom</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere.example</groupId>
- <artifactId>example-raw-jdbc</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-jdbc-core</artifactId>
- </dependency>
- </dependencies>
+ <modules>
+ <module>class-based-sharding-raw-jdbc-example</module>
+ </modules>
</project>
