Cleanup the code

Author: Artem Labazin

core/pom.xml

@@ -60,7 +60,7 @@ limitations under the License.
         <artifactId>maven-failsafe-plugin</artifactId>
       </plugin>
 
-      <!-- <plugin>
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
       </plugin>
@@ -72,7 +72,7 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin> -->
+      </plugin>
     </plugins>
   </build>
 </project>

core/src/main/java/io/appulse/epmd/java/core/mapper/deserializer/EnumDeserializer.java

@@ -16,13 +16,12 @@
 
 package io.appulse.epmd.java.core.mapper.deserializer;
 
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static java.util.Arrays.asList;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import static java.nio.charset.StandardCharsets.ISO_8859_1;
-
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Optional;

core/src/main/java/io/appulse/epmd/java/core/mapper/deserializer/MessageDeserializer.java

@@ -17,15 +17,16 @@
 package io.appulse.epmd.java.core.mapper.deserializer;
 
 import static io.appulse.epmd.java.core.model.Tag.UNDEFINED;
+import static io.appulse.utils.BytesUtil.asInteger;
 import static java.util.Arrays.asList;
 import static java.util.Optional.ofNullable;
 
-import java.nio.ByteBuffer;
 import java.util.List;
 
 import io.appulse.epmd.java.core.mapper.Message;
 import io.appulse.epmd.java.core.model.Tag;
 import io.appulse.utils.Bytes;
+
 import lombok.SneakyThrows;
 import lombok.val;
 
@@ -55,10 +56,11 @@ public <T> T deserialize (byte[] bytes, Class<T> type) {
         .map(it -> it.getAnnotation(Message.class))
         .orElseThrow(RuntimeException::new);
 
-    if (annotation.lengthBytes() > 0 && asInteger(buffer, annotation.lengthBytes()) != buffer.remaining()) {
+    val lengthBytes = annotation.lengthBytes();
+    if (lengthBytes > 0 && asInteger(buffer.getBytes(lengthBytes)) != buffer.remaining()) {
       throw new RuntimeException();
     }
-    if (annotation.value() != UNDEFINED && annotation.value() != Tag.of(buffer.get())) {
+    if (annotation.value() != UNDEFINED && annotation.value() != Tag.of(buffer.getByte())) {
       throw new RuntimeException();
     }
 

core/src/main/java/io/appulse/epmd/java/core/mapper/serializer/DataSerializer.java

@@ -18,6 +18,7 @@
 
 import io.appulse.epmd.java.core.mapper.DataSerializable;
 import io.appulse.utils.Bytes;
+
 import lombok.val;
 
 /**

core/src/main/java/io/appulse/epmd/java/core/mapper/serializer/EnumSerializer.java

@@ -19,8 +19,8 @@
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static lombok.AccessLevel.PRIVATE;
 
-import lombok.val;
 import lombok.experimental.FieldDefaults;
+import lombok.val;
 
 /**
  *

core/src/main/java/io/appulse/epmd/java/core/model/request/GetEpmdDump.java

@@ -18,9 +18,9 @@
 
 import static io.appulse.epmd.java.core.model.Tag.DUMP_REQUEST;
 
+import io.appulse.epmd.java.core.mapper.DataSerializable;
 import io.appulse.epmd.java.core.mapper.ExpectedResponse;
 import io.appulse.epmd.java.core.mapper.Message;
-import io.appulse.epmd.java.core.mapper.DataSerializable;
 import io.appulse.epmd.java.core.model.response.EpmdDump;
 import io.appulse.utils.Bytes;
 

core/src/main/java/io/appulse/epmd/java/core/model/request/GetEpmdInfo.java

@@ -18,9 +18,9 @@
 
 import static io.appulse.epmd.java.core.model.Tag.NAMES_REQUEST;
 
+import io.appulse.epmd.java.core.mapper.DataSerializable;
 import io.appulse.epmd.java.core.mapper.ExpectedResponse;
 import io.appulse.epmd.java.core.mapper.Message;
-import io.appulse.epmd.java.core.mapper.DataSerializable;
 import io.appulse.epmd.java.core.model.response.EpmdInfo;
 import io.appulse.utils.Bytes;
 

core/src/main/java/io/appulse/epmd/java/core/model/request/GetNodeInfo.java

@@ -20,9 +20,9 @@
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static lombok.AccessLevel.PRIVATE;
 
+import io.appulse.epmd.java.core.mapper.DataSerializable;
 import io.appulse.epmd.java.core.mapper.ExpectedResponse;
 import io.appulse.epmd.java.core.mapper.Message;
-import io.appulse.epmd.java.core.mapper.DataSerializable;
 import io.appulse.epmd.java.core.model.response.NodeInfo;
 import io.appulse.utils.Bytes;
 

core/src/main/java/io/appulse/epmd/java/core/model/request/Kill.java

@@ -18,9 +18,9 @@
 
 import static io.appulse.epmd.java.core.model.Tag.KILL_REQUEST;
 
+import io.appulse.epmd.java.core.mapper.DataSerializable;
 import io.appulse.epmd.java.core.mapper.ExpectedResponse;
 import io.appulse.epmd.java.core.mapper.Message;
-import io.appulse.epmd.java.core.mapper.DataSerializable;
 import io.appulse.epmd.java.core.model.response.KillResult;
 import io.appulse.utils.Bytes;
 

core/src/main/java/io/appulse/epmd/java/core/model/request/Registration.java

@@ -20,9 +20,9 @@
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static lombok.AccessLevel.PRIVATE;
 
+import io.appulse.epmd.java.core.mapper.DataSerializable;
 import io.appulse.epmd.java.core.mapper.ExpectedResponse;
 import io.appulse.epmd.java.core.mapper.Message;
-import io.appulse.epmd.java.core.mapper.DataSerializable;
 import io.appulse.epmd.java.core.model.NodeType;
 import io.appulse.epmd.java.core.model.Protocol;
 import io.appulse.epmd.java.core.model.Version;
@@ -53,8 +53,7 @@
 @ExpectedResponse(RegistrationResult.class)
 public class Registration implements DataSerializable {
 
-  @NonNull
-  Integer port;
+  int port;
 
   @NonNull
   NodeType type;
@@ -86,7 +85,7 @@ public void write (@NonNull Bytes bytes) {
 
   @Override
   public void read (@NonNull Bytes bytes) {
-    port = bytes.getInt();
+    port = bytes.getShort();
     type = NodeType.of(bytes.getByte());
     protocol = Protocol.of(bytes.getByte());
     high = Version.of(bytes.getShort());