From 2bdb6014d46a3b722d10beedf78193f359d6ed93 Mon Sep 17 00:00:00 2001
From: cherrylzhao <zhaojunv3@126.com>
Date: Wed, 13 Mar 2019 21:52:39 +0800
Subject: [PATCH] revise example for XA transaction.

---
 .../transaction/xa/spring/boot/SpringBootExample.java       | 2 +-
 .../saga/raw/jdbc/YamlConfigurationTransactionExample.java  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sharding-jdbc-example/transaction-example/transaction-2pc-xa-example/transaction-xa-spring-boot-example/src/main/java/io/shardingsphere/example/transaction/xa/spring/boot/SpringBootExample.java b/sharding-jdbc-example/transaction-example/transaction-2pc-xa-example/transaction-xa-spring-boot-example/src/main/java/io/shardingsphere/example/transaction/xa/spring/boot/SpringBootExample.java
index a0f760e9d4..c19f427892 100644
--- a/sharding-jdbc-example/transaction-example/transaction-2pc-xa-example/transaction-xa-spring-boot-example/src/main/java/io/shardingsphere/example/transaction/xa/spring/boot/SpringBootExample.java
+++ b/sharding-jdbc-example/transaction-example/transaction-2pc-xa-example/transaction-xa-spring-boot-example/src/main/java/io/shardingsphere/example/transaction/xa/spring/boot/SpringBootExample.java
@@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfigurati
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 
-@ComponentScan({"io.shardingsphere.example.common.jpa", "io.shardingsphere.example.transaction.xa.spring.boot"})
+@ComponentScan({"io.shardingsphere.example"})
 @EntityScan(basePackages = "io.shardingsphere.example.common.jpa.entity")
 @SpringBootApplication(exclude = JtaAutoConfiguration.class)
 public class SpringBootExample {
diff --git a/sharding-jdbc-example/transaction-example/transaction-base-saga-example/transaction-saga-raw-jdbc-example/src/main/java/io/shardingsphere/example/transaction/saga/raw/jdbc/YamlConfigurationTransactionExample.java b/sharding-jdbc-example/transaction-example/transaction-base-saga-example/transaction-saga-raw-jdbc-example/src/main/java/io/shardingsphere/example/transaction/saga/raw/jdbc/YamlConfigurationTransactionExample.java
index df0396addb..9722e0f381 100644
--- a/sharding-jdbc-example/transaction-example/transaction-base-saga-example/transaction-saga-raw-jdbc-example/src/main/java/io/shardingsphere/example/transaction/saga/raw/jdbc/YamlConfigurationTransactionExample.java
+++ b/sharding-jdbc-example/transaction-example/transaction-base-saga-example/transaction-saga-raw-jdbc-example/src/main/java/io/shardingsphere/example/transaction/saga/raw/jdbc/YamlConfigurationTransactionExample.java
@@ -22,8 +22,6 @@ import io.shardingsphere.example.common.jdbc.repository.OrderItemRepositoryImpl;
 import io.shardingsphere.example.common.jdbc.repository.OrderRepositoryImpl;
 import io.shardingsphere.example.common.jdbc.service.CommonServiceImpl;
 import io.shardingsphere.example.common.service.CommonService;
-import io.shardingsphere.example.type.ShardingType;
-import org.apache.shardingsphere.shardingjdbc.api.yaml.YamlMasterSlaveDataSourceFactory;
 import org.apache.shardingsphere.shardingjdbc.api.yaml.YamlShardingDataSourceFactory;
 import org.apache.shardingsphere.transaction.core.TransactionType;
 import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
@@ -46,7 +44,7 @@ public class YamlConfigurationTransactionExample {
         DataSource dataSource = YamlShardingDataSourceFactory.createDataSource(getFile(configFile));
         CommonService commonService = getCommonService(dataSource);
         commonService.initEnvironment();
-        processBaseTransaction(dataSource, commonService);
+        processSagaTransaction(dataSource, commonService);
         commonService.cleanEnvironment();
     }
     
@@ -58,7 +56,7 @@ public class YamlConfigurationTransactionExample {
         return new CommonServiceImpl(new OrderRepositoryImpl(dataSource), new OrderItemRepositoryImpl(dataSource));
     }
     
-    private static void processBaseTransaction(final DataSource dataSource, final CommonService commonService) throws SQLException {
+    private static void processSagaTransaction(final DataSource dataSource, final CommonService commonService) throws SQLException {
         TransactionTypeHolder.set(TransactionType.BASE);
         System.out.println("------ start succeed transaction ------");
         try (Connection connection = dataSource.getConnection()) {
-- 
GitLab