Skip to content

Commit

Permalink
for #1302, Rename sharding-jdbc-spring's base package to io.shardings…
Browse files Browse the repository at this point in the history
…phere.shardingjdbc
  • Loading branch information
terrymanu committed Sep 26, 2018
1 parent 091e9bf commit 9d200ad
Show file tree
Hide file tree
Showing 56 changed files with 128 additions and 128 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.boot;
package io.shardingsphere.shardingjdbc.spring.boot;

import com.google.common.base.Preconditions;
import io.shardingsphere.core.exception.ShardingException;
import io.shardingsphere.shardingjdbc.api.MasterSlaveDataSourceFactory;
import io.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory;
import io.shardingsphere.core.exception.ShardingException;
import io.shardingsphere.shardingjdbc.spring.boot.masterslave.SpringBootMasterSlaveRuleConfigurationProperties;
import io.shardingsphere.shardingjdbc.spring.boot.sharding.SpringBootShardingRuleConfigurationProperties;
import io.shardingsphere.shardingjdbc.spring.boot.util.PropertyUtil;
import io.shardingsphere.shardingjdbc.util.DataSourceUtil;
import io.shardingsphere.jdbc.spring.boot.masterslave.SpringBootMasterSlaveRuleConfigurationProperties;
import io.shardingsphere.jdbc.spring.boot.sharding.SpringBootShardingRuleConfigurationProperties;
import io.shardingsphere.jdbc.spring.boot.util.PropertyUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.EnvironmentAware;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.boot.masterslave;
package io.shardingsphere.shardingjdbc.spring.boot.masterslave;

import io.shardingsphere.core.yaml.masterslave.YamlMasterSlaveRuleConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.boot.sharding;
package io.shardingsphere.shardingjdbc.spring.boot.sharding;

import io.shardingsphere.core.yaml.sharding.YamlShardingRuleConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.boot.util;
package io.shardingsphere.shardingjdbc.spring.boot.util;

import io.shardingsphere.core.exception.ShardingException;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"groups": [
{
"name": "sharding.jdbc.datasource",
"type": "io.shardingsphere.jdbc.spring.boot.SpringBootConfiguration"
"type": "io.shardingsphere.shardingjdbc.spring.boot.SpringBootConfiguration"
},
{
"sourceType": "io.shardingsphere.core.yaml.sharding.YamlShardingStrategyConfiguration",
Expand Down Expand Up @@ -59,7 +59,7 @@
{
"name": "sharding.jdbc.datasource.names",
"type": "java.lang.String",
"sourceType": "io.shardingsphere.jdbc.spring.boot.SpringBootConfiguration"
"sourceType": "io.shardingsphere.shardingjdbc.spring.boot.SpringBootConfiguration"
},
{
"name": "sharding.jdbc.datasource",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
io.shardingsphere.jdbc.spring.boot.SpringBootConfiguration
io.shardingsphere.shardingjdbc.spring.boot.SpringBootConfiguration
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.boot;
package io.shardingsphere.shardingjdbc.spring.boot;

import io.shardingsphere.jdbc.spring.boot.type.SpringBootMasterSlaveTest;
import io.shardingsphere.jdbc.spring.boot.type.SpringBootShardingTest;
import io.shardingsphere.shardingjdbc.spring.boot.type.SpringBootMasterSlaveTest;
import io.shardingsphere.shardingjdbc.spring.boot.type.SpringBootShardingTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.boot.type;
package io.shardingsphere.shardingjdbc.spring.boot.type;

import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.boot.type;
package io.shardingsphere.shardingjdbc.spring.boot.type;

import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.core.constant.properties.ShardingProperties;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.datasource;
package io.shardingsphere.shardingjdbc.spring.datasource;

import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.datasource;
package io.shardingsphere.shardingjdbc.spring.datasource;

import io.shardingsphere.core.api.config.ShardingRuleConfiguration;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.namespace.constants;
package io.shardingsphere.shardingjdbc.spring.namespace.constants;

import lombok.AccessLevel;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.namespace.constants;
package io.shardingsphere.shardingjdbc.spring.namespace.constants;

import lombok.AccessLevel;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.namespace.constants;
package io.shardingsphere.shardingjdbc.spring.namespace.constants;

import lombok.AccessLevel;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.namespace.handler;
package io.shardingsphere.shardingjdbc.spring.namespace.handler;

import io.shardingsphere.jdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
import io.shardingsphere.jdbc.spring.namespace.parser.MasterSlaveDataSourceBeanDefinitionParser;
import io.shardingsphere.shardingjdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
import io.shardingsphere.shardingjdbc.spring.namespace.parser.MasterSlaveDataSourceBeanDefinitionParser;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.namespace.handler;
package io.shardingsphere.shardingjdbc.spring.namespace.handler;

import io.shardingsphere.jdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
import io.shardingsphere.jdbc.spring.namespace.constants.ShardingStrategyBeanDefinitionParserTag;
import io.shardingsphere.jdbc.spring.namespace.parser.ShardingDataSourceBeanDefinitionParser;
import io.shardingsphere.jdbc.spring.namespace.parser.ShardingStrategyBeanDefinitionParser;
import io.shardingsphere.shardingjdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
import io.shardingsphere.shardingjdbc.spring.namespace.constants.ShardingStrategyBeanDefinitionParserTag;
import io.shardingsphere.shardingjdbc.spring.namespace.parser.ShardingDataSourceBeanDefinitionParser;
import io.shardingsphere.shardingjdbc.spring.namespace.parser.ShardingStrategyBeanDefinitionParser;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.namespace.parser;
package io.shardingsphere.shardingjdbc.spring.namespace.parser;

import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmType;
import io.shardingsphere.jdbc.spring.datasource.SpringMasterSlaveDataSource;
import io.shardingsphere.jdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
import io.shardingsphere.jdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
import io.shardingsphere.shardingjdbc.spring.datasource.SpringMasterSlaveDataSource;
import io.shardingsphere.shardingjdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
import io.shardingsphere.shardingjdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.namespace.parser;
package io.shardingsphere.shardingjdbc.spring.namespace.parser;

import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmType;
import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration;
import io.shardingsphere.core.api.config.ShardingRuleConfiguration;
import io.shardingsphere.core.api.config.TableRuleConfiguration;
import io.shardingsphere.jdbc.spring.datasource.SpringShardingDataSource;
import io.shardingsphere.jdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
import io.shardingsphere.jdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
import io.shardingsphere.shardingjdbc.spring.datasource.SpringShardingDataSource;
import io.shardingsphere.shardingjdbc.spring.namespace.constants.MasterSlaveDataSourceBeanDefinitionParserTag;
import io.shardingsphere.shardingjdbc.spring.namespace.constants.ShardingDataSourceBeanDefinitionParserTag;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.namespace.parser;
package io.shardingsphere.shardingjdbc.spring.namespace.parser;

import com.google.common.base.Strings;
import io.shardingsphere.core.api.config.strategy.ComplexShardingStrategyConfiguration;
Expand All @@ -24,7 +24,7 @@
import io.shardingsphere.core.api.config.strategy.NoneShardingStrategyConfiguration;
import io.shardingsphere.core.api.config.strategy.StandardShardingStrategyConfiguration;
import io.shardingsphere.core.exception.ShardingException;
import io.shardingsphere.jdbc.spring.namespace.constants.ShardingStrategyBeanDefinitionParserTag;
import io.shardingsphere.shardingjdbc.spring.namespace.constants.ShardingStrategyBeanDefinitionParserTag;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.namespace.parser;
package io.shardingsphere.shardingjdbc.spring.namespace.parser;

import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
http\://shardingsphere.io/schema/shardingsphere/sharding=io.shardingsphere.jdbc.spring.namespace.handler.ShardingNamespaceHandler
http\://shardingsphere.io/schema/shardingsphere/masterslave=io.shardingsphere.jdbc.spring.namespace.handler.MasterSlaveNamespaceHandler
http\://shardingsphere.io/schema/shardingsphere/sharding=io.shardingsphere.shardingjdbc.spring.namespace.handler.ShardingNamespaceHandler
http\://shardingsphere.io/schema/shardingsphere/masterslave=io.shardingsphere.shardingjdbc.spring.namespace.handler.MasterSlaveNamespaceHandler
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring;
package io.shardingsphere.shardingjdbc.spring;

import org.junit.Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring;
package io.shardingsphere.shardingjdbc.spring;

import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
* </p>
*/

package io.shardingsphere.jdbc.spring;
package io.shardingsphere.shardingjdbc.spring;

import io.shardingsphere.jdbc.spring.cases.WithNamespaceAlgorithmClassTest;
import io.shardingsphere.jdbc.spring.cases.WithNamespaceAlgorithmExpressionTest;
import io.shardingsphere.jdbc.spring.cases.WithNamespaceBindingTablesTest;
import io.shardingsphere.jdbc.spring.cases.WithNamespaceDefaultStrategyTest;
import io.shardingsphere.jdbc.spring.cases.WithNamespaceDifferentTablesTest;
import io.shardingsphere.jdbc.spring.cases.WithNamespaceForMasterSlaveWithDefaultStrategyTest;
import io.shardingsphere.jdbc.spring.cases.WithNamespaceForMasterSlaveWithStrategyRefTest;
import io.shardingsphere.jdbc.spring.cases.WithNamespaceForMasterSlaveWithStrategyTypeTest;
import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceAlgorithmClassTest;
import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceAlgorithmExpressionTest;
import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceBindingTablesTest;
import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceDefaultStrategyTest;
import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceDifferentTablesTest;
import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceForMasterSlaveWithDefaultStrategyTest;
import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceForMasterSlaveWithStrategyRefTest;
import io.shardingsphere.shardingjdbc.spring.cases.WithNamespaceForMasterSlaveWithStrategyTypeTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
* </p>
*/

package io.shardingsphere.jdbc.spring;
package io.shardingsphere.shardingjdbc.spring;

import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.core.rule.TableRule;
import io.shardingsphere.jdbc.spring.fixture.DecrementKeyGenerator;
import io.shardingsphere.jdbc.spring.fixture.IncrementKeyGenerator;
import io.shardingsphere.jdbc.spring.util.FieldValueUtil;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.shardingjdbc.spring.fixture.DecrementKeyGenerator;
import io.shardingsphere.shardingjdbc.spring.fixture.IncrementKeyGenerator;
import io.shardingsphere.shardingjdbc.spring.util.FieldValueUtil;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
* </p>
*/

package io.shardingsphere.jdbc.spring;
package io.shardingsphere.shardingjdbc.spring;

import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
import io.shardingsphere.core.api.algorithm.masterslave.RandomMasterSlaveLoadBalanceAlgorithm;
import io.shardingsphere.core.api.algorithm.masterslave.RoundRobinMasterSlaveLoadBalanceAlgorithm;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import io.shardingsphere.core.rule.MasterSlaveRule;
import io.shardingsphere.jdbc.spring.util.FieldValueUtil;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
import io.shardingsphere.shardingjdbc.spring.util.FieldValueUtil;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring;
package io.shardingsphere.shardingjdbc.spring;

import io.shardingsphere.core.api.ConfigMapContext;
import io.shardingsphere.core.api.algorithm.masterslave.RandomMasterSlaveLoadBalanceAlgorithm;
Expand All @@ -27,19 +27,19 @@
import io.shardingsphere.core.api.config.strategy.StandardShardingStrategyConfiguration;
import io.shardingsphere.core.constant.properties.ShardingProperties;
import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.core.rule.BindingTableRule;
import io.shardingsphere.core.rule.DataNode;
import io.shardingsphere.core.rule.ShardingRule;
import io.shardingsphere.core.rule.TableRule;
import io.shardingsphere.jdbc.spring.algorithm.DefaultComplexKeysShardingAlgorithm;
import io.shardingsphere.jdbc.spring.algorithm.DefaultHintShardingAlgorithm;
import io.shardingsphere.jdbc.spring.algorithm.PreciseModuloDatabaseShardingAlgorithm;
import io.shardingsphere.jdbc.spring.algorithm.PreciseModuloTableShardingAlgorithm;
import io.shardingsphere.jdbc.spring.algorithm.RangeModuloTableShardingAlgorithm;
import io.shardingsphere.jdbc.spring.datasource.SpringShardingDataSource;
import io.shardingsphere.jdbc.spring.fixture.IncrementKeyGenerator;
import io.shardingsphere.jdbc.spring.util.FieldValueUtil;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.shardingjdbc.spring.algorithm.DefaultComplexKeysShardingAlgorithm;
import io.shardingsphere.shardingjdbc.spring.algorithm.DefaultHintShardingAlgorithm;
import io.shardingsphere.shardingjdbc.spring.algorithm.PreciseModuloDatabaseShardingAlgorithm;
import io.shardingsphere.shardingjdbc.spring.algorithm.PreciseModuloTableShardingAlgorithm;
import io.shardingsphere.shardingjdbc.spring.algorithm.RangeModuloTableShardingAlgorithm;
import io.shardingsphere.shardingjdbc.spring.datasource.SpringShardingDataSource;
import io.shardingsphere.shardingjdbc.spring.fixture.IncrementKeyGenerator;
import io.shardingsphere.shardingjdbc.spring.util.FieldValueUtil;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.algorithm;
package io.shardingsphere.shardingjdbc.spring.algorithm;

import io.shardingsphere.core.api.algorithm.sharding.ShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.complex.ComplexKeysShardingAlgorithm;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.algorithm;
package io.shardingsphere.shardingjdbc.spring.algorithm;

import io.shardingsphere.core.api.algorithm.sharding.ShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.hint.HintShardingAlgorithm;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* </p>
*/

package io.shardingsphere.jdbc.spring.algorithm;
package io.shardingsphere.shardingjdbc.spring.algorithm;

import io.shardingsphere.core.api.algorithm.sharding.PreciseShardingValue;
import io.shardingsphere.core.api.algorithm.sharding.standard.PreciseShardingAlgorithm;
Expand Down
Loading

0 comments on commit 9d200ad

Please sign in to comment.