Skip to content

Commit e878ca2

Browse files
nakamura-tonakamura-to
authored
Merge pull request #187 from domaframework/clean-warning
Eclipse 4.6.2 で検出されたワーニングを修正
2 parents 829705f + 74d7808 commit e878ca2

File tree

10 files changed

+18
-14
lines changed

10 files changed

+18
-14
lines changed

‎src/main/java/org/seasar/doma/jdbc/builder/BatchBuilder.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.seasar.doma.DomaNullPointerException;
2424
import org.seasar.doma.jdbc.JdbcException;
2525
import org.seasar.doma.jdbc.Sql;
26-
import org.seasar.doma.jdbc.SqlLogType;
2726
import org.seasar.doma.jdbc.command.BatchModifyCommand;
2827
import org.seasar.doma.jdbc.query.SqlBatchModifyQuery;
2928
import org.seasar.doma.message.Message;
@@ -139,19 +138,19 @@ BatchBuilder fixSql() {
139138

140139
private void prepare() {
141140
query.clearParameters();
142-
for (BatchParam p : helper.getParams()) {
141+
for (BatchParam<?> p : helper.getParams()) {
143142
query.addParameter(p.name, p.paramClass, p.params);
144143
}
145144
query.setSqlNode(helper.getSqlNode());
146145
query.prepare();
147146
}
148147

149-
int[] execute(Supplier<BatchModifyCommand> commandFactory) {
148+
int[] execute(Supplier<BatchModifyCommand<?>> commandFactory) {
150149
if (query.getMethodName() == null) {
151150
query.setCallerMethodName("execute");
152151
}
153152
prepare();
154-
BatchModifyCommand command = commandFactory.get();
153+
BatchModifyCommand<?> command = commandFactory.get();
155154
int[] result = command.execute();
156155
query.complete();
157156
return result;

‎src/main/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ public static MapBatchInsertBuilder newInstance(Config config, String tableName)
120120
* @throws JdbcException
121121
* 上記以外でJDBCに関する例外が発生した場合
122122
*/
123+
@SuppressWarnings("unchecked")
123124
public int[] execute(Iterable<? extends Map<String, Object>> parameter) {
124125
if (parameter == null) {
125126
throw new DomaNullPointerException("parameter");
@@ -152,7 +153,6 @@ public int[] execute(Iterable<? extends Map<String, Object>> parameter) {
152153
} else {
153154
// 静的な型指定が行えないためObjectにキャストしている
154155
// BatchBuilder内で下記clazzを利用した型チェックが行われているため安全である
155-
@SuppressWarnings("unchecked")
156156
Class<Object> clazz = (Class<Object>) value.getClass();
157157
builder.param(clazz, value).sql(", ");
158158
}

‎src/main/java/org/seasar/doma/jdbc/query/SqlBatchDeleteQuery.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.seasar.doma.jdbc.query;
1717

18-
import java.sql.Statement;
19-
2018
import org.seasar.doma.jdbc.SqlKind;
2119

2220
/**

‎src/main/java/org/seasar/doma/jdbc/query/SqlBatchModifyQuery.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ protected void prepareOptions() {
8282
protected void prepareSql() {
8383
sqls = new ArrayList<PreparedSql>();
8484
IntStream.rangeClosed(0, parameterSize - 1).forEach(i -> {
85+
@SuppressWarnings("serial")
8586
Map<String, Value> map = new LinkedHashMap<String, Value>() {
8687
{
8788
parameters.forEach((key, value) -> put(key, value.get(i)));

‎src/main/java/org/seasar/doma/jdbc/query/SqlBatchUpdateQuery.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.seasar.doma.jdbc.query;
1717

18-
import java.sql.Statement;
19-
2018
import org.seasar.doma.jdbc.SqlKind;
2119

2220
/**

‎src/test/java/org/seasar/doma/jdbc/builder/BatchDeleteExecutorTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
package org.seasar.doma.jdbc.builder;
1717

1818
import java.math.BigDecimal;
19-
import java.util.ArrayList;
2019
import java.util.Arrays;
21-
import java.util.LinkedHashMap;
2220
import java.util.List;
2321

2422
import junit.framework.TestCase;
@@ -203,6 +201,7 @@ public void testParamToLiteral() throws Exception {
203201
}
204202

205203
private static class Employee {
204+
@SuppressWarnings("unused")
206205
final int id;
207206
final String name;
208207
final BigDecimal salary;

‎src/test/java/org/seasar/doma/jdbc/builder/BatchInsertExecutorTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ public void testExecutor() throws Exception {
225225
});
226226
}
227227

228+
@SuppressWarnings("serial")
228229
public void testExecutorByMap() throws Exception {
229230
List<LinkedHashMap<String, Object>> employees = new ArrayList<LinkedHashMap<String, Object>>() {{
230231
add(new LinkedHashMap<String, Object>() {{

‎src/test/java/org/seasar/doma/jdbc/builder/BatchUpdateExecutorTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
package org.seasar.doma.jdbc.builder;
1717

1818
import java.math.BigDecimal;
19-
import java.util.ArrayList;
2019
import java.util.Arrays;
21-
import java.util.LinkedHashMap;
2220
import java.util.List;
2321

2422
import junit.framework.TestCase;

‎src/test/java/org/seasar/doma/jdbc/builder/MapBatchInsertBuilderTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import junit.framework.TestCase;
2525

26-
import org.seasar.doma.DomaIllegalArgumentException;
2726
import org.seasar.doma.internal.jdbc.mock.MockConfig;
2827
import org.seasar.doma.jdbc.JdbcException;
2928
import org.seasar.doma.jdbc.Sql;
@@ -36,6 +35,7 @@
3635
*/
3736
public class MapBatchInsertBuilderTest extends TestCase {
3837

38+
@SuppressWarnings("serial")
3939
public void test() throws Exception {
4040
MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp");
4141
builder.callerClassName(getClass().getName());
@@ -53,6 +53,7 @@ public void test() throws Exception {
5353
builder.execute(employees);
5454
}
5555

56+
@SuppressWarnings("serial")
5657
public void testGetSqls() throws Exception {
5758
MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp");
5859
List<LinkedHashMap<String, Object>> employees = new ArrayList<LinkedHashMap<String, Object>>() {{
@@ -84,6 +85,7 @@ public void testGetSqls() throws Exception {
8485
assertEquals(2001, parameters1.get(1).getValue());
8586
}
8687

88+
@SuppressWarnings("serial")
8789
public void testNullValue() throws Exception {
8890
MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp");
8991
List<LinkedHashMap<String, Object>> employees = new ArrayList<LinkedHashMap<String, Object>>() {{
@@ -115,6 +117,7 @@ public void testNullValue() throws Exception {
115117
assertEquals(null, parameters1.get(1).getValue());
116118
}
117119

120+
@SuppressWarnings("serial")
118121
public void testChangeType() throws Exception {
119122
MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp");
120123
List<LinkedHashMap<String, Object>> employees = new ArrayList<LinkedHashMap<String, Object>>() {{
@@ -140,6 +143,7 @@ public void testChangeType() throws Exception {
140143
fail();
141144
}
142145

146+
@SuppressWarnings("serial")
143147
public void testNotEqualMapSize() throws Exception {
144148
MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp");
145149
List<LinkedHashMap<String, Object>> employees = new ArrayList<LinkedHashMap<String, Object>>() {{
@@ -161,6 +165,7 @@ public void testNotEqualMapSize() throws Exception {
161165
fail();
162166
}
163167

168+
@SuppressWarnings("serial")
164169
public void testHashMap() throws Exception {
165170
MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp");
166171
List<Map<String, Object>> employees = new ArrayList<Map<String, Object>>() {{
@@ -204,6 +209,7 @@ public void testEmptyList() throws Exception {
204209
fail();
205210
}
206211

212+
@SuppressWarnings("serial")
207213
public void testDifferentKey() throws Exception {
208214
MapBatchInsertBuilder builder = MapBatchInsertBuilder.newInstance(new MockConfig(), "Emp");
209215
builder.callerClassName(getClass().getName());

‎src/test/java/org/seasar/doma/jdbc/builder/MapInsertBuilderTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
*/
3030
public class MapInsertBuilderTest extends TestCase {
3131

32+
@SuppressWarnings("serial")
3233
public void test() throws Exception {
3334
MapInsertBuilder builder = MapInsertBuilder.newInstance(new MockConfig(), "Emp");
3435
builder.execute(new LinkedHashMap<String, Object>(){{
@@ -37,6 +38,7 @@ public void test() throws Exception {
3738
}});
3839
}
3940

41+
@SuppressWarnings("serial")
4042
public void testGetSql() throws Exception {
4143
MapInsertBuilder builder = MapInsertBuilder.newInstance(new MockConfig(), "Emp");
4244

@@ -55,6 +57,7 @@ public void testGetSql() throws Exception {
5557
assertEquals(100, parameters.get(1).getValue());
5658
}
5759

60+
@SuppressWarnings("serial")
5861
public void testNullValue() throws Exception {
5962
MapInsertBuilder builder = MapInsertBuilder.newInstance(new MockConfig(), "Emp");
6063
builder.execute(new LinkedHashMap<String, Object>(){{
@@ -71,6 +74,7 @@ public void testNullValue() throws Exception {
7174
assertEquals(100, parameters.get(0).getValue());
7275
}
7376

77+
@SuppressWarnings("serial")
7478
public void testLastNullValue() throws Exception {
7579
MapInsertBuilder builder = MapInsertBuilder.newInstance(new MockConfig(), "Emp");
7680
builder.execute(new LinkedHashMap<String, Object>(){{

0 commit comments

Comments
 (0)