diff --git a/src/main/java/net/ayyalasomayajula/net/client/Dashboard.java b/src/main/java/net/ayyalasomayajula/net/client/Dashboard.java index 425e1f0..c158faf 100644 --- a/src/main/java/net/ayyalasomayajula/net/client/Dashboard.java +++ b/src/main/java/net/ayyalasomayajula/net/client/Dashboard.java @@ -118,9 +118,15 @@ public class Dashboard extends JFrame { try { while (true) { // Read the next message from the server - Message receivedMessage = (Message) inputStream.readObject(); - receivedMessages.add(receivedMessage); - updateMessageDisplay(receivedMessage); // Update the GUI with the new message + Object receivedMessage = inputStream.readObject(); + if(receivedMessage instanceof Message) { + Message message = (Message) receivedMessage; + logger.info("Received EHR response: {}", message); + if(message.data().length == 0) {continue;} + receivedMessages.add(message); + updateMessageDisplay(message); // Update the GUI with the new message + } + } } catch (IOException | ClassNotFoundException e) { logger.error("Error while listening for messages: {}", e.getMessage()); diff --git a/src/main/java/net/ayyalasomayajula/net/server/ServerDaemon.java b/src/main/java/net/ayyalasomayajula/net/server/ServerDaemon.java index d757e05..4ef2ae6 100644 --- a/src/main/java/net/ayyalasomayajula/net/server/ServerDaemon.java +++ b/src/main/java/net/ayyalasomayajula/net/server/ServerDaemon.java @@ -195,6 +195,7 @@ public class ServerDaemon implements Runnable { case "EHR": logger.info("EHR caught"); EHR found = EHRUtils.searchClosestEHR(assetId, Path.of(basePath)); + if(found == null) {return null;} return new Message(MessageVariant.SET, "", 5, SerializationUtils.toBytes(found)); case "XRAY": logger.info("XRAY caught"); diff --git a/src/main/java/net/ayyalasomayajula/net/shared/Appointment.java b/src/main/java/net/ayyalasomayajula/net/shared/Appointment.java index d1c281b..c29058e 100644 --- a/src/main/java/net/ayyalasomayajula/net/shared/Appointment.java +++ b/src/main/java/net/ayyalasomayajula/net/shared/Appointment.java @@ -1,5 +1,6 @@ package net.ayyalasomayajula.net.shared; +import java.io.Serializable; import java.time.LocalDateTime; import java.util.UUID; @@ -9,7 +10,7 @@ import java.util.UUID; * @author Krishna Ayyalasomayajula * @version 1.0 */ -public record Appointment(UUID uuid, UUID patient, LocalDateTime time, boolean attendance, String description) { +public record Appointment(UUID uuid, UUID patient, LocalDateTime time, boolean attendance, String description) implements Serializable { /** * Evaluates whether the allotted time has already passed. * @return boolean object, true if date time is past diff --git a/src/main/java/net/ayyalasomayajula/net/shared/EHR.java b/src/main/java/net/ayyalasomayajula/net/shared/EHR.java index 6de2e5d..e90712b 100644 --- a/src/main/java/net/ayyalasomayajula/net/shared/EHR.java +++ b/src/main/java/net/ayyalasomayajula/net/shared/EHR.java @@ -3,6 +3,7 @@ package net.ayyalasomayajula.net.shared; import net.ayyalasomayajula.net.shared.Appointment; import net.ayyalasomayajula.net.shared.Message; +import java.io.Serializable; import java.nio.file.Path; import java.time.LocalDateTime; import java.util.ArrayList; @@ -17,7 +18,7 @@ import java.util.UUID; * @author Krishna Ayyalasomayajula * @version 1.0 */ -public class EHR { +public class EHR implements Serializable { private String patientName; private UUID uuid; private List medicalNotes; diff --git a/src/main/java/net/ayyalasomayajula/net/shared/Message.java b/src/main/java/net/ayyalasomayajula/net/shared/Message.java index 4dbe7da..7679c70 100644 --- a/src/main/java/net/ayyalasomayajula/net/shared/Message.java +++ b/src/main/java/net/ayyalasomayajula/net/shared/Message.java @@ -1,12 +1,15 @@ package net.ayyalasomayajula.net.shared; +import java.io.Serializable; + /** * Encapsulates the socket message objects using a record. * * @author Krishna Ayyalasomayajula * @version 1.0 */ -public record Message(MessageVariant messageVariant, String messageQuery, int timeoutSeconds, byte[] data) { + +public record Message(MessageVariant messageVariant, String messageQuery, int timeoutSeconds, byte[] data) implements Serializable { /** * Constructor for Message record. * @author Krishna Ayyalasomayajula diff --git a/src/main/java/net/ayyalasomayajula/net/shared/MessageVariant.java b/src/main/java/net/ayyalasomayajula/net/shared/MessageVariant.java index c8af66b..895684d 100644 --- a/src/main/java/net/ayyalasomayajula/net/shared/MessageVariant.java +++ b/src/main/java/net/ayyalasomayajula/net/shared/MessageVariant.java @@ -1,6 +1,8 @@ package net.ayyalasomayajula.net.shared; -public enum MessageVariant{ +import java.io.Serializable; + +public enum MessageVariant implements Serializable { GET("GET"), SET("SET"), UPSERT("UPSERT"), INSERT("INSERT"); diff --git a/target/classes/com/intellij/uiDesigner/core/AbstractLayout.class b/target/classes/com/intellij/uiDesigner/core/AbstractLayout.class deleted file mode 100644 index 29f793c..0000000 Binary files a/target/classes/com/intellij/uiDesigner/core/AbstractLayout.class and /dev/null differ diff --git a/target/classes/com/intellij/uiDesigner/core/DimensionInfo.class b/target/classes/com/intellij/uiDesigner/core/DimensionInfo.class deleted file mode 100644 index be2d597..0000000 Binary files a/target/classes/com/intellij/uiDesigner/core/DimensionInfo.class and /dev/null differ diff --git a/target/classes/com/intellij/uiDesigner/core/GridConstraints.class b/target/classes/com/intellij/uiDesigner/core/GridConstraints.class deleted file mode 100644 index bd11400..0000000 Binary files a/target/classes/com/intellij/uiDesigner/core/GridConstraints.class and /dev/null differ diff --git a/target/classes/com/intellij/uiDesigner/core/GridLayoutManager.class b/target/classes/com/intellij/uiDesigner/core/GridLayoutManager.class deleted file mode 100644 index d5f2975..0000000 Binary files a/target/classes/com/intellij/uiDesigner/core/GridLayoutManager.class and /dev/null differ diff --git a/target/classes/com/intellij/uiDesigner/core/HorizontalInfo.class b/target/classes/com/intellij/uiDesigner/core/HorizontalInfo.class deleted file mode 100644 index 6b664ee..0000000 Binary files a/target/classes/com/intellij/uiDesigner/core/HorizontalInfo.class and /dev/null differ diff --git a/target/classes/com/intellij/uiDesigner/core/LayoutState.class b/target/classes/com/intellij/uiDesigner/core/LayoutState.class deleted file mode 100644 index 467cd17..0000000 Binary files a/target/classes/com/intellij/uiDesigner/core/LayoutState.class and /dev/null differ diff --git a/target/classes/com/intellij/uiDesigner/core/Spacer.class b/target/classes/com/intellij/uiDesigner/core/Spacer.class deleted file mode 100644 index 88e02ae..0000000 Binary files a/target/classes/com/intellij/uiDesigner/core/Spacer.class and /dev/null differ diff --git a/target/classes/com/intellij/uiDesigner/core/SupportCode$TextWithMnemonic.class b/target/classes/com/intellij/uiDesigner/core/SupportCode$TextWithMnemonic.class deleted file mode 100644 index 8f90733..0000000 Binary files a/target/classes/com/intellij/uiDesigner/core/SupportCode$TextWithMnemonic.class and /dev/null differ diff --git a/target/classes/com/intellij/uiDesigner/core/SupportCode.class b/target/classes/com/intellij/uiDesigner/core/SupportCode.class deleted file mode 100644 index 6af9a54..0000000 Binary files a/target/classes/com/intellij/uiDesigner/core/SupportCode.class and /dev/null differ diff --git a/target/classes/com/intellij/uiDesigner/core/Util.class b/target/classes/com/intellij/uiDesigner/core/Util.class deleted file mode 100644 index 8ece86c..0000000 Binary files a/target/classes/com/intellij/uiDesigner/core/Util.class and /dev/null differ diff --git a/target/classes/com/intellij/uiDesigner/core/VerticalInfo.class b/target/classes/com/intellij/uiDesigner/core/VerticalInfo.class deleted file mode 100644 index 65f9d87..0000000 Binary files a/target/classes/com/intellij/uiDesigner/core/VerticalInfo.class and /dev/null differ diff --git a/target/classes/net/ayyalasomayajula/net/client/Dashboard.class b/target/classes/net/ayyalasomayajula/net/client/Dashboard.class index 83b2c48..4d65035 100644 Binary files a/target/classes/net/ayyalasomayajula/net/client/Dashboard.class and b/target/classes/net/ayyalasomayajula/net/client/Dashboard.class differ