Commit 118ed73a authored by terrymanu's avatar terrymanu
Browse files

for checkstyle

parent 3991bde2

sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingjdbc/spring/AbstractSpringDBUnitTest.java

+10 −12
Original line number Diff line number Diff line
@@ -17,16 +17,8 @@ 


package io.shardingjdbc.spring;



import java.io.File;

import java.io.InputStreamReader;

import java.sql.SQLException;

import java.util.Arrays;

import java.util.List;



import javax.annotation.Resource;

import javax.sql.DataSource;



import io.shardingjdbc.core.jdbc.core.datasource.ShardingDataSource;

import lombok.Getter;

import org.apache.commons.dbcp.BasicDataSource;

import org.h2.tools.RunScript;

import org.junit.Before;
@@ -35,7 +27,13 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; 
import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;

import org.springframework.test.context.support.DirtiesContextTestExecutionListener;



import lombok.Getter;

import javax.annotation.Resource;

import javax.sql.DataSource;

import java.io.File;

import java.io.InputStreamReader;

import java.sql.SQLException;

import java.util.Arrays;

import java.util.List;



@TestExecutionListeners(inheritListeners = false, listeners =

    {DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class})
@@ -66,10 +64,10 @@ public abstract class AbstractSpringDBUnitTest extends AbstractJUnit4SpringConte 
    

    private String getFileName(final String dataSetFile) {

        String fileName = new File(dataSetFile).getName();

        if (-1 == fileName.lastIndexOf(".")) {

        if (-1 == fileName.lastIndexOf('.')) {

            return fileName;

        }

        return fileName.substring(0, fileName.lastIndexOf("."));

        return fileName.substring(0, fileName.lastIndexOf('.'));

    }

    

    protected List<String> getSchemaFiles() {

sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingjdbc/spring/GenerateKeyDBUnitTest.java

+7 −9
Original line number Diff line number Diff line
@@ -17,15 +17,15 @@ 


package io.shardingjdbc.spring;



import org.junit.Test;

import org.springframework.test.context.ContextConfiguration;



import io.shardingjdbc.core.jdbc.core.datasource.ShardingDataSource;

import io.shardingjdbc.core.rule.TableRule;

import io.shardingjdbc.spring.fixture.DecrementKeyGenerator;

import io.shardingjdbc.spring.fixture.IncrementKeyGenerator;

import io.shardingjdbc.spring.util.FieldValueUtil;

import org.junit.Test;

import org.springframework.test.context.ContextConfiguration;



import javax.annotation.Resource;

import java.sql.Connection;

import java.sql.ResultSet;

import java.sql.SQLException;
@@ -33,11 +33,9 @@ import java.sql.Statement; 
import java.util.Collection;

import java.util.Iterator;



import javax.annotation.Resource;



import static org.hamcrest.core.Is.is;

import static org.junit.Assert.assertThat;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertThat;

import static org.junit.Assert.assertTrue;



@ContextConfiguration(locations = "classpath:META-INF/rdb/withNamespaceGenerateKeyColumns.xml")
@@ -74,10 +72,10 @@ public class GenerateKeyDBUnitTest extends AbstractSpringDBUnitTest { 
        Object tableRules = FieldValueUtil.getFieldValue(shardingRule, "tableRules");

        assertNotNull(tableRules);

        assertThat(((Collection<TableRule>) tableRules).size(), is(2));

        Iterator<TableRule> iter = ((Collection<TableRule>) tableRules).iterator();

        TableRule orderRule = iter.next();

        Iterator<TableRule> tableRuleIterator = ((Collection<TableRule>) tableRules).iterator();

        TableRule orderRule = tableRuleIterator.next();

        assertThat(orderRule.getGenerateKeyColumn(), is("order_id"));

        TableRule orderItemRule = iter.next();

        TableRule orderItemRule = tableRuleIterator.next();

        assertThat(orderItemRule.getGenerateKeyColumn(), is("order_item_id"));

        assertTrue(orderItemRule.getKeyGenerator() instanceof DecrementKeyGenerator);

    }

sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingjdbc/spring/util/FieldValueUtil.java

+6 −3
Original line number Diff line number Diff line
@@ -17,11 +17,14 @@ 


package io.shardingjdbc.spring.util;



import java.lang.reflect.Field;



import com.google.common.base.Strings;

import lombok.AccessLevel;

import lombok.NoArgsConstructor;



import java.lang.reflect.Field;



public class FieldValueUtil {

@NoArgsConstructor(access = AccessLevel.PRIVATE)

public final class FieldValueUtil {

    

    private static Object getFieldValue(final Class<?> clazz, final Object obj, final String fieldName) {

        try {