Suppress or replace generic array creation

ibauersachs · ibauersachs · commit 9ae7e1d7bb1c · 2025-07-05T14:41:48.000+02:00
diff --git a/src/main/java/org/xbill/DNS/Message.java b/src/main/java/org/xbill/DNS/Message.java
@@ -810,7 +810,7 @@ public Message normalize(Message query, boolean throwOnIrrelevantRecord)
     List<RRset> additionalSectionSets = getSectionRRsets(Section.ADDITIONAL);
     List<RRset> authoritySectionSets = getSectionRRsets(Section.AUTHORITY);
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "rawtypes"})
     List<RRset>[] cleanedSection = new ArrayList[4];
     cleanedSection[Section.ANSWER] = new ArrayList<>();
     cleanedSection[Section.AUTHORITY] = new ArrayList<>();
diff --git a/src/main/java/org/xbill/DNS/NioClient.java b/src/main/java/org/xbill/DNS/NioClient.java
@@ -45,8 +45,8 @@ public abstract class NioClient {
 
   private static final Runnable[] TIMEOUT_TASKS = new Runnable[2];
 
-  @SuppressWarnings("unchecked")
-  private static final Consumer<Selector>[] REGISTRATIONS_TASKS = new Consumer[2];
+  private static Consumer<Selector> TCP_REGISTRATIONS_TASK;
+  private static Consumer<Selector> UDP_REGISTRATIONS_TASK;
 
   private static final Runnable[] CLOSE_TASKS = new Runnable[2];
   private static Thread selectorThread;
@@ -193,7 +193,11 @@ static void setTimeoutTask(Runnable r, boolean isTcpClient) {
   }
 
   static void setRegistrationsTask(Consumer<Selector> r, boolean isTcpClient) {
-    addRegistrationTask(r, isTcpClient);
+    if (isTcpClient) {
+      TCP_REGISTRATIONS_TASK = r;
+    } else {
+      UDP_REGISTRATIONS_TASK = r;
+    }
   }
 
   static void setCloseTask(Runnable r, boolean isTcpClient) {
@@ -208,14 +212,6 @@ private static void addTask(Runnable[] tasks, Runnable r, boolean isTcpClient) {
     }
   }
 
-  private static void addRegistrationTask(Consumer<Selector> r, boolean isTcpClient) {
-    if (isTcpClient) {
-      REGISTRATIONS_TASKS[0] = r;
-    } else {
-      REGISTRATIONS_TASKS[1] = r;
-    }
-  }
-
   private static void runTasks(Runnable[] runnables) {
     Runnable r0 = runnables[0];
     if (r0 != null) {
@@ -228,13 +224,13 @@ private static void runTasks(Runnable[] runnables) {
   }
 
   private static void runRegistrationTasks() {
-    Consumer<Selector> r0 = REGISTRATIONS_TASKS[0];
-    if (r0 != null) {
-      r0.accept(selector);
+    Consumer<Selector> tcpTask = TCP_REGISTRATIONS_TASK;
+    if (tcpTask != null) {
+      tcpTask.accept(selector);
     }
-    Consumer<Selector> r1 = REGISTRATIONS_TASKS[1];
-    if (r1 != null) {
-      r1.accept(selector);
+    Consumer<Selector> udpTask = UDP_REGISTRATIONS_TASK;
+    if (udpTask != null) {
+      udpTask.accept(selector);
     }
   }
 
