Remove concatenation with empty string

fmbenhassine · fmbenhassine · commit 241e37e6726c · 2023-07-05T08:03:47.000+02:00
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ChunkMonitorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ChunkMonitorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 
 /**
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  *
  */
 class ChunkMonitorTests {
@@ -49,7 +50,7 @@ void setUp() {
 			@Nullable
 			@Override
 			public String read() throws Exception, UnexpectedInputException, ParseException {
-				return "" + (count++);
+				return String.valueOf(count++);
 			}
 		});
 		monitor.registerItemStream(new ItemStreamSupport() {
@@ -150,7 +151,7 @@ void testUpdateWithNoStream() {
 			@Nullable
 			@Override
 			public String read() throws Exception, UnexpectedInputException, ParseException {
-				return "" + (count++);
+				return String.valueOf(count++);
 			}
 		});
 		monitor.setChunkSize(CHUNK_SIZE);
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java
@@ -664,7 +664,7 @@ void testCacheLimitWithRetry() throws Exception {
 			@Nullable
 			@Override
 			public String read() {
-				String item = "" + count;
+				String item = String.valueOf(count);
 				provided.add(item);
 				count++;
 				if (count >= 10) {
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ protected Object getSubQueryAlias() {
 	}
 
 	protected Object extractTableAlias() {
-		String alias = "" + getSubQueryAlias();
+		String alias = String.valueOf(getSubQueryAlias());
 		if (StringUtils.hasText(alias) && alias.toUpperCase().startsWith("AS")) {
 			alias = alias.substring(3).trim() + ".";
 		}
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java
@@ -71,8 +71,8 @@ public class DefaultFieldSet implements FieldSet {
 	public final void setNumberFormat(NumberFormat numberFormat) {
 		this.numberFormat = numberFormat;
 		if (numberFormat instanceof DecimalFormat) {
-			grouping = "" + ((DecimalFormat) numberFormat).getDecimalFormatSymbols().getGroupingSeparator();
-			decimal = "" + ((DecimalFormat) numberFormat).getDecimalFormatSymbols().getDecimalSeparator();
+			grouping = String.valueOf(((DecimalFormat) numberFormat).getDecimalFormatSymbols().getGroupingSeparator());
+			decimal = String.valueOf(((DecimalFormat) numberFormat).getDecimalFormatSymbols().getDecimalSeparator());
 		}
 	}
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
  * @author Dave Syer
  * @author Michael Minella
  * @author Olivier Bourgain
+ * @author Mahmoud Ben Hassine
  */
 public class DelimitedLineTokenizer extends AbstractLineTokenizer implements InitializingBean {
 
@@ -121,8 +122,8 @@ public void setIncludedFields(int... includedFields) {
 	 */
 	public void setQuoteCharacter(char quoteCharacter) {
 		this.quoteCharacter = quoteCharacter;
-		this.quoteString = "" + quoteCharacter;
-		this.escapedQuoteString = "" + quoteCharacter + quoteCharacter;
+		this.quoteString = String.valueOf(quoteCharacter);
+		this.escapedQuoteString = String.valueOf(quoteCharacter) + quoteCharacter;
 	}
 
 	/**
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java
@@ -169,7 +169,7 @@ void testThrottleLimit() {
 			assertNotSame(threadName, Thread.currentThread().getName());
 			Trade item = provider.read();
 			threadNames.add(Thread.currentThread().getName() + " : " + item);
-			items.add("" + item);
+			items.add(String.valueOf(item));
 			if (item != null) {
 				processor.write(Chunk.of(item));
 				// Do some more I/O
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateBulkAsynchronousTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateBulkAsynchronousTests.java
@@ -88,8 +88,8 @@ void setUp() {
 			@Override
 			public RepeatStatus doInIteration(RepeatContext context) throws Exception {
 				int position = count.incrementAndGet();
-				String item = position <= total ? "" + position : null;
-				items.add("" + item);
+				String item = position <= total ? String.valueOf(position) : null;
+				items.add(item);
 				if (item != null) {
 					beBusy();
 				}
@@ -121,7 +121,7 @@ void tearDown() {
 	void testThrottleLimit() {
 
 		template.iterate(callback);
-		int frequency = Collections.frequency(items, "null");
+		int frequency = Collections.frequency(items, null);
 		assertEquals(total, items.size() - frequency);
 		assertTrue(frequency > 1);
 		assertTrue(frequency <= throttleLimit + 1);
@@ -134,7 +134,7 @@ void testThrottleLimitEarlyFinish() {
 		early = 2;
 
 		template.iterate(callback);
-		int frequency = Collections.frequency(items, "null");
+		int frequency = Collections.frequency(items, null);
 		assertEquals(total, items.size() - frequency);
 		assertTrue(frequency > 1);
 		assertTrue(frequency <= throttleLimit + 1);
@@ -158,7 +158,7 @@ void testThrottleLimitEarlyFinishThreadStarvation() {
 		template.setTaskExecutor(taskExecutor);
 
 		template.iterate(callback);
-		int frequency = Collections.frequency(items, "null");
+		int frequency = Collections.frequency(items, null);
 		// Extra tasks will be submitted before the termination is detected
 		assertEquals(total, items.size() - frequency);
 		assertTrue(frequency <= throttleLimit + 1);
@@ -182,7 +182,7 @@ void testThrottleLimitEarlyFinishOneThread() {
 		template.setTaskExecutor(taskExecutor);
 
 		template.iterate(callback);
-		int frequency = Collections.frequency(items, "null");
+		int frequency = Collections.frequency(items, null);
 		assertEquals(total, items.size() - frequency);
 		assertTrue(frequency <= throttleLimit + 1);
 
@@ -195,7 +195,7 @@ void testThrottleLimitWithEarlyCompletion() {
 		template.setCompletionPolicy(new SimpleCompletionPolicy(10));
 
 		template.iterate(callback);
-		int frequency = Collections.frequency(items, "null");
+		int frequency = Collections.frequency(items, null);
 		assertEquals(10, items.size() - frequency);
 		assertEquals(0, frequency);
 
@@ -208,7 +208,7 @@ void testThrottleLimitWithError() {
 
 		Exception exception = assertThrows(Exception.class, () -> template.iterate(callback));
 		assertEquals("Planned", exception.getMessage());
-		int frequency = Collections.frequency(items, "null");
+		int frequency = Collections.frequency(items, null);
 		assertEquals(0, frequency);
 
 	}
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/JmsIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/JmsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -35,6 +35,7 @@
 
 /**
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  *
  */
 @SpringJUnitConfig
@@ -73,7 +74,7 @@ void testLaunchJob() throws Exception {
 			// execution are old and we need to
 			// pull them back out of the repository...
 			stepExecution = jobExplorer.getStepExecution(jobExecution.getId(), stepExecution.getId());
-			logger.debug("" + stepExecution);
+			logger.debug(String.valueOf(stepExecution));
 			assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus());
 		}
 	}
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ public void writeCredit(CustomerCredit customerCredit) throws Exception {
 			open(new ExecutionContext());
 		}
 
-		String line = "" + customerCredit.getName() + separator + customerCredit.getCredit();
+		String line = customerCredit.getName() + separator + customerCredit.getCredit();
 
 		itemWriter.write(Chunk.of(line));
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2006-2022 the original author or authors.`
	`2`	`+ * Copyright 2006-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -63,7 +63,7 @@ protected Object getSubQueryAlias() {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`protected Object extractTableAlias() {`
`66`		`- String alias = "" + getSubQueryAlias();`
	`66`	`+ String alias = String.valueOf(getSubQueryAlias());`
`67`	`67`	`if (StringUtils.hasText(alias) && alias.toUpperCase().startsWith("AS")) {`
`68`	`68`	`alias = alias.substring(3).trim() + ".";`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ public class DefaultFieldSet implements FieldSet {`
`71`	`71`	`public final void setNumberFormat(NumberFormat numberFormat) {`
`72`	`72`	`this.numberFormat = numberFormat;`
`73`	`73`	`if (numberFormat instanceof DecimalFormat) {`
`74`		`- grouping = "" + ((DecimalFormat) numberFormat).getDecimalFormatSymbols().getGroupingSeparator();`
`75`		`- decimal = "" + ((DecimalFormat) numberFormat).getDecimalFormatSymbols().getDecimalSeparator();`
	`74`	`+ grouping = String.valueOf(((DecimalFormat) numberFormat).getDecimalFormatSymbols().getGroupingSeparator());`
	`75`	`+ decimal = String.valueOf(((DecimalFormat) numberFormat).getDecimalFormatSymbols().getDecimalSeparator());`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`