Commit: 191c26cf7525b900b95cbfa175f986c0a7293e10 - HotshotWebServer (hg)

Commit MetaInfo

• Revision: 191c26cf7525b900b95cbfa175f986c0a7293e10 (tree)
• Time: 2019-01-18 05:19:37
• Author: sebastian_bugiu <sebastian_ <bugiu@head...>
• Commiter: sebastian_bugiu <sebastian_

Log Message

Adding lobby support.

Change Summary

• modified: src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/ApplicationConfig.java
• modified: src/test/java/Blackhole_Darksun_WebServer/MainTest.java
• add: src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/MessageBodyHandlers/LobbyInvitationBodyHandler.java
• add: src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/MessageBodyHandlers/LobbyInvitationListBodyHandler.java

Incremental Difference

diff -r ffe267892920 -r 191c26cf7525 src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/ApplicationConfig.java
--- a/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/ApplicationConfig.java	Wed Jan 16 22:33:19 2019 +0200
+++ b/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/ApplicationConfig.java	Thu Jan 17 22:19:37 2019 +0200
@@ -33,6 +33,8 @@
         c.add(FriendDataListBodyHandler.class);
         c.add(LobbyBodyHandler.class);
         c.add(LobbyListBodyHandler.class);
+        c.add(LobbyInvitationBodyHandler.class);
+        c.add(LobbyInvitationListBodyHandler.class);
         classes = Collections.unmodifiableSet(c);
 
 

diff -r ffe267892920 -r 191c26cf7525 src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/MessageBodyHandlers/LobbyInvitationBodyHandler.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/MessageBodyHandlers/LobbyInvitationBodyHandler.java	Thu Jan 17 22:19:37 2019 +0200
@@ -0,0 +1,49 @@
+package Blackhole_Darksun_WebServer.Tables.MessageBodyHandlers;
+
+import Blackhole_Darksun_WebServer.Tables.Lobby;
+import Blackhole_Darksun_WebServer.Tables.LobbyInvitation;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+@Provider
+@Produces("application/json")
+@Consumes("application/json")
+public class LobbyInvitationBodyHandler extends BodyHandler implements MessageBodyWriter<LobbyInvitation>, MessageBodyReader<LobbyInvitation> {
+
+    @Override
+    public boolean isWriteable(Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType) {
+        return LobbyInvitation.class.isAssignableFrom(aClass);
+    }
+
+    @Override
+    public long getSize(LobbyInvitation user, Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType) {
+        return -1;
+    }
+
+    @Override
+    public void writeTo(LobbyInvitation user, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> multivaluedMap, OutputStream outputStream) throws IOException, WebApplicationException {
+        writeGson(user, type, genericType, outputStream);
+    }
+
+    @Override
+    public boolean isReadable(Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType) {
+        return LobbyInvitation.class.isAssignableFrom(aClass);
+    }
+
+    @Override
+    public LobbyInvitation readFrom(Class<LobbyInvitation> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> multivaluedMap, InputStream inputStream) throws IOException, WebApplicationException {
+        return (LobbyInvitation) readGson(type, genericType, inputStream);
+    }
+}

diff -r ffe267892920 -r 191c26cf7525 src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/MessageBodyHandlers/LobbyInvitationListBodyHandler.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/MessageBodyHandlers/LobbyInvitationListBodyHandler.java	Thu Jan 17 22:19:37 2019 +0200
@@ -0,0 +1,49 @@
+package Blackhole_Darksun_WebServer.Tables.MessageBodyHandlers;
+
+import Blackhole_Darksun_WebServer.Tables.LobbyInvitation;
+import Blackhole_Darksun_WebServer.Tables.LobbyInvitationList;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+@Provider
+@Produces("application/json")
+@Consumes("application/json")
+public class LobbyInvitationListBodyHandler extends BodyHandler implements MessageBodyWriter<LobbyInvitationList>, MessageBodyReader<LobbyInvitationList> {
+
+    @Override
+    public boolean isWriteable(Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType) {
+        return LobbyInvitationList.class.isAssignableFrom(aClass);
+    }
+
+    @Override
+    public long getSize(LobbyInvitationList user, Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType) {
+        return -1;
+    }
+
+    @Override
+    public void writeTo(LobbyInvitationList user, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> multivaluedMap, OutputStream outputStream) throws IOException, WebApplicationException {
+        writeGson(user, type, genericType, outputStream);
+    }
+
+    @Override
+    public boolean isReadable(Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType) {
+        return LobbyInvitationList.class.isAssignableFrom(aClass);
+    }
+
+    @Override
+    public LobbyInvitationList readFrom(Class<LobbyInvitationList> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> multivaluedMap, InputStream inputStream) throws IOException, WebApplicationException {
+        return (LobbyInvitationList) readGson(type, genericType, inputStream);
+    }
+}

diff -r ffe267892920 -r 191c26cf7525 src/test/java/Blackhole_Darksun_WebServer/MainTest.java
--- a/src/test/java/Blackhole_Darksun_WebServer/MainTest.java	Wed Jan 16 22:33:19 2019 +0200
+++ b/src/test/java/Blackhole_Darksun_WebServer/MainTest.java	Thu Jan 17 22:19:37 2019 +0200
@@ -30,16 +30,16 @@
         client.register(MapBodyHandler.class);
         client.register(MapListBodyHandler.class);
         client.register(StringBodyHandler.class);
-        client.register(UserBodyHandler.class);
         client.register(UserFriendBodyHandler.class);
         client.register(UserFriendListBodyHandler.class);
         client.register(UserFriendInvitationBodyHandler.class);
         client.register(UserFriendInvitationListBodyHandler.class);
-        client.register(SessionListBodyHandler.class);
         client.register(FriendDataBodyHandler.class);
         client.register(FriendDataListBodyHandler.class);
         client.register(LobbyBodyHandler.class);
         client.register(LobbyListBodyHandler.class);
+        client.register(LobbyInvitationBodyHandler.class);
+        client.register(LobbyInvitationListBodyHandler.class);
     }
 
     static void printLongerTrace(Throwable t) {
@@ -112,6 +112,11 @@
 
         final Lobby createdLobby = createLobbyArr[0].readEntity(Lobby.class);
 
+        final Response getLobbyStatus = client.target(URI).path("get_lobby_status").path(userResponse0.getAuthToken())
+                .request().post(Entity.entity(createdLobby, MediaType.APPLICATION_JSON_TYPE));
+        Assert.assertEquals(getLobbyStatus.getStatusInfo().getStatusCode(), Response.Status.OK.getStatusCode());
+        final LobbyInvitationList lobbyInvitationList = getLobbyStatus.readEntity(LobbyInvitationList.class);
+
         // Now the other user must check for lobby invitations and join the lobby.
         final Response getLobbyInvitations = client.target(URI).path("get_lobby_invitations").path(userResponse1.getAuthToken()).request().get();
         Assert.assertEquals(getLobbyInvitations.getStatusInfo().getStatusCode(), Response.Status.OK.getStatusCode());