Skip to content

Commit 56f3fc6

Browse files
dgray16dgray16
authored
[bq] upgrade dependencies
1 parent 9c02e11 commit 56f3fc6

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

‎spring-batch-bigquery/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,31 +51,31 @@
5151

5252
<!-- Dependent on Spring Batch core -->
5353
<java.version>17</java.version>
54-
<logback.version>1.4.5</logback.version>
54+
<logback.version>1.4.11</logback.version>
5555
</properties>
5656

5757
<dependencies>
5858
<dependency>
5959
<groupId>org.springframework.batch</groupId>
6060
<artifactId>spring-batch-core</artifactId>
61-
<version>5.0.0</version>
61+
<version>5.0.3</version>
6262
</dependency>
6363

6464
<dependency>
6565
<groupId>com.google.cloud</groupId>
6666
<artifactId>google-cloud-bigquery</artifactId>
67-
<version>2.20.2</version>
67+
<version>2.31.1</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>com.fasterxml.jackson.dataformat</groupId>
7171
<artifactId>jackson-dataformat-csv</artifactId>
72-
<version>2.14.1</version>
72+
<version>2.15.2</version>
7373
</dependency>
7474

7575
<dependency>
7676
<groupId>org.apache.commons</groupId>
7777
<artifactId>commons-lang3</artifactId>
78-
<version>3.12.0</version>
78+
<version>3.13.0</version>
7979
</dependency>
8080
<dependency>
8181
<groupId>org.apache.commons</groupId>
@@ -88,13 +88,13 @@
8888
<dependency>
8989
<groupId>org.junit.jupiter</groupId>
9090
<artifactId>junit-jupiter-api</artifactId>
91-
<version>5.9.2</version>
91+
<version>5.10.0</version>
9292
<scope>test</scope>
9393
</dependency>
9494
<dependency>
9595
<groupId>org.mockito</groupId>
9696
<artifactId>mockito-core</artifactId>
97-
<version>5.0.0</version>
97+
<version>5.5.0</version>
9898
<scope>test</scope>
9999
</dependency>
100100
<dependency>
@@ -112,7 +112,7 @@
112112
<dependency>
113113
<groupId>org.slf4j</groupId>
114114
<artifactId>slf4j-api</artifactId>
115-
<version>2.0.6</version>
115+
<version>2.0.7</version>
116116
<scope>test</scope>
117117
</dependency>
118118

@@ -125,7 +125,7 @@
125125
<plugin>
126126
<groupId>org.apache.maven.plugins</groupId>
127127
<artifactId>maven-compiler-plugin</artifactId>
128-
<version>3.10.1</version>
128+
<version>3.11.0</version>
129129
<configuration>
130130
<source>${java.version}</source>
131131
<target>${java.version}</target>
@@ -136,7 +136,7 @@
136136
<plugin>
137137
<groupId>org.apache.maven.plugins</groupId>
138138
<artifactId>maven-surefire-plugin</artifactId>
139-
<version>2.22.2</version>
139+
<version>3.1.2</version>
140140
<configuration>
141141
<includes>
142142
<!-- Integration tests are omitted because they are designed to be run locally -->
@@ -149,7 +149,7 @@
149149
<plugin>
150150
<groupId>org.apache.maven.plugins</groupId>
151151
<artifactId>maven-javadoc-plugin</artifactId>
152-
<version>3.4.1</version>
152+
<version>3.5.0</version>
153153
<executions>
154154
<execution>
155155
<id>attach-javadocs</id>
@@ -162,7 +162,7 @@
162162
<plugin>
163163
<groupId>org.apache.maven.plugins</groupId>
164164
<artifactId>maven-source-plugin</artifactId>
165-
<version>3.2.1</version>
165+
<version>3.3.0</version>
166166
<executions>
167167
<execution>
168168
<id>attach-sources</id>

‎spring-batch-bigquery/src/main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryCsvItemWriter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.nio.charset.StandardCharsets;
3131
import java.util.List;
3232
import java.util.Objects;
33+
import java.util.function.Predicate;
3334
import java.util.stream.Collectors;
3435

3536
/**
@@ -80,7 +81,7 @@ protected List<byte[]> convertObjectsToByteArrays(List<? extends T> items) {
8081
.map(this::mapItemToCsv)
8182
.filter(ArrayUtils::isNotEmpty)
8283
.map(String::new)
83-
.filter(value -> !ObjectUtils.isEmpty(value))
84+
.filter(Predicate.not(ObjectUtils::isEmpty))
8485
.map(row -> row.getBytes(StandardCharsets.UTF_8))
8586
.collect(Collectors.toList());
8687
}
@@ -110,14 +111,13 @@ public void afterPropertiesSet() {
110111
}
111112

112113
private byte[] mapItemToCsv(T t) {
113-
byte[] result = null;
114114
try {
115-
result = Objects.isNull(rowMapper) ? objectWriter.writeValueAsBytes(t) : rowMapper.convert(t);
115+
return Objects.isNull(rowMapper) ? objectWriter.writeValueAsBytes(t) : rowMapper.convert(t);
116116
}
117117
catch (JsonProcessingException e) {
118118
logger.error("Error during processing of the line: ", e);
119+
return null;
119120
}
120-
return result;
121121
}
122122

123123
}

‎spring-batch-bigquery/src/main/java/org/springframework/batch/extensions/bigquery/writer/BigQueryJsonItemWriter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.nio.charset.StandardCharsets;
3131
import java.util.List;
3232
import java.util.Objects;
33+
import java.util.function.Predicate;
3334
import java.util.stream.Collectors;
3435

3536
/**
@@ -77,7 +78,7 @@ protected List<byte[]> convertObjectsToByteArrays(List<? extends T> items) {
7778
.filter(ArrayUtils::isNotEmpty)
7879
.map(String::new)
7980
.map(this::convertToNdJson)
80-
.filter(value -> !ObjectUtils.isEmpty(value))
81+
.filter(Predicate.not(ObjectUtils::isEmpty))
8182
.map(row -> row.getBytes(StandardCharsets.UTF_8))
8283
.collect(Collectors.toList());
8384
}
@@ -107,14 +108,13 @@ public void afterPropertiesSet() {
107108
}
108109

109110
private byte[] mapItemToJson(T t) {
110-
byte[] result = null;
111111
try {
112-
result = Objects.isNull(rowMapper) ? objectWriter.writeValueAsBytes(t) : rowMapper.convert(t);
112+
return Objects.isNull(rowMapper) ? objectWriter.writeValueAsBytes(t) : rowMapper.convert(t);
113113
}
114114
catch (JsonProcessingException e) {
115115
logger.error("Error during processing of the line: ", e);
116+
return null;
116117
}
117-
return result;
118118
}
119119

120120
/**

0 commit comments

Comments
 (0)