Skip to content

Commit 397c3e4

Browse files
fix: resolve spotbugs and errorprone warnings
- Replace QueueType[] array with List<QueueType> in QueueGroup record (fixes ArrayRecordComponent warning) - Use Guava Splitter instead of String.split() in Config (fixes StringSplitter warning) - Update Velocity command registration to use CommandMeta builder (fixes deprecation warning)
1 parent a3a669d commit 397c3e4

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

shared/src/main/java/net/pistonmaster/pistonqueue/shared/config/Config.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package net.pistonmaster.pistonqueue.shared.config;
2121

22+
import com.google.common.base.Splitter;
2223
import de.exlll.configlib.Comment;
2324
import de.exlll.configlib.Configuration;
2425
import de.exlll.configlib.Ignore;
@@ -613,7 +614,7 @@ private void rebuildKickWhenDownServers() {
613614
}
614615

615616
// Split by comma to support comma-separated server lists
616-
for (String server : processed.split(",")) {
617+
for (String server : Splitter.on(',').split(processed)) {
617618
String trimmed = server.trim();
618619
if (!trimmed.isEmpty() && !resolved.contains(trimmed)) {
619620
resolved.add(trimmed);
@@ -698,9 +699,9 @@ private void rebuildQueueGroups() {
698699
}
699700

700701
List<String> typeNames = configuration.getQueueTypes();
701-
QueueType[] groupTypes;
702+
List<QueueType> groupTypes;
702703
if (typeNames.isEmpty()) {
703-
groupTypes = queueTypeInstances.values().toArray(QueueType[]::new);
704+
groupTypes = List.copyOf(queueTypeInstances.values());
704705
} else {
705706
groupTypes = typeNames.stream()
706707
.map(nameKey -> {
@@ -710,7 +711,7 @@ private void rebuildQueueGroups() {
710711
}
711712
return type;
712713
})
713-
.toArray(QueueType[]::new);
714+
.toList();
714715
}
715716

716717
QueueGroup group = new QueueGroup(

shared/src/main/java/net/pistonmaster/pistonqueue/shared/plugin/PistonQueuePlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ default void scheduleTasks(QueueListenerShared queueListener) {
7373
Config config = getConfiguration();
7474
QueueGroup resolvedDefaultGroup = config.getDefaultGroup();
7575
if (resolvedDefaultGroup == null) {
76-
QueueType[] queueTypes = config.getAllQueueTypes().toArray(new QueueType[0]);
76+
List<QueueType> queueTypes = config.getAllQueueTypes();
7777
resolvedDefaultGroup = new QueueGroup(
7878
"default",
7979
Collections.singletonList(config.queueServer()),

shared/src/main/java/net/pistonmaster/pistonqueue/shared/queue/QueueGroup.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,16 @@
1919
*/
2020
package net.pistonmaster.pistonqueue.shared.queue;
2121

22-
import java.util.ArrayList;
23-
import java.util.Collections;
2422
import java.util.List;
2523
import java.util.Locale;
2624

27-
public record QueueGroup(String name, List<String> queueServers, List<String> targetServers, List<String> sourceServers, QueueType[] queueTypes) {
28-
public QueueGroup(String name, List<String> queueServers, List<String> targetServers, List<String> sourceServers, QueueType[] queueTypes) {
25+
public record QueueGroup(String name, List<String> queueServers, List<String> targetServers, List<String> sourceServers, List<QueueType> queueTypes) {
26+
public QueueGroup(String name, List<String> queueServers, List<String> targetServers, List<String> sourceServers, List<QueueType> queueTypes) {
2927
this.name = name;
3028
this.queueServers = List.copyOf(queueServers);
3129
this.targetServers = List.copyOf(targetServers);
3230
this.sourceServers = List.copyOf(sourceServers);
33-
this.queueTypes = queueTypes == null ? new QueueType[0] : queueTypes.clone();
31+
this.queueTypes = queueTypes == null ? List.of() : List.copyOf(queueTypes);
3432
}
3533

3634
/// Returns all queue servers configured for this group.
@@ -53,9 +51,4 @@ public boolean hasQueueServer(String server) {
5351
return queueServers.stream()
5452
.anyMatch(qs -> qs.toLowerCase(Locale.ROOT).equals(lowerServer));
5553
}
56-
57-
@Override
58-
public QueueType[] queueTypes() {
59-
return queueTypes.clone();
60-
}
6154
}

shared/src/main/java/net/pistonmaster/pistonqueue/shared/queue/logic/QueueEnvironment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public QueueGroup defaultGroup() {
6464
return group;
6565
}
6666

67-
QueueType[] queueTypes = config.getAllQueueTypes().toArray(new QueueType[0]);
67+
List<QueueType> queueTypes = config.getAllQueueTypes();
6868
return new QueueGroup(
6969
"default",
7070
List.of(config.queueServer()),

velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/PistonQueueVelocity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,11 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
9999
proxyServer.getChannelRegistrar().register(MinecraftChannelIdentifier.from("piston:queue"));
100100

101101
info("Registering commands");
102-
proxyServer.getCommandManager().register("pistonqueue", new MainCommand(this), "pq");
102+
var commandMeta = proxyServer.getCommandManager().metaBuilder("pistonqueue")
103+
.aliases("pq")
104+
.plugin(this)
105+
.build();
106+
proxyServer.getCommandManager().register(commandMeta, new MainCommand(this));
103107

104108
info("Registering listeners");
105109
proxyServer.getEventManager().register(this, queueListenerVelocity);

0 commit comments

Comments
 (0)