fixed #231

Author: ujued

txlcn-tc/src/main/java/com/codingapi/txlcn/tc/TCAutoConfiguration.java

@@ -22,10 +22,7 @@
 import com.codingapi.txlcn.tracing.TracingAutoConfiguration;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.*;
 
 /**
  * Description:
@@ -35,8 +32,12 @@
  * @see EnableDistributedTransaction
  */
 @Configuration
-@ComponentScan
-@Import({TxLoggerConfiguration.class, TracingAutoConfiguration.class, DependenciesImportSelector.class})
+@ComponentScan(
+        excludeFilters = @ComponentScan.Filter(
+                type = FilterType.ASPECTJ, pattern = "com.codingapi.txlcn.tc.core.transaction.txc..*"
+        )
+)
+@Import({TxLoggerConfiguration.class, TracingAutoConfiguration.class})
 public class TCAutoConfiguration {
 
     /**

txlcn-tc/src/main/java/com/codingapi/txlcn/tc/config/DependenciesImportSelector.java

@@ -15,10 +15,15 @@
  */
 package com.codingapi.txlcn.tc.config;
 
+import com.codingapi.txlcn.tc.core.transaction.txc.TxcConfiguration;
 import org.springframework.context.annotation.ImportSelector;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.lang.NonNull;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * Description:
  * Date: 1/19/19
@@ -36,8 +41,15 @@ public class DependenciesImportSelector implements ImportSelector {
     @Override
     @NonNull
     public String[] selectImports(@NonNull AnnotationMetadata importingClassMetadata) {
-        return new String[]{
-                "com.codingapi.txlcn.txmsg.MessageConfiguration"
-        };
+        boolean enabledTxc = Boolean.valueOf(
+                Objects.requireNonNull(
+                        importingClassMetadata.getAnnotationAttributes(EnableDistributedTransaction.class.getName()))
+                        .get("enableTxc").toString());
+        List<String> importClasses = new ArrayList<>();
+        importClasses.add("com.codingapi.txlcn.txmsg.MessageConfiguration");
+        if (enabledTxc) {
+            importClasses.add(TxcConfiguration.class.getName());
+        }
+        return importClasses.toArray(new String[0]);
     }
 }

txlcn-tc/src/main/java/com/codingapi/txlcn/tc/config/EnableDistributedTransaction.java

@@ -30,7 +30,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @Documented
-@Import(TCAutoConfiguration.class)
+@Import(value = {TCAutoConfiguration.class, DependenciesImportSelector.class})
 public @interface EnableDistributedTransaction {
-
+    boolean enableTxc() default true;
 }

txlcn-tc/src/main/java/com/codingapi/txlcn/tc/core/transaction/txc/TxcConfiguration.java

@@ -17,6 +17,7 @@
 
 import org.apache.commons.dbutils.QueryRunner;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
@@ -29,6 +30,7 @@
  * @author ujued
  */
 @Configuration
+@ComponentScan
 public class TxcConfiguration {
 
     /**

txlcn-tc/src/test/java/com/codingapi/txlcn/tc/MiniConfiguration.java

@@ -15,8 +15,8 @@
  */
 package com.codingapi.txlcn.tc;
 
+import com.codingapi.txlcn.tc.config.EnableDistributedTransaction;
 import com.zaxxer.hikari.HikariDataSource;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import javax.sql.DataSource;
@@ -28,9 +28,10 @@
  * @author ujued
  */
 @Configuration
+@EnableDistributedTransaction(enableTxc = false)
 public class MiniConfiguration {
 
-    @Bean
+//    @Bean
     public DataSource dataSource() {
         HikariDataSource hikariDataSource = new HikariDataSource();
         hikariDataSource.setDriverClassName("com.mysql.jdbc.Driver");

txlcn-tc/src/test/java/com/codingapi/txlcn/tc/RpcTest.java

@@ -37,7 +37,7 @@
  * @author ujued
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = {TCAutoConfiguration.class, MiniConfiguration.class})
+@SpringBootTest(classes = MiniConfiguration.class)
 public class RpcTest {
 
     @Autowired
@@ -93,4 +93,9 @@ public void testCluster() throws RpcException {
         messenger.request(new MessageDto());
     }
 
+    @Test
+    public void testTxc() {
+
+    }
+
 }