This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 cc119ca Add mysql and hikariCP dependencies (#16413)
cc119ca is described below
commit cc119ca4d18ff805945904b0db568dc80c535750
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Mar 27 21:48:57 2022 +0800
Add mysql and hikariCP dependencies (#16413)
---
.../template/jdbc/java/config/Configuration.ftl | 4 ++--
.../template/jdbc/java/service/ExampleService.ftl | 24 +++++++++++++---------
.../src/main/resources/template/jdbc/pom.ftl | 17 +++++++++++++++
3 files changed, 33 insertions(+), 12 deletions(-)
diff --git
a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/Configuration.ftl
b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/Configuration.ftl
index f06e460..7099847 100644
---
a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/Configuration.ftl
+++
b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/Configuration.ftl
@@ -117,8 +117,8 @@ public final class Configuration {
private DataSource createDataSource(final String dataSourceName) {
HikariDataSource result = new HikariDataSource();
- result.setDriverClassName("com.mysql.jdbc.Driver");
-
result.setJdbcUrl(String.format("jdbc:mysql://%s:%s/%s?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8",
HOST, PORT, dataSourceName));
+ result.setDriverClassName("com.mysql.cj.jdbc.Driver");
+
result.setJdbcUrl(String.format("jdbc:mysql://%s:%s/%s?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true",
HOST, PORT, dataSourceName));
result.setUsername(USER_NAME);
result.setPassword(PASSWORD);
return result;
diff --git
a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/service/ExampleService.ftl
b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/service/ExampleService.ftl
index 6577292..3c7d2f2 100644
---
a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/service/ExampleService.ftl
+++
b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/service/ExampleService.ftl
@@ -24,6 +24,8 @@ import
org.apache.shardingsphere.example.${package}.${framework?replace('-', '.'
import org.apache.shardingsphere.example.${package}.${framework?replace('-',
'.')}.repository.AddressRepository;
import org.apache.shardingsphere.example.${package}.${framework?replace('-',
'.')}.repository.OrderItemRepository;
import org.apache.shardingsphere.example.${package}.${framework?replace('-',
'.')}.repository.OrderRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
<#if framework?contains("spring")>
import org.springframework.stereotype.Service;
@@ -53,6 +55,8 @@ import java.util.List;
</#if>
public final class ExampleService {
+ private static final Logger logger =
LoggerFactory.getLogger(ExampleService.class);
+
private final OrderRepository orderRepository;
private final OrderItemRepository orderItemRepository;
@@ -97,16 +101,16 @@ public final class ExampleService {
}
private void processSuccess() throws SQLException {
- System.out.println("-------------- Process Success Begin
---------------");
+ logger.info("-------------- Process Success Begin ---------------");
List<Long> orderIds = insertData();
printData();
deleteData(orderIds);
printData();
- System.out.println("-------------- Process Success Finish
--------------");
+ logger.info("-------------- Process Success Finish --------------");
}
private List<Long> insertData() throws SQLException {
- System.out.println("---------------------------- Insert Data
----------------------------");
+ logger.info("---------------------------- Insert Data
----------------------------");
List<Long> result = new ArrayList<>(10);
for (int i = 1; i <= 10; i++) {
Order order = new Order();
@@ -134,7 +138,7 @@ public final class ExampleService {
}
private void deleteData(final List<Long> orderIds) throws SQLException {
- System.out.println("---------------------------- Delete Data
----------------------------");
+ logger.info("---------------------------- Delete Data
----------------------------");
long count = 1;
for (Long each : orderIds) {
<#if feature?contains("shadow")>
@@ -147,17 +151,17 @@ public final class ExampleService {
}
private void printData() throws SQLException {
- System.out.println("---------------------------- Print Order Data
-----------------------");
+ logger.info("---------------------------- Print Order Data
-----------------------");
for (Object each : this.selectAll()) {
- System.out.println(each);
+ logger.info(each.toString());
}
- System.out.println("---------------------------- Print OrderItem Data
-------------------");
+ logger.info("---------------------------- Print OrderItem Data
-------------------");
for (Object each : orderItemRepository.selectAll()) {
- System.out.println(each);
+ logger.info(each.toString());
}
- System.out.println("---------------------------- Print Address Data
-------------------");
+ logger.info("---------------------------- Print Address Data
-------------------");
for (Object each : addressRepository.selectAll()) {
- System.out.println(each);
+ logger.info(each.toString());
}
}
diff --git
a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
index c7c52ff..1067a9c 100644
---
a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
+++
b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
@@ -117,6 +117,23 @@
<version>5.2.15.RELEASE</version>
</dependency>
</#if>
+
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>8.0.11</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.7</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.10</version>
+ </dependency>
</dependencies>
<build>
