Merge branch 'master' into develop

# Conflicts:
#	build.gradle
#	src/main/java/com/apporelbotna/gameserver/persistencewsclient/GameDAO.java

Author: AlbertMontagutCasero

build.gradle

@@ -13,6 +13,7 @@ jar {
 
 repositories {
     jcenter()
+    maven { url 'https://jitpack.io/' }
 }
 
 dependencies {
@@ -23,11 +24,12 @@ dependencies {
     testImplementation 'junit:junit:4.12'
 
     // https://mvnrepository.com/artifact/org.springframework.hateoas/spring-hateoas
-    compile 'org.springframework.hateoas:spring-hateoas:0.24.0.RELEASE'
+    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'
 
-	compile fileTree(dir: 'libs', include: '*.jar')
+    // PersistenceWS Stubs
+    compile 'com.github.java-game-server:stubs:0.6.2'
 
 }

src/main/java/com/apporelbotna/gameserver/persistencewsclient/DAO.java renamed to src/main/java/com/apporelbotna/gameserver/persistencewsclient/GameDAO.java

@@ -16,11 +16,11 @@
 import com.apporelbotna.gameserver.stubs.User;
 import com.apporelbotna.gameserver.stubs.UserWrapper;
 
-public class DAO {
+public class GameDAO {
 	public static final String SERVER_URL = "http://localhost:8082/";
 	RestTemplate restTemplate = new RestTemplate();
 
-	public DAO() {
+	public GameDAO() {
 
 	}
 

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

@@ -0,0 +1,58 @@
+package com.apporelbotna.gameserver.persistencewsclient.properties;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+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;
+
+	private static String serverUrl;
+
+	private ApplicationProperties()
+	{
+		throw new UnsupportedOperationException("ApplicationProperties must not be instantiated!");
+	}
+
+	static
+	{
+		String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
+		String applicationPropertiesPath = rootPath + "com\\apporelbotna\\gameserver\\persistencewsclient\\properties\\application.properties";
+
+		Properties applicationProperties = new Properties();
+		try
+		{
+			applicationProperties.load(new FileInputStream(applicationPropertiesPath));
+			version = applicationProperties.getProperty("version");
+			name = applicationProperties.getProperty("name");
+
+			serverUrl = applicationProperties.getProperty("server.url");
+		}
+		catch (IOException e)
+		{
+			logger.error(e.getMessage());
+		}
+	}
+
+	public static String getVersion()
+	{
+		return version;
+	}
+
+	public static String getName()
+	{
+		return name;
+	}
+
+	public static String getServerUrl()
+	{
+		return serverUrl;
+	}
+}

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

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