refactor: use records, other language features

MrExplode · Jul 16, 2024 · 43d097b · 43d097b
1 parent 693e05c
commit 43d097b
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 62 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,7 +34,7 @@ shadowJar {
     archiveClassifier.set('')
     manifest {
         attributes(
-                'Main-Class': 'me.sunstorm.showmanager.Loader'
+                'Main-Class': 'me.sunstorm.showmanager.Bootstrap'
         )
     }
 }

diff --git a/.../java/me/sunstorm/showmanager/Loader.java → ...va/me/sunstorm/showmanager/Bootstrap.java b/.../java/me/sunstorm/showmanager/Loader.java → ...va/me/sunstorm/showmanager/Bootstrap.java
@@ -3,7 +3,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public class Loader {
+public class Bootstrap {
 
     public static void main(String[] args) {
         log.info("Loading ShowManager...");

diff --git a/core/src/main/java/me/sunstorm/showmanager/Worker.java b/core/src/main/java/me/sunstorm/showmanager/Worker.java
@@ -55,7 +55,7 @@ public void run() {
                 if (playing) {
                     elapsed = time - start;
                 }
-                dmxRemote.handleData(artNetModule.getData(dmxRemote.getAddress().getSubnet(), dmxRemote.getAddress().getUniverse()));
+                dmxRemote.handleData(artNetModule.getData(dmxRemote.getAddress().subnet(), dmxRemote.getAddress().universe()));
 
                 if (playing) {
                     currentTime.set(elapsed);

diff --git a/core/src/main/java/me/sunstorm/showmanager/eventsystem/EventBus.java b/core/src/main/java/me/sunstorm/showmanager/eventsystem/EventBus.java
@@ -85,14 +85,14 @@ public void unregister(Listener listener) {
 
     @Override
     public void handleMessage(EventWrapper message) {
-        if (message.isAsync()) {
-            if (message.getEvent() instanceof CancellableEvent) {
-                log.error("[EventHandler] Called cancellable event (" + message.getEvent().getClass().getSimpleName() + ") asynchronously");
+        if (message.async()) {
+            if (message.event() instanceof CancellableEvent) {
+                log.error("[EventHandler] Called cancellable event (" + message.event().getClass().getSimpleName() + ") asynchronously");
             } else {
-                executor.execute(() -> executeEvent(message.getEvent()));
+                executor.execute(() -> executeEvent(message.event()));
             }
         } else {
-            executeEvent(message.getEvent());
+            executeEvent(message.event());
         }
     }
 

diff --git a/core/src/main/java/me/sunstorm/showmanager/eventsystem/registry/EventConverter.java b/core/src/main/java/me/sunstorm/showmanager/eventsystem/registry/EventConverter.java
@@ -13,9 +13,9 @@ public class EventConverter implements Converter<EventWrapper> {
     @Override
     public byte[] encode(@NotNull EventWrapper message) {
         JsonObject object = new JsonObject();
-        object.addProperty("id", message.getId());
-        object.addProperty("async", message.isAsync());
-        object.add("event", Constants.GSON.toJsonTree(message.getEvent()));
+        object.addProperty("id", message.id());
+        object.addProperty("async", message.async());
+        object.add("event", Constants.GSON.toJsonTree(message.event()));
         return object.toString().getBytes(StandardCharsets.UTF_8);
     }
 

diff --git a/core/src/main/java/me/sunstorm/showmanager/eventsystem/registry/EventWrapper.java b/core/src/main/java/me/sunstorm/showmanager/eventsystem/registry/EventWrapper.java
@@ -1,13 +1,5 @@
 package me.sunstorm.showmanager.eventsystem.registry;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
 import me.sunstorm.showmanager.eventsystem.events.Event;
 
-@Getter
-@AllArgsConstructor
-public class EventWrapper {
-    private final int id;
-    private final boolean async;
-    private final Event event;
+public record EventWrapper(int id, boolean async, Event event) {
 }
diff --git a/core/src/main/java/me/sunstorm/showmanager/modules/audio/AudioModule.java b/core/src/main/java/me/sunstorm/showmanager/modules/audio/AudioModule.java
@@ -37,7 +37,7 @@ public class AudioModule extends Module {
     public AudioModule() {
         super("audio-player");
         init();
-        if (tracks.size() > 0) {
+        if (!tracks.isEmpty()) {
             current = tracks.get(index).loadTrack(mixer);
         }
     }
@@ -67,7 +67,7 @@ public void onTimeStop(TimecodeStopEvent e) {
             current.discard();
         }
         index = 0;
-        if (tracks.size() > 0) {
+        if (!tracks.isEmpty()) {
             current = tracks.get(index).loadTrack(mixer);
         }
     }

diff --git a/core/src/main/java/me/sunstorm/showmanager/modules/http/WebSocketHandler.java b/core/src/main/java/me/sunstorm/showmanager/modules/http/WebSocketHandler.java
@@ -90,7 +90,7 @@ public void handleMessage(@NotNull WsMessageContext ctx) {
     @EventCall
     public void onTimeChange(TimecodeChangeEvent e) {
         //slow down the ws dispatch
-        if (wsClients.size() == 0 || (lastDispatchedTime != null && e.getTime().millis() - lastDispatchedTime.millis() < 10)) return;
+        if (wsClients.isEmpty() || (lastDispatchedTime != null && e.getTime().millis() - lastDispatchedTime.millis() < 10)) return;
         JsonObject data = new JsonObject();
         Timecode time = e.getTime();
         data.addProperty("type", "time");

diff --git a/core/src/main/java/me/sunstorm/showmanager/modules/osc/OscModule.java b/core/src/main/java/me/sunstorm/showmanager/modules/osc/OscModule.java
@@ -55,7 +55,7 @@ public void handlePacket(OSCPacketEvent event) {
 
                     if (recording && worker.isPlaying()) {
                         OSCMessage message = (OSCMessage) event.getPacket();
-                        Object property = message.getArguments() == null ? null : (message.getArguments().size() > 0 ? message.getArguments().get(0) : null);
+                        Object property = message.getArguments() == null ? null : (!message.getArguments().isEmpty() ? message.getArguments().get(0) : null);
                         if (!recordCache.containsKey(message.getAddress()) && recordCache.get(message.getAddress()) != property) {
                             System.out.println("adding: " + message.getAddress() + " stuff: " + message.getArguments().toString());
                             scheduler.addEvent(new ScheduledOscEvent(worker.getCurrentTime(), new OSCMessage(message.getAddress(), message.getArguments())));

diff --git a/core/src/main/java/me/sunstorm/showmanager/modules/remote/DmxRemoteModule.java b/core/src/main/java/me/sunstorm/showmanager/modules/remote/DmxRemoteModule.java
@@ -42,7 +42,7 @@ public void handleData(byte[] dmxData) {
             state = DmxRemoteState.DISABLED;
             return;
         }
-        byte value = dmxData[address.getAddress() - 1];
+        byte value = dmxData[address.address() - 1];
         if (inToleratedRange(25, value)) {
             state = DmxRemoteState.FORCE_IDLE;
             if (state != previousState) {
@@ -93,9 +93,9 @@ private boolean inToleratedRange(int origin, byte value) {
     public JsonObject getData() {
         JsonObject data = new JsonObject();
         data.addProperty("enabled", enabled);
-        data.addProperty("address", address.getAddress());
-        data.addProperty("universe", address.getUniverse());
-        data.addProperty("subnet", address.getSubnet());
+        data.addProperty("address", address.address());
+        data.addProperty("universe", address.universe());
+        data.addProperty("subnet", address.subnet());
         return data;
     }
 

diff --git a/core/src/main/java/me/sunstorm/showmanager/redis/impl/RedisImpl.java b/core/src/main/java/me/sunstorm/showmanager/redis/impl/RedisImpl.java
@@ -120,7 +120,7 @@ private void startSendThread() {
             while (true) {
                 try (Jedis jedis = jedisPool.getResource()) {
                     Tuple<byte[], byte[]> data = sendQueue.take();
-                    jedis.publish(data.getFirst(), data.getSecond());
+                    jedis.publish(data.first(), data.second());
                 } catch (InterruptedException e) {
                     log.error("SendQueue wait interrupted", e);
                 }

diff --git a/core/src/main/java/me/sunstorm/showmanager/settings/InetData.java b/core/src/main/java/me/sunstorm/showmanager/settings/InetData.java
@@ -1,15 +1,5 @@
 package me.sunstorm.showmanager.settings;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.ToString;
-
 import java.net.InetAddress;
 
-@Getter
-@ToString
-@AllArgsConstructor
-public class InetData {
-    private final String name;
-    private final InetAddress address;
+public record InetData(String name, InetAddress address) {
 }
diff --git a/core/src/main/java/me/sunstorm/showmanager/terminable/Terminables.java b/core/src/main/java/me/sunstorm/showmanager/terminable/Terminables.java
@@ -34,7 +34,7 @@ public static void addTerminable(@NotNull Class<? extends StaticTerminable> stat
                     } catch (IllegalAccessException e) {
                         return null;
                     }
-                }).filter(Objects::nonNull).collect(Collectors.toList());
+                }).filter(Objects::nonNull).toList();
         terminations.add(() -> {
             for (MethodHandle methodHandle : list) {
                 methodHandle.invokeExact();

diff --git a/core/src/main/java/me/sunstorm/showmanager/util/DmxAddress.java b/core/src/main/java/me/sunstorm/showmanager/util/DmxAddress.java
@@ -1,12 +1,4 @@
 package me.sunstorm.showmanager.util;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class DmxAddress {
-    private final int universe;
-    private final int subnet;
-    private final int address;
+public record DmxAddress(int universe, int subnet, int address) {
 }
diff --git a/core/src/main/java/me/sunstorm/showmanager/util/Tuple.java b/core/src/main/java/me/sunstorm/showmanager/util/Tuple.java
@@ -1,11 +1,4 @@
 package me.sunstorm.showmanager.util;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class Tuple<K, V> {
-    private final K first;
-    private final V second;
+public record Tuple<K, V>(K first, V second) {
 }
diff --git a/core/src/test/java/me/sunstorm/showmanager/event/EventConverterTests.java b/core/src/test/java/me/sunstorm/showmanager/event/EventConverterTests.java
@@ -25,10 +25,10 @@ void testDecode() {
         EventWrapper excepted = new EventWrapper(5, false, new AudioVolumeChangeEvent(15));
         EventConverter converter = new EventConverter();
         assertThat(converter.decode(input.getBytes(StandardCharsets.UTF_8))).satisfies(w -> {
-            assertThat(w.getId()).as("event id").isEqualTo(excepted.getId());
-            assertThat(w.isAsync()).isEqualTo(excepted.isAsync());
-            assertThat(w.getEvent()).isNotNull().isInstanceOf(AudioVolumeChangeEvent.class);
-            assertThat(((AudioVolumeChangeEvent) w.getEvent()).getVolume()).isEqualTo(15);
+            assertThat(w.id()).as("event id").isEqualTo(excepted.id());
+            assertThat(w.async()).isEqualTo(excepted.async());
+            assertThat(w.event()).isNotNull().isInstanceOf(AudioVolumeChangeEvent.class);
+            assertThat(((AudioVolumeChangeEvent) w.event()).getVolume()).isEqualTo(15);
         });
     }
 }