Merge pull request #105 from scalecube/gateway-session-id-as-primitive

Make sessionId as long

Author: segabriel

services-gateway-netty/src/main/java/io/scalecube/services/gateway/GatewaySession.java

@@ -7,5 +7,5 @@ public interface GatewaySession {
    *
    * @return session id
    */
-  String sessionId();
+  long sessionId();
 }

services-gateway-netty/src/main/java/io/scalecube/services/gateway/rsocket/RSocketGatewaySession.java

@@ -9,7 +9,6 @@
 import io.scalecube.services.gateway.GatewayMetrics;
 import io.scalecube.services.gateway.GatewaySession;
 import io.scalecube.services.gateway.ServiceMessageCodec;
-import java.util.StringJoiner;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiFunction;
 import reactor.core.publisher.Flux;
@@ -27,7 +26,7 @@ public final class RSocketGatewaySession extends AbstractRSocket implements Gate
   private final ServiceCall serviceCall;
   private final GatewayMetrics metrics;
   private final ServiceMessageCodec messageCodec;
-  private final String sessionId;
+  private final long sessionId;
   private final BiFunction<GatewaySession, ServiceMessage, ServiceMessage> messageMapper;
 
   /**
@@ -46,11 +45,11 @@ public RSocketGatewaySession(
     this.metrics = metrics;
     this.messageCodec = messageCodec;
     this.messageMapper = messageMapper;
-    this.sessionId = Long.toHexString(SESSION_ID_GENERATOR.incrementAndGet());
+    this.sessionId = SESSION_ID_GENERATOR.incrementAndGet();
   }
 
   @Override
-  public String sessionId() {
+  public long sessionId() {
     return this.sessionId;
   }
 
@@ -105,8 +104,6 @@ private Payload toPayload(ServiceMessage message) {
 
   @Override
   public String toString() {
-    return new StringJoiner(", ", RSocketGatewaySession.class.getSimpleName() + "[", "]")
-        .add(sessionId)
-        .toString();
+    return "RSocketGatewaySession[" + sessionId + ']';
   }
 }

services-gateway-netty/src/main/java/io/scalecube/services/gateway/ws/WebsocketGatewaySession.java

@@ -7,7 +7,6 @@
 import io.scalecube.services.gateway.GatewaySessionHandler;
 import java.util.Map;
 import java.util.Optional;
-import java.util.StringJoiner;
 import java.util.concurrent.atomic.AtomicLong;
 import org.jctools.maps.NonBlockingHashMapLong;
 import org.slf4j.Logger;
@@ -35,7 +34,7 @@ public final class WebsocketGatewaySession implements GatewaySession {
   private final WebsocketOutbound outbound;
   private final GatewayMessageCodec codec;
 
-  private final String sessionId;
+  private final long sessionId;
   private final String contentType;
 
   /**
@@ -54,7 +53,7 @@ public WebsocketGatewaySession(
       WebsocketOutbound outbound,
       GatewaySessionHandler<GatewayMessage> gatewayHandler) {
     this.codec = codec;
-    this.sessionId = Long.toHexString(SESSION_ID_GENERATOR.incrementAndGet());
+    this.sessionId = SESSION_ID_GENERATOR.incrementAndGet();
 
     String contentType = httpRequest.requestHeaders().get(HttpHeaderNames.CONTENT_TYPE);
     this.contentType = Optional.ofNullable(contentType).orElse(DEFAULT_CONTENT_TYPE);
@@ -65,7 +64,7 @@ public WebsocketGatewaySession(
   }
 
   @Override
-  public String sessionId() {
+  public long sessionId() {
     return sessionId;
   }
 
@@ -195,8 +194,6 @@ private void clearSubscriptions() {
 
   @Override
   public String toString() {
-    return new StringJoiner(", ", WebsocketGatewaySession.class.getSimpleName() + "[", "]")
-        .add(sessionId)
-        .toString();
+    return "WebsocketGatewaySession[" + sessionId + ']';
   }
 }

services-gateway-tests/src/main/java/io/scalecube/services/testservice/AuthRegistry.java

@@ -13,7 +13,7 @@ public class AuthRegistry {
   /** Preconfigured userName-s that are allowed to be authenticated. */
   private final Set<String> allowedUsers;
 
-  private ConcurrentMap<String, String> loggedInUsers = new ConcurrentHashMap<>();
+  private ConcurrentMap<Long, String> loggedInUsers = new ConcurrentHashMap<>();
 
   public AuthRegistry(Set<String> allowedUsers) {
     this.allowedUsers = allowedUsers;
@@ -25,7 +25,7 @@ public AuthRegistry(Set<String> allowedUsers) {
    * @param sessionId session id to get auth info for
    * @return auth info for given session if exists
    */
-  public Optional<String> getAuth(String sessionId) {
+  public Optional<String> getAuth(long sessionId) {
     return Optional.ofNullable(loggedInUsers.get(sessionId));
   }
 
@@ -36,7 +36,7 @@ public Optional<String> getAuth(String sessionId) {
    * @param auth auth info for given session id
    * @return auth info added for session id or empty if auth info is invalid
    */
-  public Optional<String> addAuth(String sessionId, String auth) {
+  public Optional<String> addAuth(long sessionId, String auth) {
     if (allowedUsers.contains(auth)) {
       loggedInUsers.putIfAbsent(sessionId, auth);
       return Optional.of(auth);
@@ -52,7 +52,7 @@ public Optional<String> addAuth(String sessionId, String auth) {
    * @param sessionId session id to be removed from registry
    * @return true if session had auth info, false - otherwise
    */
-  public String removeAuth(String sessionId) {
+  public String removeAuth(long sessionId) {
     return loggedInUsers.remove(sessionId);
   }
 }

services-gateway-tests/src/main/java/io/scalecube/services/testservice/SecuredAuthenticator.java

@@ -20,7 +20,7 @@ public Mono<String> authenticate(ServiceMessage message) {
     return sessionId == null
         ? Mono.error(new BadRequestException("No session id provided in request"))
         : authRegistry
-            .getAuth(sessionId)
+            .getAuth(Long.parseLong(sessionId))
             .map(Mono::just)
             .orElse(Mono.error(new ForbiddenException("Session is not authenticated")));
   }

services-gateway-tests/src/main/java/io/scalecube/services/testservice/SecuredRsGwGatewaySessionHandler.java

@@ -18,7 +18,7 @@ public SecuredRsGwGatewaySessionHandler(AuthRegistry authRegistry) {
 
   @Override
   public ServiceMessage mapMessage(GatewaySession session, ServiceMessage req, Context context) {
-    return ServiceMessage.from(req).header(AuthRegistry.SESSION_ID, session).build();
+    return ServiceMessage.from(req).header(AuthRegistry.SESSION_ID, session.sessionId()).build();
   }
 
   @Override

services-gateway-tests/src/main/java/io/scalecube/services/testservice/SecuredServiceImpl.java

@@ -6,7 +6,6 @@
 import io.scalecube.services.exceptions.ForbiddenException;
 import java.util.Optional;
 import java.util.stream.IntStream;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
@@ -29,7 +28,7 @@ public Mono<String> createSession(ServiceMessage request) {
       });
     }
     String req = request.data();
-    Optional<String> authResult = authRegistry.addAuth(sessionId, req);
+    Optional<String> authResult = authRegistry.addAuth(Long.parseLong(sessionId), req);
     if (authResult.isPresent()) {
       return Mono.just(req);
     } else {

services-gateway-tests/src/main/java/io/scalecube/services/testservice/SecuredWsGwGatewaySessionManager.java

@@ -18,7 +18,7 @@ public SecuredWsGwGatewaySessionManager(AuthRegistry authRegistry) {
 
   @Override
   public GatewayMessage mapMessage(GatewaySession session, GatewayMessage req, Context context) {
-    return GatewayMessage.from(req).header(AuthRegistry.SESSION_ID, session).build();
+    return GatewayMessage.from(req).header(AuthRegistry.SESSION_ID, session.sessionId()).build();
   }
 
   @Override