From 8cd13f44d9c23c6355f21f46284a42ddf55885f9 Mon Sep 17 00:00:00 2001 From: justinjleet Date: Tue, 31 Jan 2017 22:07:31 -0500 Subject: [PATCH] METRON-680: GeoLiteDatabase incorrectly using country geoname_id instead of city --- .../metron/enrichment/adapters/geo/GeoLiteDatabase.java | 2 +- .../metron/enrichment/adapters/geo/GeoLiteDatabaseTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/geo/GeoLiteDatabase.java b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/geo/GeoLiteDatabase.java index aa4731bbd5..d40d980c73 100644 --- a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/geo/GeoLiteDatabase.java +++ b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/geo/GeoLiteDatabase.java @@ -141,7 +141,7 @@ public Optional> get(String ip) { Postal postal = cityResponse.getPostal(); Location location = cityResponse.getLocation(); - geoInfo.put("locID", convertNullToEmptyString(country.getGeoNameId())); + geoInfo.put("locID", convertNullToEmptyString(city.getGeoNameId())); geoInfo.put("country", convertNullToEmptyString(country.getIsoCode())); geoInfo.put("city", convertNullToEmptyString(city.getName())); geoInfo.put("postalCode", convertNullToEmptyString(postal.getCode())); diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoLiteDatabaseTest.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoLiteDatabaseTest.java index cc891c6431..238f8e011b 100644 --- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoLiteDatabaseTest.java +++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoLiteDatabaseTest.java @@ -43,7 +43,7 @@ public class GeoLiteDatabaseTest { /** * { - * "locID":"6252001", + * "locID":"5803556", * "country":"US", * "city":"Milton", * "postalCode":"98354", @@ -60,7 +60,7 @@ public class GeoLiteDatabaseTest { /** * { - * "locID":"2635167", + * "locID":"2643743", * "country":"GB", * "city":"London", * "postalCode":"",