Refactor orchestration spring boot starter.

cxfly · Nov 2, 2017 · 3e033d2 · 3e033d2
1 parent 94771f3
commit 3e033d2
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/pom.xml b/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/pom.xml
@@ -7,11 +7,6 @@
     </parent>
     <artifactId>sharding-jdbc-orchestration-spring-boot-starter</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>io.shardingjdbc</groupId>
-            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>

diff --git a/.../java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java b/.../java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java
@@ -7,9 +7,9 @@
 import io.shardingjdbc.core.util.DataSourceUtil;
 import io.shardingjdbc.orchestration.api.OrchestrationMasterSlaveDataSourceFactory;
 import io.shardingjdbc.orchestration.api.OrchestrationShardingDataSourceFactory;
+import io.shardingjdbc.orchestration.spring.boot.masterslave.SpringBootMasterSlaveRuleConfigurationProperties;
 import io.shardingjdbc.orchestration.spring.boot.orchestration.OrchestrationSpringBootConfigurationProperties;
-import io.shardingjdbc.spring.boot.masterslave.SpringBootMasterSlaveRuleConfigurationProperties;
-import io.shardingjdbc.spring.boot.sharding.SpringBootShardingRuleConfigurationProperties;
+import io.shardingjdbc.orchestration.spring.boot.sharding.SpringBootShardingRuleConfigurationProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.bind.RelaxedPropertyResolver;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

diff --git a/...chestration/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java b/...chestration/spring/boot/masterslave/SpringBootMasterSlaveRuleConfigurationProperties.java
@@ -0,0 +1,13 @@
+package io.shardingjdbc.orchestration.spring.boot.masterslave;
+
+import io.shardingjdbc.core.yaml.masterslave.YamlMasterSlaveRuleConfiguration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Master slave rule configuration properties.
+ *
+ * @author caohao
+ */
+@ConfigurationProperties(prefix = "sharding.jdbc.config.masterslave")
+public class SpringBootMasterSlaveRuleConfigurationProperties extends YamlMasterSlaveRuleConfiguration {
+}
diff --git a/...dbc/orchestration/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java b/...dbc/orchestration/spring/boot/sharding/SpringBootShardingRuleConfigurationProperties.java
@@ -0,0 +1,13 @@
+package io.shardingjdbc.orchestration.spring.boot.sharding;
+
+import io.shardingjdbc.core.yaml.sharding.YamlShardingRuleConfiguration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Sharding rule configuration properties.
+ *
+ * @author caohao
+ */
+@ConfigurationProperties(prefix = "sharding.jdbc.config.sharding")
+public class SpringBootShardingRuleConfigurationProperties extends YamlShardingRuleConfiguration {
+}