From a64da463ff51c712b3a8ee1d8ee09296a46c073b Mon Sep 17 00:00:00 2001 From: LostInLinearPast <1283411677@qq.com> Date: Fri, 31 Oct 2025 22:51:28 +0800 Subject: [PATCH 1/2] update blank question rule version 1.0.2 --- .../utils/http/HttpUtils.java | 4 +-- .../utils/rcon/LoginWhitelistCommand.java | 33 +++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java b/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java index 12697fb..a235cac 100644 --- a/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java +++ b/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java @@ -303,9 +303,7 @@ public class HttpUtils { ClientConnectionManager ccm = httpClient.getConnectionManager(); SchemeRegistry registry = ccm.getSchemeRegistry(); registry.register(new Scheme("https", ssf, 443)); - } catch (KeyManagementException ex) { - throw new RuntimeException(ex); - } catch (NoSuchAlgorithmException ex) { + } catch (KeyManagementException | NoSuchAlgorithmException ex) { throw new RuntimeException(ex); } } diff --git a/src/main/java/com/linearpast/minecraftmanager/utils/rcon/LoginWhitelistCommand.java b/src/main/java/com/linearpast/minecraftmanager/utils/rcon/LoginWhitelistCommand.java index 2828a25..a1b7efb 100644 --- a/src/main/java/com/linearpast/minecraftmanager/utils/rcon/LoginWhitelistCommand.java +++ b/src/main/java/com/linearpast/minecraftmanager/utils/rcon/LoginWhitelistCommand.java @@ -3,6 +3,7 @@ package com.linearpast.minecraftmanager.utils.rcon; import com.linearpast.minecraftmanager.utils.WhitelistTarget; import com.linearpast.minecraftmanager.utils.config.SelfConfig; import io.graversen.minecraft.rcon.commands.base.ICommand; +import io.graversen.minecraft.rcon.util.Target; import io.graversen.minecraft.rcon.util.WhiteListModes; import lombok.Getter; import org.apache.commons.text.StringSubstitutor; @@ -10,19 +11,25 @@ import org.apache.commons.text.StringSubstitutor; import java.util.Map; import java.util.Objects; -public record LoginWhitelistCommand(WhitelistTarget whitelistTarget, WhiteListModes whiteListMode) implements ICommand { - public LoginWhitelistCommand(WhitelistTarget whitelistTarget, WhiteListModes whiteListMode) { - this.whitelistTarget = whitelistTarget; - this.whiteListMode = Objects.requireNonNull(whiteListMode); - } +//public record LoginWhitelistCommand(WhitelistTarget whitelistTarget, WhiteListModes whiteListMode) implements ICommand { +// public LoginWhitelistCommand(WhitelistTarget whitelistTarget, WhiteListModes whiteListMode) { +// this.whitelistTarget = whitelistTarget; +// this.whiteListMode = Objects.requireNonNull(whiteListMode); +// } +// +// public String command() { +// return switch (this.whiteListMode()) { +// case ADD -> StringSubstitutor.replace(SelfConfig.addCommand + " ${name} ${uuid}", Map.of( +// "name", this.whitelistTarget().name(), +// "uuid", this.whitelistTarget().uuid()) +// ); +// case REMOVE, LIST, OFF, ON, RELOAD -> ""; +// }; +// } +//} - public String command() { - return switch (this.whiteListMode()) { - case ADD -> StringSubstitutor.replace(SelfConfig.addCommand + " ${name} ${uuid}", Map.of( - "name", this.whitelistTarget().name(), - "uuid", this.whitelistTarget().uuid()) - ); - case REMOVE, LIST, OFF, ON, RELOAD -> ""; - }; +public class LoginWhitelistCommand extends SelfWhiteListCommand { + public LoginWhitelistCommand(WhitelistTarget target, WhiteListModes whiteListMode) { + super(Target.player(target.name()), whiteListMode); } } From 117f7d222c7d0a9eb03e3d57689e9575439ce313 Mon Sep 17 00:00:00 2001 From: LostInLinearPast <1283411677@qq.com> Date: Fri, 31 Oct 2025 22:57:38 +0800 Subject: [PATCH 2/2] update blank question rule version 1.0.2 --- .../utils/config/ConfigLoader.java | 3 +- .../utils/http/HttpUtils.java | 84 +------------------ .../utils/rcon/ConnectTask.java | 5 +- .../utils/rcon/MinecraftRconUtils.java | 9 +- 4 files changed, 10 insertions(+), 91 deletions(-) diff --git a/src/main/java/com/linearpast/minecraftmanager/utils/config/ConfigLoader.java b/src/main/java/com/linearpast/minecraftmanager/utils/config/ConfigLoader.java index 1a44db5..53261a5 100644 --- a/src/main/java/com/linearpast/minecraftmanager/utils/config/ConfigLoader.java +++ b/src/main/java/com/linearpast/minecraftmanager/utils/config/ConfigLoader.java @@ -8,6 +8,7 @@ import org.springframework.core.env.PropertySource; import java.util.HashMap; import java.util.Map; +import java.util.Objects; public class ConfigLoader implements EnvironmentPostProcessor { public static final Map config = new HashMap<>(); @@ -20,7 +21,7 @@ public class ConfigLoader implements EnvironmentPostProcessor { ).findFirst().orElseThrow(); if(source instanceof MapPropertySource mapPropertySource) { for (String key : mapPropertySource.getPropertyNames()) { - config.put(key, mapPropertySource.getProperty(key).toString()); + config.put(key, Objects.requireNonNull(mapPropertySource.getProperty(key)).toString()); System.out.println(key + "=" + mapPropertySource.getProperty(key)); } } diff --git a/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java b/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java index a235cac..aed165e 100644 --- a/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java +++ b/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java @@ -33,17 +33,6 @@ import java.util.Map; public class HttpUtils { - /** - * get - * - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @return - * @throws Exception - */ public static HttpResponse doGet(String host, String path, String method, Map headers, Map querys) @@ -58,18 +47,6 @@ public class HttpUtils { return httpClient.execute(request); } - /** - * post form - * - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @param bodys - * @return - * @throws Exception - */ public static HttpResponse doPost(String host, String path, String method, Map headers, Map querys, @@ -96,18 +73,6 @@ public class HttpUtils { return httpClient.execute(request); } - /** - * Post String - * - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @param body - * @return - * @throws Exception - */ public static HttpResponse doPost(String host, String path, String method, Map headers, Map querys, @@ -127,18 +92,6 @@ public class HttpUtils { return httpClient.execute(request); } - /** - * Post stream - * - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @param body - * @return - * @throws Exception - */ public static HttpResponse doPost(String host, String path, String method, Map headers, Map querys, @@ -158,17 +111,6 @@ public class HttpUtils { return httpClient.execute(request); } - /** - * Put String - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @param body - * @return - * @throws Exception - */ public static HttpResponse doPut(String host, String path, String method, Map headers, Map querys, @@ -188,17 +130,6 @@ public class HttpUtils { return httpClient.execute(request); } - /** - * Put stream - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @param body - * @return - * @throws Exception - */ public static HttpResponse doPut(String host, String path, String method, Map headers, Map querys, @@ -218,17 +149,6 @@ public class HttpUtils { return httpClient.execute(request); } - /** - * Delete - * - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @return - * @throws Exception - */ public static HttpResponse doDelete(String host, String path, String method, Map headers, Map querys) @@ -252,7 +172,7 @@ public class HttpUtils { if (null != querys) { StringBuilder sbQuery = new StringBuilder(); for (Map.Entry query : querys.entrySet()) { - if (0 < sbQuery.length()) { + if (!sbQuery.isEmpty()) { sbQuery.append("&"); } if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) { @@ -266,7 +186,7 @@ public class HttpUtils { } } } - if (0 < sbQuery.length()) { + if (!sbQuery.isEmpty()) { sbUrl.append("?").append(sbQuery); } } diff --git a/src/main/java/com/linearpast/minecraftmanager/utils/rcon/ConnectTask.java b/src/main/java/com/linearpast/minecraftmanager/utils/rcon/ConnectTask.java index ddf14d6..de10e33 100644 --- a/src/main/java/com/linearpast/minecraftmanager/utils/rcon/ConnectTask.java +++ b/src/main/java/com/linearpast/minecraftmanager/utils/rcon/ConnectTask.java @@ -55,9 +55,8 @@ public class ConnectTask implements Callable { try { log.debug("Pausing for {} ms", this.connectOptions.getTimeBetweenRetries().toMillis()); Thread.sleep(this.connectOptions.getTimeBetweenRetries().toMillis()); - } catch (InterruptedException var2) { - InterruptedException e = var2; - e.printStackTrace(); + } catch (InterruptedException e) { + e.printStackTrace(); Thread.currentThread().interrupt(); } diff --git a/src/main/java/com/linearpast/minecraftmanager/utils/rcon/MinecraftRconUtils.java b/src/main/java/com/linearpast/minecraftmanager/utils/rcon/MinecraftRconUtils.java index b4359aa..3733543 100644 --- a/src/main/java/com/linearpast/minecraftmanager/utils/rcon/MinecraftRconUtils.java +++ b/src/main/java/com/linearpast/minecraftmanager/utils/rcon/MinecraftRconUtils.java @@ -12,6 +12,7 @@ import java.util.concurrent.*; import io.graversen.minecraft.rcon.service.ConnectOptions; import io.graversen.minecraft.rcon.service.*; +import lombok.Setter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +23,8 @@ public class MinecraftRconUtils { private final ScheduledExecutorService executorService; private volatile IMinecraftClient minecraftClient; private volatile MinecraftRcon minecraftRcon; - private volatile boolean isConnected; + @Setter + private volatile boolean isConnected; private volatile CountDownLatch connectionLatch; public MinecraftRconUtils(RconDetails rconDetails, ConnectOptions connectOptions) { @@ -108,11 +110,8 @@ public class MinecraftRconUtils { if(this.minecraftClient != null) this.minecraftRcon = new MinecraftRcon(this.minecraftClient); else this.minecraftRcon = null; } - public void setConnected(boolean connected) { - this.isConnected = connected; - } - private class TestConnect implements Runnable { + private class TestConnect implements Runnable { private final RconDetails rconDetails; TestConnect(RconDetails rconDetails) { this.rconDetails = rconDetails;