From 986b3194ec28ea529de594f397ddeb4a74c82303 Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Fri, 3 May 2019 23:10:35 +0300 Subject: [PATCH] =?UTF-8?q?[ANY]=20=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/gravit/launchserver/command/basic/TestCommand.java | 1 - .../ru/gravit/launchserver/command/basic/VersionCommand.java | 1 - .../gravit/launchserver/components/AuthLimiterComponent.java | 2 -- .../ru/gravit/launchserver/websocket/WebSocketService.java | 3 ++- .../gravit/launchserver/websocket/json/auth/AuthResponse.java | 1 - LauncherAPI/src/main/java/ru/gravit/launcher/Launcher.java | 1 - libLauncher/src/main/java/ru/gravit/utils/HookException.java | 3 +-- 7 files changed, 3 insertions(+), 9 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java index a6c3cf86..0864fb8e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java @@ -5,7 +5,6 @@ import ru.gravit.launchserver.command.Command; import ru.gravit.launchserver.websocket.NettyServerSocketHandler; import ru.gravit.launchserver.websocket.WebSocketFrameHandler; -import ru.gravit.launchserver.websocket.WebSocketService; import ru.gravit.utils.helper.CommonHelper; public class TestCommand extends Command { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java index ce51ce94..613c0549 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java @@ -1,6 +1,5 @@ package ru.gravit.launchserver.command.basic; -import ru.gravit.launcher.Launcher; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; import ru.gravit.utils.Version; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java b/LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java index be01905d..4fbd8bfa 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java @@ -2,8 +2,6 @@ import ru.gravit.launcher.NeedGarbageCollection; import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthException; -import ru.gravit.launchserver.auth.provider.AuthProvider; import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.websocket.json.auth.AuthResponse; import ru.gravit.utils.HookException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java index 812abe2c..25451577 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java @@ -61,7 +61,8 @@ public WebSocketService(ChannelGroup channels, LaunchServer server, GsonBuilder private final Gson gson; private final GsonBuilder gsonBuiler; - void process(ChannelHandlerContext ctx, TextWebSocketFrame frame, Client client) { + @SuppressWarnings("unchecked") + void process(ChannelHandlerContext ctx, TextWebSocketFrame frame, Client client) { String request = frame.text(); JsonResponseInterface response = gson.fromJson(request, JsonResponseInterface.class); if(server.config.netty.proxy.enabled) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java index d066cf71..b8270a60 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java @@ -4,7 +4,6 @@ import ru.gravit.launcher.OshiHWID; import ru.gravit.launcher.events.request.AuthRequestEvent; import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launcher.request.RequestException; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.auth.AuthException; import ru.gravit.launchserver.auth.AuthProviderPair; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/Launcher.java b/LauncherAPI/src/main/java/ru/gravit/launcher/Launcher.java index 0e72e96e..504d8386 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/Launcher.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/Launcher.java @@ -4,7 +4,6 @@ import ru.gravit.launcher.modules.ModulesManager; import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launcher.serialize.HInput; -import ru.gravit.utils.Version; import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; diff --git a/libLauncher/src/main/java/ru/gravit/utils/HookException.java b/libLauncher/src/main/java/ru/gravit/utils/HookException.java index 3d61748c..07841f39 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/HookException.java +++ b/libLauncher/src/main/java/ru/gravit/utils/HookException.java @@ -1,8 +1,7 @@ package ru.gravit.utils; public class HookException extends RuntimeException { - public HookException() { - } + private static final long serialVersionUID = -529141998961943161L; public HookException(String message) { super(message);