Skip to content

Commit

Permalink
for checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
@terrymanu
terrymanu committed Sep 12, 2016
1 parent 438f02f commit f34b5ff
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 42 deletions.
5 changes: 2 additions & 3 deletions ...om/dangdang/ddframe/rdb/sharding/merger/resultset/delegate/AbstractDelegateResultSet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;

import java.io.InputStream;
Expand All @@ -48,7 +47,6 @@
*
* @author zhangliang
*/
@Slf4j
public abstract class AbstractDelegateResultSet extends AbstractResultSetAdapter {

@Getter(AccessLevel.PROTECTED)
Expand All @@ -70,7 +68,8 @@ public final boolean next() throws SQLException {
boolean result = beforeFirst ? firstNext() : afterFirstNext();
beforeFirst = false;
if (result) {
LoggerFactory.getLogger(this.getClass().getName()).trace("Access result set, total size is: {}, result set hashcode is: {}, offset is: {}", getResultSets().size(), delegate.hashCode(), ++offset);
LoggerFactory.getLogger(this.getClass().getName()).trace(
"Access result set, total size is: {}, result set hashcode is: {}, offset is: {}", getResultSets().size(), delegate.hashCode(), ++offset);
}
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion ...g/ddframe/rdb/integrate/db/statement/ShardingDataBasesOnlyForStatementWithSelectTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void assertSelectInWithSingleTable() throws SQLException, DatabaseUnitExc
@Test
public void assertSelectLimitWithSingleTable() throws SQLException, DatabaseUnitException {
String sql = "SELECT * FROM `t_order` WHERE `order_id` in (%s, %s, %s) AND `user_id` in (%s,%s) limit 1,2";
assertDataSet("integrate/dataset/db/expect/select/SelectLimitWithSingleTable.xml", shardingDataSource.getConnection(), "t_order", String.format(sql, 1000, 1001, 2000,10,20));
assertDataSet("integrate/dataset/db/expect/select/SelectLimitWithSingleTable.xml", shardingDataSource.getConnection(), "t_order", String.format(sql, 1000, 1001, 2000, 10, 20));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion ...c-core/src/test/java/com/dangdang/ddframe/rdb/sharding/config/ShardingPropertiesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ public void assertGetValueForDefaultValue() {
boolean actualMetricsEnabled = shardingProperties.getValue(ShardingPropertiesConstant.METRICS_ENABLE);
long actualMetricsMillisecondsPeriod = shardingProperties.getValue(ShardingPropertiesConstant.METRICS_MILLISECONDS_PERIOD);
String actualMetricsPackageName = shardingProperties.getValue(ShardingPropertiesConstant.METRICS_LOGGER_NAME);
int executorMaxSize = shardingProperties.getValue(ShardingPropertiesConstant.EXECUTOR_MAX_SIZE);
assertThat(actualMetricsEnabled, is(Boolean.valueOf(ShardingPropertiesConstant.METRICS_ENABLE.getDefaultValue())));
assertThat(actualMetricsMillisecondsPeriod, is(Long.valueOf(ShardingPropertiesConstant.METRICS_MILLISECONDS_PERIOD.getDefaultValue())));
assertThat(actualMetricsPackageName, is(ShardingPropertiesConstant.METRICS_LOGGER_NAME.getDefaultValue()));
int executorMaxSize = shardingProperties.getValue(ShardingPropertiesConstant.EXECUTOR_MAX_SIZE);
assertThat(executorMaxSize, is(Integer.valueOf(ShardingPropertiesConstant.EXECUTOR_MAX_SIZE.getDefaultValue())));
}

Expand Down
4 changes: 2 additions & 2 deletions ...c/test/java/com/dangdang/ddframe/rdb/sharding/executor/PreparedStatementExecutorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,8 @@ private PreparedStatementExecutorWrapper createPreparedStatementExecutorWrapperF
private PreparedStatementExecutorWrapper createPreparedStatementExecutorWrapper(final PreparedStatement preparedStatement, final String dataSource, final String sql) {
try {
return new PreparedStatementExecutorWrapper(preparedStatement, Collections.emptyList(), new SQLExecutionUnit(dataSource, (SQLBuilder) new SQLBuilder().append(sql)));
} catch (IOException e) {
throw new RuntimeException(e);
} catch (final IOException ex) {
throw new RuntimeException(ex);
}
}
}
22 changes: 11 additions & 11 deletions ...-core/src/test/java/com/dangdang/ddframe/rdb/sharding/executor/StatementExecutorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@ public void assertExecuteQueryForMultipleStatementsSuccess() throws SQLException
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDQL(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDQL(statement2, "ds_1");
ResultSet resultSet1 = mock(ResultSet.class);
ResultSet resultSet2 = mock(ResultSet.class);
when(statement1.executeQuery(SELECT_FROM_DUAL)).thenReturn(resultSet1);
when(statement2.executeQuery(SELECT_FROM_DUAL)).thenReturn(resultSet2);
StatementExecutor actual = new StatementExecutor(executorEngine);
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDQL(statement2, "ds_1");
actual.addStatement(wrapper2);
List<ResultSet> actualResultSets = actual.executeQuery();
assertThat(actualResultSets, hasItem(resultSet1));
Expand Down Expand Up @@ -155,12 +155,12 @@ public void assertExecuteQueryForMultipleStatementsFailure() throws SQLException
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDQL(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDQL(statement2, "ds_1");
SQLException exp = new SQLException();
when(statement1.executeQuery(SELECT_FROM_DUAL)).thenThrow(exp);
when(statement2.executeQuery(SELECT_FROM_DUAL)).thenThrow(exp);
StatementExecutor actual = new StatementExecutor(executorEngine);
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDQL(statement2, "ds_1");
actual.addStatement(wrapper2);
List<ResultSet> actualResultSets = actual.executeQuery();
assertThat(actualResultSets, is(Arrays.asList((ResultSet) null, null)));
Expand Down Expand Up @@ -197,11 +197,11 @@ public void assertExecuteUpdateForMultipleStatementsSuccess() throws SQLExceptio
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
when(statement1.executeUpdate(DELETE_FROM_DUAL)).thenReturn(10);
when(statement2.executeUpdate(DELETE_FROM_DUAL)).thenReturn(20);
StatementExecutor actual = new StatementExecutor(executorEngine);
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
actual.addStatement(wrapper2);
assertThat(actual.executeUpdate(), is(30));
verify(statement1).executeUpdate(DELETE_FROM_DUAL);
Expand Down Expand Up @@ -238,12 +238,12 @@ public void assertExecuteUpdateForMultipleStatementsFailure() throws SQLExceptio
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
SQLException exp = new SQLException();
when(statement1.executeUpdate(DELETE_FROM_DUAL)).thenThrow(exp);
when(statement2.executeUpdate(DELETE_FROM_DUAL)).thenThrow(exp);
StatementExecutor actual = new StatementExecutor(executorEngine);
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
actual.addStatement(wrapper2);
assertThat(actual.executeUpdate(), is(0));
verify(statement1).executeUpdate(DELETE_FROM_DUAL);
Expand Down Expand Up @@ -330,11 +330,11 @@ public void assertExecuteForMultipleStatementsSuccessWithDML() throws SQLExcepti
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
when(statement1.execute(DELETE_FROM_DUAL)).thenReturn(false);
when(statement2.execute(DELETE_FROM_DUAL)).thenReturn(false);
StatementExecutor actual = new StatementExecutor(executorEngine);
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
actual.addStatement(wrapper2);
assertFalse(actual.execute());
verify(statement1).execute(DELETE_FROM_DUAL);
Expand Down Expand Up @@ -371,12 +371,12 @@ public void assertExecuteForMultipleStatementsFailureWithDML() throws SQLExcepti
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDML(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
SQLException exp = new SQLException();
when(statement1.execute(DELETE_FROM_DUAL)).thenThrow(exp);
when(statement2.execute(DELETE_FROM_DUAL)).thenThrow(exp);
StatementExecutor actual = new StatementExecutor(executorEngine);
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDML(statement2, "ds_1");
actual.addStatement(wrapper2);
assertFalse(actual.execute());
verify(statement1).execute(DELETE_FROM_DUAL);
Expand Down Expand Up @@ -412,11 +412,11 @@ public void assertExecuteForMultipleStatements() throws SQLException {
Statement statement1 = mock(Statement.class);
StatementExecutorWrapper wrapper1 = createStatementExecutorWrapperForDQL(statement1, "ds_0");
Statement statement2 = mock(Statement.class);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDQL(statement2, "ds_0");
when(statement1.execute(SELECT_FROM_DUAL)).thenReturn(true);
when(statement2.execute(SELECT_FROM_DUAL)).thenReturn(true);
StatementExecutor actual = new StatementExecutor(executorEngine);
actual.addStatement(wrapper1);
StatementExecutorWrapper wrapper2 = createStatementExecutorWrapperForDQL(statement2, "ds_0");
actual.addStatement(wrapper2);
assertTrue(actual.execute());
verify(statement1).execute(SELECT_FROM_DUAL);
Expand Down Expand Up @@ -483,16 +483,16 @@ public void assertExecuteWithColumnNames() throws SQLException {
private StatementExecutorWrapper createStatementExecutorWrapperForDQL(final Statement statement, final String dataSource) {
try {
return new StatementExecutorWrapper(statement, new SQLExecutionUnit(dataSource, (SQLBuilder) new SQLBuilder().append(SELECT_FROM_DUAL)));
} catch (final IOException e) {
throw new RuntimeException(e);
} catch (final IOException ex) {
throw new RuntimeException(ex);
}
}

private StatementExecutorWrapper createStatementExecutorWrapperForDML(final Statement statement, final String dataSource) {
try {
return new StatementExecutorWrapper(statement, new SQLExecutionUnit(dataSource, (SQLBuilder) new SQLBuilder().append(DELETE_FROM_DUAL)));
} catch (IOException e) {
throw new RuntimeException(e);
} catch (final IOException ex) {
throw new RuntimeException(ex);
}
}
}
3 changes: 2 additions & 1 deletion ...bc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/AbstractBaseParseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ public AggregationColumn apply(final com.dangdang.ddframe.rdb.sharding.parser.ja
}));
}
if (null != assertObj.getLimit()) {
mergeContext.setLimit(new Limit(assertObj.getLimit().getOffset(), assertObj.getLimit().getRowCount(), assertObj.getLimit().getOffsetParameterIndex(), assertObj.getLimit().getRowCountParameterIndex()));
mergeContext.setLimit(
new Limit(assertObj.getLimit().getOffset(), assertObj.getLimit().getRowCount(), assertObj.getLimit().getOffsetParameterIndex(), assertObj.getLimit().getRowCountParameterIndex()));
}
result[5] = mergeContext;
return result;
Expand Down
6 changes: 3 additions & 3 deletions ...ding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/AllParserTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
SQLParsedResultTest.class,
MySQLStatementTest.class,
MySQLPreparedStatementForOneParameterTest.class,
MySQLPreparedStatementForTowParametersTest.class,
MySQLPreparedStatementForTowParametersTest.class,
OrParseTest.class,
UnsupportedParseTest.class,
MySQLEvalVisitorTest.class,
UnsupportedParseTest.class,
MySQLEvalVisitorTest.class
})
public class AllParserTests {
}
12 changes: 6 additions & 6 deletions ...va/com/dangdang/ddframe/rdb/sharding/parser/visitor/basic/mysql/MySQLEvalVisitorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void testVisit() throws Exception {
SQLVariantRefExpr expr = new SQLVariantRefExpr("?");
expr.setIndex(1);
MySQLEvalVisitor visitor = new MySQLEvalVisitor();
visitor.setParameters(Lists.<Object>newArrayList(1 ,2));
visitor.setParameters(Lists.<Object>newArrayList(1, 2));
expr.accept(visitor);
assertThat((Integer) SQLEvalVisitorUtils.getValue(expr), is(2));
assertThat((Integer) expr.getAttribute(MySQLEvalVisitor.EVAL_VAR_INDEX), is(1));
Expand All @@ -44,7 +44,7 @@ public void testVisitErrorIndex() throws Exception {
SQLVariantRefExpr expr = new SQLVariantRefExpr("?");
expr.setIndex(2);
MySQLEvalVisitor visitor = new MySQLEvalVisitor();
visitor.setParameters(Lists.<Object>newArrayList(1 ,2));
visitor.setParameters(Lists.<Object>newArrayList(1, 2));
expr.accept(visitor);
assertThat(SQLEvalVisitorUtils.getValue(expr), nullValue());
}
Expand All @@ -55,7 +55,7 @@ public void testVisitNotOverride() throws Exception {
expr.setIndex(1);
expr.getAttributes().put(MySQLEvalVisitor.EVAL_VALUE, "test");
MySQLEvalVisitor visitor = new MySQLEvalVisitor();
visitor.setParameters(Lists.<Object>newArrayList(1 ,2));
visitor.setParameters(Lists.<Object>newArrayList(1, 2));
expr.accept(visitor);
assertThat((String) SQLEvalVisitorUtils.getValue(expr), is("test"));
}
Expand All @@ -65,7 +65,7 @@ public void testVisitWrongName() throws Exception {
SQLVariantRefExpr expr = new SQLVariantRefExpr("");
expr.setIndex(1);
MySQLEvalVisitor visitor = new MySQLEvalVisitor();
visitor.setParameters(Lists.<Object>newArrayList(1 ,2));
visitor.setParameters(Lists.<Object>newArrayList(1, 2));
expr.accept(visitor);
assertThat(SQLEvalVisitorUtils.getValue(expr), nullValue());
}
Expand All @@ -75,8 +75,8 @@ public void testVisitNullValue() throws Exception {
SQLVariantRefExpr expr = new SQLVariantRefExpr("?");
expr.setIndex(1);
MySQLEvalVisitor visitor = new MySQLEvalVisitor();
visitor.setParameters(Lists.<Object>newArrayList(1 ,null));
visitor.setParameters(Lists.<Object>newArrayList(1, null));
expr.accept(visitor);
assertThat(SQLEvalVisitorUtils.getValue(expr), is(MySQLEvalVisitor.EVAL_VALUE_NULL));
}
}
}
Loading

0 comments on commit f34b5ff

Please sign in to comment.