Merge pull request #1682 from yuppie-flu/update-spring-to-6.2

Update Spring to 6.2

pom.xml

@@ -77,7 +77,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
 
-        <spring.version>6.1.14</spring.version>
+        <spring.version>6.2.1</spring.version>
     </properties>
 
     <build>

riptide-compatibility/src/main/java/org/zalando/riptide/compatibility/HttpOutputMessageClientHttpRequestAdapter.java

@@ -9,6 +9,7 @@
 
 import javax.annotation.Nonnull;
 import java.net.URI;
+import java.util.Map;
 
 @AllArgsConstructor
 final class HttpOutputMessageClientHttpRequestAdapter implements ClientHttpRequest {
@@ -22,6 +23,7 @@ public ClientHttpResponse execute() {
         throw new UnsupportedOperationException();
     }
 
+    @Nonnull
     @Override
     public HttpMethod getMethod() {
         throw new UnsupportedOperationException();
@@ -33,4 +35,9 @@ public URI getURI() {
         throw new UnsupportedOperationException();
     }
 
+    @Nonnull
+    @Override
+    public Map<String, Object> getAttributes() {
+        throw new UnsupportedOperationException();
+    }
 }

riptide-compatibility/src/test/java/org/zalando/riptide/compatibility/HttpOutputMessageClientHttpRequestAdapterTest.java

@@ -29,4 +29,10 @@ void getURI() {
         assertThrows(UnsupportedOperationException.class, unit::getURI);
     }
 
+    @Test
+    void getAttributes() {
+        assertThrows(UnsupportedOperationException.class, unit::getAttributes);
+    }
+
+
 }

riptide-httpclient/src/main/java/org/zalando/riptide/httpclient/ApacheClientHttpResponse.java

@@ -6,7 +6,8 @@
 import org.apache.hc.core5.http.HttpEntityContainer;
 import org.apache.hc.core5.http.HttpResponse;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.client.AbstractClientHttpResponse;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.client.ClientHttpResponse;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -17,7 +18,7 @@
 import static org.zalando.riptide.httpclient.EmptyInputStream.EMPTY;
 
 @Slf4j
-final class ApacheClientHttpResponse extends AbstractClientHttpResponse {
+final class ApacheClientHttpResponse implements ClientHttpResponse {
 
     private final HttpHeaders headers = new HttpHeaders();
     private final HttpResponse response;
@@ -48,9 +49,10 @@ private static InputStream getBody(final HttpResponse response) throws IOExcepti
         });
     }
 
+    @Nonnull
     @Override
-    public int getRawStatusCode() {
-        return response.getCode();
+    public HttpStatusCode getStatusCode() {
+        return HttpStatusCode.valueOf(response.getCode());
     }
 
     @Nonnull

riptide-httpclient/src/main/java/org/zalando/riptide/httpclient/BufferingApacheClientHttpRequest.java

@@ -19,6 +19,7 @@
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Map;
 import java.util.Optional;
 
 @AllArgsConstructor
@@ -46,6 +47,12 @@ public URI getURI() {
         }
     }
 
+    @Nonnull
+    @Override
+    public Map<String, Object> getAttributes() {
+        throw new UnsupportedOperationException();
+    }
+
     @Nonnull
     @Override
     public HttpHeaders getHeaders() {

riptide-httpclient/src/main/java/org/zalando/riptide/httpclient/StreamingApacheClientHttpRequest.java

@@ -21,6 +21,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
@@ -50,6 +51,12 @@ public URI getURI() {
         }
     }
 
+    @Nonnull
+    @Override
+    public Map<String, Object> getAttributes() {
+        throw new UnsupportedOperationException();
+    }
+
     @Nonnull
     @Override
     public HttpHeaders getHeaders() {

riptide-httpclient/src/test/java/org/zalando/riptide/httpclient/BufferingApacheClientHttpRequestTest.java

@@ -1,7 +1,10 @@
 package org.zalando.riptide.httpclient;
 
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
 import org.junit.jupiter.api.Test;
+import org.springframework.http.client.ClientHttpRequest;
 
 import java.net.URISyntaxException;
 
@@ -20,4 +23,13 @@ void shouldThrowIllegalArgumentException() throws URISyntaxException {
         assertThrows(IllegalArgumentException.class, request::getURI);
     }
 
+    @Test
+    void shouldNotSupportGetAttributes() {
+        final HttpClient client = mock(HttpClient.class);
+        final HttpPost request = new HttpPost("https://example.org");
+
+        final ClientHttpRequest unit = new BufferingApacheClientHttpRequest(client, request);
+
+        assertThrows(UnsupportedOperationException.class, unit::getAttributes);
+    }
 }

riptide-httpclient/src/test/java/org/zalando/riptide/httpclient/StreamingApacheClientHttpRequestTest.java

@@ -51,4 +51,14 @@ void shouldThrowIllegalArgumentException() throws URISyntaxException {
         assertThrows(IllegalArgumentException.class, request::getURI);
     }
 
+    @Test
+    void shouldNotSupportGetAttributes() {
+        final HttpClient client = mock(HttpClient.class);
+        final HttpPost request = new HttpPost("https://example.org");
+
+        final ClientHttpRequest unit = new StreamingApacheClientHttpRequest(client, request);
+
+        assertThrows(UnsupportedOperationException.class, unit::getAttributes);
+    }
+
 }