Add getters

README.md

@@ -44,4 +44,4 @@ See also the list of [contributors](https://github.com/neuralm/Neuralm-Java-Clie
 
 ## License
 
-This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details

src/main/java/net/neuralm/client/NeuralmClient.java

@@ -31,10 +31,10 @@ public class NeuralmClient {
     private final int port;
     private final ISerializer serializer;
     private final ReadHandler readHandler;
-    AtomicBoolean isWriting = new AtomicBoolean(false);
+    final AtomicBoolean isWriting = new AtomicBoolean(false);
     private AsynchronousTlsChannel channel;
     private ByteBuffer writeBuffer = ByteBuffer.allocate(0);
-    private Queue<Message> sendQueue = new LinkedBlockingDeque<>();
+    private final Queue<Message> sendQueue = new LinkedBlockingDeque<>();
 
 
     /**

src/main/java/net/neuralm/client/ReadHandler.java

@@ -1,18 +1,21 @@
 package net.neuralm.client;
 
-import java.nio.ByteBuffer;
-import java.nio.channels.CompletionHandler;
 import net.neuralm.client.messages.Message;
 import net.neuralm.client.messages.MessageHeader;
 import net.neuralm.client.messages.responses.Response;
 import net.neuralm.client.messages.serializer.ISerializer;
 
+import java.nio.ByteBuffer;
+import java.nio.channels.CompletionHandler;
+
 public class ReadHandler implements CompletionHandler<Integer, ByteBuffer> {
 
     private final NeuralmClient client;
 
     MessageHeader currentHeader;
-    ISerializer serializer;
+    final ISerializer serializer;
+
+    ByteBuffer currentBody;
 
     public ReadHandler(NeuralmClient client, ISerializer serializer) {
         this.client = client;
@@ -36,19 +39,24 @@ public void completed(Integer result, ByteBuffer attachment) {
             }
 
             client.startReading(currentHeader.getBodySize());
+            currentBody = ByteBuffer.allocate(currentHeader.getBodySize());
         } else {
+            currentBody.put(bytes);
+
             client.startReading();
 
-            Object response = Message.deconstructMessageBody(serializer, currentHeader, bytes);
-            if (response instanceof Response) {
-                client.addResponse((Response) response);
-            } else {
-                System.err.println(String.format("Received response that wasn't a response! Bytes: %s", bytes));
-            }
+            if (currentBody.position() == currentBody.capacity()) {
+                Object response = Message.deconstructMessageBody(serializer, currentHeader, currentBody.array());
 
-            currentHeader = null;
-        }
+                if (response instanceof Response) {
+                    client.addResponse((Response) response);
+                } else {
+                    System.err.println(String.format("Received response that wasn't a response! Bytes: %s", currentBody.array()));
+                }
 
+                currentHeader = null;
+            }
+        }
     }
 
     @Override

src/main/java/net/neuralm/client/entities/TrainingSession.java

@@ -1,14 +1,15 @@
 package net.neuralm.client.entities;
 
-import java.util.UUID;
 import net.neuralm.client.neat.TrainingRoom;
 
+import java.util.UUID;
+
 public class TrainingSession {
 
-    public UUID Id;
-    public String StartedTimestamp;
-    public String EndedTimestamp; //TODO: Make this an actual date object if possible, or maybe unix time
-    public UUID UserId;
+    public UUID id;
+    public String startedTimestamp;
+    public String endedTimestamp; //TODO: Make this an actual date object if possible, or maybe unix time
+    public UUID userId;
     public TrainingRoom trainingRoom;
 
 }

src/main/java/net/neuralm/client/messages/Message.java

@@ -1,9 +1,10 @@
 package net.neuralm.client.messages;
 
+import net.neuralm.client.messages.serializer.ISerializer;
+
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
-import net.neuralm.client.messages.serializer.ISerializer;
 
 public class Message {
 
@@ -15,6 +16,13 @@ private Message(byte[] headerBytes, byte[] bodyBytes) {
         this.bodyBytes = bodyBytes;
     }
 
+    /**
+     * Construct a message object from the given object with the given serializer.
+     * It will be turned into bytes and a header will be created.
+     * @param serializer The serializer to use.
+     * @param message The object that should be turned into a message
+     * @return The message with the headerBytes and bodyBytes.
+     */
     public static Message constructMessage(ISerializer serializer, Object message) {
         byte[] bodyBytes = serializer.serialize(message);
         byte[] messageTypeBytes = message.getClass().getSimpleName().getBytes(StandardCharsets.UTF_8);
@@ -25,6 +33,14 @@ public static Message constructMessage(ISerializer serializer, Object message) {
         return new Message(headerBytes, bodyBytes);
     }
 
+    /**
+     * Turn a byte array representing an object into that object.
+     * It will deserialize the bytes using the given serializer.
+     * @param serializer The serializer to use.
+     * @param header The header corresponding to the data being deserialized.
+     * @param bodyBytes The data to deserialize
+     * @return null if the serializer fails or no class corresponding to {@link MessageHeader#getTypeName()} is found.
+     */
     public static Object deconstructMessageBody(ISerializer serializer, MessageHeader header, byte[] bodyBytes) {
         Class<?> clazz;
         try {

src/main/java/net/neuralm/client/messages/MessageHeader.java

@@ -7,7 +7,7 @@
 public class MessageHeader {
 
     private final int bodySize;
-    private String typeName;
+    private final String typeName;
 
     private MessageHeader(int bodySize, String typeName) {
         this.bodySize = bodySize;

src/main/java/net/neuralm/client/messages/requests/GetOrganismsRequest.java

@@ -4,9 +4,9 @@
 
 public class GetOrganismsRequest extends Request {
 
-    public UUID trainingSessionID;
+    public final UUID trainingSessionID;
 
-    public int amount;
+    public final int amount;
 
     public GetOrganismsRequest(UUID trainingSessionID, int amount) {
         this.trainingSessionID = trainingSessionID;

src/main/java/net/neuralm/client/messages/requests/PostOrganismsScoreRequest.java

@@ -1,16 +1,17 @@
 package net.neuralm.client.messages.requests;
 
+import net.neuralm.client.neat.Organism;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import net.neuralm.client.neat.Organism;
 
 public class PostOrganismsScoreRequest extends Request {
 
-    public UUID trainingSessionId;
+    public final UUID trainingSessionId;
 
-    public Map<UUID, Double> organismScores;
+    public final Map<UUID, Double> organismScores;
 
     /**
      * Create a PostOrganismsScoreRequest to send the organisms' score to the server
@@ -33,7 +34,7 @@ public PostOrganismsScoreRequest(UUID trainingSessionId, List<Organism> organism
         this(trainingSessionId, new HashMap<>(organisms.size()));
 
         for (Organism organism : organisms) {
-            organismScores.put(organism.id, organism.score);
+            organismScores.put(organism.getId(), organism.getScore());
         }
     }
 }

src/main/java/net/neuralm/client/messages/requests/Request.java

@@ -14,6 +14,7 @@ public class Request {
     public Request() {
         id = UUID.randomUUID();
         ZonedDateTime now = ZonedDateTime.now(ZoneOffset.UTC);
+        //noinspection SpellCheckingInspection
         date = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'.'SSSSSSS'Z'"));
     }
 

src/main/java/net/neuralm/client/messages/responses/Response.java

@@ -30,6 +30,7 @@ public UUID getRequestId() {
      * The time date this response was send.
      * @return The date as a string in the following format: "yyyy-MM-dd'T'HH:mm:ss'.'SSSSSSS'Z'"
      */
+    @SuppressWarnings("SpellCheckingInspection")
     public String getDateTime() {
         return dateTime;
     }

src/main/java/net/neuralm/client/messages/serializer/JsonSerializer.java

@@ -3,6 +3,8 @@
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+
 import java.nio.charset.StandardCharsets;
 
 public class JsonSerializer implements ISerializer {
@@ -13,17 +15,31 @@ public JsonSerializer() {
         this.gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE).create();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public byte[] serialize(Object message) {
         String json = gson.toJson(message);
 
         return json.getBytes(StandardCharsets.UTF_8);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @return The deserialized object, or null if a {@link JsonSyntaxException} occurred.
+     */
     @Override
     public <T> T deserialize(byte[] bytes, Class<T> type) {
         String json = new String(bytes, StandardCharsets.UTF_8);
 
-        return gson.fromJson(json, type);
+        try {
+            return gson.fromJson(json, type);
+        } catch (JsonSyntaxException exception) {
+            System.err.println(json);
+            exception.printStackTrace();
+            return null;
+        }
     }
 }