diff --git a/example/src/main/java/com/markozajc/akiwrapper/example/AkinatorExample.java b/example/src/main/java/com/markozajc/akiwrapper/example/AkinatorExample.java index 3bfb3f4..5715aa5 100644 --- a/example/src/main/java/com/markozajc/akiwrapper/example/AkinatorExample.java +++ b/example/src/main/java/com/markozajc/akiwrapper/example/AkinatorExample.java @@ -1,20 +1,14 @@ package com.markozajc.akiwrapper.example; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; -import java.util.Scanner; +import java.util.*; import java.util.stream.Collectors; import javax.annotation.Nonnull; -import com.markozajc.akiwrapper.Akiwrapper; +import com.markozajc.akiwrapper.*; import com.markozajc.akiwrapper.Akiwrapper.Answer; -import com.markozajc.akiwrapper.AkiwrapperBuilder; -import com.markozajc.akiwrapper.core.entities.Guess; -import com.markozajc.akiwrapper.core.entities.Question; -import com.markozajc.akiwrapper.core.entities.Server.GuessType; -import com.markozajc.akiwrapper.core.entities.Server.Language; +import com.markozajc.akiwrapper.core.entities.*; +import com.markozajc.akiwrapper.core.entities.Server.*; import com.markozajc.akiwrapper.core.entities.impl.immutable.ApiKey; import com.markozajc.akiwrapper.core.exceptions.ServerNotFoundException; diff --git a/pom.xml b/pom.xml index cc3593b..91f82d4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.markozajc akiwrapper - 1.5 + 1.5.1 Akiwrapper A Java API wrapper for Akinator @@ -41,7 +41,7 @@ UTF-8 UTF-8 - 5.6.2 + 5.7.1 1.7.30 @@ -57,7 +57,7 @@ org.json json - 20190722 + 20201115 @@ -84,14 +84,14 @@ com.konghq unirest-java - 3.7.04 + 3.11.11 com.google.guava guava - 29.0-jre + 30.1-jre @@ -111,7 +111,7 @@ com.github.spotbugs spotbugs-annotations - 4.0.0 + 4.2.1 diff --git a/src/main/java/com/markozajc/akiwrapper/Akiwrapper.java b/src/main/java/com/markozajc/akiwrapper/Akiwrapper.java index 90f2876..24c1f39 100644 --- a/src/main/java/com/markozajc/akiwrapper/Akiwrapper.java +++ b/src/main/java/com/markozajc/akiwrapper/Akiwrapper.java @@ -3,12 +3,9 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import javax.annotation.*; -import com.markozajc.akiwrapper.core.entities.Guess; -import com.markozajc.akiwrapper.core.entities.Question; -import com.markozajc.akiwrapper.core.entities.Server; +import com.markozajc.akiwrapper.core.entities.*; /** * The "core" of interaction with the Akinator's API. Contains all methods required diff --git a/src/main/java/com/markozajc/akiwrapper/AkiwrapperBuilder.java b/src/main/java/com/markozajc/akiwrapper/AkiwrapperBuilder.java index e658135..170cc35 100644 --- a/src/main/java/com/markozajc/akiwrapper/AkiwrapperBuilder.java +++ b/src/main/java/com/markozajc/akiwrapper/AkiwrapperBuilder.java @@ -2,17 +2,12 @@ import javax.annotation.Nonnull; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.markozajc.akiwrapper.core.entities.AkiwrapperMetadata; -import com.markozajc.akiwrapper.core.entities.Server; -import com.markozajc.akiwrapper.core.entities.Server.GuessType; -import com.markozajc.akiwrapper.core.entities.Server.Language; -import com.markozajc.akiwrapper.core.entities.ServerList; +import org.slf4j.*; + +import com.markozajc.akiwrapper.core.entities.*; +import com.markozajc.akiwrapper.core.entities.Server.*; import com.markozajc.akiwrapper.core.entities.impl.mutable.MutableAkiwrapperMetadata; -import com.markozajc.akiwrapper.core.exceptions.ServerNotFoundException; -import com.markozajc.akiwrapper.core.exceptions.ServerUnavailableException; +import com.markozajc.akiwrapper.core.exceptions.*; import com.markozajc.akiwrapper.core.impl.AkiwrapperImpl; import com.markozajc.akiwrapper.core.utils.Servers; @@ -88,7 +83,7 @@ public Akiwrapper build() throws ServerNotFoundException { LOG.warn("Failed to construct an instance, trying the next available server", e); } } while (serverList.next()); - throw new ServerUnavailableException("AW-KO MULTIPLE FAILS"); + throw new ServerUnavailableException("KO - NO SERVER AVAILABLE"); } else { LOG.debug("Given Server is not a ServerList, only attempting to build once."); return new AkiwrapperImpl(server, this.filterProfanity); diff --git a/src/main/java/com/markozajc/akiwrapper/core/Route.java b/src/main/java/com/markozajc/akiwrapper/core/Route.java index 2b9ecfb..a2db855 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/Route.java +++ b/src/main/java/com/markozajc/akiwrapper/core/Route.java @@ -2,28 +2,21 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import java.util.regex.*; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import javax.annotation.*; -import org.json.JSONException; -import org.json.JSONObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.json.*; +import org.slf4j.*; import com.markozajc.akiwrapper.core.entities.Status; import com.markozajc.akiwrapper.core.entities.Status.Level; -import com.markozajc.akiwrapper.core.entities.impl.immutable.ApiKey; -import com.markozajc.akiwrapper.core.entities.impl.immutable.StatusImpl; -import com.markozajc.akiwrapper.core.exceptions.ServerUnavailableException; -import com.markozajc.akiwrapper.core.exceptions.StatusException; +import com.markozajc.akiwrapper.core.entities.impl.immutable.*; +import com.markozajc.akiwrapper.core.exceptions.*; import com.markozajc.akiwrapper.core.impl.AkiwrapperImpl.Token; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import kong.unirest.Unirest; -import kong.unirest.UnirestInstance; +import kong.unirest.*; /** * A class defining various API endpoints. It is capable of building such diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/AkiwrapperMetadata.java b/src/main/java/com/markozajc/akiwrapper/core/entities/AkiwrapperMetadata.java index d9ab7f4..3b2c1ea 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/AkiwrapperMetadata.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/AkiwrapperMetadata.java @@ -1,11 +1,9 @@ package com.markozajc.akiwrapper.core.entities; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import javax.annotation.*; import com.markozajc.akiwrapper.Akiwrapper; -import com.markozajc.akiwrapper.core.entities.Server.GuessType; -import com.markozajc.akiwrapper.core.entities.Server.Language; +import com.markozajc.akiwrapper.core.entities.Server.*; /** * A class holding configuration for an {@link Akiwrapper} instance. Note that diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/Guess.java b/src/main/java/com/markozajc/akiwrapper/core/entities/Guess.java index 9cb886c..eb011ac 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/Guess.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/Guess.java @@ -2,8 +2,7 @@ import java.net.URL; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import javax.annotation.*; import com.markozajc.akiwrapper.AkiwrapperBuilder; import com.markozajc.akiwrapper.core.entities.Server.GuessType; diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/Identifiable.java b/src/main/java/com/markozajc/akiwrapper/core/entities/Identifiable.java index 57a5bfb..60ee44a 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/Identifiable.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/Identifiable.java @@ -1,7 +1,6 @@ package com.markozajc.akiwrapper.core.entities; -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; +import javax.annotation.*; /** * A representation of an object with a numeric identifier. Some objects in the API diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/Question.java b/src/main/java/com/markozajc/akiwrapper/core/entities/Question.java index 55dafdd..bfb9c0f 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/Question.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/Question.java @@ -1,7 +1,6 @@ package com.markozajc.akiwrapper.core.entities; -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; +import javax.annotation.*; import com.markozajc.akiwrapper.Akiwrapper.Answer; import com.markozajc.akiwrapper.AkiwrapperBuilder; diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/Server.java b/src/main/java/com/markozajc/akiwrapper/core/entities/Server.java index 3c98f96..461dc75 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/Server.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/Server.java @@ -1,7 +1,6 @@ package com.markozajc.akiwrapper.core.entities; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import javax.annotation.*; import com.markozajc.akiwrapper.core.Route; import com.markozajc.akiwrapper.core.exceptions.ServerNotFoundException; diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ApiKey.java b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ApiKey.java index f513cfa..fd0b105 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ApiKey.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ApiKey.java @@ -2,8 +2,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import java.util.regex.*; import javax.annotation.Nonnull; diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/GuessImpl.java b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/GuessImpl.java index e5c9420..9acbe19 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/GuessImpl.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/GuessImpl.java @@ -1,14 +1,10 @@ package com.markozajc.akiwrapper.core.entities.impl.immutable; -import java.net.MalformedURLException; -import java.net.URL; +import java.net.*; -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import javax.annotation.*; -import org.json.JSONArray; -import org.json.JSONObject; +import org.json.*; import com.markozajc.akiwrapper.core.Route; import com.markozajc.akiwrapper.core.entities.Guess; @@ -61,7 +57,7 @@ public GuessImpl(@Nonnull String id, @Nonnull String name, @Nullable String desc @SuppressWarnings("null") public GuessImpl(@Nonnull JSONObject json) { this(json.getString("id"), json.getString("name"), getDescription(json), getImage(json), - JSONUtils.getDouble(json, "proba").get().doubleValue()); + JSONUtils.getDouble(json, "proba").get()); } @Nullable diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ImmutableAkiwrapperMetadata.java b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ImmutableAkiwrapperMetadata.java index cec7d3a..d7e813f 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ImmutableAkiwrapperMetadata.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ImmutableAkiwrapperMetadata.java @@ -1,14 +1,9 @@ package com.markozajc.akiwrapper.core.entities.impl.immutable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import javax.annotation.*; -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; -import com.markozajc.akiwrapper.core.entities.Server.GuessType; -import com.markozajc.akiwrapper.core.entities.Server.Language; +import com.markozajc.akiwrapper.core.entities.*; +import com.markozajc.akiwrapper.core.entities.Server.*; /** * An immutable implementation of {@link AkiwrapperMetadata}. diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/QuestionImpl.java b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/QuestionImpl.java index 1787fd2..60cc203 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/QuestionImpl.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/QuestionImpl.java @@ -1,12 +1,10 @@ package com.markozajc.akiwrapper.core.entities.impl.immutable; -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; +import javax.annotation.*; import org.json.JSONObject; -import com.markozajc.akiwrapper.core.entities.Question; -import com.markozajc.akiwrapper.core.entities.Status; +import com.markozajc.akiwrapper.core.entities.*; import com.markozajc.akiwrapper.core.entities.Status.Level; import com.markozajc.akiwrapper.core.exceptions.MissingQuestionException; import com.markozajc.akiwrapper.core.utils.JSONUtils; @@ -67,9 +65,9 @@ public QuestionImpl(@Nonnull JSONObject json, @Nonnull Status status) { checkMissingQuestion(status); this.id = json.getString("questionid"); this.question = json.getString("question"); - this.step = JSONUtils.getInteger(json, "step").get().intValue(); - this.gain = JSONUtils.getDouble(json, "infogain").get().doubleValue(); - this.progression = JSONUtils.getDouble(json, "progression").get().doubleValue(); + this.step = JSONUtils.getInteger(json, "step").get(); + this.gain = JSONUtils.getDouble(json, "infogain").get(); + this.progression = JSONUtils.getDouble(json, "progression").get(); } private static void checkMissingQuestion(@Nonnull Status status) { diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ServerListImpl.java b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ServerListImpl.java index c70fe8e..26703b8 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ServerListImpl.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ServerListImpl.java @@ -1,18 +1,12 @@ package com.markozajc.akiwrapper.core.entities.impl.immutable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Queue; +import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import java.util.stream.*; import javax.annotation.Nonnull; -import com.markozajc.akiwrapper.core.entities.Server; -import com.markozajc.akiwrapper.core.entities.ServerList; +import com.markozajc.akiwrapper.core.entities.*; public class ServerListImpl implements ServerList { diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/StatusImpl.java b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/StatusImpl.java index 390878c..731def1 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/StatusImpl.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/immutable/StatusImpl.java @@ -1,7 +1,6 @@ package com.markozajc.akiwrapper.core.entities.impl.immutable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import javax.annotation.*; import org.json.JSONObject; diff --git a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/mutable/MutableAkiwrapperMetadata.java b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/mutable/MutableAkiwrapperMetadata.java index 8476ff5..e286616 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/entities/impl/mutable/MutableAkiwrapperMetadata.java +++ b/src/main/java/com/markozajc/akiwrapper/core/entities/impl/mutable/MutableAkiwrapperMetadata.java @@ -1,15 +1,9 @@ package com.markozajc.akiwrapper.core.entities.impl.mutable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -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; -import com.markozajc.akiwrapper.core.entities.Server.GuessType; -import com.markozajc.akiwrapper.core.entities.Server.Language; -import com.markozajc.akiwrapper.core.entities.ServerList; +import javax.annotation.*; + +import com.markozajc.akiwrapper.core.entities.*; +import com.markozajc.akiwrapper.core.entities.Server.*; import com.markozajc.akiwrapper.core.entities.impl.immutable.ImmutableAkiwrapperMetadata; import com.markozajc.akiwrapper.core.utils.Servers; diff --git a/src/main/java/com/markozajc/akiwrapper/core/exceptions/MissingQuestionException.java b/src/main/java/com/markozajc/akiwrapper/core/exceptions/MissingQuestionException.java index 09cb5b5..1c5725a 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/exceptions/MissingQuestionException.java +++ b/src/main/java/com/markozajc/akiwrapper/core/exceptions/MissingQuestionException.java @@ -11,7 +11,6 @@ public class MissingQuestionException extends RuntimeException { * Constructs a new {@link MissingQuestionException} instance. */ public MissingQuestionException() { - super(); } } diff --git a/src/main/java/com/markozajc/akiwrapper/core/exceptions/ServerNotFoundException.java b/src/main/java/com/markozajc/akiwrapper/core/exceptions/ServerNotFoundException.java index 8f339a4..e5dcc41 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/exceptions/ServerNotFoundException.java +++ b/src/main/java/com/markozajc/akiwrapper/core/exceptions/ServerNotFoundException.java @@ -1,8 +1,7 @@ package com.markozajc.akiwrapper.core.exceptions; import com.markozajc.akiwrapper.core.entities.Server; -import com.markozajc.akiwrapper.core.entities.Server.GuessType; -import com.markozajc.akiwrapper.core.entities.Server.Language; +import com.markozajc.akiwrapper.core.entities.Server.*; /** * An exception indicating that no {@link Server} could be found for the given @@ -16,7 +15,6 @@ public class ServerNotFoundException extends Exception { * Constructs a new {@link ServerNotFoundException}. */ public ServerNotFoundException() { - super(); } } diff --git a/src/main/java/com/markozajc/akiwrapper/core/exceptions/ServerUnavailableException.java b/src/main/java/com/markozajc/akiwrapper/core/exceptions/ServerUnavailableException.java index 2eadabe..77a4855 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/exceptions/ServerUnavailableException.java +++ b/src/main/java/com/markozajc/akiwrapper/core/exceptions/ServerUnavailableException.java @@ -2,8 +2,7 @@ import javax.annotation.Nonnull; -import com.markozajc.akiwrapper.core.entities.Server; -import com.markozajc.akiwrapper.core.entities.Status; +import com.markozajc.akiwrapper.core.entities.*; import com.markozajc.akiwrapper.core.entities.impl.immutable.StatusImpl; /** diff --git a/src/main/java/com/markozajc/akiwrapper/core/utils/JSONUtils.java b/src/main/java/com/markozajc/akiwrapper/core/utils/JSONUtils.java index e2dbe27..f6f90e3 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/utils/JSONUtils.java +++ b/src/main/java/com/markozajc/akiwrapper/core/utils/JSONUtils.java @@ -4,8 +4,7 @@ import javax.annotation.Nonnull; -import org.json.JSONException; -import org.json.JSONObject; +import org.json.*; /** * A set of utilities for JSON that prevent type errors. @@ -31,7 +30,7 @@ public static Optional getInteger(@Nonnull JSONObject json, @Nonnull St Object object = json.get(key); Integer value; if (object instanceof Number) - value = Integer.valueOf(((Number) object).intValue()); + value = ((Number) object).intValue(); else if (object instanceof String) value = Integer.valueOf((String) object); else @@ -62,7 +61,7 @@ public static Optional getDouble(@Nonnull JSONObject json, @Nonnull Stri Object object = json.get(key); Double value; if (object instanceof Number) - value = Double.valueOf(((Number) object).doubleValue()); + value = ((Number) object).doubleValue(); else if (object instanceof String) value = Double.valueOf((String) object); else diff --git a/src/main/java/com/markozajc/akiwrapper/core/utils/Servers.java b/src/main/java/com/markozajc/akiwrapper/core/utils/Servers.java index 3aa0fc2..bc5b7ed 100644 --- a/src/main/java/com/markozajc/akiwrapper/core/utils/Servers.java +++ b/src/main/java/com/markozajc/akiwrapper/core/utils/Servers.java @@ -1,19 +1,15 @@ package com.markozajc.akiwrapper.core.utils; import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import java.util.stream.*; import javax.annotation.Nonnull; import com.jcabi.xml.XMLDocument; import com.markozajc.akiwrapper.core.Route; -import com.markozajc.akiwrapper.core.entities.Server; -import com.markozajc.akiwrapper.core.entities.Server.GuessType; -import com.markozajc.akiwrapper.core.entities.Server.Language; -import com.markozajc.akiwrapper.core.entities.ServerList; -import com.markozajc.akiwrapper.core.entities.impl.immutable.ServerImpl; -import com.markozajc.akiwrapper.core.entities.impl.immutable.ServerListImpl; +import com.markozajc.akiwrapper.core.entities.*; +import com.markozajc.akiwrapper.core.entities.Server.*; +import com.markozajc.akiwrapper.core.entities.impl.immutable.*; import com.markozajc.akiwrapper.core.exceptions.ServerNotFoundException; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; diff --git a/src/test/java/com/markozajc/akiwrapper/IntegrationTest.java b/src/test/java/com/markozajc/akiwrapper/IntegrationTest.java index 94dc3a5..39d6c32 100644 --- a/src/test/java/com/markozajc/akiwrapper/IntegrationTest.java +++ b/src/test/java/com/markozajc/akiwrapper/IntegrationTest.java @@ -3,26 +3,18 @@ import java.util.List; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import javax.annotation.*; import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.junit.jupiter.params.provider.*; +import org.slf4j.*; import com.markozajc.akiwrapper.Akiwrapper.Answer; -import com.markozajc.akiwrapper.core.entities.Guess; -import com.markozajc.akiwrapper.core.entities.Question; -import com.markozajc.akiwrapper.core.entities.Server.GuessType; -import com.markozajc.akiwrapper.core.entities.Server.Language; +import com.markozajc.akiwrapper.core.entities.*; +import com.markozajc.akiwrapper.core.entities.Server.*; import com.markozajc.akiwrapper.core.exceptions.ServerNotFoundException; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.*; class IntegrationTest { diff --git a/src/test/java/com/markozajc/akiwrapper/core/RouteTest.java b/src/test/java/com/markozajc/akiwrapper/core/RouteTest.java index 1b3b7b2..a38d0b6 100644 --- a/src/test/java/com/markozajc/akiwrapper/core/RouteTest.java +++ b/src/test/java/com/markozajc/akiwrapper/core/RouteTest.java @@ -3,11 +3,9 @@ import org.json.JSONObject; import org.junit.jupiter.api.Test; -import com.markozajc.akiwrapper.core.exceptions.ServerUnavailableException; -import com.markozajc.akiwrapper.core.exceptions.StatusException; +import com.markozajc.akiwrapper.core.exceptions.*; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.*; class RouteTest { diff --git a/src/test/java/com/markozajc/akiwrapper/core/entities/IdentifiableTest.java b/src/test/java/com/markozajc/akiwrapper/core/entities/IdentifiableTest.java index bbb987f..5626e9c 100644 --- a/src/test/java/com/markozajc/akiwrapper/core/entities/IdentifiableTest.java +++ b/src/test/java/com/markozajc/akiwrapper/core/entities/IdentifiableTest.java @@ -2,9 +2,7 @@ import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.*; class IdentifiableTest { diff --git a/src/test/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ServerListImplTest.java b/src/test/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ServerListImplTest.java index 4740187..0ab7731 100644 --- a/src/test/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ServerListImplTest.java +++ b/src/test/java/com/markozajc/akiwrapper/core/entities/impl/immutable/ServerListImplTest.java @@ -2,21 +2,14 @@ import static java.util.Arrays.asList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.*; import org.junit.jupiter.api.Test; -import com.markozajc.akiwrapper.core.entities.Server; -import com.markozajc.akiwrapper.core.entities.Server.GuessType; -import com.markozajc.akiwrapper.core.entities.Server.Language; -import com.markozajc.akiwrapper.core.entities.ServerList; +import com.markozajc.akiwrapper.core.entities.*; +import com.markozajc.akiwrapper.core.entities.Server.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; class ServerListImplTest { diff --git a/src/test/java/com/markozajc/akiwrapper/core/entities/impl/immutable/StatusImplTest.java b/src/test/java/com/markozajc/akiwrapper/core/entities/impl/immutable/StatusImplTest.java index 95d4b56..a7545e6 100644 --- a/src/test/java/com/markozajc/akiwrapper/core/entities/impl/immutable/StatusImplTest.java +++ b/src/test/java/com/markozajc/akiwrapper/core/entities/impl/immutable/StatusImplTest.java @@ -5,16 +5,13 @@ import javax.annotation.Nonnull; import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.EnumSource; +import org.junit.jupiter.params.provider.*; import org.junit.jupiter.params.provider.EnumSource.Mode; -import org.junit.jupiter.params.provider.MethodSource; import com.markozajc.akiwrapper.core.entities.Status; import com.markozajc.akiwrapper.core.entities.Status.Level; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.*; class StatusImplTest { diff --git a/src/test/java/com/markozajc/akiwrapper/core/utils/JSONUtilsTest.java b/src/test/java/com/markozajc/akiwrapper/core/utils/JSONUtilsTest.java index 4780f0c..ccf4535 100644 --- a/src/test/java/com/markozajc/akiwrapper/core/utils/JSONUtilsTest.java +++ b/src/test/java/com/markozajc/akiwrapper/core/utils/JSONUtilsTest.java @@ -3,9 +3,7 @@ import org.json.JSONObject; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.*; class JSONUtilsTest {