From cbe0aa38d31a50ceb40a46c424486f2961e0e013 Mon Sep 17 00:00:00 2001 From: drow724 Date: Tue, 17 Jan 2023 11:27:00 +0900 Subject: [PATCH 1/3] AvroItemReader Constructor initialize --- .../org/springframework/batch/item/avro/AvroItemReader.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/AvroItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/AvroItemReader.java index aca9f4aa1e..f2ed750847 100755 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/AvroItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/AvroItemReader.java @@ -35,6 +35,7 @@ import org.springframework.core.io.Resource; import org.springframework.lang.Nullable; import org.springframework.util.Assert; +import org.springframework.util.ClassUtils; /** * An {@link ItemReader} that deserializes data from a {@link Resource} containing @@ -42,6 +43,7 @@ * * @author David Turanski * @author Mahmoud Ben Hassine + * @author Song JaeGeun * @since 4.2 */ public class AvroItemReader extends AbstractItemCountingItemStreamItemReader { @@ -61,6 +63,8 @@ public class AvroItemReader extends AbstractItemCountingItemStreamItemReader< * @param clazz the data type to be deserialized. */ public AvroItemReader(Resource resource, Class clazz) { + setName(ClassUtils.getShortName(AvroItemReader.class)); + Assert.notNull(resource, "'resource' is required."); Assert.notNull(clazz, "'class' is required."); @@ -78,6 +82,8 @@ public AvroItemReader(Resource resource, Class clazz) { * @param schema the {@link Resource} containing the Avro schema. */ public AvroItemReader(Resource data, Resource schema) { + setName(ClassUtils.getShortName(AvroItemReader.class)); + Assert.notNull(data, "'data' is required."); Assert.state(data.exists(), "'data' " + data.getFilename() + " does not exist."); Assert.notNull(schema, "'schema' is required"); From 6d1a0c2237215af9f9c94ed869a08361617116a2 Mon Sep 17 00:00:00 2001 From: drow724 Date: Tue, 17 Jan 2023 13:27:44 +0900 Subject: [PATCH 2/3] useless validation remove --- .../batch/item/avro/builder/AvroItemReaderBuilder.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java index c9803e2590..8017eb701d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java @@ -29,6 +29,7 @@ * * @author David Turanski * @author Mahmoud Ben Hassine + * @author Song JaeGeun * @since 4.2 */ public class AvroItemReaderBuilder { @@ -170,10 +171,6 @@ public AvroItemReader build() { avroItemReader.setSaveState(this.saveState); - if (this.saveState) { - Assert.state(StringUtils.hasText(this.name), "A name is required when saveState is set to true."); - } - avroItemReader.setName(this.name); avroItemReader.setCurrentItemCount(this.currentItemCount); avroItemReader.setMaxItemCount(this.maxItemCount); From cf884331da3a6d2f23359360508081e4fbfd40d2 Mon Sep 17 00:00:00 2001 From: drow724 Date: Tue, 17 Jan 2023 13:28:36 +0900 Subject: [PATCH 3/3] remove unused import --- .../batch/item/avro/builder/AvroItemReaderBuilder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java index 8017eb701d..bdbf64f2ea 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java @@ -22,7 +22,6 @@ import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; import org.springframework.util.Assert; -import org.springframework.util.StringUtils; /** * A builder implementation for the {@link AvroItemReader}.