Skip to content

Commit

Permalink
Merge pull request #547 from bestwu/dev
Browse files Browse the repository at this point in the history 
fix #544.Add additional-spring-configuration-metadata.json and spring…
  • Loading branch information
@haocao
haocao authored Jan 11, 2018
2 parents d5d7391 + e4f8b3c commit 6e6b044
Show file tree
Hide file tree
Showing 5 changed files with 547 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,12 @@
<version>${spring-boot.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${spring-boot.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions sharding-jdbc-core-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
Expand Down
217 changes: 217 additions & 0 deletions ...ng-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
{
"groups": [
{
"name": "sharding.jdbc.datasource",
"type": "io.shardingjdbc.spring.boot.SpringBootConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy",
"type": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlComplexShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.complex",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlComplexShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlHintShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.hint",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlHintShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlInlineShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.inline",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlInlineShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.standard",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy",
"type": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlComplexShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.complex",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlComplexShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlHintShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.hint",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlHintShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlInlineShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.inline",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlInlineShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.standard",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration"
}
],
"properties": [
{
"name": "sharding.jdbc.datasource.names",
"type": "java.lang.String",
"sourceType": "io.shardingjdbc.spring.boot.SpringBootConfiguration"
},
{
"name": "sharding.jdbc.datasource",
"type": "java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Object>>",
"sourceType": "io.shardingjdbc.core.util.DataSourceUtil"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.complex",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlComplexShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlComplexShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.complex.algorithm-class-name",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlComplexShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.complex.sharding-columns",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.hint",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlHintShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlHintShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.hint.algorithm-class-name",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.inline",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlInlineShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlInlineShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.inline.algorithm-expression",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlInlineShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.inline.sharding-column",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.none",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlNoneShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.standard",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.standard.precise-algorithm-class-name",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.standard.range-algorithm-class-name",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-database-strategy.standard.sharding-column",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.complex",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlComplexShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlComplexShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.complex.algorithm-class-name",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlComplexShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.complex.sharding-columns",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.hint",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlHintShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlHintShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.hint.algorithm-class-name",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.inline",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlInlineShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlInlineShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.inline.algorithm-expression",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlInlineShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.inline.sharding-column",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.none",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlNoneShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.YamlShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.standard",
"type": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.standard.precise-algorithm-class-name",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.standard.range-algorithm-class-name",
"type": "java.lang.String"
},
{
"sourceType": "io.shardingjdbc.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration",
"name": "sharding.jdbc.config.sharding.default-table-strategy.standard.sharding-column",
"type": "java.lang.String"
}
],
"hints": [
{
"name": "sharding.jdbc.datasource.keys",
"values": []
},
{
"name": "sharding.jdbc.datasource.values",
"values": [
],
"providers": [
{
"name": "any"
}
]
}
]
}

5 changes: 5 additions & 0 deletions sharding-jdbc-orchestration-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
Expand Down
Loading

0 comments on commit 6e6b044

Please sign in to comment.