update dependencies

Author: Artem Labazin

CHANGELOG.md

@@ -24,6 +24,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Do we really need `ErlangInteger.cache` methods?
 - Add atom's table equivalent.
 
+## [1.6.8](https://github.com/appulse-projects/encon-java/releases/tag/1.6.8) - 2019-04-07
+
+### Changed
+
+- Updated dependencies and plugins versions.
+
 ## [1.6.7](https://github.com/appulse-projects/encon-java/releases/tag/1.6.7) - 2018-10-07
 
 ### Changed

README.md

@@ -50,7 +50,7 @@ $> mvn clean compile
 [INFO] ------------------------------------------------------------------------
 [INFO] Reactor Summary:
 [INFO]
-[INFO] encon 1.6.7 ........................................ SUCCESS [  1.210 s]
+[INFO] encon 1.6.8 ........................................ SUCCESS [  1.210 s]
 [INFO] encon-common ....................................... SUCCESS [ 25.693 s]
 [INFO] encon-terms ........................................ SUCCESS [ 27.517 s]
 [INFO] encon-config ....................................... SUCCESS [ 18.707 s]
@@ -68,7 +68,7 @@ $> mvn clean compile
 [INFO] handler-advanced ................................... SUCCESS [ 11.289 s]
 [INFO] load-config ........................................ SUCCESS [  3.725 s]
 [INFO] load-config-spring ................................. SUCCESS [  6.420 s]
-[INFO] benchmark 1.6.7 .................................... SUCCESS [  5.594 s]
+[INFO] benchmark 1.6.8 .................................... SUCCESS [  5.594 s]
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------

benchmark/pom.xml

@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.7</version>
+    <version>1.6.8</version>
   </parent>
 
   <artifactId>benchmark</artifactId>

benchmark/src/main/java/io/appulse/encon/benchmark/Main.java

@@ -16,14 +16,19 @@
 
 package io.appulse.encon.benchmark;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 import java.io.IOException;
+import java.net.InetAddress;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
-import io.appulse.epmd.java.server.cli.CommonOptions;
-import io.appulse.epmd.java.server.command.server.ServerCommandExecutor;
-import io.appulse.epmd.java.server.command.server.ServerCommandOptions;
+import io.appulse.epmd.java.server.SubcommandServer;
 import io.appulse.utils.SocketUtils;
+import lombok.SneakyThrows;
+import lombok.val;
+import lombok.extern.slf4j.Slf4j;
 
 import org.openjdk.jmh.runner.Defaults;
 import org.openjdk.jmh.runner.NoBenchmarksException;
@@ -39,11 +44,12 @@
  * @since 1.6.0
  * @author Artem Labazin
  */
+@Slf4j
 public class Main {
 
   private static ExecutorService executor;
 
-  private static ServerCommandExecutor server;
+  private static Future<?> future;
 
   public static void main(String[] argv) throws RunnerException, IOException {
     try {
@@ -111,24 +117,35 @@ public static void main(String[] argv) throws RunnerException, IOException {
     }
   }
 
+  @SneakyThrows
   private static void startEpmd () {
     if (!SocketUtils.isPortAvailable(4369)) {
       return;
     }
     executor = Executors.newSingleThreadExecutor();
 
-    ServerCommandOptions options = new ServerCommandOptions();
-    options.setChecks(true);
+    val server = SubcommandServer.builder()
+        .port(SocketUtils.findFreePort().orElseThrow(RuntimeException::new))
+        .ip(InetAddress.getByName("0.0.0.0"))
+        .build();
 
-    server = new ServerCommandExecutor(new CommonOptions(), options);
-    executor.execute(server::execute);
+    future = executor.submit(() -> {
+      try {
+        server.run();
+      } catch (Throwable ex) {
+        log.error("popa", ex);
+      }
+    });
+    SECONDS.sleep(1);
   }
 
   private static void stopEpmd () {
     if (executor == null) {
       return;
     }
-    server.close();
+    if (future != null) {
+      future.cancel(true);
+    }
     executor.shutdown();
   }
 }

encon-common/pom.xml

@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.7</version>
+    <version>1.6.8</version>
   </parent>
 
   <artifactId>encon-common</artifactId>

encon-common/src/main/java/io/appulse/encon/common/NodeDescriptor.java

@@ -185,7 +185,7 @@ public static boolean removeFromCache (@NonNull NodeDescriptor descriptor) {
 
   private static NodeDescriptor getFromCacheOrCreateNew (@NonNull String node) {
     val atIndex = node.indexOf('@');
-    val isShortName = atIndex < 0 || node.indexOf('.', atIndex) < 0;
+    boolean isShortName = atIndex < 0 || node.indexOf('.', atIndex) < 0;
     return getFromCacheOrCreateNew(node, isShortName);
   }
 

encon-common/src/test/java/io/appulse/encon/common/DistributionFlagTest.java

@@ -23,11 +23,7 @@
 
 import java.util.stream.Stream;
 
-import io.appulse.utils.test.TestMethodNamePrinter;
-
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TestRule;
 
 /**
  *
@@ -36,9 +32,6 @@
  */
 public class DistributionFlagTest {
 
-  @Rule
-  public TestRule watcher = new TestMethodNamePrinter();
-
   @Test
   public void parse () {
     Stream.of(DistributionFlag.values()).forEach(it -> {

encon-common/src/test/java/io/appulse/encon/common/NodeDescriptorTest.java

@@ -20,12 +20,8 @@
 
 import java.net.InetAddress;
 
-import io.appulse.utils.test.TestMethodNamePrinter;
-
 import org.assertj.core.api.SoftAssertions;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TestRule;
 
 /**
  *
@@ -34,9 +30,6 @@
  */
 public class NodeDescriptorTest {
 
-  @Rule
-  public TestRule watcher = new TestMethodNamePrinter();
-
   @Test
   public void fullShortName () throws Exception {
     InetAddress address = InetAddress.getByName("localhost");

encon-config/README.md

@@ -19,7 +19,7 @@ First of all, add config's dependency:
   <dependency>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-config</artifactId>
-    <version>1.6.7</version>
+    <version>1.6.8</version>
   </dependency>
   ...
 </dependencies>
@@ -28,7 +28,7 @@ First of all, add config's dependency:
 **Gradle**:
 
 ```groovy
-compile 'io.appulse.encon:encon-config:1.6.7'
+compile 'io.appulse.encon:encon-config:1.6.8'
 ```
 
 ### File based configuration

encon-config/pom.xml

@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse.encon</groupId>
     <artifactId>encon-parent</artifactId>
-    <version>1.6.7</version>
+    <version>1.6.8</version>
   </parent>
 
   <artifactId>encon-config</artifactId>
@@ -50,7 +50,7 @@ limitations under the License.
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
-      <version>1.21</version>
+      <version>1.24</version>
     </dependency>
 
     <dependency>