Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-22 16:41:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

[ANY] Deprecated old features

Browse source
This commit is contained in:
Gravita 2021-11-10 23:44:19 +07:00
parent f30daab0f7
commit fbb24bb904
18 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java
View file

@ -102,6 +102,7 @@ public final class LaunchServer implements Runnable, AutoCloseable, Reconfigurab
public final AuthManager authManager;
public final ReconfigurableManager reconfigurableManager;
public final ConfigManager configManager;
@Deprecated
public final PingServerManager pingServerManager;
public final FeaturesManager featuresManager;
public final KeyAgreementManager keyAgreementManager;
@ -403,14 +404,12 @@ public void restart() {
}
}
@SuppressWarnings("deprecation")
public void registerObject(String name, Object object) {
if (object instanceof Reconfigurable) {
reconfigurableManager.registerReconfigurable(name, (Reconfigurable) object);
}
}
@SuppressWarnings("deprecation")
public void unregisterObject(String name, Object object) {
if (object instanceof Reconfigurable) {
reconfigurableManager.unregisterReconfigurable(name);

1
LaunchServer/src/main/java/pro/gravit/launchserver/command/handler/CommandHandler.java
View file

@ -16,6 +16,7 @@
import pro.gravit.utils.command.basic.HelpCommand;
public abstract class CommandHandler extends pro.gravit.utils.command.CommandHandler {
@SuppressWarnings("deprecation")
public static void registerCommands(pro.gravit.utils.command.CommandHandler handler, LaunchServer server) {
BaseCommandCategory basic = new BaseCommandCategory();
// Register basic commands

1
LaunchServer/src/main/java/pro/gravit/launchserver/command/service/PingServersCommand.java
View file

@ -6,6 +6,7 @@
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.command.Command;
@Deprecated
public class PingServersCommand extends Command {
private transient final Logger logger = LogManager.getLogger();

6
LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SecurityCheckCommand.java
View file

@ -85,12 +85,6 @@ public void invoke(String... args) {
printCheckResult("netty.address", "", true);
}
if (config.netty.sendExceptionEnabled) {
printCheckResult("netty.sendExceptionEnabled", "recommend \"false\" in production", false);
} else {
printCheckResult("netty.sendExceptionEnabled", "", true);
}
if (config.netty.launcherURL.startsWith("http://")) {
printCheckResult("netty.launcherUrl", "launcher jar download connection not secure", false);
} else if (config.netty.launcherURL.startsWith("https://")) {

2
LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerConfig.java
View file

@ -77,7 +77,6 @@ public static LaunchServerConfig getDefault(LaunchServer.LaunchServerEnv env) {
newConfig.netty = new NettyConfig();
newConfig.netty.fileServerEnabled = true;
newConfig.netty.sendExceptionEnabled = false;
newConfig.netty.binds = new NettyBindAddress[]{new NettyBindAddress("0.0.0.0", 9274)};
newConfig.netty.performance = new NettyPerformanceConfig();
try {
@ -286,6 +285,7 @@ public static class LauncherConf {
public static class NettyConfig {
public boolean fileServerEnabled;
@Deprecated
public boolean sendExceptionEnabled;
public boolean ipForwarding;
public boolean disableWebApiInterface;

1
LaunchServer/src/main/java/pro/gravit/launchserver/manangers/PingServerManager.java
View file

@ -7,6 +7,7 @@
import java.util.HashMap;
import java.util.Map;
@Deprecated
public class PingServerManager {
public static final long REPORT_EXPIRED_TIME = 20 * 1000;
public final Map<String, ServerInfoEntry> map = new HashMap<>();

7
LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java
View file

@ -65,6 +65,7 @@ public WebSocketService(ChannelGroup channels, LaunchServer server) {
this.gson = Launcher.gsonManager.gson;
}
@SuppressWarnings("deprecation")
public static void registerResponses() {
providers.register("auth", AuthResponse.class);
providers.register("checkServer", CheckServerResponse.class);
@ -165,11 +166,7 @@ void process(ChannelHandlerContext ctx, WebSocketServerResponse response, Client
} catch (Exception e) {
logger.error("WebSocket request processing failed", e);
RequestEvent event;
if (server.config.netty.sendExceptionEnabled) {
event = new ExceptionEvent(e);
} else {
event = new ErrorRequestEvent("Fatal server error. Contact administrator");
}
event = new ErrorRequestEvent("Fatal server error. Contact administrator");
if (response instanceof SimpleResponse) {
event.requestUUID = ((SimpleResponse) response).requestUUID;
}

1
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/PingServerReportResponse.java
View file

@ -6,6 +6,7 @@
import pro.gravit.launchserver.socket.Client;
import pro.gravit.launchserver.socket.response.SimpleResponse;
@Deprecated
public class PingServerReportResponse extends SimpleResponse {
public PingServerReportRequest.PingServerReport data;
public String name;

1
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/PingServerResponse.java
View file

@ -11,6 +11,7 @@
import java.util.List;
import java.util.Map;
@Deprecated
public class PingServerResponse extends SimpleResponse {
public List<String> serverNames; //May be null

1
LauncherAPI/src/main/java/pro/gravit/launcher/events/ExceptionEvent.java
View file

@ -2,6 +2,7 @@
import pro.gravit.launcher.LauncherNetworkAPI;
@Deprecated
public class ExceptionEvent extends RequestEvent {
@LauncherNetworkAPI
public final String message;

1
LauncherAPI/src/main/java/pro/gravit/launcher/events/PingEvent.java
View file

@ -2,5 +2,6 @@
//Пустое событие
//Все обработчики обязаны его игнорировать
@Deprecated
public final class PingEvent {
}

1
LauncherAPI/src/main/java/pro/gravit/launcher/events/SignalEvent.java
View file

@ -4,6 +4,7 @@
import pro.gravit.launcher.request.WebSocketEvent;
//Используется, что бы послать короткое сообщение, которое вмещается в int
@Deprecated
public class SignalEvent implements WebSocketEvent {
@LauncherNetworkAPI
public final int signal;

1
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LogEvent.java
View file

@ -3,6 +3,7 @@
import pro.gravit.launcher.LauncherNetworkAPI;
import pro.gravit.launcher.request.WebSocketEvent;
@Deprecated
public class LogEvent implements WebSocketEvent {
@LauncherNetworkAPI
public final String string;

1
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/PingServerReportRequestEvent.java
View file

@ -2,6 +2,7 @@
import pro.gravit.launcher.events.RequestEvent;
@Deprecated
public class PingServerReportRequestEvent extends RequestEvent {
@Override
public String getType() {

1
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/PingServerRequestEvent.java
View file

@ -5,6 +5,7 @@
import java.util.Map;
@Deprecated
public class PingServerRequestEvent extends RequestEvent {
public Map<String, PingServerReportRequest.PingServerReport> serverMap;

1
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/RegisterRequestEvent.java
View file

@ -2,6 +2,7 @@
import pro.gravit.launcher.events.RequestEvent;
@Deprecated
public class RegisterRequestEvent extends RequestEvent {
@Override
public String getType() {

1
LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java
View file

@ -81,6 +81,7 @@ public void registerRequests() {
}
@SuppressWarnings("deprecation")
public void registerResults() {
results.register("auth", AuthRequestEvent.class);
results.register("checkServer", CheckServerRequestEvent.class);

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/StdWebSocketService.java
View file

@ -71,7 +71,7 @@ public <T extends WebSocketEvent> void processEventHandlers(T event) {
}
}
@SuppressWarnings("unchecked")
@SuppressWarnings({"unchecked", "deprecation"})
public <T extends WebSocketEvent> void eventHandle(T webSocketEvent) {
if (webSocketEvent instanceof RequestEvent) {
RequestEvent event = (RequestEvent) webSocketEvent;