Merge branch '3.4.x' of github.com:freefair/okhttp-spring-boot into 3.5.x

Author: larsgrefer

okhttp-spring-client/build.gradle

@@ -12,4 +12,10 @@ dependencies {
 
     api "com.squareup.okhttp3:okhttp"
     api "org.springframework:spring-web"
+
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
+}
+
+tasks.named("test", Test) {
+    useJUnitPlatform()
 }

okhttp-spring-client/src/main/java/io/freefair/spring/okhttp/client/ResourceRequestBody.java

@@ -0,0 +1,79 @@
+package io.freefair.spring.okhttp.client;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okio.BufferedSink;
+import okio.Okio;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.Resource;
+import org.springframework.lang.Nullable;
+import org.springframework.util.MimeType;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author Lars Grefer
+ */
+public class ResourceRequestBody extends RequestBody {
+
+    private final Resource resource;
+
+    @Nullable
+    private final MediaType mediaType;
+
+    public ResourceRequestBody(Resource resource) {
+        this.resource = resource;
+        this.mediaType = null;
+    }
+
+    public ResourceRequestBody(Resource resource, MimeType springMimeType) {
+        this.resource = resource;
+        this.mediaType = MediaType.parse(springMimeType.toString());
+    }
+
+    public ResourceRequestBody(Resource resource, MediaType okhttpMediaType) {
+        this.resource = resource;
+        this.mediaType = okhttpMediaType;
+    }
+
+    @Override
+    @Nullable
+    public MediaType contentType() {
+        return mediaType;
+    }
+
+    @Override
+    public void writeTo(BufferedSink bufferedSink) throws IOException {
+        try (InputStream inputStream = resource.getInputStream()) {
+            bufferedSink.writeAll(Okio.source(inputStream));
+        }
+    }
+
+    @Override
+    public long contentLength() throws IOException {
+        if (resource instanceof InputStreamResource && resource.getClass().equals(InputStreamResource.class)) {
+            return -1;
+        }
+        return resource.contentLength();
+    }
+
+    @Override
+    public boolean isOneShot() {
+        if (resource instanceof InputStreamResource) {
+            return true;
+        }
+
+        if (resource instanceof ByteArrayResource) {
+            return false;
+        }
+
+        if (resource instanceof FileSystemResource) {
+            return false;
+        }
+
+        return super.isOneShot();
+    }
+}

okhttp-spring-client/src/main/java/io/freefair/spring/okhttp/client/StreamingBodyRequestBody.java

@@ -44,6 +44,6 @@ public void writeTo(@NotNull BufferedSink bufferedSink) throws IOException {
 
     @Override
     public boolean isOneShot() {
-        return true;
+        return !streamingBody.repeatable();
     }
 }

okhttp-spring-client/src/test/java/io/freefair/spring/okhttp/client/ResourceRequestBodyTest.java

@@ -0,0 +1,36 @@
+package io.freefair.spring.okhttp.client;
+
+import okhttp3.MediaType;
+import okio.ByteString;
+import org.junit.jupiter.api.Test;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.util.MimeType;
+import org.springframework.util.MimeTypeUtils;
+
+import java.nio.charset.StandardCharsets;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+class ResourceRequestBodyTest {
+
+
+    @Test
+    void testContentTypes() {
+
+        ByteArrayResource resource = new ByteArrayResource(ByteString.encodeUtf8("hello world").toByteArray());
+
+        assertThat(new ResourceRequestBody(resource).contentType())
+                .isNull();
+
+        assertThat(new ResourceRequestBody(resource, MimeTypeUtils.IMAGE_PNG).contentType().toString())
+                .isEqualTo("image/png");
+
+        assertThat(new ResourceRequestBody(resource, new MimeType("application", "foo", StandardCharsets.UTF_16)).contentType().toString())
+                .isEqualTo("application/foo;charset=UTF-16");
+
+        assertThat(new ResourceRequestBody(resource, MediaType.parse("text/plain")).contentType().toString())
+                .isEqualTo("text/plain");
+
+    }
+}