diff --git a/spring-batch-bigquery/pom.xml b/spring-batch-bigquery/pom.xml index 9027952..c906dfb 100644 --- a/spring-batch-bigquery/pom.xml +++ b/spring-batch-bigquery/pom.xml @@ -51,31 +51,31 @@ 17 - 1.4.5 + 1.4.11 org.springframework.batch spring-batch-core - 5.0.0 + 5.0.3 com.google.cloud google-cloud-bigquery - 2.20.2 + 2.31.1 com.fasterxml.jackson.dataformat jackson-dataformat-csv - 2.14.1 + 2.15.2 org.apache.commons commons-lang3 - 3.12.0 + 3.13.0 org.apache.commons @@ -88,13 +88,13 @@ org.junit.jupiter junit-jupiter-api - 5.9.2 + 5.10.0 test org.mockito mockito-core - 5.0.0 + 5.5.0 test @@ -112,7 +112,7 @@ org.slf4j slf4j-api - 2.0.6 + 2.0.7 test @@ -125,7 +125,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.11.0 ${java.version} ${java.version} @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.1.2 @@ -149,7 +149,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 attach-javadocs @@ -162,7 +162,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources diff --git a/spring-batch-bigquery/src/main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryCsvItemWriter.java b/spring-batch-bigquery/src/main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryCsvItemWriter.java index bb205cf..d3efb45 100644 --- a/spring-batch-bigquery/src/main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryCsvItemWriter.java +++ b/spring-batch-bigquery/src/main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryCsvItemWriter.java @@ -30,6 +30,7 @@ import org.springframework.util.ObjectUtils; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Objects; +import java.util.function.Predicate; import java.util.stream.Collectors; /** @@ -80,7 +81,7 @@ public class BigQueryCsvItemWriter extends BigQueryBaseItemWriter implemen .map(this::mapItemToCsv) .filter(ArrayUtils::isNotEmpty) .map(String::new) - .filter(value -> !ObjectUtils.isEmpty(value)) + .filter(Predicate.not(ObjectUtils::isEmpty)) .map(row -> row.getBytes(StandardCharsets.UTF_8)) .collect(Collectors.toList()); } @@ -110,14 +111,13 @@ public class BigQueryCsvItemWriter extends BigQueryBaseItemWriter implemen } private byte[] mapItemToCsv(T t) { - byte[] result = null; try { - result = Objects.isNull(rowMapper) ? objectWriter.writeValueAsBytes(t) : rowMapper.convert(t); + return Objects.isNull(rowMapper) ? objectWriter.writeValueAsBytes(t) : rowMapper.convert(t); } catch (JsonProcessingException e) { logger.error("Error during processing of the line: ", e); + return null; } - return result; } } diff --git a/spring-batch-bigquery/src/main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryJsonItemWriter.java b/spring-batch-bigquery/src/main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryJsonItemWriter.java index 9f8e18d..34a773f 100644 --- a/spring-batch-bigquery/src/main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryJsonItemWriter.java +++ b/spring-batch-bigquery/src/main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryJsonItemWriter.java @@ -30,6 +30,7 @@ import org.springframework.util.ObjectUtils; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Objects; +import java.util.function.Predicate; import java.util.stream.Collectors; /** @@ -77,7 +78,7 @@ public class BigQueryJsonItemWriter extends BigQueryBaseItemWriter impleme .filter(ArrayUtils::isNotEmpty) .map(String::new) .map(this::convertToNdJson) - .filter(value -> !ObjectUtils.isEmpty(value)) + .filter(Predicate.not(ObjectUtils::isEmpty)) .map(row -> row.getBytes(StandardCharsets.UTF_8)) .collect(Collectors.toList()); } @@ -107,14 +108,13 @@ public class BigQueryJsonItemWriter extends BigQueryBaseItemWriter impleme } private byte[] mapItemToJson(T t) { - byte[] result = null; try { - result = Objects.isNull(rowMapper) ? objectWriter.writeValueAsBytes(t) : rowMapper.convert(t); + return Objects.isNull(rowMapper) ? objectWriter.writeValueAsBytes(t) : rowMapper.convert(t); } catch (JsonProcessingException e) { logger.error("Error during processing of the line: ", e); + return null; } - return result; } /**