Fix single registration

Author: Artem Labazin

client/src/main/java/io/appulse/epmd/java/client/Connection.java

@@ -124,6 +124,10 @@ public boolean isClosed () {
     return socket.isClosed();
   }
 
+  public boolean isConnected () {
+    return socket.isConnected();
+  }
+
   private void connect () {
     if (socket.isConnected()) {
       log.debug("EPMD connection was already connected");

client/src/main/java/io/appulse/epmd/java/client/EpmdClient.java

@@ -22,6 +22,8 @@
 import java.io.Closeable;
 import java.net.InetAddress;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import io.appulse.epmd.java.client.exception.EpmdRegistrationException;
 import io.appulse.epmd.java.core.model.NodeType;
@@ -36,7 +38,6 @@
 import io.appulse.epmd.java.core.model.response.RegistrationResult;
 
 import lombok.Builder;
-import lombok.Getter;
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import lombok.experimental.Delegate;
@@ -54,8 +55,7 @@
 @FieldDefaults(level = PRIVATE, makeFinal = true)
 public final class EpmdClient implements Closeable {
 
-  @Getter(lazy = true, value = PRIVATE)
-  Connection localConnection = connect();
+  Map<String, Connection> cache = new ConcurrentHashMap<>();
 
   @Delegate
   LookupService lookupService;
@@ -102,22 +102,29 @@ public int register (String name, int nodePort, NodeType type, Protocol protocol
   }
 
   public int register (@NonNull Registration request) {
+    if (cache.containsKey(request.getName()) && cache.get(request.getName()).isConnected()) {
+      log.error("Node with name '{}' already exists");
+      throw new EpmdRegistrationException();
+    }
     log.debug("Registering: '{}'", request.getName());
-    val connection = getLocalConnection();
+    val connection = new Connection(address, port);
 
     RegistrationResult response;
     try {
       response = connection.send(request, RegistrationResult.class);
     } catch (Exception ex) {
+      connection.close();
       log.error("'{}' wasn't registered successfully", request.getName());
       throw new EpmdRegistrationException(ex);
     }
 
     if (!response.isOk()) {
+      connection.close();
       log.error("'{}' wasn't registered successfully", request.getName());
       throw new EpmdRegistrationException();
     }
 
+    cache.put(request.getName(), connection);
     log.info("'{}' was registered successfully", request.getName());
     return response.getCreation();
   }
@@ -151,20 +158,11 @@ public boolean kill () {
     }
   }
 
-  public boolean isClosed () {
-    val connection = getLocalConnection();
-    return connection.isClosed();
-  }
-
   @Override
   public void close () {
-    val connection = getLocalConnection();
-    if (connection.isClosed()) {
-      log.debug("EPMD client was already closed");
-    } else {
-      connection.close();
-      log.debug("EPMD client was closed");
-    }
+    cache.values().forEach(Connection::close);
+    cache.clear();
+    log.debug("EPMD client was closed");
   }
 
   public void clearCaches () {
@@ -177,10 +175,6 @@ protected void finalize () throws Throwable {
     super.finalize();
   }
 
-  private Connection connect () {
-    return new Connection(address, port);
-  }
-
   private static class Default {
 
     private static final InetAddress ADDRESS = getDefaultInetAddress();

client/src/test/java/io/appulse/epmd/java/client/LocalEpmdClientTest.java

@@ -73,6 +73,15 @@ public void after () {
     LocalEpmdHelper.kill();
   }
 
+  @Test
+  public void twoRegisters () throws Exception {
+    val creation = client.register("register", 8971, R3_ERLANG, TCP, R6, R6);
+    assertThat(creation).isNotEqualTo(0);
+
+    assertThatExceptionOfType(EpmdRegistrationException.class)
+          .isThrownBy(() -> client.register("register", 8971, R3_ERLANG, TCP, R6, R6));
+  }
+
   @Test
   public void register () throws Exception {
     val creation = client.register("register", 8971, R3_ERLANG, TCP, R6, R6);
@@ -179,9 +188,5 @@ public void kill () {
     assertThat(client.kill())
         .as("EPMD client wasn't killed")
         .isTrue();
-
-    assertThat(client.isClosed())
-        .as("EPMD client wasn't closed")
-        .isTrue();
   }
 }

pom.xml

@@ -272,6 +272,7 @@ limitations under the License.
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.20.1</version>
         <configuration>
+          <trimStackTrace>false</trimStackTrace>
           <includes>
             <include>**/*Test.java</include>
           </includes>

server/src/test/java/io/appulse/epmd/java/server/command/server/ServerCommandExecutorTest.java

@@ -45,7 +45,7 @@ public class ServerCommandExecutorTest {
 
   @Before
   public void before () {
-    int port = SocketUtils.findFreePort()
+    val port = SocketUtils.findFreePort()
         .orElseThrow(RuntimeException::new);
 
     val commonOptions = new CommonOptions();