Skip to content
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.

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

Allow to ignore methods on provided interface #2218

Merged
merged 2 commits into from
Oct 28, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion core/src/main/java/feign/Contract.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public List<MethodMetadata> parseAndValidateMetadata(Class<?> targetType) {
for (final Method method : targetType.getMethods()) {
if (method.getDeclaringClass() == Object.class ||
(method.getModifiers() & Modifier.STATIC) != 0 ||
Util.isDefault(method)) {
Util.isDefault(method) || method.isAnnotationPresent(FeignIgnore.class)) {
continue;
}
final MethodMetadata metadata = parseAndValidateMetadata(targetType, method);
Expand Down
27 changes: 27 additions & 0 deletions core/src/main/java/feign/FeignIgnore.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright 2012-2023 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 java.lang.annotation.Retention;

import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.RUNTIME;

/**
* Indicates that method will be ignored
*/
@Retention(RUNTIME)
@java.lang.annotation.Target({METHOD})
public @interface FeignIgnore {
}
3 changes: 3 additions & 0 deletions core/src/test/java/feign/FeignTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1272,6 +1272,9 @@ void queryMapPropertyInheritenceWithBeanMapEncoder(@QueryMap(
@Headers("Custom: {complex}")
void supportComplexHttpHeaders(@Param("complex") String complex);

@FeignIgnore
String ignore();

class ClockToMillis implements Param.Expander {

@Override
Expand Down