Browse Source
when trying to find the ErrorHandling annotation on method or class level also inspect annotations already present to see if they are annotated Co-authored-by: Marvin Froeder <velo@users.noreply.github.com>pull/1463/head
Michael Cramer
3 years ago
committed by
GitHub
5 changed files with 496 additions and 6 deletions
@ -0,0 +1,105 @@
@@ -0,0 +1,105 @@
|
||||
/** |
||||
* Copyright 2012-2021 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.error; |
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
import org.junit.Test; |
||||
import org.junit.runner.RunWith; |
||||
import org.junit.runners.Parameterized; |
||||
import org.junit.runners.Parameterized.Parameter; |
||||
import org.junit.runners.Parameterized.Parameters; |
||||
import java.lang.annotation.Retention; |
||||
import java.lang.annotation.RetentionPolicy; |
||||
import java.util.Arrays; |
||||
|
||||
@RunWith(Parameterized.class) |
||||
public class AnnotationErrorDecoderAnnotationInheritanceTest extends |
||||
AbstractAnnotationErrorDecoderTest<AnnotationErrorDecoderAnnotationInheritanceTest.TestClientInterfaceWithWithMetaAnnotation> { |
||||
@Override |
||||
public Class<TestClientInterfaceWithWithMetaAnnotation> interfaceAtTest() { |
||||
return TestClientInterfaceWithWithMetaAnnotation.class; |
||||
} |
||||
|
||||
@Parameters( |
||||
name = "{0}: When error code ({1}) on method ({2}) should return exception type ({3})") |
||||
public static Iterable<Object[]> data() { |
||||
return Arrays.asList(new Object[][] { |
||||
{"Test Code Specific At Method", 402, "method1Test", MethodLevelDefaultException.class}, |
||||
{"Test Code Specific At Method", 403, "method1Test", MethodLevelNotFoundException.class}, |
||||
{"Test Code Specific At Method", 404, "method1Test", MethodLevelNotFoundException.class}, |
||||
{"Test Code Specific At Method", 402, "method2Test", ClassLevelDefaultException.class}, |
||||
{"Test Code Specific At Method", 403, "method2Test", MethodLevelNotFoundException.class}, |
||||
{"Test Code Specific At Method", 404, "method2Test", ClassLevelNotFoundException.class}, |
||||
}); |
||||
} |
||||
|
||||
@Parameter // first data value (0) is default
|
||||
public String testType; |
||||
|
||||
@Parameter(1) |
||||
public int errorCode; |
||||
|
||||
@Parameter(2) |
||||
public String method; |
||||
|
||||
@Parameter(3) |
||||
public Class<? extends Exception> expectedExceptionClass; |
||||
|
||||
@Test |
||||
public void test() throws Exception { |
||||
AnnotationErrorDecoder decoder = |
||||
AnnotationErrorDecoder.builderFor(TestClientInterfaceWithWithMetaAnnotation.class).build(); |
||||
|
||||
assertThat(decoder.decode(feignConfigKey(method), testResponse(errorCode)).getClass()) |
||||
.isEqualTo(expectedExceptionClass); |
||||
} |
||||
|
||||
@ClassError |
||||
interface TestClientInterfaceWithWithMetaAnnotation { |
||||
@MethodError |
||||
void method1Test(); |
||||
|
||||
@ErrorHandling( |
||||
codeSpecific = {@ErrorCodes(codes = {403}, generate = MethodLevelNotFoundException.class)}) |
||||
void method2Test(); |
||||
} |
||||
|
||||
@ErrorHandling( |
||||
codeSpecific = {@ErrorCodes(codes = {404}, generate = ClassLevelNotFoundException.class),}, |
||||
defaultException = ClassLevelDefaultException.class) |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
@interface ClassError { |
||||
} |
||||
|
||||
@ErrorHandling( |
||||
codeSpecific = { |
||||
@ErrorCodes(codes = {404, 403}, generate = MethodLevelNotFoundException.class),}, |
||||
defaultException = MethodLevelDefaultException.class) |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
@interface MethodError { |
||||
} |
||||
|
||||
static class ClassLevelDefaultException extends Exception { |
||||
public ClassLevelDefaultException() {} |
||||
} |
||||
static class ClassLevelNotFoundException extends Exception { |
||||
public ClassLevelNotFoundException() {} |
||||
} |
||||
static class MethodLevelDefaultException extends Exception { |
||||
public MethodLevelDefaultException() {} |
||||
} |
||||
static class MethodLevelNotFoundException extends Exception { |
||||
public MethodLevelNotFoundException() {} |
||||
} |
||||
} |
||||
@ -0,0 +1,119 @@
@@ -0,0 +1,119 @@
|
||||
/** |
||||
* Copyright 2012-2021 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.error; |
||||
|
||||
import org.junit.Test; |
||||
import org.junit.runner.RunWith; |
||||
import org.junit.runners.Parameterized; |
||||
import org.junit.runners.Parameterized.Parameter; |
||||
import org.junit.runners.Parameterized.Parameters; |
||||
import java.lang.annotation.Retention; |
||||
import java.lang.annotation.RetentionPolicy; |
||||
import java.util.Arrays; |
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
|
||||
@RunWith(Parameterized.class) |
||||
public class AnnotationErrorDecoderInheritanceClassLevelAnnotationTest extends |
||||
AbstractAnnotationErrorDecoderTest<AnnotationErrorDecoderInheritanceClassLevelAnnotationTest.SecondLevelInterface> { |
||||
@Override |
||||
public Class<SecondLevelInterface> interfaceAtTest() { |
||||
return SecondLevelInterface.class; |
||||
} |
||||
|
||||
@Parameters( |
||||
name = "{0}: When error code ({1}) on method ({2}) should return exception type ({3})") |
||||
public static Iterable<Object[]> data() { |
||||
return Arrays.asList(new Object[][] { |
||||
{"Test Code Specific At Method", 403, "topLevelMethod", |
||||
SecondLevelClassDefaultException.class}, |
||||
{"Test Code Specific At Method", 403, "secondLevelMethod", |
||||
SecondLevelMethodDefaultException.class}, |
||||
{"Test Code Specific At Method", 404, "topLevelMethod", |
||||
SecondLevelClassAnnotationException.class}, |
||||
{"Test Code Specific At Method", 404, "secondLevelMethod", |
||||
SecondLevelMethodErrorHandlingException.class}, |
||||
}); |
||||
} |
||||
|
||||
@Parameter // first data value (0) is default
|
||||
public String testType; |
||||
|
||||
@Parameter(1) |
||||
public int errorCode; |
||||
|
||||
@Parameter(2) |
||||
public String method; |
||||
|
||||
@Parameter(3) |
||||
public Class<? extends Exception> expectedExceptionClass; |
||||
|
||||
@Test |
||||
public void test() throws Exception { |
||||
AnnotationErrorDecoder decoder = |
||||
AnnotationErrorDecoder.builderFor(SecondLevelInterface.class).build(); |
||||
|
||||
assertThat(decoder.decode(feignConfigKey(method), testResponse(errorCode)).getClass()) |
||||
.isEqualTo(expectedExceptionClass); |
||||
} |
||||
|
||||
@TopLevelClassError |
||||
interface TopLevelInterface { |
||||
@ErrorHandling |
||||
void topLevelMethod(); |
||||
} |
||||
|
||||
@SecondLevelClassError |
||||
interface SecondLevelInterface extends TopLevelInterface { |
||||
@ErrorHandling( |
||||
codeSpecific = { |
||||
@ErrorCodes(codes = {404}, generate = SecondLevelMethodErrorHandlingException.class)}, |
||||
defaultException = SecondLevelMethodDefaultException.class) |
||||
void secondLevelMethod(); |
||||
} |
||||
|
||||
@ErrorHandling( |
||||
codeSpecific = { |
||||
@ErrorCodes(codes = {403, 404}, generate = TopLevelClassAnnotationException.class),}, |
||||
defaultException = TopLevelClassDefaultException.class) |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
@interface TopLevelClassError { |
||||
} |
||||
|
||||
@ErrorHandling( |
||||
codeSpecific = { |
||||
@ErrorCodes(codes = {404}, generate = SecondLevelClassAnnotationException.class),}, |
||||
defaultException = SecondLevelClassDefaultException.class) |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
@interface SecondLevelClassError { |
||||
} |
||||
|
||||
static class TopLevelClassDefaultException extends Exception { |
||||
public TopLevelClassDefaultException() {} |
||||
} |
||||
static class TopLevelClassAnnotationException extends Exception { |
||||
public TopLevelClassAnnotationException() {} |
||||
} |
||||
static class SecondLevelClassDefaultException extends Exception { |
||||
public SecondLevelClassDefaultException() {} |
||||
} |
||||
static class SecondLevelMethodDefaultException extends Exception { |
||||
public SecondLevelMethodDefaultException() {} |
||||
} |
||||
static class SecondLevelClassAnnotationException extends Exception { |
||||
public SecondLevelClassAnnotationException() {} |
||||
} |
||||
static class SecondLevelMethodErrorHandlingException extends Exception { |
||||
public SecondLevelMethodErrorHandlingException() {} |
||||
} |
||||
} |
||||
@ -0,0 +1,141 @@
@@ -0,0 +1,141 @@
|
||||
/** |
||||
* Copyright 2012-2021 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.error; |
||||
|
||||
import org.junit.Test; |
||||
import org.junit.runner.RunWith; |
||||
import org.junit.runners.Parameterized; |
||||
import org.junit.runners.Parameterized.Parameter; |
||||
import org.junit.runners.Parameterized.Parameters; |
||||
import java.lang.annotation.Retention; |
||||
import java.lang.annotation.RetentionPolicy; |
||||
import java.util.Arrays; |
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
|
||||
@RunWith(Parameterized.class) |
||||
public class AnnotationErrorDecoderInheritanceMethodLevelAnnotationTest extends |
||||
AbstractAnnotationErrorDecoderTest<AnnotationErrorDecoderInheritanceMethodLevelAnnotationTest.SecondLevelInterface> { |
||||
@Override |
||||
public Class<SecondLevelInterface> interfaceAtTest() { |
||||
return SecondLevelInterface.class; |
||||
} |
||||
|
||||
@Parameters( |
||||
name = "{0}: When error code ({1}) on method ({2}) should return exception type ({3})") |
||||
public static Iterable<Object[]> data() { |
||||
return Arrays.asList(new Object[][] { |
||||
{"Test Code Specific At Method", 403, "topLevelMethod1", |
||||
MethodTopLevelDefaultException.class}, |
||||
{"Test Code Specific At Method", 404, "topLevelMethod1", |
||||
MethodTopLevelAnnotationException.class}, |
||||
{"Test Code Specific At Method", 403, "topLevelMethod2", |
||||
MethodSecondLevelDefaultException.class}, |
||||
{"Test Code Specific At Method", 404, "topLevelMethod2", |
||||
MethodSecondLevelAnnotationException.class}, |
||||
{"Test Code Specific At Method", 403, "topLevelMethod3", |
||||
MethodSecondLevelDefaultException.class}, |
||||
{"Test Code Specific At Method", 404, "topLevelMethod3", |
||||
MethodSecondLevelErrorHandlingException.class}, |
||||
{"Test Code Specific At Method", 403, "topLevelMethod4", |
||||
MethodSecondLevelDefaultException.class}, |
||||
{"Test Code Specific At Method", 404, "topLevelMethod4", |
||||
MethodSecondLevelAnnotationException.class}, |
||||
}); |
||||
} |
||||
|
||||
@Parameter // first data value (0) is default
|
||||
public String testType; |
||||
|
||||
@Parameter(1) |
||||
public int errorCode; |
||||
|
||||
@Parameter(2) |
||||
public String method; |
||||
|
||||
@Parameter(3) |
||||
public Class<? extends Exception> expectedExceptionClass; |
||||
|
||||
@Test |
||||
public void test() throws Exception { |
||||
AnnotationErrorDecoder decoder = |
||||
AnnotationErrorDecoder.builderFor(SecondLevelInterface.class).build(); |
||||
|
||||
assertThat(decoder.decode(feignConfigKey(method), testResponse(errorCode)).getClass()) |
||||
.isEqualTo(expectedExceptionClass); |
||||
} |
||||
|
||||
interface TopLevelInterface { |
||||
@TopLevelMethodErrorHandling |
||||
void topLevelMethod1(); |
||||
|
||||
@TopLevelMethodErrorHandling |
||||
void topLevelMethod2(); |
||||
|
||||
@TopLevelMethodErrorHandling |
||||
void topLevelMethod3(); |
||||
|
||||
@ErrorHandling(codeSpecific = @ErrorCodes(codes = {404}, |
||||
generate = TopLevelMethodErrorHandlingException.class)) |
||||
void topLevelMethod4(); |
||||
} |
||||
|
||||
interface SecondLevelInterface extends TopLevelInterface { |
||||
@SecondLevelMethodErrorHandling |
||||
void topLevelMethod2(); |
||||
|
||||
@ErrorHandling( |
||||
codeSpecific = { |
||||
@ErrorCodes(codes = {404}, generate = MethodSecondLevelErrorHandlingException.class)}, |
||||
defaultException = MethodSecondLevelDefaultException.class) |
||||
void topLevelMethod3(); |
||||
|
||||
@SecondLevelMethodErrorHandling |
||||
void topLevelMethod4(); |
||||
} |
||||
|
||||
@ErrorHandling( |
||||
codeSpecific = { |
||||
@ErrorCodes(codes = {404}, generate = MethodTopLevelAnnotationException.class),}, |
||||
defaultException = MethodTopLevelDefaultException.class) |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
@interface TopLevelMethodErrorHandling { |
||||
} |
||||
|
||||
@ErrorHandling( |
||||
codeSpecific = { |
||||
@ErrorCodes(codes = {404}, generate = MethodSecondLevelAnnotationException.class),}, |
||||
defaultException = MethodSecondLevelDefaultException.class) |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
@interface SecondLevelMethodErrorHandling { |
||||
} |
||||
|
||||
static class MethodTopLevelDefaultException extends Exception { |
||||
public MethodTopLevelDefaultException() {} |
||||
} |
||||
static class TopLevelMethodErrorHandlingException extends Exception { |
||||
public TopLevelMethodErrorHandlingException() {} |
||||
} |
||||
static class MethodTopLevelAnnotationException extends Exception { |
||||
public MethodTopLevelAnnotationException() {} |
||||
} |
||||
static class MethodSecondLevelDefaultException extends Exception { |
||||
public MethodSecondLevelDefaultException() {} |
||||
} |
||||
static class MethodSecondLevelErrorHandlingException extends Exception { |
||||
public MethodSecondLevelErrorHandlingException() {} |
||||
} |
||||
static class MethodSecondLevelAnnotationException extends Exception { |
||||
public MethodSecondLevelAnnotationException() {} |
||||
} |
||||
} |
||||
Loading…
Reference in new issue