Mock: manage headers using RequestHeaders #706

pboutes · 2018-05-17T03:11:42Z

Add the new class RequestHeaders in order to improve management of request headers when testing.

So instead of doing this:

    Map<String, Collection<String>> headers = new HashMap<>();
    headers.put("my-header", Arrays.asList("val"));
    headers.put("my-header-2", Arrays.asList("val2", "val3"));

we can do :

    RequestHeaders headers = RequestHeaders.builder()
      .add("my-header", "val")
      .add("my-header-2", Arrays.asList("val2", "val3"))
      .build();

or

    RequestHeaders headers = RequestHeaders.builder()
      .add("my-header", "val")
      .add("my-header-2", "val2")
      .add("my-header-2", "val3")
      .build();

Moreover, when a request do not match, we will now print the expected headers instead of the numbers of headers.

Before:
Expected Request [GET /myrequest: with 2 headers and no charset], but was Request [GET /myrequest: with 0 headers and no charset]

After:
Expected Request [GET /myrequest: with my-header=[val], my-header-2=[val2,val3] headers and no charset], but was Request [GET /myrequest: with no headers and no charset]

velo

I started reviewing it, but the format changes make it hard to me to see the full scope of the changes, could you please run mvn clean install to reformat this PR?

velo · 2018-05-17T03:40:40Z

mock/src/main/java/feign/mock/RequestKey.java

@@ -42,7 +41,7 @@ private Builder(HttpMethod method, String url) {
      this.url = url;
    }

-    public Builder headers(Map<String, Collection<String>> headers) {


Could you please keep the original headers with @Deprecated?

velo · 2018-05-17T03:45:35Z

mock/src/test/java/feign/mock/MockClientSequentialTest.java


    @RequestLine("PATCH /repos/{owner}/{repo}/contributors")
    List<Contributor> patchContributors(@Param("owner") String owner, @Param("repo") String repo);

    @RequestLine("POST /repos/{owner}/{repo}/contributors")
    @Body("%7B\"login\":\"{login}\",\"type\":\"{type}\"%7D")
    Contributor create(@Param("owner") String owner,
-                       @Param("repo") String repo,


Looks like you changed the formatting for many classes.... could you please rollback?

running mvn clean install should do it.

Yep, of course. I'll plug the eclipse formatter plugin to my IDE.

velo

LGTM, I just would like to see this remaining format and java 6 changes reverted.

Ping me when ready to merge

velo · 2018-05-17T09:41:07Z

mock/src/test/java/feign/mock/RequestKeyTest.java

 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertThat;
-import java.nio.charset.StandardCharsets;


Ok, i'll undo. I've made this to launch test from IntelliJ directly, because test and source don't get the same language level.

FWIW, master is now java 8 =)

velo · 2018-05-17T09:42:05Z

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

@@ -238,7 +236,8 @@ public Request verifyOne(HttpMethod method, String url) {

    List<Request> result = requests.get(requestKey);
    if (result.size() != times) {
-      throw new VerificationAssertionError("Wanted: '%s' to be invoked: '%s' times but got: '%s'!",
+      throw new VerificationAssertionError(
+          "Wanted: '%s' to be invoked: '%s' times but got: '%s'!",


I still see a bunch of No-Op changes...

Would be nice to reduce the number of thoose

velo · 2018-05-17T09:42:54Z

mock/src/test/java/feign/mock/MockClientTest.java

  private MockClient mockClient;

  @Before
  public void setup() throws IOException {
-    try (InputStream input = getClass().getResourceAsStream("/fixtures/contributors.json")) {
+    InputStream input = getClass().getResourceAsStream("/fixtures/contributors.json");


no need to undo it.

pboutes · 2018-05-17T12:40:33Z

@velo Sounds good to you ?

velo · 2018-05-17T21:03:08Z

Perfect!

pboutes added 3 commits May 17, 2018 04:13

feat(feign-mock): add RequestHeaders class to manage headers

be68a4f

feat(feign-mock): use google code style formatting

67a5be5

feat(feign-mock): remove system.out

e78d88f

velo requested changes May 17, 2018

View reviewed changes

pboutes force-pushed the master branch from b04252a to 752073f Compare May 17, 2018 08:49

feat(RequestKey): add deprecated headers builder + format code

2f3b707

pboutes force-pushed the master branch from 752073f to 2f3b707 Compare May 17, 2018 08:51

pboutes added 2 commits May 17, 2018 10:57

feat(feign-mock): format pom correctly

6da613b

feat(feign-mock): format pom correctly

00cf2b5

velo approved these changes May 17, 2018

View reviewed changes

fix(feign-mock): undo some typo and no-op change

8815321

velo merged commit fb825f2 into OpenFeign:master May 17, 2018

kdavisk6 added this to the 10.0 milestone Aug 10, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mock: manage headers using RequestHeaders #706

Mock: manage headers using RequestHeaders #706

pboutes commented May 17, 2018

velo left a comment

velo May 17, 2018

velo May 17, 2018

pboutes May 17, 2018

velo left a comment

velo May 17, 2018

pboutes May 17, 2018

velo May 17, 2018

velo May 17, 2018

velo May 17, 2018

pboutes commented May 17, 2018

velo commented May 17, 2018

Mock: manage headers using RequestHeaders #706

Mock: manage headers using RequestHeaders #706

Conversation

pboutes commented May 17, 2018

velo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

velo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pboutes commented May 17, 2018

velo commented May 17, 2018