Merge pull request #1 from appulse-projects/develop

Add server sub-project

Author: xxlabaza

.gitignore

@@ -112,6 +112,3 @@ nb-configuration.xml
 log*.txt*
 .DS_Store
 .vscode/
-
-# Secure incomplete sub-projects
-server/

.travis.yml

@@ -37,6 +37,9 @@ deploy:
     - "client/target/client-$project_version.jar"
     - "client/target/client-$project_version-javadoc.jar"
     - "client/target/client-$project_version-sources.jar"
+    - "server/target/server-$project_version.jar"
+    - "server/target/server-$project_version-javadoc.jar"
+    - "server/target/server-$project_version-sources.jar"
   skip_cleanup: true
   on:
     tags: true

CHANGELOG.md

@@ -9,14 +9,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-- Add EPMD server.
 - Add more unit and integration tests.
 
+## [0.3.0](https://github.com/appulse-projects/epmd-java/releases/tag/0.3.0) - 2018-01-31
+
+### Added
+
+- EPMD server sub-project.
+- Server test.
+
+### Changed
+
+- [Core]: registration result returns creation 0 in case of failure.
+- [Client]: set connection read timeout (connection_timeout * 2).
+
 ## [0.2.2](https://github.com/appulse-projects/epmd-java/releases/tag/0.2.2) - 2018-01-29
 
 ### Added
 
-- Add EPMD client.
+- EPMD client sub-project.
 - Serialization/Deserialization exceptions in `Core`.
 
 ### Changed

README.md

@@ -1,12 +1,13 @@
 # Overview
 
 [![build_status](https://travis-ci.org/appulse-projects/epmd-java.svg?branch=master)](https://travis-ci.org/appulse-projects/epmd-java)
-[![maven_central](https://maven-badges.herokuapp.com/maven-central/io.appulse.epmd.java/core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.appulse.epmd.java/core)
+[![maven_central](https://maven-badges.herokuapp.com/maven-central/io.appulse/epmd-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.appulse/epmd-java)
 
 This is the set of projects, which implementing EPMD server and client.
 
 - [Core description](./core/README.md)
 - [Client description](./client/README.md)
+- [Server description](./server/README.md)
 
 ## Development
 

client/README.md

@@ -14,7 +14,7 @@ Include the dependency to your project's pom.xml file:
     <dependency>
         <groupId>io.appulse.epmd.java</groupId>
         <artifactId>client</artifactId>
-        <version>0.2.2</version>
+        <version>0.3.0</version>
     </dependency>
     ...
 </dependencies>
@@ -23,7 +23,7 @@ Include the dependency to your project's pom.xml file:
 or Gradle:
 
 ```groovy
-compile 'io.appulse.epmd.java:client:0.2.2'
+compile 'io.appulse.epmd.java:client:0.3.0'
 ```
 
 ### Create client

client/pom.xml

@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse</groupId>
     <artifactId>epmd-java</artifactId>
-    <version>0.2.2</version>
+    <version>0.3.0</version>
   </parent>
 
   <groupId>io.appulse.epmd.java</groupId>
@@ -43,7 +43,7 @@ limitations under the License.
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.5.1</version>
+      <version>1.6.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

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

@@ -19,7 +19,6 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static lombok.AccessLevel.PRIVATE;
 
-import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetAddress;
@@ -30,6 +29,7 @@
 import io.appulse.epmd.java.core.mapper.deserializer.MessageDeserializer;
 import io.appulse.epmd.java.core.mapper.serializer.MessageSerializer;
 import io.appulse.epmd.java.core.model.response.RegistrationResult;
+import io.appulse.utils.SocketUtils;
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
@@ -50,12 +50,15 @@ class Connection implements Closeable {
 
   private static final int CONNECT_TIMEOUT;
 
+  private static final int READ_TIMEOUT;
+
   private static final MessageSerializer SERIALIZER;
 
   private static final MessageDeserializer DESERIALIZER;
 
   static {
     CONNECT_TIMEOUT = (int) SECONDS.toMillis(5);
+    READ_TIMEOUT = CONNECT_TIMEOUT * 2;
     SERIALIZER = new MessageSerializer();
     DESERIALIZER = new MessageDeserializer();
   }
@@ -89,8 +92,10 @@ public <T> T send (@NonNull Object request, @NonNull Class<T> responseType) thro
 
     byte[] messageBytes;
     try {
-      messageBytes = read(responseType);
-    } catch (IOException ex) {
+      messageBytes = responseType == RegistrationResult.class
+                     ? SocketUtils.read(socket, 4)
+                     : SocketUtils.read(socket);
+    } catch (Exception ex) {
       throw new EpmdConnectionException(ex);
     }
 
@@ -129,6 +134,7 @@ private void connect () {
     try {
       socket.setTcpNoDelay(true);
       socket.connect(socketAddress, CONNECT_TIMEOUT);
+      socket.setSoTimeout(READ_TIMEOUT);
     } catch (IOException ex) {
       val message = String.format("Couldn't connect to EPMD server (%s:%d), maybe it is down",
                                   address.toString(), port);
@@ -138,22 +144,4 @@ private void connect () {
 
     log.debug("EPMD connection to {}:{} was established", address, port);
   }
-
-  private byte[] read (Class<?> responseType) throws IOException {
-    val outputStream = new ByteArrayOutputStream(32);
-    val buffer = new byte[32];
-
-    while (true) {
-      val length = socket.getInputStream().read(buffer);
-      if (length == -1) {
-        break;
-      }
-      outputStream.write(buffer, 0, length);
-      if (responseType == RegistrationResult.class) {
-        break;
-      }
-    }
-
-    return outputStream.toByteArray();
-  }
 }

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

@@ -30,6 +30,7 @@
 import io.appulse.epmd.java.core.model.request.GetEpmdDump;
 import io.appulse.epmd.java.core.model.request.Kill;
 import io.appulse.epmd.java.core.model.request.Registration;
+import io.appulse.epmd.java.core.model.request.Stop;
 import io.appulse.epmd.java.core.model.response.EpmdDump;
 import io.appulse.epmd.java.core.model.response.KillResult;
 import io.appulse.epmd.java.core.model.response.RegistrationResult;
@@ -84,6 +85,7 @@ public EpmdClient (@NonNull InetAddress address, int port) {
     nodesLocatorService = new NodesLocatorService(address, port);
     this.address = address;
     this.port = port;
+    log.debug("Instantiated EPMD client to '{}:{}'", address, port);
   }
 
   public int register (String name, int nodePort, NodeType type, Protocol protocol, Version low, Version high) {
@@ -100,23 +102,23 @@ public int register (String name, int nodePort, NodeType type, Protocol protocol
   }
 
   public int register (@NonNull Registration request) {
-    log.debug("Registering: {}", request.getName());
+    log.debug("Registering: '{}'", request.getName());
     val connection = getLocalConnection();
 
     RegistrationResult response;
     try {
       response = connection.send(request, RegistrationResult.class);
     } catch (Exception ex) {
-      log.error("{} wasn't registered successfully", request.getName());
+      log.error("'{}' wasn't registered successfully", request.getName());
       throw new EpmdRegistrationException(ex);
     }
 
     if (!response.isOk()) {
-      log.error("{} wasn't registered successfully", request.getName());
+      log.error("'{}' wasn't registered successfully", request.getName());
       throw new EpmdRegistrationException();
     }
 
-    log.info("{} was registered successfully", request.getName());
+    log.info("'{}' was registered successfully", request.getName());
     return response.getCreation();
   }
 
@@ -127,6 +129,12 @@ public List<EpmdDump.NodeDump> dumpAll () {
     }
   }
 
+  public void stop (@NonNull String node) {
+    try (val connection = new Connection(address, port)) {
+      connection.send(new Stop(node));
+    }
+  }
+
   /**
    * This request kills the running EPMD server.
    *
@@ -194,7 +202,7 @@ private static int getDefaultPort () {
       } catch (NumberFormatException | SecurityException ex) {
         throw new RuntimeException(ex);
       }
-      log.debug("Default EPMD port is: {}", port);
+      log.debug("Default EPMD port is: '{}'", port);
       return port;
     }
   }

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

@@ -23,8 +23,10 @@
 import static lombok.AccessLevel.PRIVATE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static io.appulse.epmd.java.core.model.response.EpmdDump.NodeDump.Status.OLD_OR_UNUSED;
 
 import io.appulse.epmd.java.client.exception.EpmdConnectionException;
+import io.appulse.epmd.java.client.exception.EpmdRegistrationException;
 import io.appulse.epmd.java.client.util.CheckLocalEpmdExists;
 import io.appulse.epmd.java.client.util.LocalEpmdHelper;
 import io.appulse.epmd.java.client.util.TestNamePrinter;
@@ -103,15 +105,20 @@ public void register () throws Exception {
     });
   }
 
-//   @Test
-  public void connectionBroken () {
-    LocalEpmdHelper.kill();
-
-    assertThat(LocalEpmdHelper.isRunning())
-        .isFalse();
+  @Test
+  public void invalidRegistration () {
+    try (EpmdClient client2 = new EpmdClient(8091)) {
+      assertThatExceptionOfType(EpmdRegistrationException.class)
+          .isThrownBy(() -> client2.register("popa", 8971, R3_ERLANG, TCP, R6, R6));
+    }
+  }
 
-    assertThatExceptionOfType(EpmdConnectionException.class)
-        .isThrownBy(() -> client.lookup("popa"));
+  @Test
+  public void connectionBroken () {
+    try (EpmdClient client2 = new EpmdClient(8091)) {
+      assertThatExceptionOfType(EpmdConnectionException.class)
+          .isThrownBy(() -> client2.lookup("popa"));
+    }
   }
 
   @Test
@@ -147,6 +154,26 @@ public void dumpAll () {
     });
   }
 
+//   @Test
+  public void stop () {
+    client.register("stopped", 19028, R3_ERLANG, TCP, R6, R6);
+
+    client.stop("stopped");
+
+    val nodes = client.dumpAll();
+    assertThat(nodes)
+        .isNotEmpty();
+
+    val node = nodes.stream()
+        .filter(it -> "stopped".equals(it.getName()))
+        .findFirst()
+        .orElse(null);
+
+    assertThat(node)
+        .isNotNull()
+        .extracting("status").isEqualTo(OLD_OR_UNUSED);
+  }
+
   @Test
   public void kill () {
     assertThat(client.kill())

client/src/test/java/io/appulse/epmd/java/client/util/LocalEpmdHelper.java

@@ -55,7 +55,7 @@ public static void run () {
       kill();
     }
 
-    val builder = new ProcessBuilder("epmd", "-daemon");
+    val builder = new ProcessBuilder("epmd", "-daemon", "-relaxed_command_check");
     val process = builder.start();
     if (!process.waitFor(1, MINUTES)) {
       process.destroy();