Small refactoring

Artem Labazin · Artem Labazin · commit eee806e291fb · 2018-03-23T13:45:40.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Add more unit and integration tests.
 
+## [1.0.1](https://github.com/appulse-projects/epmd-java/releases/tag/1.0.1) - 2018-03-23
+
+Small refactoring.
+
+### Changed
+
+- Server generates `creation` from 1 to 3 now.
+- Small bug fixes.
+- Updated dependencies.
+
 ## [1.0.0](https://github.com/appulse-projects/epmd-java/releases/tag/1.0.0) - 2018-03-16
 
 Code style refactoring.
diff --git a/client/README.md b/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>1.0.0</version>
+        <version>1.0.1</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:1.0.0'
+compile 'io.appulse.epmd.java:client:1.0.1'
 ```
 
 ### Create client
diff --git a/client/pom.xml b/client/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse</groupId>
     <artifactId>epmd-java</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </parent>
 
   <groupId>io.appulse.epmd.java</groupId>
diff --git a/client/src/test/java/io/appulse/epmd/java/client/LocalEpmdClientTest.java b/client/src/test/java/io/appulse/epmd/java/client/LocalEpmdClientTest.java
@@ -28,7 +28,7 @@
 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;
+import io.appulse.utils.test.TestMethodNamePrinter;
 
 import lombok.experimental.FieldDefaults;
 import lombok.val;
@@ -52,7 +52,7 @@ public class LocalEpmdClientTest {
   public static CheckLocalEpmdExists localEpmdExists = new CheckLocalEpmdExists();
 
   @Rule
-  public TestRule watcher = new TestNamePrinter();
+  public TestRule watcher = new TestMethodNamePrinter();
 
   EpmdClient client;
 
diff --git a/client/src/test/java/io/appulse/epmd/java/client/RemoteEpmdClientTest.java b/client/src/test/java/io/appulse/epmd/java/client/RemoteEpmdClientTest.java
@@ -25,7 +25,7 @@
 
 import java.time.Duration;
 
-import io.appulse.epmd.java.client.util.TestNamePrinter;
+import io.appulse.utils.test.TestMethodNamePrinter;
 
 import lombok.SneakyThrows;
 import lombok.experimental.FieldDefaults;
@@ -66,7 +66,7 @@ protected void waitUntilReady () {
       });
 
   @Rule
-  public TestRule watcher = new TestNamePrinter();
+  public TestRule watcher = new TestMethodNamePrinter();
 
   EpmdClient client;
 
diff --git a/client/src/test/java/io/appulse/epmd/java/client/util/TestNamePrinter.java b/client/src/test/java/io/appulse/epmd/java/client/util/TestNamePrinter.java
diff --git a/core/pom.xml b/core/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse</groupId>
     <artifactId>epmd-java</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </parent>
 
   <groupId>io.appulse.epmd.java</groupId>
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
 
   <groupId>io.appulse</groupId>
   <artifactId>epmd-java</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -68,7 +68,7 @@ limitations under the License.
     <url>https://github.com/appulse-projects/epmd-java</url>
     <connection>scm:git:https://github.com/appulse-projects/epmd-java.git</connection>
     <developerConnection>scm:git:https://github.com/appulse-projects/epmd-java.git</developerConnection>
-    <tag>1.0.0</tag>
+    <tag>1.0.1</tag>
   </scm>
 
   <distributionManagement>
@@ -116,7 +116,7 @@ limitations under the License.
     <dependency>
       <groupId>io.appulse</groupId>
       <artifactId>utils-java</artifactId>
-      <version>1.3.3</version>
+      <version>1.5.0</version>
     </dependency>
 
     <dependency>
diff --git a/server/README.md b/server/README.md
@@ -18,7 +18,7 @@ Include the dependency to your project's pom.xml file:
     <dependency>
         <groupId>io.appulse.epmd.java</groupId>
         <artifactId>server</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </dependency>
     ...
 </dependencies>
@@ -27,5 +27,5 @@ Include the dependency to your project's pom.xml file:
 or Gradle:
 
 ```groovy
-compile 'io.appulse.epmd.java:server:1.0.0'
+compile 'io.appulse.epmd.java:server:1.0.1'
 ```
diff --git a/server/pom.xml b/server/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse</groupId>
     <artifactId>epmd-java</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </parent>
 
   <groupId>io.appulse.epmd.java</groupId>
diff --git a/server/src/main/java/io/appulse/epmd/java/server/command/server/handler/command/RegistrationRequestHandler.java b/server/src/main/java/io/appulse/epmd/java/server/command/server/handler/command/RegistrationRequestHandler.java
@@ -19,8 +19,6 @@
 import static io.appulse.epmd.java.core.model.Tag.ALIVE2_REQUEST;
 import static io.netty.channel.ChannelFutureListener.CLOSE;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import io.appulse.epmd.java.core.model.Tag;
 import io.appulse.epmd.java.core.model.request.Registration;
 import io.appulse.epmd.java.core.model.request.Request;
@@ -41,8 +39,6 @@
 @Slf4j
 class RegistrationRequestHandler implements RequestHandler {
 
-  AtomicInteger count = new AtomicInteger(0);
-
   @Override
   public void handle (@NonNull Request request, @NonNull ChannelHandlerContext context, @NonNull ServerState state) {
     if (!(request instanceof Registration)) {
@@ -84,20 +80,17 @@ public Tag getTag () {
   }
 
   private Node register (Registration registration, ServerState serverState) {
+    val creation = (int) System.currentTimeMillis() % 3 + 1;
     return serverState.getNodes()
-        .compute(registration.getName(), (key, value) -> {
-          if (value != null) {
-            return null;
-          }
-          return Node.builder()
-              .name(registration.getName())
-              .port(registration.getPort())
-              .type(registration.getType())
-              .protocol(registration.getProtocol())
-              .high(registration.getHigh())
-              .low(registration.getLow())
-              .creation(count.incrementAndGet())
-              .build();
-        });
+        .computeIfAbsent(registration.getName(), key -> Node.builder()
+            .name(registration.getName())
+            .port(registration.getPort())
+            .type(registration.getType())
+            .protocol(registration.getProtocol())
+            .high(registration.getHigh())
+            .low(registration.getLow())
+            .creation(creation)
+            .build()
+        );
   }
 }
diff --git a/server/src/test/java/io/appulse/epmd/java/server/command/server/ServerCommandExecutorTest.java b/server/src/test/java/io/appulse/epmd/java/server/command/server/ServerCommandExecutorTest.java
@@ -24,14 +24,15 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import io.appulse.epmd.java.client.EpmdClient;
 import io.appulse.epmd.java.client.exception.EpmdRegistrationException;
 import io.appulse.epmd.java.server.cli.CommonOptions;
-import io.appulse.epmd.java.server.command.server.util.TestNamePrinter;
 import io.appulse.utils.SocketUtils;
+import io.appulse.utils.test.TestMethodNamePrinter;
+import io.appulse.utils.threads.AppulseExecutors;
 
 import lombok.val;
 import org.assertj.core.api.SoftAssertions;
@@ -49,13 +50,15 @@
 public class ServerCommandExecutorTest {
 
   @Rule
-  public TestRule watcher = new TestNamePrinter();
+  public TestRule watcher = new TestMethodNamePrinter();
+
+  ExecutorService executorService = AppulseExecutors.newSingleThreadExecutor().build();
 
   EpmdClient client;
 
   ServerCommandExecutor server;
 
-  ExecutorService executorService;
+  Future<?> future;
 
   @Before
   public void before () throws Exception {
@@ -66,10 +69,9 @@ public void before () throws Exception {
     commonOptions.setPort(port);
     server = new ServerCommandExecutor(commonOptions, new ServerCommandOptions());
 
-    executorService = Executors.newSingleThreadExecutor();
-    executorService.execute(() -> server.execute());
+    future = executorService.submit(server::execute);
 
-    TimeUnit.SECONDS.sleep(2);
+    TimeUnit.SECONDS.sleep(1);
 
     client = new EpmdClient(port);
   }
@@ -78,8 +80,7 @@ public void before () throws Exception {
   public void after () {
     client.close();
     server.close();
-    executorService.shutdownNow();
-    executorService = null;
+    future.cancel(true);
   }
 
   @Test
diff --git a/server/src/test/java/io/appulse/epmd/java/server/command/server/util/TestNamePrinter.java b/server/src/test/java/io/appulse/epmd/java/server/command/server/util/TestNamePrinter.java
