Merge pull request #721 from scalecube/develop

Prepare release

Author: segabriel

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+custom: 
+    - https://www.om2.com/
+    - https://exberry.io/

.github/release-drafter.yml

@@ -0,0 +1,4 @@
+template: |
+  ## What’s Changed
+
+  $CHANGES

.travis.yml

@@ -4,7 +4,7 @@ addons:
     - libxml-xpath-perl
 sudo: required
 language: java
-jdk: openjdk8
+jdk: openjdk11
 before_install:
 - "./src/main/scripts/ci/before-install.sh"
 - "./src/main/scripts/cd/before-deploy.sh"

README.md

@@ -21,27 +21,27 @@ based on gossip protocol, without single point-of-failure or bottlenecks.<br><br
 </table>
 ScaleCube Services Features:
 
-* Provision and interconnect microservices as a service-mesh (cluster)</li>
+* Provision and interconnect microservices peers in a cluster
+* Fully Distributed with No single-point-of-failure or single-point-of-bottleneck
+* Fast - Low latency and high throughput
+* Scaleable over- cores, jvms, clusters, regions.
+* Built-in Service Discovery and service routing
+* Zero configuration, automatic peer-to-peer service discovery using gossip
+* Simple non-blocking, asynchronous programming model
 * Reactive Streams support.
   * Fire And Forget - Send and not wait for a reply
   * Request Response - Send single request and expect single reply
   * Request Stream - Send single request and expect stream of responses. 
   * Request bidirectional - send stream of requests and expect stream of responses.
-* No single-point-of-failure or single-point-of-bottleneck
-* Cluster aware and distributed
-* Modular, flexible deployment models and topology
-* Zero configuration, automatic peer-to-peer service discovery using gossip
-* Simple non-blocking, asynchronous programming model
-* Resilient due to failure detection, fault tolerance, and elasticity
+* Built-in failure detection, fault tolerance, and elasticity
 * Routing and balancing strategies for both stateless and stateful services
-* Low latency and high throughput
-* Takes advantage of the JVM and scales over available cores
-* Embeddable to existing Java applications
-* Natural Circuit-Breaker due to tight integration with scalecube-cluster failure detector.
+* Embeddable into existing applications
+* Natural Circuit-Breaker via scalecube-cluster discovery and failure detector.
 * Support Service instance tagging.
+* Modular, flexible deployment models and topology
 * pluggable api-gateway providers (http / websocket / rsocket)
-* pluggable service transport
-* pluggable encoders 
+* pluggable service transports (tcp / aeron / rsocket)
+* pluggable encoders (json, SBE, Google protocol buffers)
 
 User Guide:
 
@@ -199,5 +199,9 @@ To add a dependency on ScaleCube Services using Maven, use the following:
   <groupId>io.scalecube</groupId>
   <artifactId>scalecube-services-transport-rsocket</artifactId>
   <version>${scalecube.version}</version>
- </dependency>
- 
+ </dependency> 
+```
+
+----
+
+## Sponsored by [OM2](https://www.om2.com/)

pom.xml

@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>scalecube-services-parent</artifactId>
-  <version>2.8.11-SNAPSHOT</version>
+  <version>2.9.0-SNAPSHOT</version>
 
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-parent-pom</artifactId>
-    <version>0.0.19</version>
+    <version>0.1.0-RC1</version>
   </parent>
   <packaging>pom</packaging>
 
@@ -23,17 +23,17 @@
 
   <properties>
     <jackson.version>2.10.0.pr1</jackson.version>
-    <scalecube-cluster.version>2.4.9</scalecube-cluster.version>
-    <scalecube-commons.version>1.0.1</scalecube-commons.version>
+    <scalecube-cluster.version>2.4.10</scalecube-cluster.version>
+    <scalecube-commons.version>1.0.2</scalecube-commons.version>
     <scalecube-benchmarks.version>1.2.2</scalecube-benchmarks.version>
-    <scalecube-config.version>0.3.11</scalecube-config.version>
-    <reactor.version>Californium-SR8</reactor.version>
-    <rsocket.version>0.11.21</rsocket.version>
+    <scalecube-config.version>0.4.3</scalecube-config.version>
+    <reactor.version>Dysprosium-RELEASE</reactor.version>
+    <rsocket.version>1.0.0-RC5</rsocket.version>
     <metrics.version>3.1.2</metrics.version>
     <protostuff.version>1.6.0</protostuff.version>
-    <netty.version>4.1.36.Final</netty.version>
-    <reactor-netty.version>0.8.8.RELEASE</reactor-netty.version>
-    <slf4j.version>1.7.7</slf4j.version>
+    <netty.version>4.1.37.Final</netty.version>
+    <reactor-netty.version>0.9.0.RELEASE</reactor-netty.version>
+    <slf4j.version>1.7.30</slf4j.version>
     <log4j.version>2.11.0</log4j.version>
     <disruptor.version>3.4.2</disruptor.version>
     <jsr305.version>3.0.2</jsr305.version>
@@ -69,6 +69,16 @@
         <artifactId>scalecube-cluster</artifactId>
         <version>${scalecube-cluster.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.scalecube</groupId>
+        <artifactId>scalecube-codec-jackson</artifactId>
+        <version>${scalecube-cluster.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.scalecube</groupId>
+        <artifactId>scalecube-codec-jackson-smile</artifactId>
+        <version>${scalecube-cluster.version}</version>
+      </dependency>
 
       <!-- Scalecube Config -->
       <dependency>
@@ -112,30 +122,19 @@
       <!-- RSocket -->
       <dependency>
         <groupId>io.rsocket</groupId>
-        <artifactId>rsocket-core</artifactId>
-        <version>${rsocket.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.rsocket</groupId>
-        <artifactId>rsocket-transport-netty</artifactId>
+        <artifactId>rsocket-bom</artifactId>
         <version>${rsocket.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <!-- Jackson -->
       <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-core</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.datatype</groupId>
-        <artifactId>jackson-datatype-jsr310</artifactId>
+        <groupId>com.fasterxml.jackson</groupId>
+        <artifactId>jackson-bom</artifactId>
         <version>${jackson.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <!-- Protostuff/Protobuf -->
@@ -161,20 +160,12 @@
       </dependency>
 
       <!-- Netty -->
-      <dependency>
-        <groupId>io.projectreactor.netty</groupId>
-        <artifactId>reactor-netty</artifactId>
-        <version>${reactor-netty.version}</version>
-      </dependency>
       <dependency>
         <groupId>io.netty</groupId>
-        <artifactId>netty-common</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-buffer</artifactId>
+        <artifactId>netty-bom</artifactId>
         <version>${netty.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <!-- Scalecube benchmarks -->
@@ -259,15 +250,15 @@
       </snapshots>
       <id>bintray</id>
       <name>bintray</name>
-      <url>http://jcenter.bintray.com</url>
+      <url>https://jcenter.bintray.com</url>
     </repository>
     <repository>
       <snapshots>
         <enabled>false</enabled>
       </snapshots>
       <id>central</id>
       <name>central</name>
-      <url>http://repo1.maven.org</url>
+      <url>https://repo1.maven.org</url>
     </repository>
   </repositories>
 
@@ -286,7 +277,7 @@
       </snapshots>
       <id>central</id>
       <name>bintray-plugins</name>
-      <url>http://jcenter.bintray.com</url>
+      <url>https://jcenter.bintray.com</url>
     </pluginRepository>
   </pluginRepositories>
 

services-api/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.8.11-SNAPSHOT</version>
+    <version>2.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-api</artifactId>

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

@@ -15,7 +15,6 @@
 import io.scalecube.services.auth.Auth;
 import io.scalecube.services.auth.Principal;
 import io.scalecube.services.methods.MethodInfo;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.lang.reflect.ParameterizedType;
@@ -133,6 +132,7 @@ public static boolean isRequestTypeServiceMessage(Method method) {
    * @param object to inspect
    * @return the parameterized Type of a given object or Object class if unknown.
    */
+  @SuppressWarnings("unused")
   public static Type parameterizedType(Object object) {
     if (object != null) {
       Type type = object.getClass().getGenericSuperclass();
@@ -269,7 +269,7 @@ public static String methodName(Method method) {
    *
    * @param serviceInterface service interface to get qualifier for
    * @param method service's method to get qualifier for
-   * @return
+   * @return qualifier string
    */
   public static String qualifier(Class<?> serviceInterface, Method method) {
     return Qualifier.asString(Reflect.serviceName(serviceInterface), Reflect.methodName(method));
@@ -387,12 +387,6 @@ private static boolean isRequestChannel(Method method) {
             || Publisher.class.isAssignableFrom(reqTypes[0]));
   }
 
-  public static void setField(Field field, Object object, Object value)
-      throws IllegalAccessException {
-    field.setAccessible(true);
-    field.set(object, value);
-  }
-
   public static boolean isService(Class<?> type) {
     return type.isAnnotationPresent(Service.class);
   }

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

@@ -19,6 +19,7 @@
 import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Callable;
@@ -48,6 +49,7 @@ public class ServiceCall {
         // no-op
       };
   private Map<String, String> credentials = Collections.emptyMap();
+  private String contentType;
 
   /** Default constructor. */
   public ServiceCall() {}
@@ -58,6 +60,9 @@ private ServiceCall(ServiceCall other) {
     this.serviceRegistry = other.serviceRegistry;
     this.router = other.router;
     this.errorMapper = other.errorMapper;
+    this.contentType = other.contentType;
+    this.requestReleaser = other.requestReleaser;
+    this.credentials = new HashMap<>(other.credentials);
   }
 
   /**
@@ -156,6 +161,18 @@ public ServiceCall credentials(Map<String, String> credentials) {
     return target;
   }
 
+  /**
+   * Creates new {@link ServiceCall}'s definition with a given content type.
+   *
+   * @param contentType content type.
+   * @return new {@link ServiceCall} instance.
+   */
+  public ServiceCall contentType(String contentType) {
+    ServiceCall target = new ServiceCall(this);
+    target.contentType = contentType;
+    return target;
+  }
+
   /**
    * Issues fire-and-forget request.
    *
@@ -404,6 +421,7 @@ public Object invoke(Object proxy, Method method, Object[] params) {
                   case REQUEST_CHANNEL:
                     // this is REQUEST_CHANNEL so it means params[0] must
                     // be a publisher - its safe to cast.
+                    //noinspection rawtypes
                     return serviceCall
                         .requestBidirectional(
                             Flux.from((Publisher) request)
@@ -434,13 +452,15 @@ private ServiceMessage toServiceMessage(MethodInfo methodInfo, Object request) {
       return ServiceMessage.from((ServiceMessage) request)
           .qualifier(methodInfo.serviceName(), methodInfo.methodName())
           .headers(credentials)
+          .dataFormatIfAbsent(contentType)
           .build();
     }
 
     return ServiceMessage.builder()
         .qualifier(methodInfo.serviceName(), methodInfo.methodName())
         .headers(credentials)
         .data(request)
+        .dataFormatIfAbsent(contentType)
         .build();
   }