Repository: metron Updated Branches: refs/heads/master c642a9558 -> f9710ebee
METRON-1190 Fix Meta Alert Type handling in calculation of scores (justinleet) closes apache/metron#763 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/f9710ebe Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/f9710ebe Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/f9710ebe Branch: refs/heads/master Commit: f9710ebeedbc9fb703a0d466fd1fef5261ab6c31 Parents: c642a95 Author: justinleet <justinjl...@gmail.com> Authored: Fri Sep 15 15:57:06 2017 -0400 Committer: leet <l...@apache.org> Committed: Fri Sep 15 15:57:06 2017 -0400 ---------------------------------------------------------------------- .../dao/ElasticsearchMetaAlertDao.java | 6 ++--- .../dao/ElasticsearchMetaAlertDaoTest.java | 27 ++++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/f9710ebe/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java index cd6ed75..2fb9686 100644 --- a/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java +++ b/metron-platform/metron-elasticsearch/src/main/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDao.java @@ -275,13 +275,13 @@ public class ElasticsearchMetaAlertDao implements MetaAlertDao { alertList.add(response.getSource()); } } - metaSource.put(ALERT_FIELD, alertList.toArray()); + metaSource.put(ALERT_FIELD, alertList); - // Add any meta fields and score calculation. + // Add any meta fields String guid = UUID.randomUUID().toString(); metaSource.put(Constants.GUID, guid); metaSource.put(Constants.Fields.TIMESTAMP.getName(), System.currentTimeMillis()); - metaSource.put(GROUPS_FIELD, groups.toArray()); + metaSource.put(GROUPS_FIELD, groups); metaSource.put(STATUS_FIELD, MetaAlertStatus.ACTIVE.getStatusString()); return new Document(metaSource, guid, METAALERT_TYPE, System.currentTimeMillis()); http://git-wip-us.apache.org/repos/asf/metron/blob/f9710ebe/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDaoTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDaoTest.java b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDaoTest.java index 02ea795..74e1275 100644 --- a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDaoTest.java +++ b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/dao/ElasticsearchMetaAlertDaoTest.java @@ -18,7 +18,6 @@ package org.apache.metron.elasticsearch.dao; -import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; @@ -307,13 +306,13 @@ public class ElasticsearchMetaAlertDaoTest { MetaAlertStatus.ACTIVE.getStatusString(), actualDocument.get(MetaAlertDao.STATUS_FIELD) ); - assertArrayEquals( - alertList.toArray(), - (Object[]) actualDocument.get(MetaAlertDao.ALERT_FIELD) + assertEquals( + alertList, + actualDocument.get(MetaAlertDao.ALERT_FIELD) ); - assertArrayEquals( - groups.toArray(), - (Object[]) actualDocument.get(MetaAlertDao.GROUPS_FIELD) + assertEquals( + groups, + actualDocument.get(MetaAlertDao.GROUPS_FIELD) ); // Don't care about the result, just that it's a UUID. Exception will be thrown if not. @@ -369,13 +368,13 @@ public class ElasticsearchMetaAlertDaoTest { Map<String, Object> actualDocument = actual.getDocument(); assertNotNull(actualDocument.get(Fields.TIMESTAMP.getName())); - assertArrayEquals( - alertList.toArray(), - (Object[]) actualDocument.get(MetaAlertDao.ALERT_FIELD) + assertEquals( + alertList, + actualDocument.get(MetaAlertDao.ALERT_FIELD) ); - assertArrayEquals( - groups.toArray(), - (Object[]) actualDocument.get(MetaAlertDao.GROUPS_FIELD) + assertEquals( + groups, + actualDocument.get(MetaAlertDao.GROUPS_FIELD) ); // Don't care about the result, just that it's a UUID. Exception will be thrown if not. @@ -406,7 +405,7 @@ public class ElasticsearchMetaAlertDaoTest { } @Test - public void testCalculateMetaScores() { + public void testCalculateMetaScoresList() { List<Map<String, Object>> alertList = new ArrayList<>(); Map<String, Object> alertMap = new HashMap<>(); alertMap.put(MetaAlertDao.THREAT_FIELD_DEFAULT, 10.0d);