Skip to content

Commit 88dfc65

Browse files
committed
Make controller and listener classes final
Refactor multiple controller and listener classes to be declared as `final` to prevent subclassing and enhance encapsulation.
1 parent 9299655 commit 88dfc65

22 files changed

+26
-27
lines changed

src/main/java/net/thenextlvl/tweaks/TweaksPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
import static org.bukkit.ServerLinks.Type.WEBSITE;
132132

133133
@NullMarked
134-
public class TweaksPlugin extends JavaPlugin {
134+
public final class TweaksPlugin extends JavaPlugin {
135135
private final Metrics metrics = new Metrics(this, 19651);
136136
private final PluginMessenger messenger = new PluginMessenger(this);
137137
private final PluginVersionChecker versionChecker = new PluginVersionChecker(this);

src/main/java/net/thenextlvl/tweaks/controller/BackController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.concurrent.LinkedBlockingDeque;
1414

1515
@NullMarked
16-
public class BackController {
16+
public final class BackController {
1717
private final Map<UUID, BlockingDeque<Location>> positions = new ConcurrentHashMap<>();
1818
private final Map<UUID, Location> positionLock = new ConcurrentHashMap<>();
1919
private final TweaksPlugin plugin;

src/main/java/net/thenextlvl/tweaks/controller/DataController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.Set;
2020

2121
@NullMarked
22-
public class DataController {
22+
public final class DataController {
2323
private static final String TPA_TOGGLED = "tpa_toggled";
2424
private static final String MSG_TOGGLED = "msg_toggled";
2525
private final Connection connection;
@@ -294,7 +294,7 @@ private Set<NamedLocation> parseNamedLocations(ResultSet resultSet) throws SQLEx
294294
return new Location(world, x, y, z, yaw, pitch);
295295
}
296296

297-
protected void createHomesTable() throws SQLException {
297+
private void createHomesTable() throws SQLException {
298298
executeUpdate("""
299299
CREATE TABLE IF NOT EXISTS homes (
300300
uuid TEXT NOT NULL,
@@ -332,7 +332,7 @@ CREATE TABLE IF NOT EXISTS warps (
332332
}
333333

334334
@SuppressWarnings("SqlSourceToSinkFlow")
335-
protected <T> @Nullable T executeQuery(String query, ThrowingFunction<ResultSet, T> mapper, @Nullable Object... parameters) throws SQLException {
335+
private <T> @Nullable T executeQuery(String query, ThrowingFunction<ResultSet, T> mapper, @Nullable Object... parameters) throws SQLException {
336336
try (var preparedStatement = connection.prepareStatement(query)) {
337337
for (var i = 0; i < parameters.length; i++)
338338
preparedStatement.setObject(i + 1, parameters[i]);
@@ -343,7 +343,7 @@ CREATE TABLE IF NOT EXISTS warps (
343343
}
344344

345345
@SuppressWarnings("SqlSourceToSinkFlow")
346-
protected int executeUpdate(String query, @Nullable Object... parameters) throws SQLException {
346+
private int executeUpdate(String query, @Nullable Object... parameters) throws SQLException {
347347
try (var preparedStatement = connection.prepareStatement(query)) {
348348
for (var i = 0; i < parameters.length; i++)
349349
preparedStatement.setObject(i + 1, parameters[i]);

src/main/java/net/thenextlvl/tweaks/controller/HomeController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.concurrent.CompletableFuture;
1313

1414
@NullMarked
15-
public class HomeController {
15+
public final class HomeController {
1616
private final TweaksPlugin plugin;
1717

1818
public HomeController(TweaksPlugin plugin) {

src/main/java/net/thenextlvl/tweaks/controller/MSGController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.WeakHashMap;
99

1010
@NullMarked
11-
public class MSGController {
11+
public final class MSGController {
1212
private final Map<CommandSender, CommandSender> conversations = new WeakHashMap<>();
1313

1414
public @Nullable CommandSender getConversation(CommandSender sender) {

src/main/java/net/thenextlvl/tweaks/controller/ServiceController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.function.Function;
1818

1919
@NullMarked
20-
public class ServiceController {
20+
public final class ServiceController {
2121
private final @Nullable BankController banks;
2222
private final @Nullable ChatController chat;
2323
private final @Nullable EconomyController economy;

src/main/java/net/thenextlvl/tweaks/controller/TPAController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.WeakHashMap;
1515

1616
@NullMarked
17-
public class TPAController {
17+
public final class TPAController {
1818
private final Map<Player, Set<Request>> requests = new WeakHashMap<>();
1919
private final TweaksPlugin plugin;
2020

src/main/java/net/thenextlvl/tweaks/controller/TeleportController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.concurrent.ConcurrentHashMap;
1515

1616
@NullMarked
17-
public class TeleportController {
17+
public final class TeleportController {
1818
private final Map<UUID, Location> teleports = new ConcurrentHashMap<>();
1919
private final TweaksPlugin plugin;
2020

src/main/java/net/thenextlvl/tweaks/controller/WarpController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.concurrent.CompletableFuture;
1111

1212
@NullMarked
13-
public class WarpController {
13+
public final class WarpController {
1414
private final TweaksPlugin plugin;
1515

1616
public WarpController(TweaksPlugin plugin) {

src/main/java/net/thenextlvl/tweaks/gui/HomeGUI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import static org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.PLUGIN;
1212

1313
@NullMarked
14-
public class HomeGUI extends NamedLocationGUI {
14+
public final class HomeGUI extends NamedLocationGUI {
1515
public HomeGUI(TweaksPlugin plugin, Player owner, Collection<NamedLocation> elements) {
1616
super(plugin, plugin.config().guis.homes, owner, plugin.bundle().component("gui.title.homes", owner), elements);
1717
}

0 commit comments

Comments
 (0)