Simplified code in ServiceCall, in ServiceMethodInvoker, updated codecs Example1

Author: artem-v

services-api/src/main/java/io/scalecube/services/ServiceCall.java

@@ -427,19 +427,26 @@ private Address addressLookup(ServiceMessage request) {
   }
 
   private ServiceMessage toServiceMessage(MethodInfo methodInfo, Object request) {
+    final ServiceMessage.Builder builder;
+    final Object data;
+    final String dataFormat;
+
     if (request instanceof ServiceMessage) {
-      return ServiceMessage.from((ServiceMessage) request)
-          .qualifier(methodInfo.serviceName(), methodInfo.methodName())
-          .headers(credentials)
-          .dataFormatIfAbsent(contentType)
-          .build();
+      ServiceMessage message = (ServiceMessage) request;
+      builder = ServiceMessage.from(message);
+      data = message.data();
+      dataFormat = message.dataFormat(); // data format from message
+    } else {
+      builder = ServiceMessage.builder();
+      data = request;
+      dataFormat = contentType; // data format from service call
     }
 
-    return ServiceMessage.builder()
+    return builder
         .qualifier(methodInfo.serviceName(), methodInfo.methodName())
         .headers(credentials)
-        .data(request)
-        .dataFormatIfAbsent(contentType)
+        .data(data)
+        .dataFormat(dataFormat)
         .build();
   }
 

services-api/src/main/java/io/scalecube/services/api/ServiceMessage.java

@@ -216,21 +216,6 @@ public Builder dataFormat(String dataFormat) {
       return this;
     }
 
-    /**
-     * Setter for header {@link #HEADER_DATA_FORMAT}. Does nothing if input {@code dataFormat} is
-     * null or {@code headers} already contains value for {@link #HEADER_DATA_FORMAT}.
-     *
-     * @param dataFormat data format, optional
-     * @return self
-     */
-    public Builder dataFormatIfAbsent(String dataFormat) {
-      if (dataFormat == null) {
-        return this;
-      }
-      headers.putIfAbsent(HEADER_DATA_FORMAT, dataFormat);
-      return this;
-    }
-
     private Map<String, String> headers() {
       return this.headers;
     }

services-api/src/main/java/io/scalecube/services/methods/ServiceMethodInvoker.java

@@ -191,18 +191,19 @@ private Object toRequest(ServiceMessage message) {
   }
 
   private ServiceMessage toResponse(Object response, String qualifier, String dataFormat) {
+    final ServiceMessage.Builder builder;
+    final Object data;
+
     if (response instanceof ServiceMessage) {
       ServiceMessage message = (ServiceMessage) response;
-      if (dataFormat != null && !dataFormat.equals(message.dataFormat())) {
-        return ServiceMessage.from(message).qualifier(qualifier).dataFormat(dataFormat).build();
-      }
-      return ServiceMessage.from(message).qualifier(qualifier).build();
+      builder = ServiceMessage.from(message);
+      data = message.data();
+    } else {
+      builder = ServiceMessage.builder();
+      data = response;
     }
-    return ServiceMessage.builder()
-        .qualifier(qualifier)
-        .data(response)
-        .dataFormatIfAbsent(dataFormat)
-        .build();
+
+    return builder.qualifier(qualifier).data(data).dataFormat(dataFormat).build();
   }
 
   private Context newPrincipalContext(Object authData, Context context) {

services-examples-parent/services-examples/src/main/java/io/scalecube/services/examples/codecs/Example1.java

@@ -9,7 +9,9 @@
 
 public class Example1 {
 
-  public static final String CONTENT_TYPE = "application/protostuff";
+  public static final String JSON = "application/json";
+  public static final String PROTOSTUFF = "application/protostuff";
+  public static final String OCTET_STREAM = "application/octet-stream";
 
   /**
    * Start the example.
@@ -22,7 +24,7 @@ public static void main(String[] args) {
         Microservices.builder()
             .discovery(ScalecubeServiceDiscovery::new)
             .transport(RSocketServiceTransport::new)
-            .contentType(CONTENT_TYPE) // need to send with non-default data format
+            .defaultContentType(PROTOSTUFF) // set explicit default data format
             .startAwait();
 
     final Address seedAddress = seed.discovery().address();
@@ -38,11 +40,22 @@ public static void main(String[] args) {
             .services(new GreetingServiceImpl())
             .startAwait();
 
-    // Create service proxy
-    GreetingsService service = seed.call().api(GreetingsService.class);
-
-    // Execute the services and subscribe to service events
-    service.sayHello("joe").subscribe(consumer -> System.out.println(consumer.message()));
+    seed.call()
+        .api(GreetingsService.class)
+        .sayHello("joe (on default dataFormat PROTOSTUFF")
+        .subscribe(consumer -> System.out.println(consumer.message()));
+
+    seed.call()
+        .contentType(JSON)
+        .api(GreetingsService.class)
+        .sayHello("alice (on JSON dataFormat)")
+        .subscribe(consumer -> System.out.println(consumer.message()));
+
+    seed.call()
+        .contentType(OCTET_STREAM)
+        .api(GreetingsService.class)
+        .sayHello("bob on java native (Serializable/Externalizable) dataFormat")
+        .subscribe(consumer -> System.out.println(consumer.message()));
 
     seed.onShutdown().block();
     ms.onShutdown().block();