Skip to content

Commit 4b9b8c8

Browse files
committed
refactor
1 parent e80d498 commit 4b9b8c8

File tree

44 files changed

+45
-47
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+45
-47
lines changed

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/api/ShardingRuleBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/api/config/BindingTableRuleConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/api/config/ShardingRuleConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/api/config/StrategyConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/api/config/TableRuleConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/internal/algorithm/ClosureDatabaseShardingAlgorithm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/internal/algorithm/ClosureShardingAlgorithm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/internal/algorithm/ClosureTableShardingAlgorithm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/internal/algorithm/ShardingValueWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/internal/parser/InlineParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/test/java/com/dangdang/ddframe/rdb/sharding/config/common/AllTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/test/java/com/dangdang/ddframe/rdb/sharding/config/common/api/ShardingRuleBuilderTest.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -61,10 +61,8 @@ public void testMin() {
6161
@Test(expected = IllegalArgumentException.class)
6262
public void testClassNotFound() {
6363
Yaml yaml = new Yaml(new Constructor(ShardingRuleConfig.class));
64-
Map<String, DataSource> dsMap = new HashMap<>();
65-
dsMap.put("ds", new BasicDataSource());
6664
ShardingRuleConfig config = (ShardingRuleConfig) yaml.load(ShardingRuleBuilderTest.class.getResourceAsStream("/config/config-classNotFound.yaml"));
67-
new ShardingRuleBuilder("config-classNotFound.yaml", dsMap, config).build();
65+
new ShardingRuleBuilder(config).build();
6866
}
6967

7068
@Test(expected = IllegalArgumentException.class)

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/test/java/com/dangdang/ddframe/rdb/sharding/config/common/internal/algorithm/ClosureShardingAlgorithmTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/test/java/com/dangdang/ddframe/rdb/sharding/config/common/internal/algorithm/ShardingValueWrapperTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/test/java/com/dangdang/ddframe/rdb/sharding/config/common/internal/fixture/MultiAlgorithm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/test/java/com/dangdang/ddframe/rdb/sharding/config/common/internal/fixture/SingleAlgorithm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/test/java/com/dangdang/ddframe/rdb/sharding/config/common/internal/parser/InlineParserTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/main/java/com/dangdang/ddframe/rdb/sharding/spring/datasource/SpringShardingDataSource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/main/java/com/dangdang/ddframe/rdb/sharding/spring/namespace/constants/ShardingJdbcDataSourceBeanDefinitionParserTag.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/main/java/com/dangdang/ddframe/rdb/sharding/spring/namespace/constants/ShardingJdbcStrategyBeanDefinitionParserTag.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/main/java/com/dangdang/ddframe/rdb/sharding/spring/namespace/handler/ShardingJdbcNamespaceHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/main/java/com/dangdang/ddframe/rdb/sharding/spring/namespace/parser/ShardingJdbcDataSourceBeanDefinitionParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/main/java/com/dangdang/ddframe/rdb/sharding/spring/namespace/parser/ShardingJdbcStrategyBeanDefinition.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/main/java/com/dangdang/ddframe/rdb/sharding/spring/namespace/parser/ShardingJdbcStrategyBeanDefinitionParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/AllSpringTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/AbstractShardingBothDataBasesAndTablesSpringDBUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/AbstractSpringDBUnitTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/algorithm/SingleKeyModuloDatabaseShardingAlgorithm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/algorithm/SingleKeyModuloTableShardingAlgorithm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/cases/WithoutNamespaceDefaultStrategyTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/cases/WithoutNamespaceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/cases/namespace/WithNamespaceAlgorithmClassAndPropsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/cases/namespace/WithNamespaceAlgorithmClassTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/cases/namespace/WithNamespaceAlgorithmExpressionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/cases/namespace/WithNamespaceBindingTablesTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/cases/namespace/WithNamespaceDefaultStrategyTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/cases/namespace/WithNamespaceDifferentTablesTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-yaml/src/main/java/com/dangdang/ddframe/rdb/sharding/config/yaml/api/YamlShardingDataSource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-yaml/src/main/java/com/dangdang/ddframe/rdb/sharding/config/yaml/internel/YamlConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-yaml/src/test/java/com/dangdang/ddframe/rdb/sharding/config/AllYamlShardingConfigTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-yaml/src/test/java/com/dangdang/ddframe/rdb/sharding/config/yaml/AbstractYamlShardingDataSourceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-yaml/src/test/java/com/dangdang/ddframe/rdb/sharding/config/yaml/YamlShardingConfigTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-yaml/src/test/java/com/dangdang/ddframe/rdb/sharding/config/yaml/algorithm/MultiAlgorithm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

sharding-jdbc-config-parent/sharding-jdbc-config-yaml/src/test/java/com/dangdang/ddframe/rdb/sharding/config/yaml/algorithm/SingleAlgorithm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 1999-2015 dangdang.com.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");

0 commit comments

Comments
 (0)