Cleanup dependencies (#876)

* Removed jctools-core, bump netty

Author: artem-v

pom.xml

@@ -59,15 +59,14 @@
   </scm>
 
   <properties>
-    <scalecube-cluster.version>2.6.18.RC10</scalecube-cluster.version>
-    <scalecube-security.version>1.0.33.RC1</scalecube-security.version>
+    <scalecube-cluster.version>2.6.18.RC11</scalecube-cluster.version>
+    <scalecube-security.version>1.0.33.RC2</scalecube-security.version>
 
     <reactor.version>2020.0.32</reactor.version>
-    <jackson.version>2.18.0</jackson.version>
-    <netty.version>4.1.93.Final</netty.version>
+    <jackson.version>2.18.2</jackson.version>
+    <netty.version>4.1.117.Final</netty.version>
     <rsocket.version>1.1.4</rsocket.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <jctools.version>2.1.2</jctools.version>
 
     <mockito-junit.version>4.6.1</mockito-junit.version>
     <junit-jupiter.version>5.8.2</junit-jupiter.version>
@@ -125,7 +124,7 @@
         <scope>import</scope>
       </dependency>
 
-      <!-- Reactor -->
+      <!-- Netty -->
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-bom</artifactId>
@@ -165,13 +164,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-
-      <!-- JCTools -->
-      <dependency>
-        <groupId>org.jctools</groupId>
-        <artifactId>jctools-core</artifactId>
-        <version>${jctools.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

services-examples/pom.xml

@@ -22,7 +22,6 @@
       <artifactId>scalecube-services-transport-rsocket</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <dependency>
       <groupId>io.scalecube</groupId>
       <artifactId>scalecube-services-transport-jackson</artifactId>

services-gateway/pom.xml

@@ -38,11 +38,6 @@
       <artifactId>jackson-databind</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.jctools</groupId>
-      <artifactId>jctools-core</artifactId>
-    </dependency>
-
     <!-- Tests -->
     <dependency>
       <groupId>io.scalecube</groupId>

services-gateway/src/main/java/io/scalecube/services/gateway/client/websocket/WebsocketGatewayClientSession.java

@@ -14,7 +14,7 @@
 import java.time.Duration;
 import java.util.Map;
 import java.util.StringJoiner;
-import org.jctools.maps.NonBlockingHashMapLong;
+import java.util.concurrent.ConcurrentHashMap;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Sinks;
 import reactor.core.publisher.Sinks.Many;
@@ -39,7 +39,7 @@ public final class WebsocketGatewayClientSession {
   private final Connection connection;
 
   // processor by sid mapping
-  private final Map<Long, Object> inboundProcessors = new NonBlockingHashMapLong<>(1024);
+  private final Map<Long, Object> inboundProcessors = new ConcurrentHashMap<>(1024);
 
   WebsocketGatewayClientSession(GatewayClientCodec clientCodec, Connection connection) {
     this.id = Integer.toHexString(System.identityHashCode(this));

services-gateway/src/main/java/io/scalecube/services/gateway/websocket/WebsocketGatewaySession.java

@@ -10,8 +10,8 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
-import org.jctools.maps.NonBlockingHashMapLong;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -25,7 +25,7 @@ public final class WebsocketGatewaySession implements GatewaySession {
 
   private static final Predicate<Object> SEND_PREDICATE = f -> true;
 
-  private final Map<Long, Disposable> subscriptions = new NonBlockingHashMapLong<>(1024);
+  private final Map<Long, Disposable> subscriptions = new ConcurrentHashMap<>(1024);
 
   private final GatewaySessionHandler gatewayHandler;
 

services-security/src/main/java/io/scalecube/services/security/RegistryBasedAuthenticator.java

@@ -2,7 +2,7 @@
 
 import io.scalecube.services.auth.Authenticator;
 import java.util.Map;
-import org.jctools.maps.NonBlockingHashMapLong;
+import java.util.concurrent.ConcurrentHashMap;
 import reactor.core.publisher.Mono;
 
 /**
@@ -18,7 +18,7 @@ public final class RegistryBasedAuthenticator<T> implements Authenticator<T> {
 
   private final Authenticator<T> authenticator;
 
-  private final Map<Long, T> registry = new NonBlockingHashMapLong<>();
+  private final Map<Long, T> registry = new ConcurrentHashMap<>();
 
   public RegistryBasedAuthenticator(Authenticator<T> authenticator) {
     this.authenticator = authenticator;

services/pom.xml

@@ -20,15 +20,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.projectreactor</groupId>
-      <artifactId>reactor-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jctools</groupId>
-      <artifactId>jctools-core</artifactId>
-    </dependency>
-
     <!-- Tests -->
     <dependency>
       <groupId>io.scalecube</groupId>
@@ -43,7 +34,6 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>io.scalecube</groupId>
       <artifactId>scalecube-services-transport-jackson</artifactId>

services/src/main/java/io/scalecube/services/registry/ServiceRegistryImpl.java

@@ -18,34 +18,34 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
-import org.jctools.maps.NonBlockingHashMap;
 import reactor.core.scheduler.Scheduler;
 
 public class ServiceRegistryImpl implements ServiceRegistry {
 
   private static final Logger LOGGER = System.getLogger(ServiceRegistryImpl.class.getName());
 
   // todo how to remove it (tags problem)?
-  private final Map<String, ServiceEndpoint> serviceEndpoints = new NonBlockingHashMap<>();
+  private final Map<String, ServiceEndpoint> serviceEndpoints = new ConcurrentHashMap<>();
   private final List<ServiceInfo> serviceInfos = new CopyOnWriteArrayList<>();
 
   // remote service references by static and dynamic qualifiers
 
   private final Map<String, List<ServiceReference>> serviceReferencesByQualifier =
-      new NonBlockingHashMap<>();
+      new ConcurrentHashMap<>();
   private final Map<DynamicQualifier, List<ServiceReference>> serviceReferencesByPattern =
-      new NonBlockingHashMap<>();
+      new ConcurrentHashMap<>();
 
   // local service method invokers by static and dynamic qualifiers
 
   private final Map<String, List<ServiceMethodInvoker>> methodInvokersByQualifier =
-      new NonBlockingHashMap<>();
+      new ConcurrentHashMap<>();
   private final Map<DynamicQualifier, List<ServiceMethodInvoker>> methodInvokersByPattern =
-      new NonBlockingHashMap<>();
+      new ConcurrentHashMap<>();
 
   public ServiceRegistryImpl() {}
 

services/src/main/java/io/scalecube/services/routing/RoundRobinServiceRouter.java

@@ -6,12 +6,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.jctools.maps.NonBlockingHashMap;
 
 public class RoundRobinServiceRouter implements Router {
 
-  private final Map<String, AtomicInteger> counterByServiceName = new NonBlockingHashMap<>();
+  private final Map<String, AtomicInteger> counterByServiceName = new ConcurrentHashMap<>();
 
   @Override
   public Optional<ServiceReference> route(ServiceRegistry serviceRegistry, ServiceMessage request) {