Skip to content

Commit 8644f12

Browse files
committed
Bump dependency minor/patch versions
1 parent f6a31a7 commit 8644f12

File tree

6 files changed

+23
-19
lines changed

6 files changed

+23
-19
lines changed

bolt-helidon/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<properties>
13-
<helidon.version>[2.3,2.4)</helidon.version>
13+
<helidon.version>[2.4,2.5)</helidon.version>
1414
<!-- Helidon 2.x requires Java 11+ -->
1515
<maven.compiler.source>11</maven.compiler.source>
1616
<maven.compiler.target>11</maven.compiler.target>

bolt-helidon/src/test/java/util/HashParameters.java

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ public static HashParameters concat(Parameters... parameters) {
104104
* @return a concatenation, never {@code null}.
105105
*/
106106
public static HashParameters concat(Iterable<Parameters> parameters) {
107-
ArrayList<Map<String, List<String>>> prms = new ArrayList<>();
107+
ArrayList<Map<String, List<String>>> _params = new ArrayList<>();
108108
for (Parameters p : parameters) {
109109
if (p != null) {
110-
prms.add(p.toMap());
110+
_params.add(p.toMap());
111111
}
112112
}
113-
return concat(prms);
113+
return concat(_params);
114114
}
115115

116116
private static HashParameters concat(List<Map<String, List<String>>> prms) {
@@ -240,9 +240,9 @@ public List<String> computeSingleIfAbsent(String key, Function<String, String> v
240240
}
241241

242242
@Override
243-
public void putAll(Parameters parameters) {
243+
public Parameters putAll(Parameters parameters) {
244244
if (parameters == null) {
245-
return;
245+
return null;
246246
}
247247

248248
for (Map.Entry<String, List<String>> entry : parameters.toMap().entrySet()) {
@@ -251,58 +251,62 @@ public void putAll(Parameters parameters) {
251251
content.put(entry.getKey(), Collections.unmodifiableList(values));
252252
}
253253
}
254+
return parameters;
254255
}
255256

256257
@Override
257-
public void add(String key, String... values) {
258+
public Parameters add(String key, String... values) {
258259
Objects.requireNonNull(key, "Parameter 'key' is null!");
259260
if (values == null || values.length == 0) {
260261
// do not necessarily create an entry in the map, simply immediately return
261-
return;
262+
return null;
262263
}
263264

264265
content.compute(key, (s, list) -> {
265266
if (list == null) {
266-
return Collections.unmodifiableList(new ArrayList<>(Arrays.asList(values)));
267+
return List.of(values);
267268
} else {
268269
ArrayList<String> newValues = new ArrayList<>(list.size() + values.length);
269270
newValues.addAll(list);
270271
newValues.addAll(Arrays.asList(values));
271272
return Collections.unmodifiableList(newValues);
272273
}
273274
});
275+
return null;
274276
}
275277

276278
@Override
277-
public void add(String key, Iterable<String> values) {
279+
public Parameters add(String key, Iterable<String> values) {
278280
Objects.requireNonNull(key, "Parameter 'key' is null!");
279281
List<String> vls = internalListCopy(values);
280282
if (vls == null) {
281283
// do not necessarily create an entry in the map, simply immediately return
282-
return;
284+
return null;
283285
}
284286

285287
content.compute(key, (s, list) -> {
286288
if (list == null) {
287-
return Collections.unmodifiableList(vls);
289+
return vls;
288290
} else {
289291
ArrayList<String> newValues = new ArrayList<>(list.size() + vls.size());
290292
newValues.addAll(list);
291293
newValues.addAll(vls);
292294
return Collections.unmodifiableList(newValues);
293295
}
294296
});
297+
return null;
295298
}
296299

297300
@Override
298-
public void addAll(Parameters parameters) {
301+
public Parameters addAll(Parameters parameters) {
299302
if (parameters == null) {
300-
return;
303+
return null;
301304
}
302305
Map<String, List<String>> map = parameters.toMap();
303306
for (Map.Entry<String, List<String>> entry : map.entrySet()) {
304307
add(entry.getKey(), entry.getValue());
305308
}
309+
return parameters;
306310
}
307311

308312
@Override

bolt-helidon/src/test/java/util/HashRequestHeaders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class HashRequestHeaders extends ReadOnlyParameters implements RequestHeaders {
2727

2828
/**
29-
* Header value of the non compliant {@code Accept} header sent by
29+
* Header value of the non-compliant {@code Accept} header sent by
3030
* {@link java.net.HttpURLConnection} when none is set.
3131
*
3232
* @see <a href="https://bugs.openjdk.java.net/browse/JDK-8163921">JDK-8163921</a>

bolt-http4k/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<properties>
13-
<http4k.version>4.16.2.0</http4k.version>
13+
<http4k.version>4.16.3.0</http4k.version>
1414
</properties>
1515

1616
<artifactId>bolt-http4k</artifactId>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<!-- For these compile scope dependencies, we don't use ranges of versions -->
4747
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
4848
<okhttp.version>4.9.2</okhttp.version>
49-
<gson.version>2.8.8</gson.version>
49+
<gson.version>2.8.9</gson.version>
5050
<kotlin.version>1.5.31</kotlin.version>
5151
<slf4j.version>1.7.32</slf4j.version>
5252
<lombok.version>1.18.22</lombok.version>
@@ -56,7 +56,7 @@
5656
<!-- optional / testing-only dependencies -->
5757
<aws.s3.version>[1.12.62,1.13.0)</aws.s3.version>
5858
<junit.version>4.13.2</junit.version>
59-
<logback.version>1.2.6</logback.version>
59+
<logback.version>1.2.7</logback.version>
6060
<hamcrest.version>[1.3,2.0)</hamcrest.version>
6161
<mockito-core.version>[3.12.4,3.13.0)</mockito-core.version>
6262
<jetty-for-tests.version>9.2.27.v20190403</jetty-for-tests.version>

slack-api-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<tyrus-standalone-client.version>1.17</tyrus-standalone-client.version>
2020
<java-websocket.version>1.5.2</java-websocket.version>
2121
<jedis.version>3.7.0</jedis.version>
22-
<jedis-mock.version>0.1.22</jedis-mock.version>
22+
<jedis-mock.version>0.1.23</jedis-mock.version>
2323
</properties>
2424

2525
<dependencies>

0 commit comments

Comments
 (0)