Merge branch 'development'v1.3.3

6 files changed, 65 insertions, 48 deletions

diff --git a/example/pom.xml b/example/pom.xml
index d500564..4b0bf60 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -3,9 +3,30 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

         <modelVersion>4.0.0</modelVersion>

 

-        <groupId>com.example</groupId>

-        <artifactId>MyApp</artifactId>

-        <version>0.0.1</version>

+        <groupId>com.github.markozajc</groupId>

+        <artifactId>akiwrapper-example</artifactId>

+        <version>1.0</version>

+

+        <name>Akiwrapper Example</name>

+        <description>An example for Akiwrapper, the Java API wrapper for Akinator</description>

+        <url>https://github.com/markozajc/Akiwrapper</url>

+

+        <inceptionYear>2017</inceptionYear>

+

+        <licenses>

+                <license>

+                        <name>The GNU General Public License, Version 3.0</name>

+                        <url>https://www.gnu.org/licenses/gpl.txt</url>

+                </license>

+        </licenses>

+

+        <developers>

+                <developer>

+                        <name>Marko Zajc</name>

+                        <email>sigmund.brotbeck@gmail.com</email>

+                        <url>https://github.com/markozajc</url>

+                </developer>

+        </developers>

 

         <properties>

                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/example/src/com/markozajc/akiwrapper/example/AkinatorExample.java b/example/src/com/markozajc/akiwrapper/example/AkinatorExample.java
index 87ff352..8e99fa1 100644
--- a/example/src/com/markozajc/akiwrapper/example/AkinatorExample.java
+++ b/example/src/com/markozajc/akiwrapper/example/AkinatorExample.java
@@ -8,6 +8,7 @@ import java.util.stream.Collectors;
 import com.markozajc.akiwrapper.Akiwrapper;

 import com.markozajc.akiwrapper.Akiwrapper.Answer;

 import com.markozajc.akiwrapper.AkiwrapperBuilder;

+import com.markozajc.akiwrapper.core.entities.AkiwrapperMetadata;

 import com.markozajc.akiwrapper.core.entities.Guess;

 import com.markozajc.akiwrapper.core.entities.Question;

 import com.markozajc.akiwrapper.core.entities.Server.Language;

@@ -67,7 +68,7 @@ public class AkinatorExample {
         public static void main(String[] args) throws Exception {

                 try (Scanner sc = new Scanner(System.in)) {

 

-                        System.out.println("What's your name? (desktopPlayer)");

+                        System.out.println("What's your name? (" + AkiwrapperMetadata.DEFAULT_NAME + ")");

                         String name = sc.nextLine().trim();

                         if (name.equals(""))

                                 name = "desktopPlayer";

diff --git a/pom.xml b/pom.xml
index 810ad35..c00aea1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 

         <groupId>com.github.markozajc</groupId>

         <artifactId>akiwrapper</artifactId>

-        <version>1.3.2</version>

+        <version>1.3.3</version>

 

         <name>Akiwrapper</name>

         <description>A Java API wrapper for Akinator</description>

@@ -113,6 +113,7 @@
                         <groupId>com.google.code.findbugs</groupId>

                         <artifactId>jsr305</artifactId>

                         <version>3.0.2</version>

+                        <scope>runtime</scope>

                 </dependency>

 

         </dependencies>

diff --git a/src/com/markozajc/akiwrapper/core/entities/AkiwrapperMetadata.java b/src/com/markozajc/akiwrapper/core/entities/AkiwrapperMetadata.java
index dfa0d24..b437103 100644
--- a/src/com/markozajc/akiwrapper/core/entities/AkiwrapperMetadata.java
+++ b/src/com/markozajc/akiwrapper/core/entities/AkiwrapperMetadata.java
@@ -15,12 +15,13 @@ public interface AkiwrapperMetadata {
         /**

          * The default name for new {@link Akiwrapper} instances.

          */

-        public static final String DEFAULT_NAME = "AkiwrapperUser";

+        public static final String DEFAULT_NAME = "website-desktop";

 

         /**

          * The default user-agent for new {@link Akiwrapper} instances.

          */

-        public static final String DEFAULT_USER_AGENT = "AkiwrapperClient";

+        public static final String DEFAULT_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) "

+                        + "Chrome/66.0.3359.181 Safari/537.36";

 

         /**

          * The default profanity filter for new {@link Akiwrapper} instances.

diff --git a/src/com/markozajc/akiwrapper/core/entities/Server.java b/src/com/markozajc/akiwrapper/core/entities/Server.java
index 4173388..266e8ad 100644
--- a/src/com/markozajc/akiwrapper/core/entities/Server.java
+++ b/src/com/markozajc/akiwrapper/core/entities/Server.java
@@ -22,7 +22,6 @@ public interface Server {
         ENGLISH,

         FRENCH,

         GERMAN,

-        HINDI,

         HEBREW,

         ITALIAN,

         JAPANESE,

diff --git a/src/com/markozajc/akiwrapper/core/utils/Servers.java b/src/com/markozajc/akiwrapper/core/utils/Servers.java
index e0d7768..6159cb4 100644
--- a/src/com/markozajc/akiwrapper/core/utils/Servers.java
+++ b/src/com/markozajc/akiwrapper/core/utils/Servers.java
@@ -37,54 +37,49 @@ public class Servers {
 

                 // Arabic

                 servers.put(Language.ARABIC, new ServerGroupImpl(Language.ARABIC, new Server[] {

-                                new ServerImpl("api-ar2.akinator.com", Language.ARABIC),

-                                new ServerImpl("api-ar3.akinator.com", Language.ARABIC),

+                                new ServerImpl("ns623157.ovh.net:8121", Language.ARABIC),

+                                new ServerImpl("62-210-100-133.rev.poneytelecom.eu:8155", Language.ARABIC),

                 }));

 

                 // Chinese

                 servers.put(Language.CHINESE, new ServerGroupImpl(Language.CHINESE, new Server[] {

-                                new ServerImpl("api-cn1.akinator.com", Language.CHINESE),

-                                new ServerImpl("api-cn3.akinator.com", Language.CHINESE),

+                                new ServerImpl("ns623157.ovh.net:8125", Language.CHINESE),

+                                new ServerImpl("ns3003941.ip-37-187-149.eu:8148", Language.CHINESE),

                 }));

 

                 // Dutch

                 servers.put(Language.DUTCH, new ServerGroupImpl(Language.DUTCH, new Server[] {

-                                new ServerImpl("api-nl2.akinator.com", Language.DUTCH),

-                                new ServerImpl("api-nl3.akinator.com", Language.DUTCH),

+                                new ServerImpl("ns6624370.ip-5-196-85.eu:8133", Language.DUTCH),

+                                new ServerImpl("62-210-100-133.rev.poneytelecom.eu:8158", Language.DUTCH),

                 }));

 

                 // English

                 servers.put(Language.ENGLISH, new ServerGroupImpl(Language.ENGLISH, new Server[] {

-                                new ServerImpl("api-en1.akinator.com", Language.ENGLISH),

                                 new ServerImpl("api-en3.akinator.com", Language.ENGLISH),

-                                new ServerImpl("api-en4.akinator.com", Language.ENGLISH),

-                                new ServerImpl("api-usa1.akinator.com", Language.ENGLISH),

-                                new ServerImpl("api-usa3.akinator.com", Language.ENGLISH),

-                                new ServerImpl("api-usa4.akinator.com", Language.ENGLISH),

-                                new ServerImpl("api-usa5.akinator.com", Language.ENGLISH),

                                 new ServerImpl("api-usa6.akinator.com", Language.ENGLISH),

-                                new ServerImpl("api-us3.akinator.com", Language.ENGLISH),

-                                new ServerImpl("api-us4.akinator.com", Language.ENGLISH),

                                 new ServerImpl("ns623133.ovh.net:8014", Language.ENGLISH),

+                                new ServerImpl("62-4-22-192.rev.poneytelecom.eu:8117", Language.ENGLISH),

+                                new ServerImpl("ns6624370.ip-5-196-85.eu:8118", Language.ENGLISH),

+                                new ServerImpl("ns3003941.ip-37-187-149.eu:8141", Language.ENGLISH),

+                                new ServerImpl("ns3003941.ip-37-187-149.eu:8144", Language.ENGLISH),

+                                new ServerImpl("62-210-100-133.rev.poneytelecom.eu:8157", Language.ENGLISH),

+                                new ServerImpl("62-210-100-133.rev.poneytelecom.eu:8162", Language.ENGLISH),

+                                new ServerImpl("62-210-100-133.rev.poneytelecom.eu:8163", Language.ENGLISH),

                 }));

 

                 // French

                 servers.put(Language.FRENCH, new ServerGroupImpl(Language.FRENCH, new Server[] {

-                                new ServerImpl("api-obj-fr1.akinator.com", Language.FRENCH),

-                                new ServerImpl("api-obj-fr3.akinator.com", Language.FRENCH),

                                 new ServerImpl("ns623133.ovh.net:8030", Language.FRENCH),

+                                new ServerImpl("62-4-22-192.rev.poneytelecom.eu:8165", Language.FRENCH),

+                                new ServerImpl("62-4-22-192.rev.poneytelecom.eu:8167", Language.FRENCH),

+                                new ServerImpl("ns6624370.ip-5-196-85.eu:8138", Language.FRENCH),

                 }));

 

                 // German

                 servers.put(Language.GERMAN, new ServerGroupImpl(Language.GERMAN, new Server[] {

-                                new ServerImpl("api-de3.akinator.com ", Language.GERMAN),

+                                new ServerImpl("api-de3.akinator.com", Language.GERMAN),

                                 new ServerImpl("ns623133.ovh.net:8005", Language.GERMAN),

-                }));

-

-                // Hindi

-                servers.put(Language.HINDI, new ServerGroupImpl(Language.HINDI, new Server[] {

-                                new ServerImpl("api-in1.akinator.com", Language.HINDI),

-                                new ServerImpl("api-in2.akinator.com", Language.HINDI),

+                                new ServerImpl("ns3003941.ip-37-187-149.eu:8145", Language.GERMAN),

                 }));

 

                 // Hebrew

@@ -94,53 +89,52 @@ public class Servers {
 

                 // Italian

                 servers.put(Language.ITALIAN, new ServerGroupImpl(Language.ITALIAN, new Server[] {

-                                new ServerImpl("api-it2.akinator.com", Language.ITALIAN),

-                                new ServerImpl("api-it3.akinator.com", Language.ITALIAN),

+                                new ServerImpl("ns6624370.ip-5-196-85.eu:8131", Language.ITALIAN),

+                                new ServerImpl("62-210-100-133.rev.poneytelecom.eu:8159", Language.ITALIAN),

                 }));

 

                 // Japanese

                 servers.put(Language.JAPANESE, new ServerGroupImpl(Language.JAPANESE, new Server[] {

-                                new ServerImpl("api-jp2.akinator.com", Language.JAPANESE),

-                                new ServerImpl("api-jp3.akinator.com", Language.JAPANESE),

                                 new ServerImpl("ns623133.ovh.net:8012", Language.JAPANESE),

+                                new ServerImpl("ns6624370.ip-5-196-85.eu:8132", Language.JAPANESE),

+                                new ServerImpl("ns3003941.ip-37-187-149.eu:8146", Language.JAPANESE),

                 }));

 

                 // Korean

                 servers.put(Language.KOREAN, new ServerGroupImpl(Language.KOREAN, new Server[] {

-                                new ServerImpl("api-kr1.akinator.com", Language.KOREAN),

-                                new ServerImpl("api-kr4.akinator.com", Language.KOREAN),

+                                new ServerImpl("62-4-22-192.rev.poneytelecom.eu:8167", Language.KOREAN),

+                                new ServerImpl("62-210-100-133.rev.poneytelecom.eu:8156", Language.KOREAN),

                 }));

 

                 // Polish

                 servers.put(Language.POLISH, new ServerGroupImpl(Language.POLISH, new Server[] {

-                                new ServerImpl("api-pl1.akinator.com", Language.POLISH),

-                                new ServerImpl("api-pl3.akinator.com", Language.POLISH),

+                                new ServerImpl("ns3003941.ip-37-187-149.eu:8143", Language.POLISH),

                 }));

 

                 // Portuguese

                 servers.put(Language.PORTUGUESE, new ServerGroupImpl(Language.PORTUGUESE, new Server[] {

-                                new ServerImpl("api-pt3.akinator.com", Language.PORTUGUESE),

-                                new ServerImpl("api-pt4.akinator.com", Language.PORTUGUESE),

+                                new ServerImpl("62-4-22-192.rev.poneytelecom.eu:8166", Language.PORTUGUESE),

+                                new ServerImpl("ns6624370.ip-5-196-85.eu:8111", Language.PORTUGUESE),

+                                new ServerImpl("62-210-100-133.rev.poneytelecom.eu:8161", Language.PORTUGUESE),

                 }));

 

                 // Russian

                 servers.put(Language.RUSSIAN, new ServerGroupImpl(Language.RUSSIAN, new Server[] {

-                                new ServerImpl("api-ru1.akinator.com", Language.RUSSIAN),

-                                new ServerImpl("api-ru3.akinator.com", Language.RUSSIAN),

-                                new ServerImpl("api-ru4.akinator.com", Language.RUSSIAN),

+                                new ServerImpl("ns623157.ovh.net:8124", Language.RUSSIAN),

+                                new ServerImpl("62-4-22-192.rev.poneytelecom.eu:8169", Language.RUSSIAN),

+                                new ServerImpl("ns3003941.ip-37-187-149.eu:8142", Language.RUSSIAN),

                 }));

 

                 // Spanish

                 servers.put(Language.SPANISH, new ServerGroupImpl(Language.SPANISH, new Server[] {

-                                new ServerImpl("api-es3.akinator.com", Language.SPANISH),

-                                new ServerImpl("api-es4.akinator.com", Language.SPANISH),

                                 new ServerImpl("ns623133.ovh.net:8013", Language.SPANISH),

+                                new ServerImpl("62-210-100-133.rev.poneytelecom.eu:8160", Language.SPANISH),

                 }));

 

                 // Turkish

                 servers.put(Language.TURKISH, new ServerGroupImpl(Language.TURKISH, new Server[] {

-                                new ServerImpl("api-tr1.akinator.com", Language.TURKISH),

-                                new ServerImpl("api-tr3.akinator.com", Language.TURKISH),

+                                new ServerImpl("62-4-22-192.rev.poneytelecom.eu:8164", Language.TURKISH),

+                                new ServerImpl("ns6624370.ip-5-196-85.eu:8134", Language.TURKISH),

                 }));

 

                 SERVER_GROUPS = Collections.unmodifiableMap(servers);