[bq] upgrade dependencies

spring-projects · Aug 25, 2023 · 56f3fc6 · 56f3fc6
1 parent 9c02e11
commit 56f3fc6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/spring-batch-bigquery/pom.xml b/spring-batch-bigquery/pom.xml
@@ -51,31 +51,31 @@
 
         <!-- Dependent on Spring Batch core -->
         <java.version>17</java.version>
-        <logback.version>1.4.5</logback.version>
+        <logback.version>1.4.11</logback.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.batch</groupId>
             <artifactId>spring-batch-core</artifactId>
-            <version>5.0.0</version>
+            <version>5.0.3</version>
         </dependency>
 
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-bigquery</artifactId>
-            <version>2.20.2</version>
+            <version>2.31.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
-            <version>2.14.1</version>
+            <version>2.15.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -88,13 +88,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.2</version>
+            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.0.0</version>
+            <version>5.5.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <scope>test</scope>
         </dependency>
 
@@ -125,7 +125,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -136,7 +136,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.1.2</version>
                 <configuration>
                     <includes>
                         <!-- Integration tests are omitted because they are designed to be run locally -->
@@ -149,7 +149,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -162,7 +162,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>

diff --git a/...main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryCsvItemWriter.java b/...main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryCsvItemWriter.java
@@ -30,6 +30,7 @@
 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 @@ protected List<byte[]> convertObjectsToByteArrays(List<? extends T> items) {
                 .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 void afterPropertiesSet() {
     }
 
     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/...ain/java/org/springframework/batch/extensions/bigquery/writer/BigQueryJsonItemWriter.java b/...ain/java/org/springframework/batch/extensions/bigquery/writer/BigQueryJsonItemWriter.java
@@ -30,6 +30,7 @@
 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 @@ protected List<byte[]> convertObjectsToByteArrays(List<? extends T> items) {
                 .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 void afterPropertiesSet() {
     }
 
     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;
     }
 
     /**