From fde7d50edce35d06a4faaa4c3230455811a34cb4 Mon Sep 17 00:00:00 2001 From: Colin McDonald Date: Sat, 25 Jun 2016 18:41:44 -0400 Subject: [PATCH] Make some changes to make IntelliJ's code inspection happier --- src/main/java/net/frozenorb/apiv3/APIv3.java | 2 +- .../net/frozenorb/apiv3/maxmind/MaxMindUserType.java | 2 +- src/main/java/net/frozenorb/apiv3/model/BannedAsn.java | 5 +---- src/main/java/net/frozenorb/apiv3/model/Rank.java | 5 +---- src/main/java/net/frozenorb/apiv3/model/Server.java | 5 +---- src/main/java/net/frozenorb/apiv3/model/ServerGroup.java | 5 +---- .../net/frozenorb/apiv3/route/auditLog/GETAuditLog.java | 2 +- .../net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java | 2 +- .../java/net/frozenorb/apiv3/route/grants/GETGrants.java | 2 +- .../java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java | 2 +- .../apiv3/route/punishments/GETPunishments.java | 2 +- .../apiv3/route/servers/POSTServersHeartbeat.java | 6 +----- .../serialization/jackson/InstantJsonDeserializer.java | 2 +- .../serialization/jackson/InstantJsonSerializer.java | 2 +- .../serialization/jackson/UuidJsonDeserializer.java | 2 +- .../apiv3/serialization/jackson/UuidJsonSerializer.java | 2 +- .../frozenorb/apiv3/serialization/mongodb/UuidCodec.java | 2 +- .../apiv3/unsorted/TotpAuthorizationResult.java | 2 +- .../java/net/frozenorb/apiv3/util/MandrillUtils.java | 9 ++------- src/main/java/net/frozenorb/apiv3/util/MaxMindUtils.java | 4 +--- src/main/java/net/frozenorb/apiv3/util/MojangUtils.java | 4 +--- src/main/java/net/frozenorb/apiv3/util/ZangUtils.java | 4 +--- 22 files changed, 23 insertions(+), 50 deletions(-) diff --git a/src/main/java/net/frozenorb/apiv3/APIv3.java b/src/main/java/net/frozenorb/apiv3/APIv3.java index 7aee78f..e2ab60c 100644 --- a/src/main/java/net/frozenorb/apiv3/APIv3.java +++ b/src/main/java/net/frozenorb/apiv3/APIv3.java @@ -99,7 +99,7 @@ public final class APIv3 extends AbstractVerticle { @Getter private static Vertx vertxInstance; @Getter private static MongoDatabase database; - @Getter private static Properties config = new Properties(); + @Getter private static final Properties config = new Properties(); private static final Gson gson = new GsonBuilder() .registerTypeAdapter(Instant.class, new InstantTypeAdapter()) .setExclusionStrategies(new FollowAnnotationExclusionStrategy()) diff --git a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindUserType.java b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindUserType.java index 92f9770..d1706f9 100644 --- a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindUserType.java +++ b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindUserType.java @@ -21,7 +21,7 @@ public enum MaxMindUserType { TRAVELER(true), UNKNOWN(true); - @Getter private boolean allowed; + @Getter private final boolean allowed; MaxMindUserType(boolean allowed) { this.allowed = allowed; diff --git a/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java b/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java index 2a4a4ba..7353d1b 100644 --- a/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java +++ b/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java @@ -43,10 +43,7 @@ public final class BannedAsn { static { updateCache(); - - APIv3.getVertxInstance().setPeriodic(TimeUnit.MINUTES.toMillis(1), (id) -> { - updateCache(); - }); + APIv3.getVertxInstance().setPeriodic(TimeUnit.MINUTES.toMillis(1), (id) -> updateCache()); } private static void updateCache() { diff --git a/src/main/java/net/frozenorb/apiv3/model/Rank.java b/src/main/java/net/frozenorb/apiv3/model/Rank.java index 3aef1da..3ca4bb0 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Rank.java +++ b/src/main/java/net/frozenorb/apiv3/model/Rank.java @@ -43,10 +43,7 @@ public final class Rank { static { updateCache(); - - APIv3.getVertxInstance().setPeriodic(TimeUnit.MINUTES.toMillis(1), (id) -> { - updateCache(); - }); + APIv3.getVertxInstance().setPeriodic(TimeUnit.MINUTES.toMillis(1), (id) -> updateCache()); } private static void updateCache() { diff --git a/src/main/java/net/frozenorb/apiv3/model/Server.java b/src/main/java/net/frozenorb/apiv3/model/Server.java index b7cca91..a189655 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Server.java +++ b/src/main/java/net/frozenorb/apiv3/model/Server.java @@ -45,10 +45,7 @@ public final class Server { static { updateCache(); - - APIv3.getVertxInstance().setPeriodic(TimeUnit.MINUTES.toMillis(1), (id) -> { - updateCache(); - }); + APIv3.getVertxInstance().setPeriodic(TimeUnit.MINUTES.toMillis(1), (id) -> updateCache()); } private static void updateCache() { diff --git a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java b/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java index b808085..61547f5 100644 --- a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java +++ b/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java @@ -41,10 +41,7 @@ public final class ServerGroup { static { updateCache(); - - APIv3.getVertxInstance().setPeriodic(TimeUnit.MINUTES.toMillis(1), (id) -> { - updateCache(); - }); + APIv3.getVertxInstance().setPeriodic(TimeUnit.MINUTES.toMillis(1), (id) -> updateCache()); } private static void updateCache() { diff --git a/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java b/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java index 5f88d6f..dee547b 100644 --- a/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java +++ b/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java @@ -22,7 +22,7 @@ public final class GETAuditLog implements Handler { APIv3.respondJson(ctx, auditLog); } }); - } catch (NumberFormatException ex) { + } catch (NumberFormatException ignored) { ErrorUtils.respondInvalidInput(ctx, "skip and pageSize must be numerical inputs."); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java b/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java index d5dcc57..97d9960 100644 --- a/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java +++ b/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java @@ -32,7 +32,7 @@ public final class POSTAuditLog implements Handler { try { type = AuditLogActionType.valueOf(requestBody.getString("type")); - } catch (IllegalArgumentException ex) { + } catch (IllegalArgumentException ignored) { ErrorUtils.respondNotFound(ctx, "Audit log action type", requestBody.getString("type")); return; } diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java b/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java index f97813a..0b20542 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java +++ b/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java @@ -21,7 +21,7 @@ public final class GETGrants implements Handler { APIv3.respondJson(ctx, grants); } }); - } catch (NumberFormatException ex) { + } catch (NumberFormatException ignored) { ErrorUtils.respondInvalidInput(ctx, "skip and pageSize must be numerical inputs."); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java b/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java index a92ee28..375d8cd 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java @@ -21,7 +21,7 @@ public final class GETIpBans implements Handler { APIv3.respondJson(ctx, grants); } }); - } catch (NumberFormatException ex) { + } catch (NumberFormatException ignored) { ErrorUtils.respondInvalidInput(ctx, "skip and pageSize must be numerical inputs."); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishments.java b/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishments.java index c634378..2b09f3a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishments.java +++ b/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishments.java @@ -21,7 +21,7 @@ public final class GETPunishments implements Handler { APIv3.respondJson(ctx, grants); } }); - } catch (NumberFormatException ex) { + } catch (NumberFormatException ignored) { ErrorUtils.respondInvalidInput(ctx, "skip and pageSize must be numerical inputs."); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java index 5269943..575f29c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java +++ b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java @@ -114,11 +114,7 @@ public final class POSTServersHeartbeat implements Handler { } Map response = new HashMap<>(); - - loginInfoFutures.forEach((uuid, loginInfo) -> { - response.put(uuid.toString(), loginInfo.result()); - }); - + loginInfoFutures.forEach((uuid, loginInfo) -> response.put(uuid.toString(), loginInfo.result())); callback.complete(response); }); }); diff --git a/src/main/java/net/frozenorb/apiv3/serialization/jackson/InstantJsonDeserializer.java b/src/main/java/net/frozenorb/apiv3/serialization/jackson/InstantJsonDeserializer.java index ac464b3..0c846bb 100644 --- a/src/main/java/net/frozenorb/apiv3/serialization/jackson/InstantJsonDeserializer.java +++ b/src/main/java/net/frozenorb/apiv3/serialization/jackson/InstantJsonDeserializer.java @@ -11,7 +11,7 @@ import java.time.Instant; public final class InstantJsonDeserializer extends JsonDeserializer { @Override - public Instant deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException { + public Instant deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException { return Instant.ofEpochMilli(jsonParser.getValueAsLong()); } diff --git a/src/main/java/net/frozenorb/apiv3/serialization/jackson/InstantJsonSerializer.java b/src/main/java/net/frozenorb/apiv3/serialization/jackson/InstantJsonSerializer.java index 2af3601..fecde1c 100644 --- a/src/main/java/net/frozenorb/apiv3/serialization/jackson/InstantJsonSerializer.java +++ b/src/main/java/net/frozenorb/apiv3/serialization/jackson/InstantJsonSerializer.java @@ -11,7 +11,7 @@ import java.time.Instant; public final class InstantJsonSerializer extends JsonSerializer { @Override - public void serialize(Instant instant, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException { + public void serialize(Instant instant, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { jsonGenerator.writeNumber(instant.toEpochMilli()); } diff --git a/src/main/java/net/frozenorb/apiv3/serialization/jackson/UuidJsonDeserializer.java b/src/main/java/net/frozenorb/apiv3/serialization/jackson/UuidJsonDeserializer.java index f086f8f..4dc4a23 100644 --- a/src/main/java/net/frozenorb/apiv3/serialization/jackson/UuidJsonDeserializer.java +++ b/src/main/java/net/frozenorb/apiv3/serialization/jackson/UuidJsonDeserializer.java @@ -11,7 +11,7 @@ import java.util.UUID; public final class UuidJsonDeserializer extends JsonDeserializer { @Override - public UUID deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException { + public UUID deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException { return UUID.fromString(jsonParser.getValueAsString()); } diff --git a/src/main/java/net/frozenorb/apiv3/serialization/jackson/UuidJsonSerializer.java b/src/main/java/net/frozenorb/apiv3/serialization/jackson/UuidJsonSerializer.java index 6818f95..b3f71da 100644 --- a/src/main/java/net/frozenorb/apiv3/serialization/jackson/UuidJsonSerializer.java +++ b/src/main/java/net/frozenorb/apiv3/serialization/jackson/UuidJsonSerializer.java @@ -11,7 +11,7 @@ import java.util.UUID; public final class UuidJsonSerializer extends JsonSerializer { @Override - public void serialize(UUID uuid, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException { + public void serialize(UUID uuid, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { jsonGenerator.writeString(uuid.toString()); } diff --git a/src/main/java/net/frozenorb/apiv3/serialization/mongodb/UuidCodec.java b/src/main/java/net/frozenorb/apiv3/serialization/mongodb/UuidCodec.java index 2c3d949..4622cf9 100644 --- a/src/main/java/net/frozenorb/apiv3/serialization/mongodb/UuidCodec.java +++ b/src/main/java/net/frozenorb/apiv3/serialization/mongodb/UuidCodec.java @@ -8,7 +8,7 @@ import org.bson.codecs.EncoderContext; import java.util.UUID; -public final class UuidCodec implements Codec { +final class UuidCodec implements Codec { @Override public UUID decode(BsonReader bsonReader, DecoderContext decoderContext) { diff --git a/src/main/java/net/frozenorb/apiv3/unsorted/TotpAuthorizationResult.java b/src/main/java/net/frozenorb/apiv3/unsorted/TotpAuthorizationResult.java index 8feffde..6f0a99f 100644 --- a/src/main/java/net/frozenorb/apiv3/unsorted/TotpAuthorizationResult.java +++ b/src/main/java/net/frozenorb/apiv3/unsorted/TotpAuthorizationResult.java @@ -10,7 +10,7 @@ public enum TotpAuthorizationResult { NOT_AUTHORIZED_RECENTLY_USED(false), NOT_AUTHORIZED_BAD_CODE(false); - @Getter private boolean authorized; + @Getter private final boolean authorized; TotpAuthorizationResult(boolean authorized) { this.authorized = authorized; diff --git a/src/main/java/net/frozenorb/apiv3/util/MandrillUtils.java b/src/main/java/net/frozenorb/apiv3/util/MandrillUtils.java index 940ceb2..aa0bb86 100644 --- a/src/main/java/net/frozenorb/apiv3/util/MandrillUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/MandrillUtils.java @@ -20,13 +20,8 @@ public class MandrillUtils { .put("message", message); httpClient.post("mandrillapp.com", "/api/1.0/messages/send.json", (response) -> { - response.bodyHandler((resultBody) -> { - callback.onResult(null, null); - }); - - response.exceptionHandler((error) -> { - callback.onResult(null, error); - }); + response.bodyHandler((ignored) -> callback.onResult(null, null)); + response.exceptionHandler((error) -> callback.onResult(null, error)); }) .putHeader(HttpHeaders.CONTENT_TYPE, MediaType.JSON_UTF_8.toString()) .end(body.encode()); diff --git a/src/main/java/net/frozenorb/apiv3/util/MaxMindUtils.java b/src/main/java/net/frozenorb/apiv3/util/MaxMindUtils.java index c814644..6e17137 100644 --- a/src/main/java/net/frozenorb/apiv3/util/MaxMindUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/MaxMindUtils.java @@ -27,9 +27,7 @@ public class MaxMindUtils { callback.onResult(new MaxMindResult(bodyJson), null); }); - response.exceptionHandler((error) -> { - callback.onResult(null, error); - }); + response.exceptionHandler((error) -> callback.onResult(null, error)); }) .putHeader("Authorization", authHeader) .end(); diff --git a/src/main/java/net/frozenorb/apiv3/util/MojangUtils.java b/src/main/java/net/frozenorb/apiv3/util/MojangUtils.java index 040360a..57d5b39 100644 --- a/src/main/java/net/frozenorb/apiv3/util/MojangUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/MojangUtils.java @@ -33,9 +33,7 @@ public class MojangUtils { } }); - response.exceptionHandler((error) -> { - callback.onResult(null, error); - }); + response.exceptionHandler((error) -> callback.onResult(null, error)); }).end(); } diff --git a/src/main/java/net/frozenorb/apiv3/util/ZangUtils.java b/src/main/java/net/frozenorb/apiv3/util/ZangUtils.java index 93186c3..957132c 100644 --- a/src/main/java/net/frozenorb/apiv3/util/ZangUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/ZangUtils.java @@ -37,9 +37,7 @@ public class ZangUtils { } }); - response.exceptionHandler((error) -> { - callback.onResult(null, error); - }); + response.exceptionHandler((error) -> callback.onResult(null, error)); }) .putHeader("Authorization", authHeader) .putHeader(HttpHeaders.CONTENT_TYPE, MediaType.JSON_UTF_8.toString())