Merge branch 'master' of

https://github.com/java-game-server/ws-java-client.git

Conflicts:
	build.gradle
	src/main/java/com/apporelbotna/gameserver/persistencewsclient/properties/ApplicationProperties.java
	src/main/java/com/apporelbotna/gameserver/persistencewsclient/properties/application.properties

Author: Jendoliver

README.md

@@ -0,0 +1,7 @@
+# ws-java-client
+A java client for persistence-ws
+
+[![](https://jitpack.io/v/java-game-server/ws-java-client.svg)](https://jitpack.io/#java-game-server/ws-java-client)
+
+#How to build
+https://jitpack.io/#java-game-server/ws-java-client/3.0.0

build.gradle

@@ -25,7 +25,10 @@ dependencies {
 
     // https://mvnrepository.com/artifact/org.springframework.hateoas/spring-hateoas
     compileOnly 'org.springframework.hateoas:spring-hateoas:0.24.0.RELEASE'
-    
+
+	// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
+	compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.0.0.RELEASE'
+    	
     // PersistenceWS Stubs
     compile 'com.github.java-game-server:stubs:0.6.2'
 

src/main/java/com/apporelbotna/gameserver/persistencewsclient/GameDAO.java

@@ -9,16 +9,13 @@
 import org.springframework.web.client.RestTemplate;
 
 import com.apporelbotna.gameserver.stubs.Game;
+import com.apporelbotna.gameserver.stubs.Match;
 import com.apporelbotna.gameserver.stubs.RankingPointsTO;
 import com.apporelbotna.gameserver.stubs.RegisterUser;
 import com.apporelbotna.gameserver.stubs.Token;
 import com.apporelbotna.gameserver.stubs.User;
 import com.apporelbotna.gameserver.stubs.UserWrapper;
 
-//TODO los metodos devuelven un HttpStatus que es el code de segun si ha ido bien, mal, etc.
-//esto se podria hacer alguna clase que controlase los codigos que se mostraran en la applicacion
-//personalizados y en diferentes idiomas
-
 public class GameDAO
 {
 	public static final String SERVER_URL = "http://localhost:8082/";
@@ -29,30 +26,44 @@ public GameDAO()
 
 	}
 
-	 public boolean isUserLoggeable(String email, String tokenString)
-	 {
-	 UserWrapper wrapper = new UserWrapper(new User(email), new
-	 Token(tokenString));
+	public boolean finishMatch(Match... matches)
+	{
+
+		for (Match match : matches)
+		{
+			ResponseEntity<?> response = restTemplate.postForEntity(SERVER_URL + "/match", match,
+					null);
+			if (!response.getStatusCode().equals(HttpStatus.CREATED))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	public boolean isUserLoggeable(String email, String tokenString)
+	{
+
+		UserWrapper wrapper = new UserWrapper(new User(email), new Token(tokenString));
 
-	 HttpStatus response = restTemplate
-	 .getForObject(SERVER_URL + "/auth/" + email + "/" + tokenString,
-	 HttpStatus.class);
+		ResponseEntity<?> response = restTemplate.postForEntity(SERVER_URL + "/auth", wrapper,
+				null);
 
-	 return (response.equals(HttpStatus.OK));
-	 }
+		return (response.getStatusCode().equals(HttpStatus.OK));
+	}
 
 	public User validateUser(String email, String tokenString)
 	{
-		//TODO implement
-		return null;
+		return isUserLoggeable(email, tokenString) ? getUserInformation(email) : null;
 	}
 
-	public UserWrapper login(String email, String password)
+	public Token login(String email, String password)
 	{
 
 		RestTemplate restTemplate = new RestTemplate();
 		return restTemplate.getForObject(SERVER_URL + "/login/" + email + "/" + password,
-				UserWrapper.class);
+				Token.class);
 	}
 
 	// saca todos los juegos de un usuario
@@ -110,6 +121,4 @@ public List<RankingPointsTO> getRankingPointsByGameAndUser(int gameId)
 		return responseWS.getBody();
 	}
 
-
-
 }

src/main/java/com/apporelbotna/gameserver/persistencewsclient/properties/ApplicationProperties.java

@@ -2,13 +2,8 @@
 
 import java.util.ResourceBundle;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public final class ApplicationProperties
 {
-	private static final Logger logger = LoggerFactory.getLogger(ApplicationProperties.class);
-
 	private static String version;
 	private static String name;
 
@@ -44,4 +39,4 @@ public static String getServerUrl()
 	{
 		return serverUrl;
 	}
-}
+}

src/main/java/com/apporelbotna/gameserver/persistencewsclient/properties/application.properties

@@ -1,4 +1,4 @@
-version=2.0.2
-name=PersistenceWSClient
-
-server.url=http\://localhost\:8082/
+version=3.0.1
+name=PersistenceWSClient
+
+server.url=http://localhost:8082/