[shardingsphere] branch master updated (d413343 -> a14e172)

[zh...@apache.org]

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

zhangliang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.


    from d413343  Fix typo DataSource Properties (#14530)
     add a14e172  Integration of jdbc templates and adjustment examples (#14517)

No new revisions were added by this update.

Summary of changes:
 .../example/engine/ExampleTemplateFactory.java     |  31 +--
 .../src/main/resources/template/Example.ftl        |   1 -
 .../src/main/resources/template/entity/Order.ftl   |  15 +-
 .../main/resources/template/entity/OrderItem.ftl   |  15 +-
 .../src/main/resources/template/entity/User.ftl    |  96 --------
 .../resources/template/jdbc/ExampleService.ftl     | 220 ++++++++++++++++--
 .../jdbc/{Configuration.ftl => configuration.ftl}  |   0
 .../src/main/resources/template/jdbc/encrypt.ftl   |  15 +-
 .../template/jdbc/orderExampleService.ftl          | 189 ---------------
 .../template/jdbc/readwrite-splitting.ftl          |   1 +
 .../src/main/resources/template/jdbc/shadow.ftl    |   8 +-
 .../template/jdbc/shadowExampleService.ftl         | 166 --------------
 .../src/main/resources/template/jdbc/sharding.ftl  |   1 +
 .../resources/template/jdbc/userExampleService.ftl | 115 ----------
 .../main/resources/template/properties/encrypt.ftl |  19 +-
 .../main/resources/template/properties/shadow.ftl  |  10 +-
 .../src/main/resources/template/xml/encrypt.ftl    |  12 +-
 .../src/main/resources/template/xml/shadow.ftl     |   8 +-
 .../MemoryLocalDbDiscoveryJdbcConfiguration.java   |   6 +-
 .../jdbc/MemoryLocalDbDiscoveryJdbcExample.java    |   1 -
 .../MemoryLocalDbDiscoveryJdbcExampleService.java  |  53 +++--
 .../example/db/discovery/jdbc/entity/Order.java    |  12 +-
 .../db/discovery/jdbc/entity/OrderItem.java        |  12 +-
 ...scoverySpringBootStarterJdbcExampleService.java |  53 +++--
 .../spring/boot/starter/jdbc/entity/Order.java     |  12 +-
 .../spring/boot/starter/jdbc/entity/OrderItem.java |  12 +-
 ...DiscoverySpringNamespaceJdbcExampleService.java |  53 +++--
 .../spring/namespace/jdbc/entity/Order.java        |  12 +-
 .../spring/namespace/jdbc/entity/OrderItem.java    |  12 +-
 .../src/main/resources/application.xml             |   3 +
 .../jdbc/MemoryLocalEncryptJdbcConfiguration.java  |  17 +-
 .../jdbc/MemoryLocalEncryptJdbcExample.java        |   5 +-
 .../jdbc/MemoryLocalEncryptJdbcExampleService.java | 171 ++++++++++----
 .../TestQueryAssistedShardingEncryptAlgorithm.java |   5 +-
 .../example/encrypt/jdbc/entity/Order.java         |  12 +-
 .../example/encrypt/jdbc/entity/OrderItem.java     |  12 +-
 .../example/encrypt/jdbc/entity/User.java          |  60 -----
 ...che.shardingsphere.encrypt.spi.EncryptAlgorithm |   2 +-
 ...EncryptSpringBootStarterJdbcExampleService.java | 162 +++++++++----
 .../spring/boot/starter/jdbc/entity/Order.java     |  14 +-
 .../boot/starter/jdbc}/entity/OrderItem.java       |  14 +-
 .../spring/boot/starter/jdbc/entity/User.java      |  60 -----
 .../src/main/resources/application.properties      |  21 +-
 ...alEncryptSpringNamespaceJdbcExampleService.java | 160 +++++++++----
 .../spring/namespace}/jdbc/entity/Order.java       |  14 +-
 .../spring/namespace/jdbc}/entity/OrderItem.java   |  14 +-
 .../encrypt/spring/namespace/jdbc/entity/User.java |  60 -----
 .../src/main/resources/application.xml             |  32 ++-
 ...ryLocalReadwriteSplittingJdbcConfiguration.java |   2 +-
 .../MemoryLocalReadwriteSplittingJdbcExample.java  |   4 +-
 ...yLocalReadwriteSplittingJdbcExampleService.java |  38 +--
 .../readwrite/splitting/jdbc/entity/Order.java     |  12 +-
 .../readwrite/splitting/jdbc/entity/OrderItem.java |  12 +-
 .../src/main/resources/logback.xml                 |   2 +-
 ...littingSpringBootStarterJdbcExampleService.java |  54 +++--
 .../spring/boot/starter/jdbc/entity/Order.java     |  12 +-
 .../spring/boot/starter/jdbc/entity/OrderItem.java |  12 +-
 ...SplittingSpringNamespaceJdbcExampleService.java |  53 +++--
 .../spring/namespace/jdbc/entity/Order.java        |  12 +-
 .../spring/namespace/jdbc/entity/OrderItem.java    |  12 +-
 .../src/main/resources/application.xml             |  16 +-
 .../src/main/resources/logback.xml                 |   2 +-
 .../jdbc/MemoryLocalShadowJdbcConfiguration.java   |  17 +-
 .../jdbc/MemoryLocalShadowJdbcExampleService.java  | 250 +++++++++++---------
 .../example/shadow}/jdbc/entity/Order.java         |  14 +-
 .../example/shadow}/jdbc/entity/OrderItem.java     |  14 +-
 .../example/shadow/jdbc/entity/User.java           |  70 ------
 ...lShadowSpringBootStarterJdbcExampleService.java | 254 ++++++++++++---------
 .../spring/boot/starter/jdbc/entity/Order.java     |  14 +-
 .../boot/starter/jdbc}/entity/OrderItem.java       |  14 +-
 .../spring/boot/starter/jdbc/entity/User.java      |  70 ------
 .../src/main/resources/application.properties      |  10 +-
 ...calShadowSpringNamespaceJdbcExampleService.java | 250 +++++++++++---------
 .../spring/namespace}/jdbc/entity/Order.java       |  14 +-
 .../spring/namespace/jdbc}/entity/OrderItem.java   |  14 +-
 .../shadow/spring/namespace/jdbc/entity/User.java  |  70 ------
 .../src/main/resources/application.xml             |  10 +-
 .../jdbc/MemoryLocalShardingJdbcConfiguration.java |   4 +-
 .../jdbc/MemoryLocalShardingJdbcExample.java       |   5 +-
 .../MemoryLocalShardingJdbcExampleService.java     |  54 ++---
 .../example/sharding/jdbc/entity/Order.java        |  12 +-
 .../example/sharding/jdbc/entity/OrderItem.java    |  12 +-
 .../src/main/resources/logback.xml                 |   2 +-
 ...hardingSpringBootStarterJdbcExampleService.java |  54 +++--
 .../spring/boot/starter/jdbc/entity/Order.java     |  12 +-
 .../spring/boot/starter/jdbc/entity/OrderItem.java |  12 +-
 .../src/main/resources/application.properties      |   1 -
 ...oryLocalShardingSpringNamespaceJdbcExample.java |   2 +-
 ...lShardingSpringNamespaceJdbcExampleService.java |  53 +++--
 .../spring/namespace/jdbc/entity/Order.java        |  12 +-
 .../spring/namespace/jdbc/entity/OrderItem.java    |  12 +-
 .../src/main/resources/application.xml             |  29 ++-
 .../src/main/resources/logback.xml                 |   0
 93 files changed, 1774 insertions(+), 1828 deletions(-)
 delete mode 100644 examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/entity/User.ftl
 rename examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/{Configuration.ftl => configuration.ftl} (100%)
 delete mode 100644 examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/orderExampleService.ftl
 delete mode 100644 examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/shadowExampleService.ftl
 delete mode 100644 examples/shardingsphere-sample/shardingsphere-example-engine/src/main/resources/template/jdbc/userExampleService.ftl
 copy examples/{example-core/config-utility/src/main/java/org/apache/shardingsphere/example/fixture => shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/jdbc}/TestQueryAssistedShardingEncryptAlgorithm.java (96%)
 delete mode 100644 examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/jdbc/entity/User.java
 copy examples/{example-core/config-utility => shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-jdbc-example}/src/main/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm (89%)
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-db-discovery-example/shardingsphere-jdbc-memory-local-db-discovery-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/db/discovery => shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardin [...]
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-db-discovery-example/shardingsphere-jdbc-memory-local-db-discovery-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/db/discovery/spring/boot/starter/mybatis => shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/s [...]
 delete mode 100644 examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/boot/starter/jdbc/entity/User.java
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-db-discovery-example/shardingsphere-jdbc-memory-local-db-discovery-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/db/discovery/spring/boot/starter => shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/main/java/o [...]
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-db-discovery-example/shardingsphere-jdbc-memory-local-db-discovery-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/db/discovery/spring/boot/starter/mybatis => shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/ [...]
 delete mode 100644 examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-encrypt-example/shardingsphere-jdbc-memory-local-encrypt-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/spring/namespace/jdbc/entity/User.java
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-db-discovery-example/shardingsphere-jdbc-memory-local-db-discovery-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/db/discovery/spring/boot/starter => shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardings [...]
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-db-discovery-example/shardingsphere-jdbc-memory-local-db-discovery-jdbc-example/src/main/java/org/apache/shardingsphere/example/db/discovery => shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow}/jdbc/entity/OrderI [...]
 delete mode 100644 examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/jdbc/entity/User.java
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-db-discovery-example/shardingsphere-jdbc-memory-local-db-discovery-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/db/discovery => shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardings [...]
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-db-discovery-example/shardingsphere-jdbc-memory-local-db-discovery-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/db/discovery/spring/boot/starter/mybatis => shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-jdbc-example/src [...]
 delete mode 100644 examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/boot/starter/jdbc/entity/User.java
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-db-discovery-example/shardingsphere-jdbc-memory-local-db-discovery-spring-boot-starter-jdbc-example/src/main/java/org/apache/shardingsphere/example/db/discovery/spring/boot/starter => shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-jdbc-example/src/main/java/org [...]
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/{shardingsphere-jdbc-memory-local-db-discovery-example/shardingsphere-jdbc-memory-local-db-discovery-spring-boot-starter-mybatis-example/src/main/java/org/apache/shardingsphere/example/db/discovery/spring/boot/starter/mybatis => shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-jdbc-example/src/ma [...]
 delete mode 100644 examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-shadow-example/shardingsphere-jdbc-memory-local-shadow-spring-namespace-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/spring/namespace/jdbc/entity/User.java
 copy examples/shardingsphere-sample/shardingsphere-jdbc-sample/shardingsphere-jdbc-memory-example/shardingsphere-jdbc-memory-local-example/shardingsphere-jdbc-memory-local-sharding-example/{shardingsphere-jdbc-memory-local-sharding-spring-boot-starter-mybatis-example => shardingsphere-jdbc-memory-local-sharding-spring-namespace-jdbc-example}/src/main/resources/logback.xml (100%)