Commit c239dc4e authored by terrymanu's avatar terrymanu
Browse files

move ResultSetUtil from sharding-core to sharding-jdbc-core

parent 7ebca8ce

sharding-core/src/test/java/io/shardingjdbc/core/merger/AllMergerTests.java

+1 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import io.shardingjdbc.core.merger.dql.orderby.CompareUtilTest; 
import io.shardingjdbc.core.merger.dql.orderby.OrderByStreamResultSetMergerTest;

import io.shardingjdbc.core.merger.dql.orderby.OrderByValueTest;

import io.shardingjdbc.core.merger.dql.pagination.LimitDecoratorResultSetMergerTest;

import io.shardingjdbc.core.merger.util.ResultSetUtilTest;

import org.junit.runner.RunWith;

import org.junit.runners.Suite;
@@ -52,8 +51,7 @@ import org.junit.runners.Suite; 
        GroupByStreamResultSetMergerTest.class, 

        GroupByMemoryResultSetMergerTest.class, 

        AllAggregationTests.class, 

        LimitDecoratorResultSetMergerTest.class, 

        ResultSetUtilTest.class

        LimitDecoratorResultSetMergerTest.class 

    })

public class AllMergerTests {

}

sharding-core/src/main/java/io/shardingjdbc/core/merger/util/ResultSetUtil.java→sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/core/resultset/ResultSetUtil.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * </p>

 */



package io.shardingjdbc.core.merger.util;

package io.shardingjdbc.core.jdbc.core.resultset;



import io.shardingjdbc.core.exception.ShardingJdbcException;

import lombok.AccessLevel;

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/core/resultset/ShardingResultSet.java

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package io.shardingjdbc.core.jdbc.core.resultset; 


import io.shardingjdbc.core.jdbc.adapter.AbstractResultSetAdapter;

import io.shardingjdbc.core.merger.ResultSetMerger;

import io.shardingjdbc.core.merger.util.ResultSetUtil;



import java.io.InputStream;

import java.io.Reader;

sharding-jdbc-core/src/test/java/io/shardingjdbc/core/jdbc/core/AllCoreTests.java

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import io.shardingjdbc.core.jdbc.core.datasource.MasterSlaveDataSourceTest; 
import io.shardingjdbc.core.jdbc.core.datasource.ShardingDataSourceTest;

import io.shardingjdbc.core.jdbc.core.resultset.GeneratedKeysResultSetMetaDataTest;

import io.shardingjdbc.core.jdbc.core.resultset.GeneratedKeysResultSetTest;

import io.shardingjdbc.core.jdbc.core.resultset.ResultSetUtilTest;

import io.shardingjdbc.core.jdbc.core.resultset.ShardingResultSetTest;

import io.shardingjdbc.core.jdbc.core.statement.ShardingPreparedStatementTest;

import io.shardingjdbc.core.jdbc.core.statement.ShardingStatementTest;
@@ -36,6 +37,7 @@ import org.junit.runners.Suite; 
        ShardingStatementTest.class, 

        ShardingPreparedStatementTest.class, 

        ShardingResultSetTest.class,

        ResultSetUtilTest.class, 

        GeneratedKeysResultSetTest.class, 

        GeneratedKeysResultSetMetaDataTest.class 

    })

sharding-core/src/test/java/io/shardingjdbc/core/merger/util/ResultSetUtilTest.java→sharding-jdbc-core/src/test/java/io/shardingjdbc/core/jdbc/core/resultset/ResultSetUtilTest.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * </p>

 */



package io.shardingjdbc.core.merger.util;

package io.shardingjdbc.core.jdbc.core.resultset;



import io.shardingjdbc.core.exception.ShardingJdbcException;

import org.junit.Test;