Minor bug fixes

CHANGELOG.md

@@ -11,6 +11,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Add more unit and integration tests.
 
+## [0.4.1](https://github.com/appulse-projects/epmd-java/releases/tag/0.4.1) - 2018-02-16
+
+Minor bug fixes
+
+### Changed
+
+- EPMD address and port are public now.
+- Lookup cache doesn't cache not found items any more.
+
 ## [0.4.0](https://github.com/appulse-projects/epmd-java/releases/tag/0.4.0) - 2018-02-16
 
 Introducing NIO server.

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.4.0</version>
+        <version>0.4.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:0.4.0'
+compile 'io.appulse.epmd.java:client:0.4.1'
 ```
 
 ### Create client

client/pom.xml

@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse</groupId>
     <artifactId>epmd-java</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1</version>
   </parent>
 
   <groupId>io.appulse.epmd.java</groupId>

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

@@ -175,11 +175,11 @@ protected void finalize () throws Throwable {
     super.finalize();
   }
 
-  private static class Default {
+  public static class Default {
 
-    private static final InetAddress ADDRESS = getDefaultInetAddress();
+    public static final InetAddress ADDRESS = getDefaultInetAddress();
 
-    private static final int PORT = getDefaultPort();
+    public static final int PORT = getDefaultPort();
 
     @SneakyThrows
     private static InetAddress getDefaultInetAddress () {

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

@@ -55,12 +55,17 @@ class LookupService {
 
     COMPUTE = (key, value) -> {
       if (value != null) {
+        log.debug("Used cached value {}", value);
         return value;
       }
 
       val request = new GetNodeInfo(key.getNode());
       try (val connection = new Connection(key.getAddress(), key.getPort())) {
-        return connection.send(request, NodeInfo.class);
+        val response = connection.send(request, NodeInfo.class);
+        log.debug("Lookup result is {}", response);
+        return response.isOk()
+               ? response
+               : null;
       }
     };
   }
@@ -93,7 +98,7 @@ public Optional<NodeInfo> lookup (@NonNull String node, @NonNull InetAddress add
     val tokens = node.split("@", 2);
     val shortName = tokens[0];
 
-    log.debug("Looking up node '{}' at '{}'", shortName, address);
+    log.debug("Looking up node '{}' at '{}:{}'", shortName, address, port);
 
     val descriptor = new NodeDescriptor(shortName, address, port);
     val nodeInfo = CACHE.compute(descriptor, COMPUTE);

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

@@ -122,6 +122,30 @@ public void invalidRegistration () {
     }
   }
 
+  @Test
+  public void lookupAndRegistration () {
+    assertThat(client.register("node-1", 61_111, R3_ERLANG, TCP, R6, R6))
+        .isNotEqualTo(0);
+
+    val optional1 = client.lookup("node-1");
+    assertThat(optional1)
+        .isPresent();
+    assertThat(optional1.get().isOk())
+        .isTrue();
+
+    assertThat(client.lookup("node-2"))
+        .isNotPresent();
+
+    assertThat(client.register("node-2", 61_011, R3_ERLANG, TCP, R6, R6))
+        .isNotEqualTo(0);
+
+    val optional2 = client.lookup("node-2");
+    assertThat(optional2)
+        .isPresent();
+    assertThat(optional2.get().isOk())
+        .isTrue();
+  }
+
   @Test
   public void connectionBroken () {
     try (EpmdClient client2 = new EpmdClient(8091)) {

core/pom.xml

@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse</groupId>
     <artifactId>epmd-java</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1</version>
   </parent>
 
   <groupId>io.appulse.epmd.java</groupId>

pom.xml

@@ -24,7 +24,7 @@ limitations under the License.
 
   <groupId>io.appulse</groupId>
   <artifactId>epmd-java</artifactId>
-  <version>0.4.0</version>
+  <version>0.4.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>0.4.0</tag>
+    <tag>0.4.1</tag>
   </scm>
 
   <distributionManagement>

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>0.4.0</version>
+        <version>0.4.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:0.4.0'
+compile 'io.appulse.epmd.java:server:0.4.1'
 ```

server/pom.xml

@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <groupId>io.appulse</groupId>
     <artifactId>epmd-java</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1</version>
   </parent>
 
   <groupId>io.appulse.epmd.java</groupId>

server/src/main/java/io/appulse/epmd/java/server/command/server/ServerCommandExecutor.java

@@ -108,8 +108,7 @@ public void initChannel (SocketChannel channel) throws Exception {
     } catch (InterruptedException ex) {
       log.error("Server work exception", ex);
     } finally {
-      workerGroup.shutdownGracefully();
-      bossGroup.shutdownGracefully();
+      close();
     }
   }