Use new thread builders

AlexProgrammerDE · Feb 19, 2024 · c5b101b · c5b101b
1 parent 8c07590
commit c5b101b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/src/main/java/net/pistonmaster/soulfire/client/gui/libs/MessageLogPanel.java b/src/main/java/net/pistonmaster/soulfire/client/gui/libs/MessageLogPanel.java
@@ -41,10 +41,10 @@
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultCaret;
+import javax.swing.text.Document;
 import javax.swing.text.DocumentFilter;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
-import javax.swing.text.StyledDocument;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import net.pistonmaster.soulfire.server.util.XtermPalette256;
@@ -76,7 +76,7 @@ public class MessageLogPanel extends JPanel {
   private final NoopDocumentFilter noopDocumentFilter = new NoopDocumentFilter();
   private final List<String> toInsert = Collections.synchronizedList(new ArrayList<>());
   private final JTextPane textComponent;
-  private final StyledDocument document;
+  private final Document document;
   private final ParserFactory factory =
       new DefaultParserFactory.Builder()
           .environment(Environment._7_BIT)
@@ -103,7 +103,7 @@ public MessageLogPanel(int numLines) {
 
     var caret = (DefaultCaret) textComponent.getCaret();
     caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE);
-    document = textComponent.getStyledDocument();
+    document = textComponent.getDocument();
     document.addDocumentListener(new LimitLinesDocumentListener(numLines, true));
     ((AbstractDocument) document).setDocumentFilter(noopDocumentFilter);
 
@@ -122,12 +122,7 @@ public MessageLogPanel(int numLines) {
 
     var executorService =
         Executors.newSingleThreadScheduledExecutor(
-            (r) -> {
-              var thread = new Thread(r);
-              thread.setName("MessageLogPanel");
-              thread.setDaemon(true);
-              return thread;
-            });
+            r -> Thread.ofPlatform().name("MessageLogPanel").daemon().unstarted(r));
     executorService.scheduleWithFixedDelay(
         this::updateTextComponent, 100, 100, TimeUnit.MILLISECONDS);
   }

diff --git a/src/main/java/net/pistonmaster/soulfire/server/protocol/ExecutorManager.java b/src/main/java/net/pistonmaster/soulfire/server/protocol/ExecutorManager.java
@@ -75,20 +75,20 @@ public ExecutorService newCachedExecutorService(BotConnection botConnection, Str
 
   private ThreadFactory getThreadFactory(BotConnection botConnection, String threadName) {
     return runnable -> {
-      var thread =
-          new Thread(
-              () -> {
-                BOT_CONNECTION_THREAD_LOCAL.set(botConnection);
-                runnable.run();
-                BOT_CONNECTION_THREAD_LOCAL.remove();
-              });
       var usedThreadName = threadName;
       if (runnable instanceof NamedRunnable named) {
         usedThreadName = named.name();
       }
-      thread.setName(threadPrefix + "-" + usedThreadName);
 
-      return thread;
+      return Thread.ofPlatform()
+          .name(threadPrefix + "-" + usedThreadName)
+          .daemon()
+          .unstarted(
+              () -> {
+                BOT_CONNECTION_THREAD_LOCAL.set(botConnection);
+                runnable.run();
+                BOT_CONNECTION_THREAD_LOCAL.remove();
+              });
     };
   }
 

diff --git a/src/main/java/net/pistonmaster/soulfire/server/protocol/netty/SFNettyHelper.java b/src/main/java/net/pistonmaster/soulfire/server/protocol/netty/SFNettyHelper.java
@@ -73,7 +73,8 @@ public class SFNettyHelper {
   private SFNettyHelper() {}
 
   public static EventLoopGroup createEventLoopGroup(int threads, String name) {
-    ThreadFactory threadFactory = r -> new Thread(r, "SoulFire-" + name);
+    ThreadFactory threadFactory =
+        r -> Thread.ofPlatform().name(name).daemon().priority(Thread.MAX_PRIORITY).unstarted(r);
     EventLoopGroup group =
         switch (TransportHelper.determineTransportMethod()) {
           case IO_URING -> new IOUringEventLoopGroup(threads, threadFactory);