date:20180412

metron git commit: METRON-1503 Alerts are not getting populated in alerts UI when search engine is Solr (merrimanr) closes apache/metron#975

2018-04-12 Thread rmerriman

Repository: metron
Updated Branches:
  refs/heads/feature/METRON-1416-upgrade-solr f715d6dba -> 7ef4b7703


METRON-1503 Alerts are not getting populated in alerts UI when search engine is 
Solr (merrimanr) closes apache/metron#975


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/7ef4b770
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/7ef4b770
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/7ef4b770

Branch: refs/heads/feature/METRON-1416-upgrade-solr
Commit: 7ef4b7703e75538f96764cb3efafe8db5afba126
Parents: f715d6d
Author: merrimanr 
Authored: Thu Apr 12 09:51:04 2018 -0500
Committer: merrimanr 
Committed: Thu Apr 12 09:51:04 2018 -0500

--
 .../indexing/dao/search/SearchResponse.java |  23 +
 .../indexing/dao/SearchIntegrationTest.java |   2 +-
 .../metron/solr/dao/SolrColumnMetadataDao.java  |  14 +-
 .../org/apache/metron/solr/dao/SolrDao.java |  12 +-
 .../apache/metron/solr/dao/SolrSearchDao.java   |  81 ++--
 .../metron/solr/dao/SolrColumnMetadataTest.java | 150 ++
 .../org/apache/metron/solr/dao/SolrDaoTest.java | 133 ++
 .../metron/solr/dao/SolrSearchDaoTest.java  | 478 +++
 .../metron/solr/dao/SolrUpdateDaoTest.java  | 135 ++
 .../matcher/ModifiableSolrParamsMatcher.java|  55 +++
 .../matcher/SolrInputDocumentListMatcher.java   |  60 +++
 .../solr/matcher/SolrInputDocumentMatcher.java  |  50 ++
 .../metron/solr/matcher/SolrQueryMatcher.java   |  56 +++
 metron-platform/pom.xml |   4 +-
 pom.xml |   1 +
 15 files changed, 1207 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/7ef4b770/metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/search/SearchResponse.java
--
diff --git 
a/metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/search/SearchResponse.java
 
b/metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/search/SearchResponse.java
index aad489a..5b0b006 100644
--- 
a/metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/search/SearchResponse.java
+++ 
b/metron-platform/metron-indexing/src/main/java/org/apache/metron/indexing/dao/search/SearchResponse.java
@@ -61,4 +61,27 @@ public class SearchResponse {
   public void setFacetCounts(Map> facetCounts) {
 this.facetCounts = facetCounts;
   }
+
+  @Override
+  public boolean equals(Object o) {
+if (this == o) {
+  return true;
+}
+if (o == null || getClass() != o.getClass()) {
+  return false;
+}
+
+SearchResponse that = (SearchResponse) o;
+
+return getTotal() == that.getTotal() &&
+(getResults() != null ? getResults().equals(that.getResults()) : 
that.getResults() != null) &&
+(getFacetCounts() != null ? 
getFacetCounts().equals(that.getFacetCounts()) : that.getFacetCounts() != null);
+  }
+
+  @Override
+  public int hashCode() {
+int result = 31 * (int) getTotal() + (getResults() != null ? 
getResults().hashCode() : 0);
+result = 31 * result + (getFacetCounts() != null ? 
getFacetCounts().hashCode() : 0);
+return result;
+  }
 }

http://git-wip-us.apache.org/repos/asf/metron/blob/7ef4b770/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/SearchIntegrationTest.java
--
diff --git 
a/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/SearchIntegrationTest.java
 
b/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/SearchIntegrationTest.java
index 16d4d7b..83046b8 100644
--- 
a/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/SearchIntegrationTest.java
+++ 
b/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/SearchIntegrationTest.java
@@ -71,7 +71,7 @@ public abstract class SearchIntegrationTest {
 
   /**
* {
-   * "indices": ["bro", "snort"],
+   * "indices": ["bro", "snort", "some_collection"],
* "query": "*",
* "from": 0,
* "size": 10,

http://git-wip-us.apache.org/repos/asf/metron/blob/7ef4b770/metron-platform/metron-solr/src/main/java/org/apache/metron/solr/dao/SolrColumnMetadataDao.java
--
diff --git 
a/metron-platform/metron-solr/src/main/java/org/apache/metron/solr/dao/SolrColumnMetadataDao.java
 
b/metron-platform/metron-solr/src/main/java/org/apache/metron/solr/dao/SolrColumnMetadataDao.java
index f645e93..61f0209 100644
---

metron git commit: METRON-1521: JSONMapParser is no longer serializable closes apache/incubator-metron#991

2018-04-12 Thread cestella

Repository: metron
Updated Branches:
  refs/heads/master ea6992fd9 -> eb5b2d42b


METRON-1521: JSONMapParser is no longer serializable closes 
apache/incubator-metron#991


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/eb5b2d42
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/eb5b2d42
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/eb5b2d42

Branch: refs/heads/master
Commit: eb5b2d42b83901c05c15e00b9c3c5bce5dd72ab9
Parents: ea6992f
Author: cstella 
Authored: Thu Apr 12 09:33:12 2018 -0400
Committer: cstella 
Committed: Thu Apr 12 09:33:12 2018 -0400

--
 .../java/org/apache/metron/parsers/json/JSONMapParser.java | 4 ++--
 .../org/apache/metron/parsers/integration/ParserDriver.java| 6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/metron/blob/eb5b2d42/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/json/JSONMapParser.java
--
diff --git 
a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/json/JSONMapParser.java
 
b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/json/JSONMapParser.java
index bddf35d..f5d67f9 100644
--- 
a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/json/JSONMapParser.java
+++ 
b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/json/JSONMapParser.java
@@ -89,8 +89,7 @@ public class JSONMapParser extends BasicParser {
   public static final String JSONP_QUERY = "jsonpQuery";
 
   private MapStrategy mapStrategy = MapStrategy.DROP;
-  private TypeRef>> typeRef = new 
TypeRef>>() {
-  };
+  private transient TypeRef>> typeRef = null;
   private String jsonpQuery = null;
 
 
@@ -99,6 +98,7 @@ public class JSONMapParser extends BasicParser {
 String strategyStr = (String) config.getOrDefault(MAP_STRATEGY_CONFIG, 
MapStrategy.DROP.name());
 mapStrategy = MapStrategy.valueOf(strategyStr);
 if (config.containsKey(JSONP_QUERY)) {
+  typeRef = new TypeRef>>() { };
   jsonpQuery = (String) config.get(JSONP_QUERY);
   Configuration.setDefaults(new Configuration.Defaults() {
 

http://git-wip-us.apache.org/repos/asf/metron/blob/eb5b2d42/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserDriver.java
--
diff --git 
a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserDriver.java
 
b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserDriver.java
index deb0217..b03ea80 100644
--- 
a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserDriver.java
+++ 
b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserDriver.java
@@ -18,6 +18,7 @@
 package org.apache.metron.parsers.integration;
 
 import com.google.common.collect.ImmutableList;
+import org.apache.commons.lang.SerializationUtils;
 import org.apache.metron.common.configuration.ConfigurationsUtils;
 import org.apache.metron.common.configuration.FieldValidator;
 import org.apache.metron.common.configuration.ParserConfigurations;
@@ -42,6 +43,7 @@ import org.mockito.Matchers;
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -54,7 +56,7 @@ import static org.mockito.Mockito.when;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ParserDriver {
+public class ParserDriver implements Serializable {
   private static final Logger LOG = LoggerFactory.getLogger(ParserBolt.class);
   public static class CollectingWriter implements MessageWriter{
 List output;
@@ -151,6 +153,8 @@ public class ParserDriver {
 
   public ProcessorResult> run(List in) {
 ShimParserBolt bolt = new ShimParserBolt(new ArrayList<>());
+byte[] b = SerializationUtils.serialize(bolt);
+ShimParserBolt b2 = (ShimParserBolt) SerializationUtils.deserialize(b);
 OutputCollector collector = mock(OutputCollector.class);
 bolt.prepare(null, null, collector);
 for(byte[] record : in) {

metron git commit: METRON-1503 Alerts are not getting populated in alerts UI when search engine is Solr (merrimanr) closes apache/metron#975

metron git commit: METRON-1521: JSONMapParser is no longer serializable closes apache/incubator-metron#991

2 matches

Site Navigation

Mail list logo

Footer information