OSDN > Developer > hotshot5000 > Chamber > HotshotWebServer > Commit

HotshotWebServer
Fork

(Original repository, No fork origin)

Commit

Revision	3d1f47d215be0032b5ca6589e8240a809a52cb8e (tree)
Time	2018-12-07 07:24:16
Author	sebastian_bugiu <sebastian_ <bugiu@head...>
Commiter	sebastian_bugiu <sebastian_

Adding lobby support.

diff -r 118bf8e28785 -r 3d1f47d215be src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Main.java

--- a/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Main.java Wed Dec 05 23:22:19 2018 +0200

+++ b/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Main.java Fri Dec 07 00:24:16 2018 +0200

		@@ -13,7 +13,6 @@
13	13	import javax.ws.rs.core.MediaType;
14	14	import javax.ws.rs.core.Response;
15	15	import java.sql.Timestamp;
16		-import java.util.ArrayList;
17	16	import java.util.Date;
18	17	import java.util.List;
19	18

		@@ -189,7 +188,7 @@
189	188	public Response getFriendInvitations(@PathParam("user_token") String token) {
190	189	GetAuthToken getAuthToken = new GetAuthToken(token).invoke();
191	190	if (getAuthToken.is()) {
192		- UserFriend server = new UserFriend();
	191	+ UserFriendInvitationList server = new UserFriendInvitationList();
193	192	server.setErrorCode(ErrorCodes.TOKEN_INVALID);
194	193	server.setError(ErrorCodes.TOKEN_INVALID_STR);
195	194	return createResponse(server);

		@@ -197,7 +196,7 @@
197	196	AuthToken authToken = getAuthToken.getAuthToken();
198	197	GetUserByToken getUserByToken = new GetUserByToken(token, authToken).invoke();
199	198	if (getUserByToken.is()) {
200		- UserFriend server = new UserFriend();
	199	+ UserFriendInvitationList server = new UserFriendInvitationList();
201	200	server.setErrorCode(ErrorCodes.TOKEN_EXPIRED);
202	201	server.setError(ErrorCodes.TOKEN_EXPIRED_STR);
203	202	return createResponse(server);

		@@ -205,7 +204,7 @@
205	204	User user = getUserByToken.getUser();
206	205	List<UserFriendInvitation> userFriendInvitationList = em.createNamedQuery(UserFriendInvitation.GET_USER_FRIEND_INVITATION)
207	206	.setParameter("userId", user.getId()).getResultList();
208		- return createResponse(new GenericEntity<List<UserFriendInvitation>>(userFriendInvitationList) {
	207	+ return createResponse(new GenericEntity<UserFriendInvitationList>(new UserFriendInvitationList(userFriendInvitationList)) {
209	208	});
210	209	}
211	210

diff -r 118bf8e28785 -r 3d1f47d215be src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/LobbyInvitationList.java

--- /dev/null Thu Jan 01 00:00:00 1970 +0000

+++ b/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/LobbyInvitationList.java Fri Dec 07 00:24:16 2018 +0200

		@@ -0,0 +1,17 @@
	1	+package Blackhole_Darksun_WebServer.Tables;
	2	+
	3	+import java.util.ArrayList;
	4	+import java.util.List;
	5	+
	6	+public class LobbyInvitationList extends GenericTransient {
	7	+
	8	+ public ArrayList<LobbyInvitation> lobbyInvitationList = new ArrayList<>();
	9	+
	10	+ public LobbyInvitationList() {
	11	+
	12	+ }
	13	+
	14	+ public LobbyInvitationList(List<LobbyInvitation> lobbyInvitationList) {
	15	+ this.lobbyInvitationList.addAll(lobbyInvitationList);
	16	+ }
	17	+}

diff -r 118bf8e28785 -r 3d1f47d215be src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/LobbyList.java

--- /dev/null Thu Jan 01 00:00:00 1970 +0000

+++ b/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/LobbyList.java Fri Dec 07 00:24:16 2018 +0200

		@@ -0,0 +1,17 @@
	1	+package Blackhole_Darksun_WebServer.Tables;
	2	+
	3	+import java.util.ArrayList;
	4	+import java.util.List;
	5	+
	6	+public class LobbyList extends GenericTransient {
	7	+
	8	+ public ArrayList<Lobby> lobbyList = new ArrayList<>();
	9	+
	10	+ public LobbyList() {
	11	+
	12	+ }
	13	+
	14	+ public LobbyList(List<Lobby> lobbyList) {
	15	+ this.lobbyList.addAll(lobbyList);
	16	+ }
	17	+}

diff -r 118bf8e28785 -r 3d1f47d215be src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/UserFriendInvitationList.java

--- /dev/null Thu Jan 01 00:00:00 1970 +0000

+++ b/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/UserFriendInvitationList.java Fri Dec 07 00:24:16 2018 +0200

		@@ -0,0 +1,17 @@
	1	+package Blackhole_Darksun_WebServer.Tables;
	2	+
	3	+import java.util.ArrayList;
	4	+import java.util.List;
	5	+
	6	+public class UserFriendInvitationList extends GenericTransient {
	7	+
	8	+ public ArrayList<UserFriendInvitation> userFriendInvitationList = new ArrayList<>();
	9	+
	10	+ public UserFriendInvitationList() {
	11	+
	12	+ }
	13	+
	14	+ public UserFriendInvitationList(List<UserFriendInvitation> userFriendInvitationList) {
	15	+ this.userFriendInvitationList.addAll(userFriendInvitationList);
	16	+ }
	17	+}