From ce59abd3d104ce59966417d77d557aa6eb7eaa29 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Thu, 15 Sep 2016 15:32:20 -0700 Subject: [PATCH] Minor code cleanup --- src/main/java/com/maxmind/geoip2/WebServiceClient.java | 2 +- .../java/com/maxmind/geoip2/model/AbstractCityResponse.java | 2 +- .../java/com/maxmind/geoip2/record/AbstractNamedRecord.java | 2 +- src/main/java/com/maxmind/geoip2/record/Postal.java | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/maxmind/geoip2/WebServiceClient.java b/src/main/java/com/maxmind/geoip2/WebServiceClient.java index b040fb33..3d24d093 100644 --- a/src/main/java/com/maxmind/geoip2/WebServiceClient.java +++ b/src/main/java/com/maxmind/geoip2/WebServiceClient.java @@ -432,10 +432,10 @@ private String userAgent() { + " (Java/" + System.getProperty("java.version") + ")"; } - @Override /** * Close any open connections and return resources to the system. */ + @Override public void close() throws IOException { httpClient.close(); } diff --git a/src/main/java/com/maxmind/geoip2/model/AbstractCityResponse.java b/src/main/java/com/maxmind/geoip2/model/AbstractCityResponse.java index 8dd8279e..17d18b6a 100644 --- a/src/main/java/com/maxmind/geoip2/model/AbstractCityResponse.java +++ b/src/main/java/com/maxmind/geoip2/model/AbstractCityResponse.java @@ -67,7 +67,7 @@ public Postal getPostal() { * returns an empty array. */ public List getSubdivisions() { - return new ArrayList(this.subdivisions); + return new ArrayList<>(this.subdivisions); } /** diff --git a/src/main/java/com/maxmind/geoip2/record/AbstractNamedRecord.java b/src/main/java/com/maxmind/geoip2/record/AbstractNamedRecord.java index c64c9af2..24cc9a7e 100644 --- a/src/main/java/com/maxmind/geoip2/record/AbstractNamedRecord.java +++ b/src/main/java/com/maxmind/geoip2/record/AbstractNamedRecord.java @@ -57,6 +57,6 @@ public String getName() { */ @JsonProperty("names") public Map getNames() { - return new HashMap(this.names); + return new HashMap<>(this.names); } } diff --git a/src/main/java/com/maxmind/geoip2/record/Postal.java b/src/main/java/com/maxmind/geoip2/record/Postal.java index 19e4df80..577c30b5 100644 --- a/src/main/java/com/maxmind/geoip2/record/Postal.java +++ b/src/main/java/com/maxmind/geoip2/record/Postal.java @@ -1,6 +1,3 @@ -/** - * - */ package com.maxmind.geoip2.record; import com.fasterxml.jackson.annotation.JsonProperty;