Commit fd6a5f18 authored by terrymanu's avatar terrymanu
Browse files

remove NoArgsConstructor for KeyGeneratorConfiguration

parent 55a73c8c

sharding-core/src/main/java/org/apache/shardingsphere/api/config/KeyGeneratorConfiguration.java

+5 −9
Original line number Diff line number Diff line
@@ -18,10 +18,8 @@ 
package org.apache.shardingsphere.api.config;



import com.google.common.base.Strings;

import lombok.AllArgsConstructor;

import lombok.Getter;

import lombok.NoArgsConstructor;

import lombok.Setter;

import lombok.RequiredArgsConstructor;

import org.apache.shardingsphere.core.keygen.ShardingKeyGeneratorFactory;

import org.apache.shardingsphere.core.keygen.generator.ShardingKeyGenerator;
@@ -32,17 +30,15 @@ import java.util.Properties; 
 *

 * @author panjuan

 */

@NoArgsConstructor

@AllArgsConstructor

@RequiredArgsConstructor

@Getter

@Setter

public final class KeyGeneratorConfiguration {

    

    private String column;

    private final String column;

    

    private String type;

    private final String type;

    

    private Properties props = new Properties();

    private final Properties props;

    

    /**

     * Build key generator configuration.

sharding-core/src/test/java/org/apache/shardingsphere/api/config/ShardingKeyGeneratorConfigurationTest.java

+3 −8
Original line number Diff line number Diff line
@@ -46,21 +46,16 @@ public class ShardingKeyGeneratorConfigurationTest { 
        

    @Test

    public void assertGetKeyGeneratorClassNameWithUUID() {

        KeyGeneratorConfiguration keyGeneratorConfiguration = new KeyGeneratorConfiguration();

        keyGeneratorConfiguration.setType("UUID");

        assertThat(keyGeneratorConfiguration.getKeyGenerator().getClass().getName(), is(UUIDShardingKeyGenerator.class.getName()));

        assertThat(new KeyGeneratorConfiguration(null, "UUID", new Properties()).getKeyGenerator().getClass().getName(), is(UUIDShardingKeyGenerator.class.getName()));

    }

    

    @Test(expected = ShardingConfigurationException.class)

    public void assertGetKeyGeneratorClassNameWithException() {

        KeyGeneratorConfiguration keyGeneratorConfiguration = new KeyGeneratorConfiguration();

        keyGeneratorConfiguration.setType("DEFAULT");

        keyGeneratorConfiguration.getKeyGenerator();

        new KeyGeneratorConfiguration(null, "DEFAULT", new Properties()).getKeyGenerator();

    }

    

    @Test

    public void assertGetKeyGeneratorVariables() {

        KeyGeneratorConfiguration keyGeneratorConfiguration = new KeyGeneratorConfiguration();

        assertTrue(null == keyGeneratorConfiguration.getKeyGenerator());

        assertTrue(null == new KeyGeneratorConfiguration(null, null, new Properties()).getKeyGenerator());

    }

}

sharding-core/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java

+3 −10
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import org.junit.Test; 
import java.util.Arrays;

import java.util.Collection;

import java.util.Collections;

import java.util.Properties;



import static org.hamcrest.CoreMatchers.instanceOf;

import static org.hamcrest.CoreMatchers.is;
@@ -378,16 +379,10 @@ public final class ShardingRuleTest { 
        shardingRuleConfiguration.getBroadcastTables().add("BROADCAST_TABLE");

        shardingRuleConfiguration.setDefaultDatabaseShardingStrategyConfig(new InlineShardingStrategyConfiguration("id", "ds_%{id % 2}"));

        shardingRuleConfiguration.setDefaultTableShardingStrategyConfig(new InlineShardingStrategyConfiguration("id", "table_%{id % 2}"));

        shardingRuleConfiguration.setDefaultKeyGeneratorConfig(getKeyGeneratorConfiguration());

        shardingRuleConfiguration.setDefaultKeyGeneratorConfig(new KeyGeneratorConfiguration(null, "INCREMENT", new Properties()));

        return new ShardingRule(shardingRuleConfiguration, createDataSourceNames());

    }

    

    private KeyGeneratorConfiguration getKeyGeneratorConfiguration() {

        KeyGeneratorConfiguration keyGeneratorConfiguration = new KeyGeneratorConfiguration();

        keyGeneratorConfiguration.setType("INCREMENT");

        return keyGeneratorConfiguration;

    }

    

    private ShardingRule createMinimumShardingRule() {

        ShardingRuleConfiguration shardingRuleConfiguration = new ShardingRuleConfiguration();

        TableRuleConfiguration tableRuleConfiguration = createTableRuleConfiguration("LOGIC_TABLE", "ds_${0..1}.table_${0..2}", "id");
@@ -399,9 +394,7 @@ public final class ShardingRuleTest { 
        TableRuleConfiguration result = new TableRuleConfiguration();

        result.setLogicTable(logicTableName);

        result.setActualDataNodes(actualDataNodes);

        KeyGeneratorConfiguration keyGeneratorConfiguration = new KeyGeneratorConfiguration();

        keyGeneratorConfiguration.setColumn(keyGeneratorColumnName);

        result.setKeyGeneratorConfig(keyGeneratorConfiguration);

        result.setKeyGeneratorConfig(new KeyGeneratorConfiguration(keyGeneratorColumnName, null, new Properties()));

        return result;

    }

sharding-core/src/test/java/org/apache/shardingsphere/core/rule/TableRuleTest.java

+2 −8
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import org.junit.Test; 
import java.util.Arrays;

import java.util.Collection;

import java.util.Collections;

import java.util.Properties;



import static org.hamcrest.CoreMatchers.instanceOf;

import static org.hamcrest.CoreMatchers.is;
@@ -60,7 +61,7 @@ public final class TableRuleTest { 
        tableRuleConfig.setActualDataNodes("ds${0..1}.table_${0..2}");

        tableRuleConfig.setDatabaseShardingStrategyConfig(new NoneShardingStrategyConfiguration());

        tableRuleConfig.setTableShardingStrategyConfig(new NoneShardingStrategyConfiguration());

        tableRuleConfig.setKeyGeneratorConfig(getKeyGeneratorConfiguration());

        tableRuleConfig.setKeyGeneratorConfig(new KeyGeneratorConfiguration("col_1", "INCREMENT", new Properties()));

        tableRuleConfig.setLogicIndex("LOGIC_INDEX");

        TableRule actual = new TableRule(tableRuleConfig, createShardingDataSourceNames(), null);

        assertThat(actual.getLogicTable(), is("logic_table"));
@@ -78,13 +79,6 @@ public final class TableRuleTest { 
        assertThat(actual.getLogicIndex(), is("logic_index"));

    }

    

    private KeyGeneratorConfiguration getKeyGeneratorConfiguration() {

        KeyGeneratorConfiguration keyGeneratorConfiguration = new KeyGeneratorConfiguration();

        keyGeneratorConfiguration.setType("INCREMENT");

        keyGeneratorConfiguration.setColumn("col_1");

        return keyGeneratorConfiguration;

    }

    

    @Test

    public void assertGetActualDatasourceNames() {

        TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration();

sharding-core/src/test/java/org/apache/shardingsphere/core/yaml/sharding/YamlTableRuleConfigurationTest.java

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


package org.apache.shardingsphere.core.yaml.sharding;



import org.apache.shardingsphere.api.config.KeyGeneratorConfiguration;

import org.apache.shardingsphere.api.config.rule.TableRuleConfiguration;

import org.apache.shardingsphere.api.config.strategy.NoneShardingStrategyConfiguration;

import org.apache.shardingsphere.core.yaml.sharding.strategy.YamlNoneShardingStrategyConfiguration;
@@ -72,8 +71,6 @@ public final class YamlTableRuleConfigurationTest { 
    private void assertTableRuleConfig(final TableRuleConfiguration actual) {

        assertThat(actual.getLogicTable(), is("t_order"));

        assertThat(actual.getActualDataNodes(), is("ds_${0..1}.t_order_${0..1}"));

        KeyGeneratorConfiguration keyGeneratorConfiguration = new KeyGeneratorConfiguration();

        keyGeneratorConfiguration.setColumn("order_id");

        assertThat(actual.getKeyGeneratorConfig().getColumn(), is("order_id"));

        assertThat(actual.getLogicIndex(), is("order_index"));

    }