-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
allow multiple inheritance on the interface level with current restri…
…ctions intact.
- Loading branch information
1 parent
ee8d517
commit 7f0d9e1
Showing
11 changed files
with
843 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
181 changes: 181 additions & 0 deletions
181
core/src/test/java/feign/DefaultContractInheritanceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| /** | ||
| * Copyright 2012-2020 The Feign Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License | ||
| * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
| * or implied. See the License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
| package feign; | ||
|
|
||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.ExpectedException; | ||
| import java.util.List; | ||
| import static feign.assertj.FeignAssertions.assertThat; | ||
| import static java.util.Arrays.asList; | ||
| import static org.assertj.core.data.MapEntry.entry; | ||
|
|
||
| /** | ||
| * Tests interface inheritance defined per {@link Contract.Default} are interpreted into expected | ||
| * {@link feign .RequestTemplate template} instances. | ||
| */ | ||
| public class DefaultContractInheritanceTest { | ||
|
|
||
| @Rule | ||
| public final ExpectedException thrown = ExpectedException.none(); | ||
|
|
||
| Contract.Default contract = new Contract.Default(); | ||
|
|
||
| @Headers("Foo: Bar") | ||
| interface SimpleParameterizedBaseApi<M> { | ||
|
|
||
| @RequestLine("GET /api/{zoneId}") | ||
| M get(@Param("key") String key); | ||
| } | ||
|
|
||
| interface SimpleParameterizedApi extends SimpleParameterizedBaseApi<String> { | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void simpleParameterizedBaseApi() throws Exception { | ||
| final List<MethodMetadata> md = contract.parseAndValidateMetadata(SimpleParameterizedApi.class); | ||
|
|
||
| assertThat(md).hasSize(1); | ||
|
|
||
| assertThat(md.get(0).configKey()) | ||
| .isEqualTo("SimpleParameterizedApi#get(String)"); | ||
| assertThat(md.get(0).returnType()) | ||
| .isEqualTo(String.class); | ||
| assertThat(md.get(0).template()) | ||
| .hasHeaders(entry("Foo", asList("Bar"))); | ||
| } | ||
|
|
||
| @Test | ||
| public void parameterizedApiUnsupported() throws Exception { | ||
| thrown.expect(IllegalStateException.class); | ||
| thrown.expectMessage("Parameterized types unsupported: SimpleParameterizedBaseApi"); | ||
| contract.parseAndValidateMetadata(SimpleParameterizedBaseApi.class); | ||
| } | ||
|
|
||
| interface OverrideParameterizedApi extends SimpleParameterizedBaseApi<String> { | ||
|
|
||
| @Override | ||
| @RequestLine("GET /api/{zoneId}") | ||
| String get(@Param("key") String key); | ||
| } | ||
|
|
||
| @Headers("Foo: Bar") | ||
| interface SimpleBaseApi { | ||
|
|
||
| @RequestLine("GET /api/{zoneId}") | ||
| String get(@Param("key") String key); | ||
| } | ||
|
|
||
| interface OverrideSimpleApi extends SimpleBaseApi { | ||
|
|
||
| @RequestLine("GET /api/v2/{zoneId}") | ||
| String get(@Param("key") String key); | ||
| } | ||
|
|
||
| @Test | ||
| public void overrideParameterizedApiSupported() { | ||
| contract.parseAndValidateMetadata(OverrideParameterizedApi.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void overrideSimpleApiSupported() { | ||
| contract.parseAndValidateMetadata(OverrideSimpleApi.class); | ||
| } | ||
|
|
||
| interface Child<T> extends SimpleParameterizedBaseApi<List<T>> { | ||
|
|
||
| } | ||
|
|
||
| interface GrandChild extends Child<String> { | ||
|
|
||
| } | ||
|
|
||
| interface SingleInheritanceChild extends SimpleParameterizedBaseApi<String> { | ||
| } | ||
|
|
||
| interface FirstServiceBaseApi<T> { | ||
| T get(String key); | ||
| } | ||
|
|
||
| interface SecondServiceBaseApi<T> { | ||
| void update(String key, T value); | ||
| } | ||
|
|
||
| interface MultipleInheritanceDoneWrong | ||
| extends SimpleParameterizedBaseApi<String>, FirstServiceBaseApi<String>, | ||
| SecondServiceBaseApi<String> { | ||
| } | ||
|
|
||
| @Headers("Foo: Bar") | ||
| interface MultipleInheritanceParameterizedBaseApi<T> | ||
| extends FirstServiceBaseApi<T>, SecondServiceBaseApi<T> { | ||
|
|
||
| @Override | ||
| @RequestLine("GET /api/{zoneId}") | ||
| T get(@Param("key") String key); | ||
|
|
||
| @Override | ||
| @RequestLine("POST /api/{zoneId}") | ||
| @Body("%7B\"value\": \"{value}\"%7D") | ||
| void update(@Param("key") String key, @Param("value") T value); | ||
| } | ||
|
|
||
| interface MultipleInheritanceDoneCorrectly | ||
| extends MultipleInheritanceParameterizedBaseApi<String> { | ||
| } | ||
|
|
||
| interface ServiceApi<T> extends FirstServiceBaseApi<T>, SecondServiceBaseApi<T> { | ||
| } | ||
|
|
||
| @Headers("Foo: Bar") | ||
| interface MultipleInheritanceApi extends ServiceApi<String> { | ||
|
|
||
| @Override | ||
| @RequestLine("GET /api/{zoneId}") | ||
| String get(@Param("key") String key); | ||
|
|
||
| @Override | ||
| @RequestLine("POST /api/{zoneId}") | ||
| @Body("%7B\"value\": \"{value}\"%7D") | ||
| void update(@Param("key") String key, @Param("value") String value); | ||
| } | ||
|
|
||
| @Test | ||
| public void singleInheritance() { | ||
| contract.parseAndValidateMetadata(SingleInheritanceChild.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void multipleInheritanceDoneWrong() { | ||
| thrown.expect(IllegalStateException.class); | ||
| thrown.expectMessage("Only single inheritance supported: MultipleInheritanceDoneWrong"); | ||
| contract.parseAndValidateMetadata(MultipleInheritanceDoneWrong.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void multipleInheritanceDoneCorrectly() { | ||
| contract.parseAndValidateMetadata(MultipleInheritanceDoneCorrectly.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void multipleInheritanceDoneCorrectly2() { | ||
| contract.parseAndValidateMetadata(MultipleInheritanceApi.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void multipleInheritanceSupported() { | ||
| contract.parseAndValidateMetadata(GrandChild.class); | ||
| } | ||
| } |
Oops, something went wrong.