Skip to content

Commit fe40370

Browse files
fmbenhassinefmbenhassine
committed
Refine contribution #4167
The documentation generation change introduced in #4167 seems to scan more files than previously WRT checking the code formatting style. This commit fixes the formatting of the files that do not conform to the Spring style.
1 parent f89aa20 commit fe40370

File tree

12 files changed

+170
-170
lines changed

12 files changed

+170
-170
lines changed

‎spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -538,15 +538,15 @@ public static void main(String[] args) throws Exception {
538538
}
539539
else {
540540
switch (count) {
541-
case 0:
542-
jobPath = arg;
543-
break;
544-
case 1:
545-
jobIdentifier = arg;
546-
break;
547-
default:
548-
params.add(arg);
549-
break;
541+
case 0:
542+
jobPath = arg;
543+
break;
544+
case 1:
545+
jobIdentifier = arg;
546+
break;
547+
default:
548+
params.add(arg);
549+
break;
550550
}
551551
count++;
552552
}

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/Jackson2ExecutionContextStringSerializer.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -185,22 +185,22 @@ public JobParameter deserialize(JsonParser parser, DeserializationContext contex
185185
JsonNode value = node.get(VALUE_KEY_NAME);
186186
Object parameterValue;
187187
switch (JobParameter.ParameterType.valueOf(type)) {
188-
case STRING: {
189-
parameterValue = value.asText();
190-
return new JobParameter((String) parameterValue, identifying);
191-
}
192-
case DATE: {
193-
parameterValue = new Date(value.get(1).asLong());
194-
return new JobParameter((Date) parameterValue, identifying);
195-
}
196-
case LONG: {
197-
parameterValue = value.get(1).asLong();
198-
return new JobParameter((Long) parameterValue, identifying);
199-
}
200-
case DOUBLE: {
201-
parameterValue = value.asDouble();
202-
return new JobParameter((Double) parameterValue, identifying);
203-
}
188+
case STRING: {
189+
parameterValue = value.asText();
190+
return new JobParameter((String) parameterValue, identifying);
191+
}
192+
case DATE: {
193+
parameterValue = new Date(value.get(1).asLong());
194+
return new JobParameter((Date) parameterValue, identifying);
195+
}
196+
case LONG: {
197+
parameterValue = value.get(1).asLong();
198+
return new JobParameter((Long) parameterValue, identifying);
199+
}
200+
case DOUBLE: {
201+
parameterValue = value.asDouble();
202+
return new JobParameter((Double) parameterValue, identifying);
203+
}
204204
}
205205
return null;
206206
}

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -174,27 +174,27 @@ public void setValues(PreparedStatement ps, int i) throws SQLException {
174174
Integer[] parameterTypes = (Integer[]) parameters.get(1);
175175
for (int indx = 0; indx < parameterValues.length; indx++) {
176176
switch (parameterTypes[indx]) {
177-
case Types.INTEGER:
178-
ps.setInt(indx + 1, (Integer) parameterValues[indx]);
179-
break;
180-
case Types.VARCHAR:
181-
ps.setString(indx + 1, (String) parameterValues[indx]);
182-
break;
183-
case Types.TIMESTAMP:
184-
if (parameterValues[indx] != null) {
185-
ps.setTimestamp(indx + 1,
186-
new Timestamp(((java.util.Date) parameterValues[indx]).getTime()));
187-
}
188-
else {
189-
ps.setNull(indx + 1, Types.TIMESTAMP);
190-
}
191-
break;
192-
case Types.BIGINT:
193-
ps.setLong(indx + 1, (Long) parameterValues[indx]);
194-
break;
195-
default:
196-
throw new IllegalArgumentException(
197-
"unsupported SQL parameter type for step execution field index " + i);
177+
case Types.INTEGER:
178+
ps.setInt(indx + 1, (Integer) parameterValues[indx]);
179+
break;
180+
case Types.VARCHAR:
181+
ps.setString(indx + 1, (String) parameterValues[indx]);
182+
break;
183+
case Types.TIMESTAMP:
184+
if (parameterValues[indx] != null) {
185+
ps.setTimestamp(indx + 1,
186+
new Timestamp(((java.util.Date) parameterValues[indx]).getTime()));
187+
}
188+
else {
189+
ps.setNull(indx + 1, Types.TIMESTAMP);
190+
}
191+
break;
192+
case Types.BIGINT:
193+
ps.setLong(indx + 1, (Long) parameterValues[indx]);
194+
break;
195+
default:
196+
throw new IllegalArgumentException(
197+
"unsupported SQL parameter type for step execution field index " + i);
198198
}
199199
}
200200
}

‎spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/ChunkContextTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class ChunkContextTests {
3737

3838
private final ChunkContext context = new ChunkContext(new StepContext(new JobExecution(new JobInstance(0L, "job"),
3939
1L, new JobParameters(Collections.singletonMap("foo", new JobParameter("bar"))))
40-
.createStepExecution("foo")));
40+
.createStepExecution("foo")));
4141

4242
@Test
4343
void testGetStepContext() {

‎spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -252,26 +252,26 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
252252
// Invocation on ConnectionProxy interface coming in...
253253

254254
switch (method.getName()) {
255-
case "equals":
256-
// Only consider equal when proxies are identical.
257-
return (proxy == args[0] ? Boolean.TRUE : Boolean.FALSE);
258-
case "hashCode":
259-
// Use hashCode of Connection proxy.
260-
return System.identityHashCode(proxy);
261-
case "close":
262-
// Handle close method: don't pass the call on if we are
263-
// suppressing close calls.
264-
if (dataSource.completeCloseCall((Connection) proxy)) {
265-
return null;
266-
}
267-
else {
268-
target.close();
269-
return null;
270-
}
271-
case "getTargetConnection":
272-
// Handle getTargetConnection method: return underlying
273-
// Connection.
274-
return this.target;
255+
case "equals":
256+
// Only consider equal when proxies are identical.
257+
return (proxy == args[0] ? Boolean.TRUE : Boolean.FALSE);
258+
case "hashCode":
259+
// Use hashCode of Connection proxy.
260+
return System.identityHashCode(proxy);
261+
case "close":
262+
// Handle close method: don't pass the call on if we are
263+
// suppressing close calls.
264+
if (dataSource.completeCloseCall((Connection) proxy)) {
265+
return null;
266+
}
267+
else {
268+
target.close();
269+
return null;
270+
}
271+
case "getTargetConnection":
272+
// Handle getTargetConnection method: return underlying
273+
// Connection.
274+
return this.target;
275275
}
276276

277277
// Invoke method on target Connection.

‎spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/builder/JdbcPagingItemReaderBuilder.java

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -336,45 +336,45 @@ private PagingQueryProvider determineQueryProvider(DataSource dataSource) {
336336

337337
switch (databaseType) {
338338

339-
case DERBY:
340-
provider = new DerbyPagingQueryProvider();
341-
break;
342-
case DB2:
343-
case DB2VSE:
344-
case DB2ZOS:
345-
case DB2AS400:
346-
provider = new Db2PagingQueryProvider();
347-
break;
348-
case H2:
349-
provider = new H2PagingQueryProvider();
350-
break;
351-
case HANA:
352-
provider = new HanaPagingQueryProvider();
353-
break;
354-
case HSQL:
355-
provider = new HsqlPagingQueryProvider();
356-
break;
357-
case SQLSERVER:
358-
provider = new SqlServerPagingQueryProvider();
359-
break;
360-
case MYSQL:
361-
provider = new MySqlPagingQueryProvider();
362-
break;
363-
case ORACLE:
364-
provider = new OraclePagingQueryProvider();
365-
break;
366-
case POSTGRES:
367-
provider = new PostgresPagingQueryProvider();
368-
break;
369-
case SYBASE:
370-
provider = new SybasePagingQueryProvider();
371-
break;
372-
case SQLITE:
373-
provider = new SqlitePagingQueryProvider();
374-
break;
375-
default:
376-
throw new IllegalArgumentException(
377-
"Unable to determine PagingQueryProvider type " + "from database type: " + databaseType);
339+
case DERBY:
340+
provider = new DerbyPagingQueryProvider();
341+
break;
342+
case DB2:
343+
case DB2VSE:
344+
case DB2ZOS:
345+
case DB2AS400:
346+
provider = new Db2PagingQueryProvider();
347+
break;
348+
case H2:
349+
provider = new H2PagingQueryProvider();
350+
break;
351+
case HANA:
352+
provider = new HanaPagingQueryProvider();
353+
break;
354+
case HSQL:
355+
provider = new HsqlPagingQueryProvider();
356+
break;
357+
case SQLSERVER:
358+
provider = new SqlServerPagingQueryProvider();
359+
break;
360+
case MYSQL:
361+
provider = new MySqlPagingQueryProvider();
362+
break;
363+
case ORACLE:
364+
provider = new OraclePagingQueryProvider();
365+
break;
366+
case POSTGRES:
367+
provider = new PostgresPagingQueryProvider();
368+
break;
369+
case SYBASE:
370+
provider = new SybasePagingQueryProvider();
371+
break;
372+
case SQLITE:
373+
provider = new SqlitePagingQueryProvider();
374+
break;
375+
default:
376+
throw new IllegalArgumentException(
377+
"Unable to determine PagingQueryProvider type " + "from database type: " + databaseType);
378378
}
379379

380380
provider.setSelectClause(this.selectClause);

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/example/User.java

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -130,32 +130,32 @@ public org.apache.avro.Schema getSchema() {
130130
// Used by DatumWriter. Applications should not call.
131131
public Object get(int field$) {
132132
switch (field$) {
133-
case 0:
134-
return name;
135-
case 1:
136-
return favorite_number;
137-
case 2:
138-
return favorite_color;
139-
default:
140-
throw new org.apache.avro.AvroRuntimeException("Bad index");
133+
case 0:
134+
return name;
135+
case 1:
136+
return favorite_number;
137+
case 2:
138+
return favorite_color;
139+
default:
140+
throw new org.apache.avro.AvroRuntimeException("Bad index");
141141
}
142142
}
143143

144144
// Used by DatumReader. Applications should not call.
145145
@SuppressWarnings(value = "unchecked")
146146
public void put(int field$, Object value$) {
147147
switch (field$) {
148-
case 0:
149-
name = (CharSequence) value$;
150-
break;
151-
case 1:
152-
favorite_number = (Integer) value$;
153-
break;
154-
case 2:
155-
favorite_color = (CharSequence) value$;
156-
break;
157-
default:
158-
throw new org.apache.avro.AvroRuntimeException("Bad index");
148+
case 0:
149+
name = (CharSequence) value$;
150+
break;
151+
case 1:
152+
favorite_number = (Integer) value$;
153+
break;
154+
case 2:
155+
favorite_color = (CharSequence) value$;
156+
break;
157+
default:
158+
throw new org.apache.avro.AvroRuntimeException("Bad index");
159159
}
160160
}
161161

@@ -510,33 +510,33 @@ public void customDecode(org.apache.avro.io.ResolvingDecoder in) throws java.io.
510510
else {
511511
for (int i = 0; i < 3; i++) {
512512
switch (fieldOrder[i].pos()) {
513-
case 0:
514-
this.name = in.readString(this.name instanceof Utf8 ? (Utf8) this.name : null);
515-
break;
516-
517-
case 1:
518-
if (in.readIndex() != 0) {
519-
in.readNull();
520-
this.favorite_number = null;
521-
}
522-
else {
523-
this.favorite_number = in.readInt();
524-
}
525-
break;
526-
527-
case 2:
528-
if (in.readIndex() != 0) {
529-
in.readNull();
530-
this.favorite_color = null;
531-
}
532-
else {
533-
this.favorite_color = in
534-
.readString(this.favorite_color instanceof Utf8 ? (Utf8) this.favorite_color : null);
535-
}
536-
break;
537-
538-
default:
539-
throw new java.io.IOException("Corrupt ResolvingDecoder.");
513+
case 0:
514+
this.name = in.readString(this.name instanceof Utf8 ? (Utf8) this.name : null);
515+
break;
516+
517+
case 1:
518+
if (in.readIndex() != 0) {
519+
in.readNull();
520+
this.favorite_number = null;
521+
}
522+
else {
523+
this.favorite_number = in.readInt();
524+
}
525+
break;
526+
527+
case 2:
528+
if (in.readIndex() != 0) {
529+
in.readNull();
530+
this.favorite_color = null;
531+
}
532+
else {
533+
this.favorite_color = in.readString(
534+
this.favorite_color instanceof Utf8 ? (Utf8) this.favorite_color : null);
535+
}
536+
break;
537+
538+
default:
539+
throw new java.io.IOException("Corrupt ResolvingDecoder.");
540540
}
541541
}
542542
}

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/Neo4jItemReaderTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ void testResultsWithMatchAndWhereWithSession() throws Exception {
142142
when(this.sessionFactory.openSession()).thenReturn(this.session);
143143
when(this.session.query(String.class,
144144
"START n=node(*) MATCH n -- m WHERE has(n.name) RETURN m ORDER BY n.age SKIP 0 LIMIT 50", null))
145-
.thenReturn(result);
145+
.thenReturn(result);
146146
when(result.iterator()).thenReturn(Arrays.asList("foo", "bar", "baz").iterator());
147147

148148
assertTrue(itemReader.doPageRead().hasNext());
@@ -162,7 +162,7 @@ void testResultsWithMatchAndWhereWithParametersWithSession() throws Exception {
162162
when(this.sessionFactory.openSession()).thenReturn(this.session);
163163
when(this.session.query(String.class,
164164
"START n=node(*) MATCH n -- m WHERE has(n.name) RETURN m ORDER BY n.age SKIP 0 LIMIT 50", params))
165-
.thenReturn(result);
165+
.thenReturn(result);
166166
when(result.iterator()).thenReturn(Arrays.asList("foo", "bar", "baz").iterator());
167167

168168
assertTrue(itemReader.doPageRead().hasNext());

0 commit comments

Comments
 (0)