Skip to content

Fix feign-core test compilation broken by removed Request.create overload #3406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
velo merged 5 commits into from
Jun 11, 2026
Merged

Fix feign-core test compilation broken by removed Request.create overload #3406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7ea91f
fix: adapt logger tests to the Request.create(Body, RequestTemplate) …
seonwooj0810 Jun 10, 2026
bccfa6c
fix: adapt Slf4jLoggerTest to the Request.create(Body, RequestTemplat…
seonwooj0810 Jun 10, 2026
18cba58
fix: adapt validation tests to the RequestTemplate#body(Request.Body)…
seonwooj0810 Jun 10, 2026
f9cd6b3
test: make Http2ClientTest hermetic, dropping the live nghttp2.org de…
velo Jun 11, 2026
37c6532
Merge branch 'master' into fix/core-logger-test-compile
velo Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions core/src/test/java/feign/JavaLoggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ void rebuffersResponseBodyWhenJulLevelIsInfo() throws Exception {
Response.builder()
.status(200)
.reason("OK")
.request(
Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
.request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body("{\"error\":\"test\"}", Util.UTF_8)
.build();
Expand All @@ -69,8 +68,7 @@ void rebuffersResponseBodyWhenJulLevelIsWarning() throws Exception {
Response.builder()
.status(500)
.reason("Internal Server Error")
.request(
Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
.request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body("{\"message\":\"error details\"}", Util.UTF_8)
.build();
Expand All @@ -95,8 +93,7 @@ void responseBodyReadableMultipleTimesForErrorDecoder() throws Exception {
.status(400)
.reason("Bad Request")
.request(
Request.create(
HttpMethod.POST, "/api/submit", Collections.emptyMap(), null, Util.UTF_8))
Request.create(HttpMethod.POST, "/api/submit", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body(originalBody, Util.UTF_8)
.build();
Expand Down
19 changes: 7 additions & 12 deletions core/src/test/java/feign/LoggerRebufferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ void headersLevelRebuffersResponseBody() throws Exception {
.status(404)
.reason("Not Found")
.request(
Request.create(
HttpMethod.GET, "/api/resource", Collections.emptyMap(), null, Util.UTF_8))
Request.create(HttpMethod.GET, "/api/resource", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body(originalBody, Util.UTF_8)
.build();
Expand All @@ -70,8 +69,7 @@ void basicLevelDoesNotRebufferResponseBody() throws Exception {
.status(200)
.reason("OK")
.request(
Request.create(
HttpMethod.GET, "/api/resource", Collections.emptyMap(), null, Util.UTF_8))
Request.create(HttpMethod.GET, "/api/resource", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body(originalBody, Util.UTF_8)
.build();
Expand All @@ -94,8 +92,7 @@ void fullLevelRebuffersResponseBody() throws Exception {
.status(200)
.reason("OK")
.request(
Request.create(
HttpMethod.POST, "/api/create", Collections.emptyMap(), null, Util.UTF_8))
Request.create(HttpMethod.POST, "/api/create", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body(originalBody, Util.UTF_8)
.build();
Expand All @@ -122,8 +119,7 @@ void noneLevelDoesNotRebufferResponseBody() throws Exception {
.status(200)
.reason("OK")
.request(
Request.create(
HttpMethod.GET, "/api/status", Collections.emptyMap(), null, Util.UTF_8))
Request.create(HttpMethod.GET, "/api/status", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body(originalBody, Util.UTF_8)
.build();
Expand All @@ -146,7 +142,7 @@ void http204DoesNotRebufferEvenAtHeadersLevel() throws Exception {
.reason("No Content")
.request(
Request.create(
HttpMethod.DELETE, "/api/resource/1", Collections.emptyMap(), null, Util.UTF_8))
HttpMethod.DELETE, "/api/resource/1", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body("should be ignored", Util.UTF_8)
.build();
Expand All @@ -168,8 +164,7 @@ void http205DoesNotRebufferEvenAtHeadersLevel() throws Exception {
.status(205)
.reason("Reset Content")
.request(
Request.create(
HttpMethod.POST, "/api/form", Collections.emptyMap(), null, Util.UTF_8))
Request.create(HttpMethod.POST, "/api/form", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body("should be ignored", Util.UTF_8)
.build();
Expand All @@ -192,7 +187,7 @@ void nullBodyHandledCorrectlyAtHeadersLevel() throws Exception {
.reason("OK")
.request(
Request.create(
HttpMethod.HEAD, "/api/resource", Collections.emptyMap(), null, Util.UTF_8))
HttpMethod.HEAD, "/api/resource", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body((byte[]) null)
.build();
Expand Down
100 changes: 83 additions & 17 deletions java11/src/test/java/feign/http2client/test/Http2ClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,20 @@
import feign.http2client.Http2Client;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.http.HttpTimeoutException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.RecordedRequest;
import org.json.JSONException;
import org.junit.jupiter.api.Test;
import org.skyscreamer.jsonassert.JSONAssert;

/** Tests client-specific behavior, such as ensuring Content-Length is sent when specified. */
public class Http2ClientTest extends AbstractClientTest {
Expand Down Expand Up @@ -83,17 +87,39 @@ public interface TestInterface {
@Override
@Test
public void patch() throws Exception {
server.enqueue(new MockResponse().setBody("foo"));

final TestInterface api =
newBuilder().target(TestInterface.class, "https://nghttp2.org/httpbin/");
assertThat(api.patch("")).contains("https://nghttp2.org/httpbin/patch");
newBuilder().target(TestInterface.class, "http://localhost:" + server.getPort());

assertThat(api.patch("some text")).isEqualTo("foo");

MockWebServerAssertions.assertThat(server.takeRequest())
.hasMethod("PATCH")
.hasPath("/patch")
.hasBody("some text");
}

@Override
@Test
public void noResponseBodyForPatch() {
server.enqueue(new MockResponse());

final TestInterface api =
newBuilder().target(TestInterface.class, "https://nghttp2.org/httpbin/");
assertThat(api.patch()).contains("https://nghttp2.org/httpbin/patch");
newBuilder().target(TestInterface.class, "http://localhost:" + server.getPort());

assertThat(api.patch()).isEmpty();

MockWebServerAssertions.assertThat(takeRequest()).hasMethod("PATCH").hasPath("/patch");
}

private RecordedRequest takeRequest() {
try {
return server.takeRequest();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new IllegalStateException(e);
}
}

@Override
Expand Down Expand Up @@ -150,21 +176,61 @@ void timeoutTest() {
}

@Test
void getWithRequestBody() throws JSONException {
final TestInterface api =
newBuilder().target(TestInterface.class, "https://nghttp2.org/httpbin/");
String result = api.getWithBody();
String expected = "{ \"data\":\"some request body\" }";
JSONAssert.assertEquals(expected, result, false);
void getWithRequestBody() throws Exception {
// MockWebServer rejects GET requests carrying a body ("Request must not have a body"),
// so this test runs against a minimal local socket server instead.
try (ServerSocket httpServer = new ServerSocket(0, 1, InetAddress.getLoopbackAddress())) {
final AtomicReference<String> receivedRequest = new AtomicReference<>();
final Thread serverThread =
new Thread(
() -> {
try (Socket socket = httpServer.accept()) {
socket.setSoTimeout(5000);
final InputStream in = socket.getInputStream();
final StringBuilder request = new StringBuilder();
final byte[] buffer = new byte[8192];
while (!request.toString().contains("some request body")) {
final int read = in.read(buffer);
if (read == -1) {
break;
}
request.append(new String(buffer, 0, read, UTF_8));
}
receivedRequest.set(request.toString());
socket
.getOutputStream()
.write("HTTP/1.1 200 OK\r\nContent-Length: 3\r\n\r\nfoo".getBytes(UTF_8));
} catch (IOException e) {
throw new UncheckedIOException(e);
}
});
serverThread.start();

final TestInterface api =
newBuilder().target(TestInterface.class, "http://localhost:" + httpServer.getLocalPort());

assertThat(api.getWithBody()).isEqualTo("foo");

serverThread.join(5000);
assertThat(receivedRequest.get())
.startsWith("GET /anything HTTP/1.1")
.contains("some request body");
}
}

@Test
void deleteWithRequestBody() throws JSONException {
void deleteWithRequestBody() throws Exception {
server.enqueue(new MockResponse().setBody("foo"));

final TestInterface api =
newBuilder().target(TestInterface.class, "https://nghttp2.org/httpbin/");
String result = api.deleteWithBody();
String expected = "{ \"data\":\"some request body\" }";
JSONAssert.assertEquals(expected, result, false);
newBuilder().target(TestInterface.class, "http://localhost:" + server.getPort());

assertThat(api.deleteWithBody()).isEqualTo("foo");

MockWebServerAssertions.assertThat(server.takeRequest())
.hasMethod("DELETE")
.hasPath("/anything")
.hasBody("some request body");
}

@Override
Expand Down
10 changes: 4 additions & 6 deletions slf4j/src/test/java/feign/slf4j/Slf4jLoggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import feign.Request.HttpMethod;
import feign.RequestTemplate;
import feign.Response;
import feign.Util;
import java.util.Collection;
import java.util.Collections;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -124,8 +125,7 @@ void rebuffersResponseBodyWhenLogLevelIsInfo() throws Exception {
Response.builder()
.status(200)
.reason("OK")
.request(
Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
.request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body("{\"error\":\"test\"}", Util.UTF_8)
.build();
Expand All @@ -150,8 +150,7 @@ void rebuffersResponseBodyWhenLogLevelIsFull() throws Exception {
Response.builder()
.status(500)
.reason("Internal Server Error")
.request(
Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
.request(Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body("{\"message\":\"error details\"}", Util.UTF_8)
.build();
Expand All @@ -177,8 +176,7 @@ void responseBodyReadableMultipleTimes() throws Exception {
.status(400)
.reason("Bad Request")
.request(
Request.create(
HttpMethod.POST, "/api/submit", Collections.emptyMap(), null, Util.UTF_8))
Request.create(HttpMethod.POST, "/api/submit", Collections.emptyMap(), null, null))
.headers(Collections.<String, Collection<String>>emptyMap())
.body(originalBody, Util.UTF_8)
.build();
Expand Down
4 changes: 3 additions & 1 deletion validation-jakarta/src/test/java/feign/validation/BeanValidationMethodInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import feign.Feign;
import feign.Param;
import feign.Request;
import feign.RequestLine;
import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Valid;
Expand Down Expand Up @@ -76,7 +77,8 @@ interface Api {

private Api api() {
return Feign.builder()
.encoder((object, bodyType, template) -> template.body(String.valueOf(object)))
.encoder(
(object, bodyType, template) -> template.body(Request.Body.of(String.valueOf(object))))
.methodInterceptor(BeanValidationMethodInterceptor.usingDefaultFactory())
.target(Api.class, "http://localhost:" + server.getPort());
}
Expand Down
4 changes: 3 additions & 1 deletion validation/src/test/java/feign/validation/BeanValidationMethodInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import feign.Feign;
import feign.Param;
import feign.Request;
import feign.RequestLine;
import javax.validation.ConstraintViolationException;
import javax.validation.Valid;
Expand Down Expand Up @@ -76,7 +77,8 @@ interface Api {

private Api api() {
return Feign.builder()
.encoder((object, bodyType, template) -> template.body(String.valueOf(object)))
.encoder(
(object, bodyType, template) -> template.body(Request.Body.of(String.valueOf(object))))
.methodInterceptor(BeanValidationMethodInterceptor.usingDefaultFactory())
.target(Api.class, "http://localhost:" + server.getPort());
}
Expand Down