Skip to content

Commit 8e84f5e

Browse files
authored
Stage feign 10 1 (OpenFeign#819)
* NPE when resolving a template with binary body * must cast to super class Buffer otherwise break when running with java 11 * Better error message for feign mock * Recomend using Response.Builder on MockClient
1 parent 0cdebcd commit 8e84f5e

3 files changed

Lines changed: 24 additions & 4 deletions

File tree

‎core/src/main/java/feign/Util.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.lang.reflect.ParameterizedType;
2626
import java.lang.reflect.Type;
2727
import java.lang.reflect.WildcardType;
28+
import java.nio.Buffer;
2829
import java.nio.ByteBuffer;
2930
import java.nio.CharBuffer;
3031
import java.nio.charset.CharacterCodingException;
@@ -287,10 +288,12 @@ public static String toString(Reader reader) throws IOException {
287288
}
288289
try {
289290
StringBuilder to = new StringBuilder();
290-
CharBuffer buf = CharBuffer.allocate(BUF_SIZE);
291-
while (reader.read(buf) != -1) {
291+
CharBuffer charBuf = CharBuffer.allocate(BUF_SIZE);
292+
// must cast to super class Buffer otherwise break when running with java 11
293+
Buffer buf = charBuf;
294+
while (reader.read(charBuf) != -1) {
292295
buf.flip();
293-
to.append(buf);
296+
to.append(charBuf);
294297
buf.clear();
295298
}
296299
return to.toString();

‎core/src/test/java/feign/RequestTemplateTest.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,18 @@ public void resolveTemplateWithBinaryBody() {
108108
.hasUrl("/hostedzone/Z1PA6795UKMFR9");
109109
}
110110

111+
@Test
112+
public void resolveTemplateWithBinaryBody() {
113+
RequestTemplate template = new RequestTemplate().method(HttpMethod.GET)
114+
.uri("{zoneId}")
115+
.body(new byte[] {7,3,-3,-7}, null);
116+
117+
template = template.resolve(mapOf("zoneId", "/hostedzone/Z1PA6795UKMFR9"));
118+
119+
assertThat(template)
120+
.hasUrl("/hostedzone/Z1PA6795UKMFR9");
121+
}
122+
111123
@Test
112124
public void canInsertAbsoluteHref() {
113125
RequestTemplate template = new RequestTemplate().method(HttpMethod.GET)

‎mock/src/main/java/feign/mock/MockClient.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,10 @@ public MockClient add(RequestKey requestKey, Response.Builder response) {
206206
return this;
207207
}
208208

209+
/**
210+
* @deprecated use {@link #add(HttpMethod, String, feign.Response.Builder)} instead
211+
*/
212+
@Deprecated
209213
public MockClient add(HttpMethod method, String url, Response response) {
210214
return this.add(method, url, response.toBuilder());
211215
}
@@ -230,7 +234,8 @@ public List<Request> verifyTimes(final HttpMethod method, final String url, fina
230234

231235
RequestKey requestKey = RequestKey.builder(method, url).build();
232236
if (!requests.containsKey(requestKey)) {
233-
throw new VerificationAssertionError("Wanted: '%s' but never invoked!", requestKey);
237+
throw new VerificationAssertionError("Wanted: '%s' but never invoked! Got: %s", requestKey,
238+
requests.keySet());
234239
}
235240

236241
List<Request> result = requests.get(requestKey);

0 commit comments

Comments
 (0)