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 6a70d74 Migration sharding-readwrite-splitting example (#12951)
6a70d74 is described below
commit 6a70d74de389b16dd2b1a30c62c15f9f49954d52
Author: yx9o <[email protected]>
AuthorDate: Sat Oct 9 15:05:40 2021 +0800
Migration sharding-readwrite-splitting example (#12951)
---
.../jpa/repository/ShadowUserRepositoryImpl.java | 4 +--
.../pom.xml | 14 ++++++++++-
...adwriteSplittingSpringNamespaceJpaExample.java} | 4 +--
.../application-sharding-readwrite-splitting.xml | 0
.../{pom.xml => src/main/resources/logback.xml} | 29 ++++++++++++----------
...iteSplittingSpringNamespaceMybatisExample.java} | 2 +-
.../jpa/ShardingSpringNamespaceJpaExample.java | 1 -
7 files changed, 34 insertions(+), 20 deletions(-)
diff --git
a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/repository/ShadowUserRepositoryImpl.java
b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/repository/ShadowUserRepositoryImpl.java
index 5df391d..526307d 100644
---
a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/repository/ShadowUserRepositoryImpl.java
+++
b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/repository/ShadowUserRepositoryImpl.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.example.core.jpa.repository;
import org.apache.shardingsphere.example.core.api.entity.ShadowUser;
-import org.apache.shardingsphere.example.core.api.repository.CommonRepository;
+import
org.apache.shardingsphere.example.core.api.repository.ShadowUserRepository;
import org.springframework.stereotype.Repository;
import javax.persistence.EntityManager;
@@ -30,7 +30,7 @@ import java.util.List;
@Repository
@Transactional
-public class ShadowUserRepositoryImpl implements CommonRepository<ShadowUser,
Long> {
+public class ShadowUserRepositoryImpl implements ShadowUserRepository {
@PersistenceContext
private EntityManager entityManager;
diff --git
a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/pom.xml
b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/pom.xml
index 29476e6..66859b2 100644
---
a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/pom.xml
@@ -26,6 +26,18 @@
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>sharding-readwrite-splitting-spring-namespace-jpa-example</artifactId>
- <packaging>pom</packaging>
<name>${project.artifactId}</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere.example</groupId>
+ <artifactId>example-spring-jpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-jdbc-core-spring-namespace</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git
a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/spring/namespace/mybatis/ShardingSpringNamespaceMybatisExample.java
b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/src/main/java/org/apa
[...]
similarity index 94%
copy from
examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/spring/namespace/mybatis/ShardingSpringNamespaceMybatisExample.java
copy to
examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/spring/namespace/jpa/ShardingReadwriteSplittingSpringNamespaceJpaExample.java
index a8b58d4..4b3a533 100644
---
a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/spring/namespace/mybatis/ShardingSpringNamespaceMybatisExample.java
+++
b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/spring/namespace/jpa/ShardingReadwriteSplittingSpringNamespaceJpaExample.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.example.sharding.readwrite.splitting.spring.namespace.mybatis;
+package
org.apache.shardingsphere.example.sharding.readwrite.splitting.spring.namespace.jpa;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
@@ -24,7 +24,7 @@ import
org.springframework.context.support.ClassPathXmlApplicationContext;
import java.sql.SQLException;
-public final class ShardingSpringNamespaceMybatisExample {
+public final class ShardingReadwriteSplittingSpringNamespaceJpaExample {
private static final String CONFIG_FILE =
"META-INF/application-sharding-readwrite-splitting.xml";
diff --git
a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/application-sharding-readwrite-splitting.xml
b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-readwrite-splitting.xml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/application-sharding-readwrite-splitting.xml
rename to
examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-readwrite-splitting.xml
diff --git
a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/pom.xml
b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/src/main/resources/logback.xml
similarity index 57%
copy from
examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/pom.xml
copy to
examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/src/main/resources/logback.xml
index 29476e6..2972694 100644
---
a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-jpa-example/src/main/resources/logback.xml
@@ -16,16 +16,19 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.shardingsphere.example</groupId>
- <artifactId>sharding-readwrite-splitting-example</artifactId>
- <version>5.0.0-RC1-SNAPSHOT</version>
- </parent>
-
<artifactId>sharding-readwrite-splitting-spring-namespace-jpa-example</artifactId>
- <packaging>pom</packaging>
- <name>${project.artifactId}</name>
-</project>
+<configuration>
+ <property name="log.context.name"
value="sharding-readwrite-splitting-spring-namespace-jpa-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" />
+ </root>
+</configuration>
diff --git
a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/spring/namespace/mybatis/ShardingSpringNamespaceMybatisExample.java
b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-mybatis-example/src/main/java/org
[...]
similarity index 95%
rename from
examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/spring/namespace/mybatis/ShardingSpringNamespaceMybatisExample.java
rename to
examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/spring/namespace/mybatis/ShardingReadwriteSplittingSpringNamespaceMybatisExample.java
index a8b58d4..bc5d938 100644
---
a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/spring/namespace/mybatis/ShardingSpringNamespaceMybatisExample.java
+++
b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-spring-namespace-mybatis-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/spring/namespace/mybatis/ShardingReadwriteSplittingSpringNamespaceMybatisExample.java
@@ -24,7 +24,7 @@ import
org.springframework.context.support.ClassPathXmlApplicationContext;
import java.sql.SQLException;
-public final class ShardingSpringNamespaceMybatisExample {
+public final class ShardingReadwriteSplittingSpringNamespaceMybatisExample {
private static final String CONFIG_FILE =
"META-INF/application-sharding-readwrite-splitting.xml";
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/jpa/ShardingSpringNamespaceJpaExample.java
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/jpa/ShardingSpringNamespaceJpaExample.java
index 0fcda39..863ff38 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/jpa/ShardingSpringNamespaceJpaExample.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/java/org/apache/shardingsphere/example/sharding/spring/namespace/jpa/ShardingSpringNamespaceJpaExample.java
@@ -30,7 +30,6 @@ public final class ShardingSpringNamespaceJpaExample {
// private static final String CONFIG_FILE =
"META-INF/application-sharding-tables.xml";
// private static final String CONFIG_FILE =
"META-INF/application-sharding-databases-tables.xml";
// private static final String CONFIG_FILE =
"META-INF/application-readwrite-splitting.xml";
-// private static final String CONFIG_FILE =
"META-INF/application-sharding-readwrite-splitting.xml";
public static void main(final String[] args) throws SQLException {
try (ConfigurableApplicationContext applicationContext = new
ClassPathXmlApplicationContext(CONFIG_FILE)) {
