Merge pull request #777 from scalecube/develop

New release

Author: artem-v

.travis.yml

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

README.md

@@ -2,6 +2,7 @@
 [![Build Status](https://travis-ci.org/scalecube/scalecube-services.svg?branch=develop)](https://travis-ci.org/scalecube/scalecube-services)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/5e2ee9be41f7425590313ee1b8f737d7)](https://app.codacy.com/app/ScaleCube/scalecube-services?utm_source=github.com&utm_medium=referral&utm_content=scalecube/scalecube-services&utm_campaign=badger)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.scalecube/scalecube-services-api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.scalecube/scalecube-services-api)
+[![SourceSpy Dashboard](https://sourcespy.com/shield.svg)](https://sourcespy.com/github/scalecubescalecubeservices/)
 
 ## MICROSERVICES 2.0
 

docs/index.html

@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>scalecube-services-parent</artifactId>
-  <version>2.9.1-SNAPSHOT</version>
+  <version>2.10.0-SNAPSHOT</version>
 
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-parent-pom</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2-RC3</version>
   </parent>
   <packaging>pom</packaging>
 
@@ -22,19 +22,17 @@
   </scm>
 
   <properties>
-    <jackson.version>2.10.0.pr1</jackson.version>
-    <scalecube-cluster.version>2.4.10</scalecube-cluster.version>
-    <scalecube-commons.version>1.0.2</scalecube-commons.version>
+    <jackson.version>2.11.0</jackson.version>
+    <scalecube-cluster.version>2.6.0-RC3</scalecube-cluster.version>
+    <scalecube-commons.version>1.0.7</scalecube-commons.version>
     <scalecube-benchmarks.version>1.2.2</scalecube-benchmarks.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>
+    <scalecube-config.version>0.4.4</scalecube-config.version>
+    <reactor.version>Dysprosium-SR9</reactor.version>
+    <rsocket.version>1.0.1</rsocket.version>
     <protostuff.version>1.6.0</protostuff.version>
-    <netty.version>4.1.37.Final</netty.version>
-    <reactor-netty.version>0.9.0.RELEASE</reactor-netty.version>
+    <netty.version>4.1.50.Final</netty.version>
     <slf4j.version>1.7.30</slf4j.version>
-    <log4j.version>2.11.0</log4j.version>
+    <log4j.version>2.13.2</log4j.version>
     <disruptor.version>3.4.2</disruptor.version>
     <jsr305.version>3.0.2</jsr305.version>
     <jctools.version>2.1.2</jctools.version>
@@ -104,14 +102,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-slf4j-impl</artifactId>
-        <version>${log4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-core</artifactId>
+        <artifactId>log4j-bom</artifactId>
         <version>${log4j.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
+
       <!-- Disruptor -->
       <dependency>
         <groupId>com.lmax</groupId>
@@ -180,13 +176,6 @@
         <version>${scalecube-benchmarks.version}</version>
       </dependency>
 
-      <!-- Codahale -->
-      <dependency>
-        <groupId>io.dropwizard.metrics</groupId>
-        <artifactId>metrics-core</artifactId>
-        <version>${metrics.version}</version>
-      </dependency>
-
       <!-- JCTools -->
       <dependency>
         <groupId>org.jctools</groupId>

pom.xml

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

services-api/pom.xml

@@ -12,11 +12,9 @@
 import io.scalecube.services.annotations.Tag;
 import io.scalecube.services.api.Qualifier;
 import io.scalecube.services.api.ServiceMessage;
-import io.scalecube.services.auth.Auth;
-import io.scalecube.services.auth.Principal;
+import io.scalecube.services.auth.Secured;
 import io.scalecube.services.methods.MethodInfo;
 import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Arrays;
@@ -93,10 +91,6 @@ public static Class<?> requestType(Method method) {
       if (method.isAnnotationPresent(RequestType.class)) {
         return method.getAnnotation(RequestType.class).value();
       } else {
-        if (method.getParameters()[0].isAnnotationPresent(Principal.class)) {
-          return Void.TYPE;
-        }
-
         if (method.getGenericParameterTypes()[0] instanceof ParameterizedType) {
           try {
             return Class.forName(parameterizedRequestType(method).getTypeName());
@@ -157,17 +151,17 @@ public static Map<Method, MethodInfo> methodsInfo(Class<?> serviceInterface) {
             .collect(
                 Collectors.toMap(
                     Function.identity(),
-                    method1 ->
+                    method ->
                         new MethodInfo(
                             serviceName(serviceInterface),
-                            methodName(method1),
-                            parameterizedReturnType(method1),
-                            isReturnTypeServiceMessage(method1),
-                            communicationMode(method1),
-                            method1.getParameterCount(),
-                            requestType(method1),
-                            isRequestTypeServiceMessage(method1),
-                            isAuth(method1)))));
+                            methodName(method),
+                            parameterizedReturnType(method),
+                            isReturnTypeServiceMessage(method),
+                            communicationMode(method),
+                            method.getParameterCount(),
+                            requestType(method),
+                            isRequestTypeServiceMessage(method),
+                            isSecured(method)))));
   }
 
   /**
@@ -290,10 +284,10 @@ public static void validateMethodOrThrow(Method method) {
 
     validateResponseType(method);
     validateRequestType(method);
-    validatePrincipalParameter(method);
 
-    if (method.getParameterCount() > 2) {
-      throw new UnsupportedOperationException("Service method can accept maximum 2 parameters");
+    if (method.getParameterCount() > 1) {
+      throw new UnsupportedOperationException(
+          "Service method can accept at maximum single parameter");
     }
   }
 
@@ -321,31 +315,6 @@ private static void validateRequestType(Method method) {
     }
   }
 
-  private static void validatePrincipalParameter(Method method) {
-    Parameter[] parameters = method.getParameters();
-
-    if (!isAuth(method)) {
-      for (Parameter parameter : parameters) {
-        if (parameter.isAnnotationPresent(Principal.class)) {
-          throw new UnsupportedOperationException(
-              "@Principal can be used only for parameter of @Auth method");
-        }
-      }
-    }
-
-    if (method.getParameterCount() == 2) {
-      if (parameters[0].isAnnotationPresent(Principal.class)) {
-        throw new UnsupportedOperationException(
-            "@Principal cannot be the first parameter on method with two parameters");
-      }
-
-      if (!parameters[1].isAnnotationPresent(Principal.class)) {
-        throw new UnsupportedOperationException(
-            "The second parameter can be only @Principal (optional)");
-      }
-    }
-  }
-
   /**
    * This method is used to get catual {@link CommunicationMode} os service method.
    *
@@ -391,8 +360,8 @@ public static boolean isService(Class<?> type) {
     return type.isAnnotationPresent(Service.class);
   }
 
-  public static boolean isAuth(Method method) {
-    return method.isAnnotationPresent(Auth.class)
-        || method.getDeclaringClass().isAnnotationPresent(Auth.class);
+  public static boolean isSecured(Method method) {
+    return method.isAnnotationPresent(Secured.class)
+        || method.getDeclaringClass().isAnnotationPresent(Secured.class);
   }
 }