[Java] Play! retrofit2 client content-type handling fixes (#6440)

* proper content-type handling (npe fixed when content-type is absent, improved content-length calculation)

* samples updated

* fixed missing imports, samples updated

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache

@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * Creates {@link Call} instances that invoke underlying {@link WSClient}
@@ -163,20 +164,23 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
 
                        @Override
                        public MediaType contentType() {
-                           return MediaType.parse(r.getHeader("Content-Type"));
+                           return Optional.ofNullable(r.getHeader("Content-Type"))
+                                          .map(MediaType::parse)
+                                          .orElse(null);
                        }
 
                        @Override
                        public long contentLength() {
-                           return r.getBody().getBytes().length;
+                           return r.asByteArray().length;
                        }
 
                        @Override
                        public BufferedSource source() {
-                           return new Buffer().write(r.getBody().getBytes());
+                           return new Buffer().write(r.asByteArray());
                        }
+                       
                    });
-
+                   
             for (Map.Entry<String, List<String>> entry : r.getAllHeaders().entrySet()) {
                 for (String value : entry.getValue()) {
                     builder.addHeader(entry.getKey(), value);

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache

@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.CompletionStage;
 
 /**
@@ -160,20 +161,23 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
 
                        @Override
                        public MediaType contentType() {
-                           return MediaType.parse(r.getHeader("Content-Type"));
+                           return Optional.ofNullable(r.getHeader("Content-Type"))
+                                          .map(MediaType::parse)
+                                          .orElse(null);
                        }
 
                        @Override
                        public long contentLength() {
-                           return r.getBody().getBytes().length;
+                           return r.asByteArray().length;
                        }
 
                        @Override
                        public BufferedSource source() {
-                           return new Buffer().write(r.getBody().getBytes());
+                           return new Buffer().write(r.asByteArray());
                        }
+                       
                    });
-
+                   
             for (Map.Entry<String, List<String>> entry : r.getAllHeaders().entrySet()) {
                 for (String value : entry.getValue()) {
                     builder.addHeader(entry.getKey(), value);

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/Play24CallFactory.java

@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * Creates {@link Call} instances that invoke underlying {@link WSClient}
@@ -163,20 +164,23 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
 
                        @Override
                        public MediaType contentType() {
-                           return MediaType.parse(r.getHeader("Content-Type"));
+                           return Optional.ofNullable(r.getHeader("Content-Type"))
+                                          .map(MediaType::parse)
+                                          .orElse(null);
                        }
 
                        @Override
                        public long contentLength() {
-                           return r.getBody().getBytes().length;
+                           return r.asByteArray().length;
                        }
 
                        @Override
                        public BufferedSource source() {
-                           return new Buffer().write(r.getBody().getBytes());
+                           return new Buffer().write(r.asByteArray());
                        }
+                       
                    });
-
+                   
             for (Map.Entry<String, List<String>> entry : r.getAllHeaders().entrySet()) {
                 for (String value : entry.getValue()) {
                     builder.addHeader(entry.getKey(), value);

samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/Play25CallFactory.java

@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.CompletionStage;
 
 /**
@@ -160,20 +161,23 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
 
                        @Override
                        public MediaType contentType() {
-                           return MediaType.parse(r.getHeader("Content-Type"));
+                           return Optional.ofNullable(r.getHeader("Content-Type"))
+                                          .map(MediaType::parse)
+                                          .orElse(null);
                        }
 
                        @Override
                        public long contentLength() {
-                           return r.getBody().getBytes().length;
+                           return r.asByteArray().length;
                        }
 
                        @Override
                        public BufferedSource source() {
-                           return new Buffer().write(r.getBody().getBytes());
+                           return new Buffer().write(r.asByteArray());
                        }
+                       
                    });
-
+                   
             for (Map.Entry<String, List<String>> entry : r.getAllHeaders().entrySet()) {
                 for (String value : entry.getValue()) {
                     builder.addHeader(entry.getKey(), value);

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java

@@ -6,6 +6,7 @@ import retrofit2.Call;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.math.BigDecimal;
 import io.swagger.client.model.Client;

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

@@ -6,6 +6,7 @@ import retrofit2.Call;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Client;
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java

@@ -6,6 +6,7 @@ import retrofit2.Call;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.io.File;
 import io.swagger.client.model.ModelApiResponse;

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java

@@ -6,6 +6,7 @@ import retrofit2.Call;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Order;
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java

@@ -6,6 +6,7 @@ import retrofit2.Call;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.User;
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java

@@ -6,6 +6,7 @@ import rx.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.math.BigDecimal;
 import io.swagger.client.model.Client;

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

@@ -6,6 +6,7 @@ import rx.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Client;
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java

@@ -6,6 +6,7 @@ import rx.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.io.File;
 import io.swagger.client.model.ModelApiResponse;

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java

@@ -6,6 +6,7 @@ import rx.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Order;
 

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java

@@ -6,6 +6,7 @@ import rx.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.User;
 

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/FakeApi.java

@@ -6,6 +6,7 @@ import io.reactivex.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.math.BigDecimal;
 import io.swagger.client.model.Client;

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

@@ -6,6 +6,7 @@ import io.reactivex.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Client;
 

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/PetApi.java

@@ -6,6 +6,7 @@ import io.reactivex.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import java.io.File;
 import io.swagger.client.model.ModelApiResponse;

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/StoreApi.java

@@ -6,6 +6,7 @@ import io.reactivex.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.Order;
 

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/UserApi.java

@@ -6,6 +6,7 @@ import io.reactivex.Observable;
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 
 import io.swagger.client.model.User;