Move MethodInterceptor classes into feign.interceptor package

velo · velo · commit 57687b076beb · 2026-05-07T11:35:36.000-03:00
Signed-off-by: Marvin Froeder &lt;velo.br@gmail.com&gt;
diff --git a/core/src/main/java/feign/AsyncFeign.java b/core/src/main/java/feign/AsyncFeign.java
@@ -22,6 +22,7 @@
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
+import feign.interceptor.MethodInterceptor;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
diff --git a/core/src/main/java/feign/AsynchronousMethodHandler.java b/core/src/main/java/feign/AsynchronousMethodHandler.java
@@ -21,6 +21,8 @@
 
 import feign.InvocationHandlerFactory.MethodHandler;
 import feign.Request.Options;
+import feign.interceptor.Invocation;
+import feign.interceptor.MethodInterceptor;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
diff --git a/core/src/main/java/feign/BaseBuilder.java b/core/src/main/java/feign/BaseBuilder.java
@@ -27,6 +27,8 @@
 import feign.codec.DefaultErrorDecoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
+import feign.interceptor.MethodInterceptor;
+import feign.interceptor.MethodInterceptors;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/core/src/main/java/feign/Feign.java b/core/src/main/java/feign/Feign.java
@@ -21,6 +21,7 @@
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
+import feign.interceptor.MethodInterceptor;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
diff --git a/core/src/main/java/feign/MethodHandlerConfiguration.java b/core/src/main/java/feign/MethodHandlerConfiguration.java
@@ -17,6 +17,7 @@
 
 import static feign.Util.checkNotNull;
 
+import feign.interceptor.MethodInterceptor;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/core/src/main/java/feign/SynchronousMethodHandler.java b/core/src/main/java/feign/SynchronousMethodHandler.java
@@ -21,6 +21,8 @@
 
 import feign.InvocationHandlerFactory.MethodHandler;
 import feign.Request.Options;
+import feign.interceptor.Invocation;
+import feign.interceptor.MethodInterceptor;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
diff --git a/core/src/main/java/feign/interceptor/Invocation.java b/core/src/main/java/feign/interceptor/Invocation.java
@@ -13,10 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign;
+package feign.interceptor;
 
 import static feign.Util.checkNotNull;
 
+import feign.Experimental;
+import feign.MethodMetadata;
+import feign.RequestTemplate;
+import feign.Response;
+import feign.Target;
 import java.lang.reflect.Method;
 
 /**
@@ -77,8 +82,12 @@ public Response response() {
     return response;
   }
 
-  /** Package-private setter used by the framework's terminal chain step. */
-  void response(Response response) {
+  /**
+   * Framework-internal setter populated by the terminal chain step after the HTTP client returns.
+   * Calling this from interceptor code is unsupported and may break in future versions.
+   */
+  @Experimental
+  public void response(Response response) {
     this.response = response;
   }
 }
diff --git a/core/src/main/java/feign/interceptor/MethodInterceptor.java b/core/src/main/java/feign/interceptor/MethodInterceptor.java
@@ -13,7 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign;
+package feign.interceptor;
+
+import feign.Contract;
+import feign.Experimental;
+import feign.MethodMetadata;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import feign.Response;
+import feign.ResponseInterceptor;
 
 /**
  * An around-style interceptor invoked once per method call, after the {@link Contract} has resolved
diff --git a/core/src/main/java/feign/interceptor/MethodInterceptors.java b/core/src/main/java/feign/interceptor/MethodInterceptors.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign;
+package feign.interceptor;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/core/src/test/java/feign/interceptor/MethodInterceptorTest.java b/core/src/test/java/feign/interceptor/MethodInterceptorTest.java
@@ -13,11 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign;
+package feign.interceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import feign.Feign;
+import feign.Param;
+import feign.RequestInterceptor;
+import feign.RequestLine;
+import feign.RequestTemplate;
+import feign.Response;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/http-cache/README.md b/http-cache/README.md
@@ -6,7 +6,7 @@ A `MethodInterceptor` that performs conditional HTTP revalidation using `ETag` a
 its validators. Subsequent calls send `If-None-Match` / `If-Modified-Since` headers,
 and a `304 Not Modified` response short-circuits to the cached value.
 
-Marked `@Experimental` while the underlying `feign.MethodInterceptor` API stabilises.
+Marked `@Experimental` while the underlying `feign.interceptor.MethodInterceptor` API stabilises.
 
 ```xml
 <dependency>
diff --git a/http-cache/src/main/java/feign/cache/HttpCacheInterceptor.java b/http-cache/src/main/java/feign/cache/HttpCacheInterceptor.java
@@ -17,10 +17,10 @@
 
 import feign.Experimental;
 import feign.FeignException;
-import feign.Invocation;
-import feign.MethodInterceptor;
 import feign.RequestTemplate;
 import feign.Response;
+import feign.interceptor.Invocation;
+import feign.interceptor.MethodInterceptor;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.Map;
diff --git a/validation-jakarta/README.md b/validation-jakarta/README.md
@@ -6,7 +6,7 @@ interface using Jakarta Bean Validation (`jakarta.validation`) **before** the HT
 request is dispatched. Constraint violations surface as
 `jakarta.validation.ConstraintViolationException`.
 
-Marked `@Experimental` while the underlying `feign.MethodInterceptor` API stabilises.
+Marked `@Experimental` while the underlying `feign.interceptor.MethodInterceptor` API stabilises.
 
 For the legacy `javax.validation` namespace, use the sibling `feign-validation` module.
 
diff --git a/validation-jakarta/src/main/java/feign/validation/BeanValidationMethodInterceptor.java b/validation-jakarta/src/main/java/feign/validation/BeanValidationMethodInterceptor.java
@@ -16,9 +16,9 @@
 package feign.validation;
 
 import feign.Experimental;
-import feign.Invocation;
-import feign.MethodInterceptor;
 import feign.MethodMetadata;
+import feign.interceptor.Invocation;
+import feign.interceptor.MethodInterceptor;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.validation.Valid;
diff --git a/validation/README.md b/validation/README.md
@@ -6,7 +6,7 @@ interface using JSR-303 / Bean Validation 2.0 (`javax.validation`) **before** th
 request is dispatched. Constraint violations surface as
 `javax.validation.ConstraintViolationException`.
 
-Marked `@Experimental` while the underlying `feign.MethodInterceptor` API stabilises.
+Marked `@Experimental` while the underlying `feign.interceptor.MethodInterceptor` API stabilises.
 
 For the Jakarta namespace, see the sibling module `feign-validation-jakarta`.
 
diff --git a/validation/src/main/java/feign/validation/BeanValidationMethodInterceptor.java b/validation/src/main/java/feign/validation/BeanValidationMethodInterceptor.java
@@ -16,9 +16,9 @@
 package feign.validation;
 
 import feign.Experimental;
-import feign.Invocation;
-import feign.MethodInterceptor;
 import feign.MethodMetadata;
+import feign.interceptor.Invocation;
+import feign.interceptor.MethodInterceptor;
 import java.lang.annotation.Annotation;
 import java.util.LinkedHashSet;
 import java.util.Set;
