You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by le...@apache.org on 2017/02/03 16:09:16 UTC
incubator-metron git commit: METRON-680 GeoLiteDatabase incorrectly
using country geoname_id instead of city (justinleet) closes
apache/incubator-metron#433
Repository: incubator-metron
Updated Branches:
refs/heads/master 8340c0e25 -> ddca4d829
METRON-680 GeoLiteDatabase incorrectly using country geoname_id instead of city (justinleet) closes apache/incubator-metron#433
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/ddca4d82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/ddca4d82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/ddca4d82
Branch: refs/heads/master
Commit: ddca4d82947aceef19ed7c2de7cd0e49475774c9
Parents: 8340c0e
Author: justinleet <ju...@gmail.com>
Authored: Fri Feb 3 11:07:34 2017 -0500
Committer: leet <le...@apache.org>
Committed: Fri Feb 3 11:07:34 2017 -0500
----------------------------------------------------------------------
.../metron/enrichment/adapters/geo/GeoLiteDatabase.java | 2 +-
.../metron/enrichment/adapters/geo/GeoAdapterTest.java | 2 +-
.../metron/enrichment/adapters/geo/GeoLiteDatabaseTest.java | 4 ++--
.../enrichment/stellar/GeoEnrichmentFunctionsTest.java | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/ddca4d82/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/geo/GeoLiteDatabase.java
----------------------------------------------------------------------
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 aa4731b..d40d980 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 enum GeoLiteDatabase {
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()));
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/ddca4d82/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoAdapterTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoAdapterTest.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoAdapterTest.java
index f91939d..8d2a7ec 100644
--- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoAdapterTest.java
+++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoAdapterTest.java
@@ -36,7 +36,7 @@ public class GeoAdapterTest {
/**
* {
- * "locID":"6252001",
+ * "locID":"5803556",
* "country":"US",
* "city":"Milton",
* "postalCode":"98354",
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/ddca4d82/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoLiteDatabaseTest.java
----------------------------------------------------------------------
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 cc891c6..238f8e0 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":"",
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/ddca4d82/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/stellar/GeoEnrichmentFunctionsTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/stellar/GeoEnrichmentFunctionsTest.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/stellar/GeoEnrichmentFunctionsTest.java
index c87449d..e8f8f71 100644
--- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/stellar/GeoEnrichmentFunctionsTest.java
+++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/stellar/GeoEnrichmentFunctionsTest.java
@@ -43,7 +43,7 @@ public class GeoEnrichmentFunctionsTest {
/**
* {
- * "locID":"6252001",
+ * "locID":"5803556",
* "country":"US",
* "city":"Milton",
* "postalCode":"98354",
@@ -122,7 +122,7 @@ public class GeoEnrichmentFunctionsTest {
public void testGetRemote() throws Exception {
String stellar = "GEO_GET('216.160.83.56')";
Object result = run(stellar, ImmutableMap.of());
- Assert.assertEquals("Remote Local IP should return result based on DB", expectedMessage, result);
+ Assert.assertEquals("Remote IP should return result based on DB", expectedMessage, result);
}
@Test
@@ -130,7 +130,7 @@ public class GeoEnrichmentFunctionsTest {
public void testGetRemoteSingleField() throws Exception {
String stellar = "GEO_GET('216.160.83.56', ['country'])";
Object result = run(stellar, ImmutableMap.of());
- Assert.assertEquals("Remote Local IP should return country result based on DB", "US", result);
+ Assert.assertEquals("Remote IP should return country result based on DB", "US", result);
}
@Test
@@ -138,7 +138,7 @@ public class GeoEnrichmentFunctionsTest {
public void testGetRemoteMultipleFields() throws Exception {
String stellar = "GEO_GET('216.160.83.56', ['country', 'city', 'dmaCode', 'location_point'])";
Object result = run(stellar, ImmutableMap.of());
- Assert.assertEquals("Remote Local IP should return country result based on DB", expectedSubsetMessage, result);
+ Assert.assertEquals("Remote IP should return country result based on DB", expectedSubsetMessage, result);
}
@Test(expected=org.apache.metron.common.dsl.ParseException.class)