Skip to content

Commit 7902fd8

Browse files
markozajcmarkozajc
committed
Merge branch 'development'
2 parents 9cd0345 + d15884f commit 7902fd8

28 files changed

+77
-162
lines changed

‎example/src/main/java/com/markozajc/akiwrapper/example/AkinatorExample.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
package com.markozajc.akiwrapper.example;
22

3-
import java.util.ArrayList;
4-
import java.util.EnumSet;
5-
import java.util.List;
6-
import java.util.Scanner;
3+
import java.util.*;
74
import java.util.stream.Collectors;
85

96
import javax.annotation.Nonnull;
107

11-
import com.markozajc.akiwrapper.Akiwrapper;
8+
import com.markozajc.akiwrapper.*;
129
import com.markozajc.akiwrapper.Akiwrapper.Answer;
13-
import com.markozajc.akiwrapper.AkiwrapperBuilder;
14-
import com.markozajc.akiwrapper.core.entities.Guess;
15-
import com.markozajc.akiwrapper.core.entities.Question;
16-
import com.markozajc.akiwrapper.core.entities.Server.GuessType;
17-
import com.markozajc.akiwrapper.core.entities.Server.Language;
10+
import com.markozajc.akiwrapper.core.entities.*;
11+
import com.markozajc.akiwrapper.core.entities.Server.*;
1812
import com.markozajc.akiwrapper.core.entities.impl.immutable.ApiKey;
1913
import com.markozajc.akiwrapper.core.exceptions.ServerNotFoundException;
2014

‎pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.github.markozajc</groupId>
77
<artifactId>akiwrapper</artifactId>
8-
<version>1.5</version>
8+
<version>1.5.1</version>
99

1010
<name>Akiwrapper</name>
1111
<description>A Java API wrapper for Akinator</description>
@@ -41,7 +41,7 @@
4141
<properties>
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4343
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
44-
<junit.version>5.6.2</junit.version>
44+
<junit.version>5.7.1</junit.version>
4545
<slf4j.version>1.7.30</slf4j.version>
4646
</properties>
4747

@@ -57,7 +57,7 @@
5757
<dependency>
5858
<groupId>org.json</groupId>
5959
<artifactId>json</artifactId>
60-
<version>20190722</version>
60+
<version>20201115</version>
6161
</dependency>
6262

6363
<!-- Unit tests -->
@@ -84,14 +84,14 @@
8484
<dependency>
8585
<groupId>com.konghq</groupId>
8686
<artifactId>unirest-java</artifactId>
87-
<version>3.7.04</version>
87+
<version>3.11.11</version>
8888
</dependency>
8989

9090
<!-- Cache -->
9191
<dependency>
9292
<groupId>com.google.guava</groupId>
9393
<artifactId>guava</artifactId>
94-
<version>29.0-jre</version>
94+
<version>30.1-jre</version>
9595
</dependency>
9696

9797
<!-- Logging -->
@@ -111,7 +111,7 @@
111111
<dependency>
112112
<groupId>com.github.spotbugs</groupId>
113113
<artifactId>spotbugs-annotations</artifactId>
114-
<version>4.0.0</version>
114+
<version>4.2.1</version>
115115
</dependency>
116116

117117
<dependency>

‎src/main/java/com/markozajc/akiwrapper/Akiwrapper.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
import java.util.List;
44
import java.util.stream.Collectors;
55

6-
import javax.annotation.Nonnull;
7-
import javax.annotation.Nullable;
6+
import javax.annotation.*;
87

9-
import com.markozajc.akiwrapper.core.entities.Guess;
10-
import com.markozajc.akiwrapper.core.entities.Question;
11-
import com.markozajc.akiwrapper.core.entities.Server;
8+
import com.markozajc.akiwrapper.core.entities.*;
129

1310
/**
1411
* The "core" of interaction with the Akinator's API. Contains all methods required

‎src/main/java/com/markozajc/akiwrapper/AkiwrapperBuilder.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22

33
import javax.annotation.Nonnull;
44

5-
import org.slf4j.Logger;
6-
import org.slf4j.LoggerFactory;
7-
8-
import com.markozajc.akiwrapper.core.entities.AkiwrapperMetadata;
9-
import com.markozajc.akiwrapper.core.entities.Server;
10-
import com.markozajc.akiwrapper.core.entities.Server.GuessType;
11-
import com.markozajc.akiwrapper.core.entities.Server.Language;
12-
import com.markozajc.akiwrapper.core.entities.ServerList;
5+
import org.slf4j.*;
6+
7+
import com.markozajc.akiwrapper.core.entities.*;
8+
import com.markozajc.akiwrapper.core.entities.Server.*;
139
import com.markozajc.akiwrapper.core.entities.impl.mutable.MutableAkiwrapperMetadata;
14-
import com.markozajc.akiwrapper.core.exceptions.ServerNotFoundException;
15-
import com.markozajc.akiwrapper.core.exceptions.ServerUnavailableException;
10+
import com.markozajc.akiwrapper.core.exceptions.*;
1611
import com.markozajc.akiwrapper.core.impl.AkiwrapperImpl;
1712
import com.markozajc.akiwrapper.core.utils.Servers;
1813

@@ -88,7 +83,7 @@ public Akiwrapper build() throws ServerNotFoundException {
8883
LOG.warn("Failed to construct an instance, trying the next available server", e);
8984
}
9085
} while (serverList.next());
91-
throw new ServerUnavailableException("AW-KO MULTIPLE FAILS");
86+
throw new ServerUnavailableException("KO - NO SERVER AVAILABLE");
9287
} else {
9388
LOG.debug("Given Server is not a ServerList, only attempting to build once.");
9489
return new AkiwrapperImpl(server, this.filterProfanity);

‎src/main/java/com/markozajc/akiwrapper/core/Route.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,21 @@
22

33
import java.io.UnsupportedEncodingException;
44
import java.net.URLEncoder;
5-
import java.util.regex.Matcher;
6-
import java.util.regex.Pattern;
5+
import java.util.regex.*;
76

8-
import javax.annotation.Nonnull;
9-
import javax.annotation.Nullable;
7+
import javax.annotation.*;
108

11-
import org.json.JSONException;
12-
import org.json.JSONObject;
13-
import org.slf4j.Logger;
14-
import org.slf4j.LoggerFactory;
9+
import org.json.*;
10+
import org.slf4j.*;
1511

1612
import com.markozajc.akiwrapper.core.entities.Status;
1713
import com.markozajc.akiwrapper.core.entities.Status.Level;
18-
import com.markozajc.akiwrapper.core.entities.impl.immutable.ApiKey;
19-
import com.markozajc.akiwrapper.core.entities.impl.immutable.StatusImpl;
20-
import com.markozajc.akiwrapper.core.exceptions.ServerUnavailableException;
21-
import com.markozajc.akiwrapper.core.exceptions.StatusException;
14+
import com.markozajc.akiwrapper.core.entities.impl.immutable.*;
15+
import com.markozajc.akiwrapper.core.exceptions.*;
2216
import com.markozajc.akiwrapper.core.impl.AkiwrapperImpl.Token;
2317

2418
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
25-
import kong.unirest.Unirest;
26-
import kong.unirest.UnirestInstance;
19+
import kong.unirest.*;
2720

2821
/**
2922
* A class defining various API endpoints. It is capable of building such

‎src/main/java/com/markozajc/akiwrapper/core/entities/AkiwrapperMetadata.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package com.markozajc.akiwrapper.core.entities;
22

3-
import javax.annotation.Nonnull;
4-
import javax.annotation.Nullable;
3+
import javax.annotation.*;
54

65
import com.markozajc.akiwrapper.Akiwrapper;
7-
import com.markozajc.akiwrapper.core.entities.Server.GuessType;
8-
import com.markozajc.akiwrapper.core.entities.Server.Language;
6+
import com.markozajc.akiwrapper.core.entities.Server.*;
97

108
/**
119
* A class holding configuration for an {@link Akiwrapper} instance. Note that

‎src/main/java/com/markozajc/akiwrapper/core/entities/Guess.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import java.net.URL;
44

5-
import javax.annotation.Nonnull;
6-
import javax.annotation.Nullable;
5+
import javax.annotation.*;
76

87
import com.markozajc.akiwrapper.AkiwrapperBuilder;
98
import com.markozajc.akiwrapper.core.entities.Server.GuessType;

‎src/main/java/com/markozajc/akiwrapper/core/entities/Identifiable.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.markozajc.akiwrapper.core.entities;
22

3-
import javax.annotation.Nonnegative;
4-
import javax.annotation.Nonnull;
3+
import javax.annotation.*;
54

65
/**
76
* A representation of an object with a numeric identifier. Some objects in the API

‎src/main/java/com/markozajc/akiwrapper/core/entities/Question.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.markozajc.akiwrapper.core.entities;
22

3-
import javax.annotation.Nonnegative;
4-
import javax.annotation.Nonnull;
3+
import javax.annotation.*;
54

65
import com.markozajc.akiwrapper.Akiwrapper.Answer;
76
import com.markozajc.akiwrapper.AkiwrapperBuilder;

‎src/main/java/com/markozajc/akiwrapper/core/entities/Server.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.markozajc.akiwrapper.core.entities;
22

3-
import javax.annotation.Nonnull;
4-
import javax.annotation.Nullable;
3+
import javax.annotation.*;
54

65
import com.markozajc.akiwrapper.core.Route;
76
import com.markozajc.akiwrapper.core.exceptions.ServerNotFoundException;

‎src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ApiKey.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import java.io.UnsupportedEncodingException;
44
import java.net.URLEncoder;
5-
import java.util.regex.Matcher;
6-
import java.util.regex.Pattern;
5+
import java.util.regex.*;
76

87
import javax.annotation.Nonnull;
98

‎src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/GuessImpl.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
package com.markozajc.akiwrapper.core.entities.impl.immutable;
22

3-
import java.net.MalformedURLException;
4-
import java.net.URL;
3+
import java.net.*;
54

6-
import javax.annotation.Nonnegative;
7-
import javax.annotation.Nonnull;
8-
import javax.annotation.Nullable;
5+
import javax.annotation.*;
96

10-
import org.json.JSONArray;
11-
import org.json.JSONObject;
7+
import org.json.*;
128

139
import com.markozajc.akiwrapper.core.Route;
1410
import com.markozajc.akiwrapper.core.entities.Guess;
@@ -61,7 +57,7 @@ public GuessImpl(@Nonnull String id, @Nonnull String name, @Nullable String desc
6157
@SuppressWarnings("null")
6258
public GuessImpl(@Nonnull JSONObject json) {
6359
this(json.getString("id"), json.getString("name"), getDescription(json), getImage(json),
64-
JSONUtils.getDouble(json, "proba").get().doubleValue());
60+
JSONUtils.getDouble(json, "proba").get());
6561
}
6662

6763
@Nullable

‎src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ImmutableAkiwrapperMetadata.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
package com.markozajc.akiwrapper.core.entities.impl.immutable;
22

3-
import javax.annotation.Nonnull;
4-
import javax.annotation.Nullable;
3+
import javax.annotation.*;
54

6-
import com.markozajc.akiwrapper.core.entities.AkiwrapperMetadata;
7-
import com.markozajc.akiwrapper.core.entities.Guess;
8-
import com.markozajc.akiwrapper.core.entities.Question;
9-
import com.markozajc.akiwrapper.core.entities.Server;
10-
import com.markozajc.akiwrapper.core.entities.Server.GuessType;
11-
import com.markozajc.akiwrapper.core.entities.Server.Language;
5+
import com.markozajc.akiwrapper.core.entities.*;
6+
import com.markozajc.akiwrapper.core.entities.Server.*;
127

138
/**
149
* An immutable implementation of {@link AkiwrapperMetadata}.

‎src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/QuestionImpl.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.markozajc.akiwrapper.core.entities.impl.immutable;
22

3-
import javax.annotation.Nonnegative;
4-
import javax.annotation.Nonnull;
3+
import javax.annotation.*;
54

65
import org.json.JSONObject;
76

8-
import com.markozajc.akiwrapper.core.entities.Question;
9-
import com.markozajc.akiwrapper.core.entities.Status;
7+
import com.markozajc.akiwrapper.core.entities.*;
108
import com.markozajc.akiwrapper.core.entities.Status.Level;
119
import com.markozajc.akiwrapper.core.exceptions.MissingQuestionException;
1210
import com.markozajc.akiwrapper.core.utils.JSONUtils;
@@ -67,9 +65,9 @@ public QuestionImpl(@Nonnull JSONObject json, @Nonnull Status status) {
6765
checkMissingQuestion(status);
6866
this.id = json.getString("questionid");
6967
this.question = json.getString("question");
70-
this.step = JSONUtils.getInteger(json, "step").get().intValue();
71-
this.gain = JSONUtils.getDouble(json, "infogain").get().doubleValue();
72-
this.progression = JSONUtils.getDouble(json, "progression").get().doubleValue();
68+
this.step = JSONUtils.getInteger(json, "step").get();
69+
this.gain = JSONUtils.getDouble(json, "infogain").get();
70+
this.progression = JSONUtils.getDouble(json, "progression").get();
7371
}
7472

7573
private static void checkMissingQuestion(@Nonnull Status status) {

‎src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ServerListImpl.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
package com.markozajc.akiwrapper.core.entities.impl.immutable;
22

3-
import java.util.ArrayList;
4-
import java.util.Arrays;
5-
import java.util.Collection;
6-
import java.util.List;
7-
import java.util.Queue;
3+
import java.util.*;
84
import java.util.concurrent.ConcurrentLinkedQueue;
9-
import java.util.stream.Collectors;
10-
import java.util.stream.Stream;
5+
import java.util.stream.*;
116

127
import javax.annotation.Nonnull;
138

14-
import com.markozajc.akiwrapper.core.entities.Server;
15-
import com.markozajc.akiwrapper.core.entities.ServerList;
9+
import com.markozajc.akiwrapper.core.entities.*;
1610

1711
public class ServerListImpl implements ServerList {
1812

‎src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/StatusImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.markozajc.akiwrapper.core.entities.impl.immutable;
22

3-
import javax.annotation.Nonnull;
4-
import javax.annotation.Nullable;
3+
import javax.annotation.*;
54

65
import org.json.JSONObject;
76

‎src/main/java/com/markozajc/akiwrapper/core/entities/impl/mutable/MutableAkiwrapperMetadata.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
package com.markozajc.akiwrapper.core.entities.impl.mutable;
22

3-
import javax.annotation.Nonnull;
4-
import javax.annotation.Nullable;
5-
6-
import com.markozajc.akiwrapper.core.entities.AkiwrapperMetadata;
7-
import com.markozajc.akiwrapper.core.entities.Guess;
8-
import com.markozajc.akiwrapper.core.entities.Question;
9-
import com.markozajc.akiwrapper.core.entities.Server;
10-
import com.markozajc.akiwrapper.core.entities.Server.GuessType;
11-
import com.markozajc.akiwrapper.core.entities.Server.Language;
12-
import com.markozajc.akiwrapper.core.entities.ServerList;
3+
import javax.annotation.*;
4+
5+
import com.markozajc.akiwrapper.core.entities.*;
6+
import com.markozajc.akiwrapper.core.entities.Server.*;
137
import com.markozajc.akiwrapper.core.entities.impl.immutable.ImmutableAkiwrapperMetadata;
148
import com.markozajc.akiwrapper.core.utils.Servers;
159

‎src/main/java/com/markozajc/akiwrapper/core/exceptions/MissingQuestionException.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class MissingQuestionException extends RuntimeException {
1111
* Constructs a new {@link MissingQuestionException} instance.
1212
*/
1313
public MissingQuestionException() {
14-
super();
1514
}
1615

1716
}

‎src/main/java/com/markozajc/akiwrapper/core/exceptions/ServerNotFoundException.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package com.markozajc.akiwrapper.core.exceptions;
22

33
import com.markozajc.akiwrapper.core.entities.Server;
4-
import com.markozajc.akiwrapper.core.entities.Server.GuessType;
5-
import com.markozajc.akiwrapper.core.entities.Server.Language;
4+
import com.markozajc.akiwrapper.core.entities.Server.*;
65

76
/**
87
* An exception indicating that no {@link Server} could be found for the given
@@ -16,7 +15,6 @@ public class ServerNotFoundException extends Exception {
1615
* Constructs a new {@link ServerNotFoundException}.
1716
*/
1817
public ServerNotFoundException() {
19-
super();
2018
}
2119

2220
}

‎src/main/java/com/markozajc/akiwrapper/core/exceptions/ServerUnavailableException.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import javax.annotation.Nonnull;
44

5-
import com.markozajc.akiwrapper.core.entities.Server;
6-
import com.markozajc.akiwrapper.core.entities.Status;
5+
import com.markozajc.akiwrapper.core.entities.*;
76
import com.markozajc.akiwrapper.core.entities.impl.immutable.StatusImpl;
87

98
/**

0 commit comments

Comments
 (0)