http://git-wip-us.apache.org/repos/asf/metron/blob/e7e19fbb/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchSearchIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchSearchIntegrationTest.java b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchSearchIntegrationTest.java index 8071e68..61dd0f6 100644 --- a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchSearchIntegrationTest.java +++ b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchSearchIntegrationTest.java @@ -39,6 +39,7 @@ import org.apache.metron.indexing.dao.search.SearchRequest; import org.apache.metron.indexing.dao.search.SearchResponse; import org.apache.metron.indexing.dao.search.SearchResult; import org.apache.metron.integration.InMemoryComponent; +import org.apache.metron.integration.utils.TestUtils; import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexRequestBuilder; @@ -200,7 +201,7 @@ public class ElasticsearchSearchIntegrationTest extends SearchIntegrationTest { config.setGlobalConfigSupplier( () -> new HashMap<String, Object>() {{ put("es.clustername", "metron"); - put("es.port", "9300"); + put("es.port", "9200"); put("es.ip", "localhost"); put("es.date.format", dateFormat); }} @@ -272,8 +273,10 @@ public class ElasticsearchSearchIntegrationTest extends SearchIntegrationTest { public void returns_column_metadata_for_specified_indices() throws Exception { // getColumnMetadata with only bro { + //TODO: It shouldn't require an assertEventually() here as it should be synchronous. + // Before merging, please figure out why. + TestUtils.assertEventually(() -> Assert.assertEquals(13, dao.getColumnMetadata(Collections.singletonList("bro")).size())); Map<String, FieldType> fieldTypes = dao.getColumnMetadata(Collections.singletonList("bro")); - Assert.assertEquals(13, fieldTypes.size()); Assert.assertEquals(FieldType.TEXT, fieldTypes.get("bro_field")); Assert.assertEquals(FieldType.TEXT, fieldTypes.get("ttl")); Assert.assertEquals(FieldType.KEYWORD, fieldTypes.get("guid")); @@ -292,8 +295,10 @@ public class ElasticsearchSearchIntegrationTest extends SearchIntegrationTest { } // getColumnMetadata with only snort { + //TODO: It shouldn't require an assertEventually() here as it should be synchronous. + // Before merging, please figure out why. + TestUtils.assertEventually(() -> Assert.assertEquals(14, dao.getColumnMetadata(Collections.singletonList("snort")).size())); Map<String, FieldType> fieldTypes = dao.getColumnMetadata(Collections.singletonList("snort")); - Assert.assertEquals(14, fieldTypes.size()); Assert.assertEquals(FieldType.INTEGER, fieldTypes.get("snort_field")); Assert.assertEquals(FieldType.INTEGER, fieldTypes.get("ttl")); Assert.assertEquals(FieldType.KEYWORD, fieldTypes.get("guid")); @@ -313,8 +318,10 @@ public class ElasticsearchSearchIntegrationTest extends SearchIntegrationTest { @Override public void returns_column_data_for_multiple_indices() throws Exception { + //TODO: It shouldn't require an assertEventually() here as it should be synchronous. + // Before merging, please figure out why. + TestUtils.assertEventually(() -> Assert.assertEquals(15, dao.getColumnMetadata(Arrays.asList("bro", "snort")).size())); Map<String, FieldType> fieldTypes = dao.getColumnMetadata(Arrays.asList("bro", "snort")); - Assert.assertEquals(15, fieldTypes.size()); Assert.assertEquals(FieldType.KEYWORD, fieldTypes.get("guid")); Assert.assertEquals(FieldType.TEXT, fieldTypes.get("source:type")); Assert.assertEquals(FieldType.IP, fieldTypes.get("ip_src_addr"));
http://git-wip-us.apache.org/repos/asf/metron/blob/e7e19fbb/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchUpdateIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchUpdateIntegrationTest.java b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchUpdateIntegrationTest.java index c5c0bc1..6f36790 100644 --- a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchUpdateIntegrationTest.java +++ b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchUpdateIntegrationTest.java @@ -104,7 +104,7 @@ public class ElasticsearchUpdateIntegrationTest extends UpdateIntegrationTest { protected static Map<String, Object> createGlobalConfig() { return new HashMap<String, Object>() {{ put("es.clustername", "metron"); - put("es.port", "9300"); + put("es.port", "9200"); put("es.ip", "localhost"); put("es.date.format", dateFormat); }}; http://git-wip-us.apache.org/repos/asf/metron/blob/e7e19fbb/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/components/ElasticSearchComponent.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/components/ElasticSearchComponent.java b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/components/ElasticSearchComponent.java index 45b4d60..3e14c00 100644 --- a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/components/ElasticSearchComponent.java +++ b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/components/ElasticSearchComponent.java @@ -135,7 +135,7 @@ public class ElasticSearchComponent implements InMemoryComponent { .put("path.data",dataDir.getAbsolutePath()) .put("path.home", indexDir.getAbsoluteFile()) .put("transport.type", "netty4") - .put("http.enabled", "false"); + .put("http.enabled", "true"); if (extraElasticSearchSettings != null) { settingsBuilder = settingsBuilder.put(extraElasticSearchSettings); @@ -277,7 +277,9 @@ public class ElasticSearchComponent implements InMemoryComponent { @Override public void stop() { try { - node.close(); + if(node != null) { + node.close(); + } } catch (IOException e) { throw new RuntimeException("Unable to stop node." , e); } http://git-wip-us.apache.org/repos/asf/metron/blob/e7e19fbb/metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertSearchDao.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertSearchDao.java b/metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertSearchDao.java index e8b9f26..cbbe9ee 100644 --- a/metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertSearchDao.java +++ b/metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/metaalert/MetaAlertSearchDao.java @@ -22,6 +22,8 @@ import org.apache.metron.indexing.dao.search.InvalidSearchException; import org.apache.metron.indexing.dao.search.SearchDao; import org.apache.metron.indexing.dao.search.SearchResponse; +import java.io.IOException; + public interface MetaAlertSearchDao extends SearchDao { /** @@ -30,6 +32,6 @@ public interface MetaAlertSearchDao extends SearchDao { * @return All meta alerts with a child alert having the GUID * @throws InvalidSearchException If a problem occurs with the search */ - SearchResponse getAllMetaAlertsForAlert(String guid) throws InvalidSearchException; + SearchResponse getAllMetaAlertsForAlert(String guid) throws InvalidSearchException, IOException; } http://git-wip-us.apache.org/repos/asf/metron/blob/e7e19fbb/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/metaalert/MetaAlertIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/metaalert/MetaAlertIntegrationTest.java b/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/metaalert/MetaAlertIntegrationTest.java index 7e28853..24989b4 100644 --- a/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/metaalert/MetaAlertIntegrationTest.java +++ b/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/metaalert/MetaAlertIntegrationTest.java @@ -1095,7 +1095,7 @@ public abstract class MetaAlertIntegrationTest { protected abstract long getMatchingMetaAlertCount(String fieldName, String fieldValue) throws IOException, InterruptedException; - protected abstract void setupTypings(); + protected abstract void setupTypings() throws IOException; // Get the base index name without any adjustments (e.g. without ES's "_index") protected abstract String getTestIndexName(); http://git-wip-us.apache.org/repos/asf/metron/blob/e7e19fbb/metron-platform/metron-integration-test/src/main/config/zookeeper/global.json ---------------------------------------------------------------------- diff --git a/metron-platform/metron-integration-test/src/main/config/zookeeper/global.json b/metron-platform/metron-integration-test/src/main/config/zookeeper/global.json index 9292f72..f7d45a7 100644 --- a/metron-platform/metron-integration-test/src/main/config/zookeeper/global.json +++ b/metron-platform/metron-integration-test/src/main/config/zookeeper/global.json @@ -1,7 +1,7 @@ { "es.clustername": "metron", "es.ip": "localhost", - "es.port": 9300, + "es.port": 9200, "es.date.format": "yyyy.MM.dd.HH", "solr.zookeeper": "localhost:2181", http://git-wip-us.apache.org/repos/asf/metron/blob/e7e19fbb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a98de72..8fe1786 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ <global_solr_version>6.6.2</global_solr_version> <global_mockito_version>1.10.19</global_mockito_version> <global_powermock_version>1.7.0</global_powermock_version> - <global_shade_version>2.4.3</global_shade_version> + <global_shade_version>3.1.1</global_shade_version> <global_jackson_version>2.7.4</global_jackson_version> <global_errorprone_core_version>2.0.14</global_errorprone_core_version> <global_jar_version>3.0.2</global_jar_version>
