[FEATURE] Реализация ResultInterface классами RequestEvent

This commit is contained in:
Gravit 2019-01-28 23:14:13 +07:00
parent 92cb0b0628
commit 8726988291
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
13 changed files with 71 additions and 14 deletions

View file

@ -4,6 +4,7 @@
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import ru.gravit.launcher.hasher.HashedEntry; import ru.gravit.launcher.hasher.HashedEntry;
import ru.gravit.launcher.hasher.HashedEntryAdapter; import ru.gravit.launcher.hasher.HashedEntryAdapter;
import ru.gravit.launcher.request.ResultInterface;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;

View file

@ -1,7 +1,7 @@
package ru.gravit.launcher.request.websockets; package ru.gravit.launcher.request.websockets;
import com.google.gson.*; import com.google.gson.*;
import ru.gravit.launcher.request.update.LauncherRequest; import ru.gravit.launcher.request.ResultInterface;
import java.lang.reflect.Type; import java.lang.reflect.Type;

View file

@ -1,5 +1,7 @@
package ru.gravit.launcher.request.websockets; package ru.gravit.launcher.request.websockets;
import ru.gravit.launcher.request.ResultInterface;
import java.util.HashSet; import java.util.HashSet;
public class WaitEventHandler implements ClientWebSocketService.EventHandler { public class WaitEventHandler implements ClientWebSocketService.EventHandler {

View file

@ -2,11 +2,12 @@
import ru.gravit.launcher.ClientPermissions; import ru.gravit.launcher.ClientPermissions;
import ru.gravit.launcher.profiles.PlayerProfile; import ru.gravit.launcher.profiles.PlayerProfile;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.event.EventInterface; import ru.gravit.utils.event.EventInterface;
import java.util.UUID; import java.util.UUID;
public class AuthRequestEvent implements EventInterface { public class AuthRequestEvent implements EventInterface, ResultInterface {
private static final UUID uuid = UUID.fromString("77e1bfd7-adf9-4f5d-87d6-a7dd068deb74"); private static final UUID uuid = UUID.fromString("77e1bfd7-adf9-4f5d-87d6-a7dd068deb74");
public AuthRequestEvent() { public AuthRequestEvent() {
} }
@ -20,4 +21,9 @@ public AuthRequestEvent() {
public UUID getUUID() { public UUID getUUID() {
return uuid; return uuid;
} }
@Override
public String getType() {
return "auth";
}
} }

View file

@ -1,11 +1,12 @@
package ru.gravit.launcher.events.request; package ru.gravit.launcher.events.request;
import ru.gravit.launcher.profiles.PlayerProfile; import ru.gravit.launcher.profiles.PlayerProfile;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.event.EventInterface; import ru.gravit.utils.event.EventInterface;
import java.util.UUID; import java.util.UUID;
public class BatchProfileByUsernameRequestEvent implements EventInterface public class BatchProfileByUsernameRequestEvent implements EventInterface, ResultInterface
{ {
private static final UUID uuid = UUID.fromString("c1d6729e-be2c-48cc-b5ae-af8c012232c3"); private static final UUID uuid = UUID.fromString("c1d6729e-be2c-48cc-b5ae-af8c012232c3");
public String requesttype = "batchProfileByUsername"; public String requesttype = "batchProfileByUsername";
@ -15,4 +16,9 @@ public class BatchProfileByUsernameRequestEvent implements EventInterface
public UUID getUUID() { public UUID getUUID() {
return uuid; return uuid;
} }
@Override
public String getType() {
return "batchProfileByUsername";
}
} }

View file

@ -1,11 +1,12 @@
package ru.gravit.launcher.events.request; package ru.gravit.launcher.events.request;
import ru.gravit.launcher.profiles.PlayerProfile; import ru.gravit.launcher.profiles.PlayerProfile;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.event.EventInterface; import ru.gravit.utils.event.EventInterface;
import java.util.UUID; import java.util.UUID;
public class CheckServerEvent implements EventInterface { public class CheckServerEvent implements EventInterface, ResultInterface {
private static final UUID _uuid = UUID.fromString("8801d07c-51ba-4059-b61d-fe1f1510b28a"); private static final UUID _uuid = UUID.fromString("8801d07c-51ba-4059-b61d-fe1f1510b28a");
public String type = "success"; public String type = "success";
public String requesttype = "checkServer"; public String requesttype = "checkServer";
@ -15,4 +16,9 @@ public class CheckServerEvent implements EventInterface {
public UUID getUUID() { public UUID getUUID() {
return _uuid; return _uuid;
} }
@Override
public String getType() {
return "checkServe";
}
} }

View file

@ -1,13 +1,14 @@
package ru.gravit.launcher.events.request; package ru.gravit.launcher.events.request;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.event.EventInterface; import ru.gravit.utils.event.EventInterface;
import java.util.UUID; import java.util.UUID;
public class JoinServerRequestEvent implements EventInterface { public class JoinServerRequestEvent implements EventInterface, ResultInterface {
private static final UUID uuid = UUID.fromString("2a12e7b5-3f4a-4891-a2f9-ea141c8e1995"); private static final UUID uuid = UUID.fromString("2a12e7b5-3f4a-4891-a2f9-ea141c8e1995");
public String type = "success"; public String type = "success";
public String requesttype = "checkServer"; public String requesttype = "joinServer";
public JoinServerRequestEvent(boolean allow) { public JoinServerRequestEvent(boolean allow) {
this.allow = allow; this.allow = allow;
@ -18,4 +19,9 @@ public JoinServerRequestEvent(boolean allow) {
public UUID getUUID() { public UUID getUUID() {
return uuid; return uuid;
} }
@Override
public String getType() {
return "joinServer";
}
} }

View file

@ -1,13 +1,14 @@
package ru.gravit.launcher.events.request; package ru.gravit.launcher.events.request;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.event.EventInterface; import ru.gravit.utils.event.EventInterface;
import java.util.UUID; import java.util.UUID;
public class LauncherRequestEvent implements EventInterface { public class LauncherRequestEvent implements EventInterface, ResultInterface {
private static final UUID uuid = UUID.fromString("d54cc12a-4f59-4f23-9b10-f527fdd2e38f"); private static final UUID uuid = UUID.fromString("d54cc12a-4f59-4f23-9b10-f527fdd2e38f");
public String type = "success"; public String type = "success";
public String requesttype = "launcherUpdate"; public String requesttype = "launcher";
public String url; public String url;
public LauncherRequestEvent(boolean needUpdate, String url) { public LauncherRequestEvent(boolean needUpdate, String url) {
@ -20,4 +21,9 @@ public LauncherRequestEvent(boolean needUpdate, String url) {
public UUID getUUID() { public UUID getUUID() {
return uuid; return uuid;
} }
@Override
public String getType() {
return "launcher";
}
} }

View file

@ -1,11 +1,12 @@
package ru.gravit.launcher.events.request; package ru.gravit.launcher.events.request;
import ru.gravit.launcher.profiles.PlayerProfile; import ru.gravit.launcher.profiles.PlayerProfile;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.event.EventInterface; import ru.gravit.utils.event.EventInterface;
import java.util.UUID; import java.util.UUID;
public class ProfileByUUIDRequestEvent implements EventInterface public class ProfileByUUIDRequestEvent implements EventInterface, ResultInterface
{ {
private static final UUID uuid = UUID.fromString("b9014cf3-4b95-4d38-8c5f-867f190a18a0"); private static final UUID uuid = UUID.fromString("b9014cf3-4b95-4d38-8c5f-867f190a18a0");
String requesttype = "profileByUUID"; String requesttype = "profileByUUID";
@ -19,4 +20,9 @@ public ProfileByUUIDRequestEvent(PlayerProfile playerProfile) {
public UUID getUUID() { public UUID getUUID() {
return uuid; return uuid;
} }
@Override
public String getType() {
return "profileByUUID";
}
} }

View file

@ -1,11 +1,12 @@
package ru.gravit.launcher.events.request; package ru.gravit.launcher.events.request;
import ru.gravit.launcher.profiles.PlayerProfile; import ru.gravit.launcher.profiles.PlayerProfile;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.event.EventInterface; import ru.gravit.utils.event.EventInterface;
import java.util.UUID; import java.util.UUID;
public class ProfileByUsernameRequestEvent implements EventInterface public class ProfileByUsernameRequestEvent implements EventInterface, ResultInterface
{ {
private static final UUID uuid = UUID.fromString("06204302-ff6b-4779-b97d-541e3bc39aa1"); private static final UUID uuid = UUID.fromString("06204302-ff6b-4779-b97d-541e3bc39aa1");
String requesttype = "profileByUsername"; String requesttype = "profileByUsername";
@ -19,4 +20,9 @@ public ProfileByUsernameRequestEvent(PlayerProfile playerProfile) {
public UUID getUUID() { public UUID getUUID() {
return uuid; return uuid;
} }
@Override
public String getType() {
return "profileByUsername";
}
} }

View file

@ -1,12 +1,13 @@
package ru.gravit.launcher.events.request; package ru.gravit.launcher.events.request;
import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launcher.profiles.ClientProfile;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.event.EventInterface; import ru.gravit.utils.event.EventInterface;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
public class ProfilesRequestEvent implements EventInterface public class ProfilesRequestEvent implements EventInterface, ResultInterface
{ {
private static final UUID uuid = UUID.fromString("2f26fbdf-598a-46dd-92fc-1699c0e173b1"); private static final UUID uuid = UUID.fromString("2f26fbdf-598a-46dd-92fc-1699c0e173b1");
List<ClientProfile> profiles; List<ClientProfile> profiles;
@ -15,10 +16,15 @@ public ProfilesRequestEvent(List<ClientProfile> profiles) {
this.profiles = profiles; this.profiles = profiles;
} }
String requesttype = "profilesList"; String requesttype = "profiles";
String error; String error;
@Override @Override
public UUID getUUID() { public UUID getUUID() {
return uuid; return uuid;
} }
@Override
public String getType() {
return "profiles";
}
} }

View file

@ -1,11 +1,12 @@
package ru.gravit.launcher.events.request; package ru.gravit.launcher.events.request;
import ru.gravit.launcher.hasher.HashedDir; import ru.gravit.launcher.hasher.HashedDir;
import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.utils.event.EventInterface; import ru.gravit.utils.event.EventInterface;
import java.util.UUID; import java.util.UUID;
public class UpdateListRequestEvent implements EventInterface { public class UpdateListRequestEvent implements EventInterface, ResultInterface {
private static final UUID uuid = UUID.fromString("5fa836ae-6b61-401c-96ac-d8396f07ec6b"); private static final UUID uuid = UUID.fromString("5fa836ae-6b61-401c-96ac-d8396f07ec6b");
public final String type; public final String type;
public final String requesttype; public final String requesttype;
@ -20,4 +21,9 @@ public UpdateListRequestEvent(HashedDir dir) {
public UUID getUUID() { public UUID getUUID() {
return uuid; return uuid;
} }
@Override
public String getType() {
return "updateList";
}
} }

View file

@ -1,4 +1,4 @@
package ru.gravit.launcher.request.websockets; package ru.gravit.launcher.request;
public interface ResultInterface { public interface ResultInterface {
String getType(); String getType();