Skip to content

Commit ceff1ce

Browse files
author
Gerald Unterrainer
committed
update #minor and others
and fix sneaky reference to MapStruct.Strings
1 parent 9412066 commit ceff1ce

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>info.unterrainer.commons</groupId>
77
<artifactId>parent-pom</artifactId>
8-
<version>0.1.26</version>
8+
<version>0.2.1</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>rest-client</artifactId>
13-
<version>0.0.17</version>
13+
<version>0.1.0</version>
1414
<name>RestClient</name>
1515
<packaging>jar</packaging>
1616

@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>info.unterrainer.commons</groupId>
2828
<artifactId>serialization</artifactId>
29-
<version>0.1.9</version>
29+
<version>0.2.0</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>com.squareup.okhttp3</groupId>

src/main/java/info/unterrainer/commons/restclient/BaseBuilder.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import java.util.Map;
99
import java.util.stream.Collectors;
1010

11-
import org.mapstruct.ap.internal.util.Strings;
12-
1311
import com.fasterxml.jackson.core.type.TypeReference;
1412
import com.fasterxml.jackson.databind.JavaType;
1513
import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -196,12 +194,11 @@ public R retryEnduring() {
196194
* @return the return value of type you specified when you created this builder.
197195
*/
198196
public T execute() {
199-
String url = Strings.join(this.url.stream().map(e -> cutLeadingTrailing("/", e)).collect(Collectors.toList()),
200-
"/");
197+
String url = String.join("/",
198+
this.url.stream().map(e -> cutLeadingTrailing("/", e)).collect(Collectors.toList()));
201199

202-
String params = Strings.join(
203-
parameters.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.toList()),
204-
"&");
200+
String params = String.join("&",
201+
parameters.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.toList()));
205202
if (!params.isBlank())
206203
url += "?" + params;
207204

0 commit comments

Comments
 (0)