[GitHub] incubator-metron pull request #261: METRON-434: JSON Parser

2016-09-23 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/incubator-metron/pull/261


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-metron pull request #261: METRON-434: JSON Parser

2016-09-20 Thread cestella
GitHub user cestella reopened a pull request:

https://github.com/apache/incubator-metron/pull/261

METRON-434: JSON Parser

There are some situations where your data is already in JSON form and 
parsing should be as simple as passing the data through, adding `timestamp` and 
`original_message` along the way.  This JIRA will create a parser which will 
take a JSON map in.

Since we have standardized on one-dimensional maps, we must handle data 
which contains inner maps.  Inner maps should be handled pluggably by doing one 
of the following (configurably):
* doing nothing
* unfolding maps (e.g. `{ "foo" : { "bar" : 7 } }` is transformed into 
`{"foo.bar" : 7 }`)
* throwing an exception
* dropping the inner map


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/cestella/incubator-metron METRON-434

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-metron/pull/261.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #261


commit 0c8bb5c4ab04f9e19859981cea5bfe58b868a16f
Author: cstella 
Date:   2016-09-07T20:47:03Z

Initial commit for identity parser.

commit 151a54b07832aef82c95a4fd59a2b0a0bc30e005
Author: cstella 
Date:   2016-09-19T13:07:28Z

Merge branch 'master' into identity_parser

commit ffa7b5297f4013aa7aa364f49bae1c2eb6c4ee3a
Author: cstella 
Date:   2016-09-19T15:13:07Z

updating to have a handler for maps.

commit 68be22f5e1b72172e415909340c121c974651414
Author: cstella 
Date:   2016-09-19T22:14:04Z

METRON-434: JSON Parser

commit 860e8302cb1edf0c9178b37093a7930cd068ff92
Author: cstella 
Date:   2016-09-19T22:17:49Z

Merge branch 'identity_parser' into METRON-434

commit 3adca211b7836af9b559be72125c2fdab3ac7b44
Author: cstella 
Date:   2016-09-20T13:17:00Z

licenses

commit 8a725e99fb23bf12973a0778e54cd70b927951e2
Author: cstella 
Date:   2016-09-20T13:39:26Z

Missed a license.

commit b8af693a85aa5b2ef60e08a528eeb92741a86432
Author: cstella 
Date:   2016-09-20T15:03:07Z

Updating test.




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-metron pull request #261: METRON-434: JSON Parser

2016-09-20 Thread cestella
Github user cestella closed the pull request at:

https://github.com/apache/incubator-metron/pull/261


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-metron pull request #261: METRON-434: JSON Parser

2016-09-20 Thread cestella
Github user cestella commented on a diff in the pull request:

https://github.com/apache/incubator-metron/pull/261#discussion_r79632896
  
--- Diff: 
metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/json/JSONMapParserTest.java
 ---
@@ -0,0 +1,112 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.metron.parsers.json;
+
+import com.google.common.collect.ImmutableMap;
+import org.adrianwalker.multilinestring.Multiline;
+import org.json.simple.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+public class JSONMapParserTest {
+
+  /**
+   {
+ "foo" : "bar"
+,"blah" : "blah"
+,"number" : 2.0
+   }
+   */
+   @Multiline
+   static String happyPathJSON;
+
+  @Test
+  public void testHappyPath() {
+JSONMapParser parser = new JSONMapParser();
+List output = parser.parse(happyPathJSON.getBytes());
+Assert.assertEquals(output.size(), 1);
+//don't forget the timestamp field!
+Assert.assertEquals(output.get(0).size(), 5);
+JSONObject message = output.get(0);
+Assert.assertEquals("bar", message.get("foo"));
+Assert.assertEquals("blah", message.get("blah"));
+Assert.assertNotNull(message.get("timestamp"));
+Assert.assertTrue(message.get("timestamp") instanceof Number);
+Assert.assertNotNull(message.get("number"));
+Assert.assertTrue(message.get("number") instanceof Number);
+  }
+
+  /**
+   {
+"collection" : { "blah" : 7, "blah2" : "foo" }
+   }
+   */
+   @Multiline
+   static String collectionHandlingJSON;
+
+  @Test
+  public void testCollectionHandlingDrop() {
+JSONMapParser parser = new JSONMapParser();
+List output = 
parser.parse(collectionHandlingJSON.getBytes());
+Assert.assertEquals(output.size(), 1);
+//don't forget the timestamp field!
+Assert.assertEquals(output.get(0).size(), 2);
+JSONObject message = output.get(0);
+Assert.assertNotNull(message.get("timestamp"));
+Assert.assertTrue(message.get("timestamp") instanceof Number);
+  }
+
+  @Test(expected=IllegalStateException.class)
+  public void testCollectionHandlingError() {
+JSONMapParser parser = new JSONMapParser();
+parser.configure(ImmutableMap.of("mapStrategy", "ERROR"));
+List output = 
parser.parse(collectionHandlingJSON.getBytes());
+  }
+
+
+  @Test
+  public void testCollectionHandlingAllow() {
+JSONMapParser parser = new JSONMapParser();
+parser.configure(ImmutableMap.of("mapStrategy", "ALLOW"));
--- End diff --

Agreed


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-metron pull request #261: METRON-434: JSON Parser

2016-09-20 Thread mmiklavc
Github user mmiklavc commented on a diff in the pull request:

https://github.com/apache/incubator-metron/pull/261#discussion_r79625878
  
--- Diff: 
metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/json/JSONMapParserTest.java
 ---
@@ -0,0 +1,112 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.metron.parsers.json;
+
+import com.google.common.collect.ImmutableMap;
+import org.adrianwalker.multilinestring.Multiline;
+import org.json.simple.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+public class JSONMapParserTest {
+
+  /**
+   {
+ "foo" : "bar"
+,"blah" : "blah"
+,"number" : 2.0
+   }
+   */
+   @Multiline
+   static String happyPathJSON;
+
+  @Test
+  public void testHappyPath() {
+JSONMapParser parser = new JSONMapParser();
+List output = parser.parse(happyPathJSON.getBytes());
+Assert.assertEquals(output.size(), 1);
+//don't forget the timestamp field!
+Assert.assertEquals(output.get(0).size(), 5);
+JSONObject message = output.get(0);
+Assert.assertEquals("bar", message.get("foo"));
+Assert.assertEquals("blah", message.get("blah"));
+Assert.assertNotNull(message.get("timestamp"));
+Assert.assertTrue(message.get("timestamp") instanceof Number);
+Assert.assertNotNull(message.get("number"));
+Assert.assertTrue(message.get("number") instanceof Number);
+  }
+
+  /**
+   {
+"collection" : { "blah" : 7, "blah2" : "foo" }
+   }
+   */
+   @Multiline
+   static String collectionHandlingJSON;
+
+  @Test
+  public void testCollectionHandlingDrop() {
+JSONMapParser parser = new JSONMapParser();
+List output = 
parser.parse(collectionHandlingJSON.getBytes());
+Assert.assertEquals(output.size(), 1);
+//don't forget the timestamp field!
+Assert.assertEquals(output.get(0).size(), 2);
+JSONObject message = output.get(0);
+Assert.assertNotNull(message.get("timestamp"));
+Assert.assertTrue(message.get("timestamp") instanceof Number);
+  }
+
+  @Test(expected=IllegalStateException.class)
+  public void testCollectionHandlingError() {
+JSONMapParser parser = new JSONMapParser();
+parser.configure(ImmutableMap.of("mapStrategy", "ERROR"));
+List output = 
parser.parse(collectionHandlingJSON.getBytes());
+  }
+
+
+  @Test
+  public void testCollectionHandlingAllow() {
+JSONMapParser parser = new JSONMapParser();
+parser.configure(ImmutableMap.of("mapStrategy", "ALLOW"));
--- End diff --

Could strings instead reference the enums directly? e.g. 
MapStrategy.ALLOW.name()


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] incubator-metron pull request #261: METRON-434: JSON Parser

2016-09-19 Thread cestella
GitHub user cestella opened a pull request:

https://github.com/apache/incubator-metron/pull/261

METRON-434: JSON Parser

There are some situations where your data is already in JSON form and 
parsing should be as simple as passing the data through, adding `timestamp` and 
`original_message` along the way.  This JIRA will create a parser which will 
take a JSON map in.

Since we have standardized on one-dimensional maps, we must handle data 
which contains inner maps.  Inner maps should be handled pluggably by doing one 
of the following (configurably):
* doing nothing
* unfolding maps (e.g. `{ "foo" : { "bar" : 7 } }` is transformed into 
`{"foo.bar" : 7 }`)
* throwing an exception
* dropping the inner map


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/cestella/incubator-metron METRON-434

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-metron/pull/261.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #261


commit 0c8bb5c4ab04f9e19859981cea5bfe58b868a16f
Author: cstella 
Date:   2016-09-07T20:47:03Z

Initial commit for identity parser.

commit 151a54b07832aef82c95a4fd59a2b0a0bc30e005
Author: cstella 
Date:   2016-09-19T13:07:28Z

Merge branch 'master' into identity_parser

commit ffa7b5297f4013aa7aa364f49bae1c2eb6c4ee3a
Author: cstella 
Date:   2016-09-19T15:13:07Z

updating to have a handler for maps.

commit 68be22f5e1b72172e415909340c121c974651414
Author: cstella 
Date:   2016-09-19T22:14:04Z

METRON-434: JSON Parser

commit 860e8302cb1edf0c9178b37093a7930cd068ff92
Author: cstella 
Date:   2016-09-19T22:17:49Z

Merge branch 'identity_parser' into METRON-434




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---