Skip to content

Commit 13e52f1

Browse files
committed
refactor: make fields final in various workflow and handler classes for immutability
1 parent df9451b commit 13e52f1

16 files changed

+26
-28
lines changed

src/main/java/mindustrytool/handler/ApiGateway.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private Builder setHeaders(Builder builder) {
8888

8989
private URI path(String... path) {
9090
var uri = URI.create("http://server-manager:8088/internal-api/v1/" + Strings.join("/", path));
91-
Log.debug("[REQUEST]: " + uri.toString());
91+
Log.debug("[REQUEST]: " + uri);
9292

9393
return uri;
9494
}

src/main/java/mindustrytool/handler/ClientCommandHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public ClientCommandHandler(ServerController controller) {
3636
Log.info("Client command handler created: " + this);
3737
}
3838

39-
private static boolean isPreparingForNewWave = false;
39+
private static final boolean isPreparingForNewWave = false;
4040
private static short waveVoted = 0;
4141

4242
@Getter

src/main/java/mindustrytool/handler/EventHandler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public EventHandler(ServerController controller) {
6565
}
6666

6767
private List<ServerResponseData> servers = new ArrayList<>();
68-
private List<ServerCore> serverCores = new ArrayList<>();
68+
private final List<ServerCore> serverCores = new ArrayList<>();
6969

7070
int page = 0;
7171
int gap = 50;
@@ -136,7 +136,7 @@ public void init() {
136136
: "[red]" + server.getStatus();
137137

138138
var mods = server.getMods();
139-
mods.removeIf(m -> m.trim().toLowerCase().equals("mindustrytoolplugin"));
139+
mods.removeIf(m -> m.trim().equalsIgnoreCase("mindustrytoolplugin"));
140140

141141
String message = //
142142
"%s (Tap core to join)\n\n".formatted(server.getName()) //
@@ -297,7 +297,7 @@ private void setName(Player player, String name, int level) {
297297
}
298298

299299
public String getIconBaseOnLevel(int level) {
300-
var index = (int) (level / 3);
300+
var index = level / 3;
301301

302302
if (index >= icons.size()) {
303303
index = icons.size() - 1;
@@ -630,7 +630,7 @@ public void sendServerList(Player player, int page) {
630630
server.getName());
631631

632632
var mods = server.getMods();
633-
mods.removeIf(m -> m.trim().toLowerCase().equals("mindustrytoolplugin"));
633+
mods.removeIf(m -> m.trim().equalsIgnoreCase("mindustrytoolplugin"));
634634

635635
if (server.getMapName() == null) {
636636
options.add(List.of(HudUtils.option(valid, "[yellow]%s".formatted(server.getName())),

src/main/java/mindustrytool/handler/HttpServer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,6 @@ public void init() {
419419
} catch (WorkflowError e) {
420420
Log.err("Failed to load workflow", e);
421421
context.status(400).json(Map.of("message", "Failed to load workflow: " + e.getMessage()));
422-
return;
423422
}
424423
});
425424

src/main/java/mindustrytool/handler/RtvVoteHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public void check(int mapId) {
7979
Vars.maps.setNextMapOverride(getMaps().get(mapId));
8080
reset();
8181
Events.fire(new EventType.GameOverEvent(Team.crux));
82-
return;
8382
}
8483
}
8584
}

src/main/java/mindustrytool/handler/ServerCommandHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public ServerCommandHandler(ServerController controller) {
3131
@Getter
3232
private CommandHandler handler;
3333

34-
private List<PrevCommand> prevCommands = new ArrayList<>();
34+
private final List<PrevCommand> prevCommands = new ArrayList<>();
3535

3636
public void execute(String command, Consumer<CommandResponse> callback) {
3737
Core.app.post(() -> {

src/main/java/mindustrytool/handler/SessionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import mindustrytool.type.Session;
99

1010
public class SessionHandler {
11-
private HashMap<String, Session> data = new HashMap<>();
11+
private final HashMap<String, Session> data = new HashMap<>();
1212

1313
public HashMap<String, Session> get() {
1414
return data;

src/main/java/mindustrytool/workflow/ESupplier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
@FunctionalInterface
44
public interface ESupplier<T> {
55

6-
public T get() throws Exception;
6+
T get() throws Exception;
77

88
}

src/main/java/mindustrytool/workflow/Workflow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class Workflow {
5454
@Getter
5555
public WorkflowContext context;
5656

57-
private Queue<SseClient> workflowEventConsumers = new ConcurrentLinkedQueue<>();
57+
private final Queue<SseClient> workflowEventConsumers = new ConcurrentLinkedQueue<>();
5858

5959
public Queue<SseClient> getWorkflowEventConsumers() {
6060
return workflowEventConsumers;

src/main/java/mindustrytool/workflow/nodes/DisplayLabelWorkflow.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
import mindustrytool.workflow.WorkflowUnit;
88

99
public class DisplayLabelWorkflow extends WorkflowNode {
10-
private WorkflowField<Player, Void> playerField = new WorkflowField<Player, Void>("player")
10+
private final WorkflowField<Player, Void> playerField = new WorkflowField<Player, Void>("player")
1111
.consume(new FieldConsumer<>(Player.class).notRequired());
1212

13-
private WorkflowField<String, Void> messageField = new WorkflowField<String, Void>("message")
13+
private final WorkflowField<String, Void> messageField = new WorkflowField<String, Void>("message")
1414
.consume(new FieldConsumer<>(String.class)
1515
.defaultValue("Hello"));
1616

17-
private WorkflowField<Float, Void> xField = new WorkflowField<Float, Void>("x")
17+
private final WorkflowField<Float, Void> xField = new WorkflowField<Float, Void>("x")
1818
.consume(new FieldConsumer<>(Float.class)
1919
.defaultValue(0f));
2020

21-
private WorkflowField<Float, Void> yField = new WorkflowField<Float, Void>("y")
21+
private final WorkflowField<Float, Void> yField = new WorkflowField<Float, Void>("y")
2222
.consume(new FieldConsumer<>(Float.class)
2323
.defaultValue(0f));
2424

25-
private WorkflowField<Float, Void> durationField = new WorkflowField<Float, Void>("duration")
25+
private final WorkflowField<Float, Void> durationField = new WorkflowField<Float, Void>("duration")
2626
.consume(new FieldConsumer<>(Float.class)
2727
.unit(WorkflowUnit.SECOND)
2828
.defaultValue(0f));

0 commit comments

Comments
 (0)