Merge master into codex/openfeign-2782-builder-clone

Signed-off-by: Marvin Froeder <velo.br@gmail.com>

Author: velo

.mvn/extensions.xml

@@ -19,11 +19,11 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>develocity-maven-extension</artifactId>
-        <version>2.4.2</version>
+        <version>2.5.0</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>common-custom-user-data-maven-extension</artifactId>
-        <version>2.2.0</version>
+        <version>2.3.0</version>
     </extension>
 </extensions>

CHANGELOG.md

@@ -1,3 +1,9 @@
+### Version 13.14
+
+* Add support for the HTTP QUERY method (RFC 10008) — safe, idempotent, and cacheable with a
+  request body. `HttpCacheInterceptor` includes QUERY in its default cacheable set and
+  incorporates a body hash into the cache key to reduce cross-body collisions.
+
 ### Version 13.12
 
 * `UrlencodedFormContentProcessor` now honors `CollectionFormat` from `@RequestLine`/`RequestTemplate` for array and

benchmark/pom.xml

@@ -32,7 +32,7 @@
     <jmh.version>1.37</jmh.version>
     <rx.netty.version>0.5.3</rx.netty.version>
     <rx.java.version>1.3.8</rx.java.version>
-    <netty.version>4.2.15.Final</netty.version>
+    <netty.version>4.2.16.Final</netty.version>
     <moditect.skip>true</moditect.skip>
   </properties>
 

core/src/main/java/feign/BaseBuilder.java

@@ -318,10 +318,21 @@ B enrich() {
       // enrich each response interceptor, then enrich the list as a whole
       ResponseInterceptor[] responseArray =
           clone.responseInterceptors.toArray(new ResponseInterceptor[0]);
-      for (int i = 0; i < responseArray.length; i++) {
-        responseArray[i] =
+      if (responseArray.length == 0) {
+        ResponseInterceptor defaultResponseInterceptor = (context, chain) -> chain.next(context);
+        ResponseInterceptor enrichedResponseInterceptor =
             (ResponseInterceptor)
-                Capability.enrich(responseArray[i], ResponseInterceptor.class, capabilities);
+                Capability.enrich(
+                    defaultResponseInterceptor, ResponseInterceptor.class, capabilities);
+        if (enrichedResponseInterceptor != defaultResponseInterceptor) {
+          responseArray = new ResponseInterceptor[] {enrichedResponseInterceptor};
+        }
+      } else {
+        for (int i = 0; i < responseArray.length; i++) {
+          responseArray[i] =
+              (ResponseInterceptor)
+                  Capability.enrich(responseArray[i], ResponseInterceptor.class, capabilities);
+        }
       }
       ResponseInterceptors responseInterceptors =
           (ResponseInterceptors)

core/src/main/java/feign/DefaultClient.java

@@ -111,7 +111,9 @@ Response convertResponse(HttpURLConnection connection, Request request) throws I
     }
 
     Integer length = connection.getContentLength();
-    if (length == -1) {
+    if (length < 0) {
+      // -1 signals unknown or above Integer.MAX_VALUE; any other negative value is a malformed
+      // header that HttpURLConnection surfaces verbatim
       length = null;
     }
     InputStream stream;
@@ -170,7 +172,6 @@ HttpURLConnection convertAndSend(Request request, Options options) throws IOExce
         if (field.equals(CONTENT_LENGTH)) {
           if (!gzipEncodedRequest && !deflateEncodedRequest) {
             contentLength = Integer.valueOf(value);
-            connection.addRequestProperty(field, value);
           }
         }
         // Avoid add "Accept-encoding" twice or more when "compression" option is enabled
@@ -189,7 +190,7 @@ else if (field.equals(ACCEPT_ENCODING)) {
 
     byte[] body = request.body();
 
-    if (body != null) {
+    if (body != null && (body.length > 0 || request.httpMethod() != Request.HttpMethod.GET)) {
       /*
        * Ignore disableRequestBuffering flag if the empty body was set, to ensure that internal
        * retry logic applies to such requests.

core/src/main/java/feign/Logger.java

@@ -21,10 +21,14 @@
 import static feign.Util.valuesOrEmpty;
 import static java.util.Objects.nonNull;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.FileHandler;
+import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import java.util.logging.SimpleFormatter;
 
@@ -182,9 +186,10 @@ protected void log(String configKey, String format, Object... args) {
   }
 
   /** Logs to the category {@link Logger} at {@link java.util.logging.Level#FINE}, if loggable. */
-  public static class JavaLogger extends Logger {
+  public static class JavaLogger extends Logger implements Closeable {
 
     final java.util.logging.Logger logger;
+    private final List<Handler> handlers = new ArrayList<>();
 
     /**
      * @deprecated Use {@link #JavaLogger(String)} or {@link #JavaLogger(Class)} instead.
@@ -256,11 +261,21 @@ public String format(LogRecord record) {
               }
             });
         logger.addHandler(handler);
+        handlers.add(handler);
       } catch (IOException e) {
         throw new IllegalStateException("Could not add file handler.", e);
       }
       return this;
     }
+
+    @Override
+    public void close() {
+      for (Handler handler : handlers) {
+        logger.removeHandler(handler);
+        handler.close();
+      }
+      handlers.clear();
+    }
   }
 
   public static class NoOpLogger extends Logger {

core/src/main/java/feign/Request.java

@@ -44,7 +44,8 @@ public enum HttpMethod {
     CONNECT,
     OPTIONS,
     TRACE,
-    PATCH(true);
+    PATCH(true),
+    QUERY(true);
 
     private final boolean withBody;
 
@@ -554,7 +555,7 @@ public boolean isBinary() {
     }
 
     public static Body create(String data) {
-      return new Body(data.getBytes());
+      return create(data, Util.UTF_8);
     }
 
     public static Body create(String data, Charset charset) {

core/src/main/java/feign/RequestLine.java

@@ -35,9 +35,10 @@
    *
    * <p>The string must begin with a valid {@linkplain feign.Request.HttpMethod HTTP method name}
    * (e.g. {@linkplain feign.Request.HttpMethod#GET GET}, {@linkplain feign.Request.HttpMethod#POST
-   * POST}, {@linkplain feign.Request.HttpMethod#PUT PUT}), followed by a space and a URI template.
-   * If only the HTTP method is specified (e.g. {@code "DELETE"}), the request will use the base URL
-   * defined for the client.
+   * POST}, {@linkplain feign.Request.HttpMethod#PUT PUT}, {@linkplain
+   * feign.Request.HttpMethod#QUERY QUERY}), followed by a space and a URI template. If only the
+   * HTTP method is specified (e.g. {@code "DELETE"}), the request will use the base URL defined for
+   * the client.
    *
    * <p>Example:
    *

core/src/main/java/feign/codec/StringDecoder.java

@@ -31,7 +31,7 @@ public Object decode(Response response, Type type) throws IOException {
       return null;
     }
     if (String.class.equals(type)) {
-      return Util.toString(body.asReader(Util.UTF_8));
+      return Util.toString(body.asReader(response.charset()));
     }
     throw new DecodeException(
         response.status(),

core/src/main/java/feign/template/HeaderTemplate.java

@@ -141,7 +141,10 @@ private HeaderTemplate(String name, Iterable<String> values, Charset charset, bo
 
   public Collection<String> getValues() {
     return Collections.unmodifiableList(
-        this.values.stream().map(Template::toString).collect(Collectors.toList()));
+        this.values.stream()
+            .map(Template::toString)
+            .map(HeaderTemplate::stripCrlf)
+            .collect(Collectors.toList()));
   }
 
   public List<String> getVariables() {
@@ -167,7 +170,7 @@ public String expand(Map<String, ?> variables) {
           continue;
         }
 
-        expanded.add(result);
+        expanded.add(stripCrlf(result));
       }
     }
 
@@ -178,4 +181,16 @@ public String expand(Map<String, ?> variables) {
 
     return result.toString();
   }
+
+  /**
+   * Removes carriage return and line feed characters from a resolved header value. Values are
+   * written to the header verbatim, so a CR or LF in a value would terminate the header line and
+   * inject additional headers.
+   *
+   * @param value to sanitise.
+   * @return the value without CR or LF characters.
+   */
+  private static String stripCrlf(String value) {
+    return value.replace("\r", "").replace("\n", "");
+  }
 }