Replace @SuppressWarnings("NullableProblems") with @nonnull

acktsap · web-flow · commit 0408b7eaa637 · 2025-02-02T20:20:15.000+09:00
Signed-off-by: Taeik Lim &lt;sibera21@gmail.com&gt;
diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemProcessorAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemProcessorAdapter.java
@@ -48,9 +48,8 @@ protected ItemProcessorAdapter(ItemProcessorDelegate<I, O> delegate) {
 		this.delegate = Objects.requireNonNull(delegate, "Delegate processor must not be null");
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public O process(I item) {
+	public O process(@NonNull I item) {
 		return this.delegate.process(item);
 	}
 }
diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamFluxReaderAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamFluxReaderAdapter.java
@@ -58,9 +58,8 @@ protected ItemStreamFluxReaderAdapter(ItemStreamFluxReaderDelegate<T> delegate)
 		this.delegate = Objects.requireNonNull(delegate, "Delegate reader must not be null");
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void open(ExecutionContext executionContext) {
+	public void open(@NonNull ExecutionContext executionContext) {
 		this.delegate.onOpenRead(executionContext);
 		this.flux = this.delegate.readFlux(executionContext);
 	}
@@ -75,9 +74,8 @@ public T read() {
 		}
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void update(ExecutionContext executionContext) {
+	public void update(@NonNull ExecutionContext executionContext) {
 		this.delegate.onUpdateRead(executionContext);
 	}
 
diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIterableReaderAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIterableReaderAdapter.java
@@ -54,9 +54,8 @@ protected ItemStreamIterableReaderAdapter(ItemStreamIterableReaderDelegate<T> de
 		this.delegate = Objects.requireNonNull(delegate, "Delegate reader must not be null");
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void open(ExecutionContext executionContext) {
+	public void open(@NonNull ExecutionContext executionContext) {
 		this.delegate.onOpenRead(executionContext);
 		this.iterable = this.delegate.readIterable(executionContext);
 	}
@@ -71,9 +70,8 @@ public T read() {
 		}
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void update(ExecutionContext executionContext) {
+	public void update(@NonNull ExecutionContext executionContext) {
 		this.delegate.onUpdateRead(executionContext);
 	}
 
diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIteratorReaderAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIteratorReaderAdapter.java
@@ -51,9 +51,8 @@ protected ItemStreamIteratorReaderAdapter(ItemStreamIteratorReaderDelegate<T> de
 		this.delegate = Objects.requireNonNull(delegate, "Delegate reader must not be null");
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void open(ExecutionContext executionContext) {
+	public void open(@NonNull ExecutionContext executionContext) {
 		this.delegate.onOpenRead(executionContext);
 		this.iterator = this.delegate.readIterator(executionContext);
 	}
@@ -68,9 +67,8 @@ public T read() {
 		}
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void update(ExecutionContext executionContext) {
+	public void update(@NonNull ExecutionContext executionContext) {
 		this.delegate.onUpdateRead(executionContext);
 	}
 
diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamSimpleReaderAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamSimpleReaderAdapter.java
@@ -48,9 +48,8 @@ protected ItemStreamSimpleReaderAdapter(ItemStreamSimpleReaderDelegate<T> delega
 		this.delegate = Objects.requireNonNull(delegate, "Delegate reader must not be null");
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void open(ExecutionContext executionContext) {
+	public void open(@NonNull ExecutionContext executionContext) {
 		this.delegate.onOpenRead(executionContext);
 	}
 
@@ -59,9 +58,8 @@ public T read() {
 		return this.delegate.read();
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void update(ExecutionContext executionContext) {
+	public void update(@NonNull ExecutionContext executionContext) {
 		this.delegate.onUpdateRead(executionContext);
 	}
 
diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamWriterAdapter.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamWriterAdapter.java
@@ -49,21 +49,18 @@ protected ItemStreamWriterAdapter(ItemStreamWriterDelegate<T> delegate) {
 		this.delegate = Objects.requireNonNull(delegate, "Delegate writer must not be null");
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void open(ExecutionContext executionContext) {
+	public void open(@NonNull ExecutionContext executionContext) {
 		this.delegate.onOpenWrite(executionContext);
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void write(Chunk<? extends T> chunk) {
+	public void write(@NonNull Chunk<? extends T> chunk) {
 		this.delegate.write(chunk);
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void update(ExecutionContext executionContext) {
+	public void update(@NonNull ExecutionContext executionContext) {
 		this.delegate.onUpdateWrite(executionContext);
 	}
 
diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/StepScopeItemStreamReader.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/StepScopeItemStreamReader.java
@@ -30,6 +30,7 @@
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStreamException;
 import org.springframework.batch.item.ItemStreamReader;
+import org.springframework.lang.NonNull;
 
 /**
  * A {@link StepScope} bound proxy implementation.
@@ -60,9 +61,8 @@ protected StepScopeItemStreamReader(Supplier<ItemStreamReader<T>> readerGenerato
 		this.delegateSupplier = Objects.requireNonNull(readerGenerator, "Reader generator must not be null");
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void open(ExecutionContext executionContext) throws ItemStreamException {
+	public void open(@NonNull ExecutionContext executionContext) throws ItemStreamException {
 		getDelegate().open(executionContext);
 	}
 
@@ -71,9 +71,8 @@ public T read() throws Exception {
 		return getDelegate().read();
 	}
 
-	@SuppressWarnings("NullableProblems")
 	@Override
-	public void update(ExecutionContext executionContext) throws ItemStreamException {
+	public void update(@NonNull ExecutionContext executionContext) throws ItemStreamException {
 		getDelegate().update(executionContext);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,8 @@ protected ItemProcessorAdapter(ItemProcessorDelegate<I, O> delegate) {`
`48`	`48`	`this.delegate = Objects.requireNonNull(delegate, "Delegate processor must not be null");`
`49`	`49`	`}`
`50`	`50`
`51`		`- @SuppressWarnings("NullableProblems")`
`52`	`51`	`@Override`
`53`		`- public O process(I item) {`
	`52`	`+ public O process(@NonNull I item) {`
`54`	`53`	`return this.delegate.process(item);`
`55`	`54`	`}`
`56`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,8 @@ protected ItemStreamFluxReaderAdapter(ItemStreamFluxReaderDelegate<T> delegate)`
`58`	`58`	`this.delegate = Objects.requireNonNull(delegate, "Delegate reader must not be null");`
`59`	`59`	`}`
`60`	`60`
`61`		`- @SuppressWarnings("NullableProblems")`
`62`	`61`	`@Override`
`63`		`- public void open(ExecutionContext executionContext) {`
	`62`	`+ public void open(@NonNull ExecutionContext executionContext) {`
`64`	`63`	`this.delegate.onOpenRead(executionContext);`
`65`	`64`	`this.flux = this.delegate.readFlux(executionContext);`
`66`	`65`	`}`
`@@ -75,9 +74,8 @@ public T read() {`
`75`	`74`	`}`
`76`	`75`	`}`
`77`	`76`
`78`		`- @SuppressWarnings("NullableProblems")`
`79`	`77`	`@Override`
`80`		`- public void update(ExecutionContext executionContext) {`
	`78`	`+ public void update(@NonNull ExecutionContext executionContext) {`
`81`	`79`	`this.delegate.onUpdateRead(executionContext);`
`82`	`80`	`}`
`83`	`81`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,8 @@ protected ItemStreamIterableReaderAdapter(ItemStreamIterableReaderDelegate<T> de`
`54`	`54`	`this.delegate = Objects.requireNonNull(delegate, "Delegate reader must not be null");`
`55`	`55`	`}`
`56`	`56`
`57`		`- @SuppressWarnings("NullableProblems")`
`58`	`57`	`@Override`
`59`		`- public void open(ExecutionContext executionContext) {`
	`58`	`+ public void open(@NonNull ExecutionContext executionContext) {`
`60`	`59`	`this.delegate.onOpenRead(executionContext);`
`61`	`60`	`this.iterable = this.delegate.readIterable(executionContext);`
`62`	`61`	`}`
`@@ -71,9 +70,8 @@ public T read() {`
`71`	`70`	`}`
`72`	`71`	`}`
`73`	`72`
`74`		`- @SuppressWarnings("NullableProblems")`
`75`	`73`	`@Override`
`76`		`- public void update(ExecutionContext executionContext) {`
	`74`	`+ public void update(@NonNull ExecutionContext executionContext) {`
`77`	`75`	`this.delegate.onUpdateRead(executionContext);`
`78`	`76`	`}`
`79`	`77`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,8 @@ protected ItemStreamIteratorReaderAdapter(ItemStreamIteratorReaderDelegate<T> de`
`51`	`51`	`this.delegate = Objects.requireNonNull(delegate, "Delegate reader must not be null");`
`52`	`52`	`}`
`53`	`53`
`54`		`- @SuppressWarnings("NullableProblems")`
`55`	`54`	`@Override`
`56`		`- public void open(ExecutionContext executionContext) {`
	`55`	`+ public void open(@NonNull ExecutionContext executionContext) {`
`57`	`56`	`this.delegate.onOpenRead(executionContext);`
`58`	`57`	`this.iterator = this.delegate.readIterator(executionContext);`
`59`	`58`	`}`
`@@ -68,9 +67,8 @@ public T read() {`
`68`	`67`	`}`
`69`	`68`	`}`
`70`	`69`
`71`		`- @SuppressWarnings("NullableProblems")`
`72`	`70`	`@Override`
`73`		`- public void update(ExecutionContext executionContext) {`
	`71`	`+ public void update(@NonNull ExecutionContext executionContext) {`
`74`	`72`	`this.delegate.onUpdateRead(executionContext);`
`75`	`73`	`}`
`76`	`74`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,8 @@ protected ItemStreamSimpleReaderAdapter(ItemStreamSimpleReaderDelegate<T> delega`
`48`	`48`	`this.delegate = Objects.requireNonNull(delegate, "Delegate reader must not be null");`
`49`	`49`	`}`
`50`	`50`
`51`		`- @SuppressWarnings("NullableProblems")`
`52`	`51`	`@Override`
`53`		`- public void open(ExecutionContext executionContext) {`
	`52`	`+ public void open(@NonNull ExecutionContext executionContext) {`
`54`	`53`	`this.delegate.onOpenRead(executionContext);`
`55`	`54`	`}`
`56`	`55`
`@@ -59,9 +58,8 @@ public T read() {`
`59`	`58`	`return this.delegate.read();`
`60`	`59`	`}`
`61`	`60`
`62`		`- @SuppressWarnings("NullableProblems")`
`63`	`61`	`@Override`
`64`		`- public void update(ExecutionContext executionContext) {`
	`62`	`+ public void update(@NonNull ExecutionContext executionContext) {`
`65`	`63`	`this.delegate.onUpdateRead(executionContext);`
`66`	`64`	`}`
`67`	`65`
Original file line number	Diff line number	Diff line change
`@@ -49,21 +49,18 @@ protected ItemStreamWriterAdapter(ItemStreamWriterDelegate<T> delegate) {`
`49`	`49`	`this.delegate = Objects.requireNonNull(delegate, "Delegate writer must not be null");`
`50`	`50`	`}`
`51`	`51`
`52`		`- @SuppressWarnings("NullableProblems")`
`53`	`52`	`@Override`
`54`		`- public void open(ExecutionContext executionContext) {`
	`53`	`+ public void open(@NonNull ExecutionContext executionContext) {`
`55`	`54`	`this.delegate.onOpenWrite(executionContext);`
`56`	`55`	`}`
`57`	`56`
`58`		`- @SuppressWarnings("NullableProblems")`
`59`	`57`	`@Override`
`60`		`- public void write(Chunk<? extends T> chunk) {`
	`58`	`+ public void write(@NonNull Chunk<? extends T> chunk) {`
`61`	`59`	`this.delegate.write(chunk);`
`62`	`60`	`}`
`63`	`61`
`64`		`- @SuppressWarnings("NullableProblems")`
`65`	`62`	`@Override`
`66`		`- public void update(ExecutionContext executionContext) {`
	`63`	`+ public void update(@NonNull ExecutionContext executionContext) {`
`67`	`64`	`this.delegate.onUpdateWrite(executionContext);`
`68`	`65`	`}`
`69`	`66`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`import org.springframework.batch.item.ExecutionContext;`
`31`	`31`	`import org.springframework.batch.item.ItemStreamException;`
`32`	`32`	`import org.springframework.batch.item.ItemStreamReader;`
	`33`	`+import org.springframework.lang.NonNull;`
`33`	`34`
`34`	`35`	`/**`
`35`	`36`	`* A {@link StepScope} bound proxy implementation.`
`@@ -60,9 +61,8 @@ protected StepScopeItemStreamReader(Supplier<ItemStreamReader<T>> readerGenerato`
`60`	`61`	`this.delegateSupplier = Objects.requireNonNull(readerGenerator, "Reader generator must not be null");`
`61`	`62`	`}`
`62`	`63`
`63`		`- @SuppressWarnings("NullableProblems")`
`64`	`64`	`@Override`
`65`		`- public void open(ExecutionContext executionContext) throws ItemStreamException {`
	`65`	`+ public void open(@NonNull ExecutionContext executionContext) throws ItemStreamException {`
`66`	`66`	`getDelegate().open(executionContext);`
`67`	`67`	`}`
`68`	`68`
`@@ -71,9 +71,8 @@ public T read() throws Exception {`
`71`	`71`	`return getDelegate().read();`
`72`	`72`	`}`
`73`	`73`
`74`		`- @SuppressWarnings("NullableProblems")`
`75`	`74`	`@Override`
`76`		`- public void update(ExecutionContext executionContext) throws ItemStreamException {`
	`75`	`+ public void update(@NonNull ExecutionContext executionContext) throws ItemStreamException {`
`77`	`76`	`getDelegate().update(executionContext);`
`78`	`77`	`}`
`79`	`78`