Skip to content

Commit d15884f

Browse files
markozajcmarkozajc
committed
Reformat the codebase
1 parent 1f31127 commit d15884f

26 files changed

+65
-145
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

‎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/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
/**

‎src/main/java/com/markozajc/akiwrapper/core/utils/JSONUtils.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
import javax.annotation.Nonnull;
66

7-
import org.json.JSONException;
8-
import org.json.JSONObject;
7+
import org.json.*;
98

109
/**
1110
* A set of utilities for JSON that prevent type errors.
@@ -31,7 +30,7 @@ public static Optional<Integer> getInteger(@Nonnull JSONObject json, @Nonnull St
3130
Object object = json.get(key);
3231
Integer value;
3332
if (object instanceof Number)
34-
value = Integer.valueOf(((Number) object).intValue());
33+
value = ((Number) object).intValue();
3534
else if (object instanceof String)
3635
value = Integer.valueOf((String) object);
3736
else
@@ -62,7 +61,7 @@ public static Optional<Double> getDouble(@Nonnull JSONObject json, @Nonnull Stri
6261
Object object = json.get(key);
6362
Double value;
6463
if (object instanceof Number)
65-
value = Double.valueOf(((Number) object).doubleValue());
64+
value = ((Number) object).doubleValue();
6665
else if (object instanceof String)
6766
value = Double.valueOf((String) object);
6867
else

‎src/main/java/com/markozajc/akiwrapper/core/utils/Servers.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
package com.markozajc.akiwrapper.core.utils;
22

33
import java.util.List;
4-
import java.util.stream.Collectors;
5-
import java.util.stream.Stream;
4+
import java.util.stream.*;
65

76
import javax.annotation.Nonnull;
87

98
import com.jcabi.xml.XMLDocument;
109
import com.markozajc.akiwrapper.core.Route;
11-
import com.markozajc.akiwrapper.core.entities.Server;
12-
import com.markozajc.akiwrapper.core.entities.Server.GuessType;
13-
import com.markozajc.akiwrapper.core.entities.Server.Language;
14-
import com.markozajc.akiwrapper.core.entities.ServerList;
15-
import com.markozajc.akiwrapper.core.entities.impl.immutable.ServerImpl;
16-
import com.markozajc.akiwrapper.core.entities.impl.immutable.ServerListImpl;
10+
import com.markozajc.akiwrapper.core.entities.*;
11+
import com.markozajc.akiwrapper.core.entities.Server.*;
12+
import com.markozajc.akiwrapper.core.entities.impl.immutable.*;
1713
import com.markozajc.akiwrapper.core.exceptions.ServerNotFoundException;
1814

1915
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

‎src/test/java/com/markozajc/akiwrapper/IntegrationTest.java

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,18 @@
33
import java.util.List;
44
import java.util.stream.Stream;
55

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

98
import org.junit.jupiter.params.ParameterizedTest;
10-
import org.junit.jupiter.params.provider.Arguments;
11-
import org.junit.jupiter.params.provider.MethodSource;
12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
9+
import org.junit.jupiter.params.provider.*;
10+
import org.slf4j.*;
1411

1512
import com.markozajc.akiwrapper.Akiwrapper.Answer;
16-
import com.markozajc.akiwrapper.core.entities.Guess;
17-
import com.markozajc.akiwrapper.core.entities.Question;
18-
import com.markozajc.akiwrapper.core.entities.Server.GuessType;
19-
import com.markozajc.akiwrapper.core.entities.Server.Language;
13+
import com.markozajc.akiwrapper.core.entities.*;
14+
import com.markozajc.akiwrapper.core.entities.Server.*;
2015
import com.markozajc.akiwrapper.core.exceptions.ServerNotFoundException;
2116

22-
import static org.junit.jupiter.api.Assertions.assertEquals;
23-
import static org.junit.jupiter.api.Assertions.assertFalse;
24-
import static org.junit.jupiter.api.Assertions.assertNull;
25-
import static org.junit.jupiter.api.Assertions.fail;
17+
import static org.junit.jupiter.api.Assertions.*;
2618

2719
class IntegrationTest {
2820

‎src/test/java/com/markozajc/akiwrapper/core/RouteTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
import org.json.JSONObject;
44
import org.junit.jupiter.api.Test;
55

6-
import com.markozajc.akiwrapper.core.exceptions.ServerUnavailableException;
7-
import com.markozajc.akiwrapper.core.exceptions.StatusException;
6+
import com.markozajc.akiwrapper.core.exceptions.*;
87

9-
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
10-
import static org.junit.jupiter.api.Assertions.assertThrows;
8+
import static org.junit.jupiter.api.Assertions.*;
119

1210
class RouteTest {
1311

0 commit comments

Comments
 (0)