Repository: incubator-unomi Updated Branches: refs/heads/master a4a644403 -> 70fe6640c
UNOMI-177 update population variable type to Long instead of Integer The max value holding by this types: * Integer: 2^31-1 ~= 2147483647 * Long: 2^63-1 ~= 9223372036854775807 So we must use the Long class type to wrap the value of population Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/70fe6640 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/70fe6640 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/70fe6640 Branch: refs/heads/master Commit: 70fe6640c401dfdadef8d9e42469fd63617e9223 Parents: a4a6444 Author: Taybou <[email protected]> Authored: Mon Apr 23 14:22:15 2018 +0200 Committer: Taybou <[email protected]> Committed: Mon Apr 23 14:22:15 2018 +0200 ---------------------------------------------------------------------- .../org/apache/unomi/geonames/services/GeonameEntry.java | 8 ++++---- .../apache/unomi/geonames/services/GeonamesServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/70fe6640/extensions/geonames/services/src/main/java/org/apache/unomi/geonames/services/GeonameEntry.java ---------------------------------------------------------------------- diff --git a/extensions/geonames/services/src/main/java/org/apache/unomi/geonames/services/GeonameEntry.java b/extensions/geonames/services/src/main/java/org/apache/unomi/geonames/services/GeonameEntry.java index ac41a6e..36f4f0b 100644 --- a/extensions/geonames/services/src/main/java/org/apache/unomi/geonames/services/GeonameEntry.java +++ b/extensions/geonames/services/src/main/java/org/apache/unomi/geonames/services/GeonameEntry.java @@ -42,7 +42,7 @@ public class GeonameEntry extends Item { protected String admin2Code; protected String admin3Code; protected String admin4Code; - protected Integer population; + protected Long population; protected Integer elevation; protected String dem; protected String timezone; @@ -51,7 +51,7 @@ public class GeonameEntry extends Item { public GeonameEntry() { } - public GeonameEntry(String geonameId, String name, String asciiname, Double lat, Double lon, String featureClass, String featureCode, String countryCode, List<String> cc2, String admin1Code, String admin2Code, String admin3Code, String admin4Code, Integer population, Integer elevation, String dem, String timezone, Date modificationDate) { + public GeonameEntry(String geonameId, String name, String asciiname, Double lat, Double lon, String featureClass, String featureCode, String countryCode, List<String> cc2, String admin1Code, String admin2Code, String admin3Code, String admin4Code, Long population, Integer elevation, String dem, String timezone, Date modificationDate) { super(geonameId); this.name = name; this.asciiname = asciiname; @@ -170,11 +170,11 @@ public class GeonameEntry extends Item { this.admin4Code = admin4Code; } - public Integer getPopulation() { + public Long getPopulation() { return population; } - public void setPopulation(Integer population) { + public void setPopulation(Long population) { this.population = population; } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/70fe6640/extensions/geonames/services/src/main/java/org/apache/unomi/geonames/services/GeonamesServiceImpl.java ---------------------------------------------------------------------- diff --git a/extensions/geonames/services/src/main/java/org/apache/unomi/geonames/services/GeonamesServiceImpl.java b/extensions/geonames/services/src/main/java/org/apache/unomi/geonames/services/GeonamesServiceImpl.java index 9bce9b2..8817836 100644 --- a/extensions/geonames/services/src/main/java/org/apache/unomi/geonames/services/GeonamesServiceImpl.java +++ b/extensions/geonames/services/src/main/java/org/apache/unomi/geonames/services/GeonamesServiceImpl.java @@ -134,7 +134,7 @@ public class GeonamesServiceImpl implements GeonamesService { values[6], values[7], values[8], Arrays.asList(values[9].split(",")), values[10], values[11], values[12], values[13], - StringUtils.isEmpty(values[14]) ? null : Integer.parseInt(values[14]), + StringUtils.isEmpty(values[14]) ? null : Long.parseLong(values[14]), StringUtils.isEmpty(values[15]) ? null : Integer.parseInt(values[15]), values[16], values[17], sdf.parse(values[18]));
