Flatten and Aggregate features in JSON array processing

Issue-ID: DCAEGEN2-1598
Change-Id: I9f563bcfa18285daf7b48878e8427bfdb1aff21f
Signed-off-by: Guobiao Mo <guobiaomo@chinamobile.com>

4 files changed, 23 insertions, 0 deletions

diff --git a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/config/ApplicationConfigurationTest.java b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/config/ApplicationConfigurationTest.java
index 617b50e3..0c56d5af 100644
--- a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/config/ApplicationConfigurationTest.java
+++ b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/config/ApplicationConfigurationTest.java
@@ -68,6 +68,7 @@ public class ApplicationConfigurationTest {
         assertNotNull(config.getRawDataLabel());
         assertNotNull(config.getTimestampLabel());
         assertNotNull(config.getElasticsearchType());
+        assertNotNull(config.getDatalakeVersion());
         
       //HDFS
         assertTrue(config.getHdfsBatchSize()>0);
diff --git a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/dto/TopicConfigTest.java b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/dto/TopicConfigTest.java
index bb31cd74..f52332a5 100644
--- a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/dto/TopicConfigTest.java
+++ b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/dto/TopicConfigTest.java
@@ -77,6 +77,23 @@ public class TopicConfigTest {
     }
 
     @Test
+    public void testArrayPath() {
+        Topic topic = new Topic("testArrayPath");
+        topic.setAggregateArrayPath("/data/data2/value,/data/data3");
+        topic.setFlattenArrayPath("/data/data2/value,/data/data3");
+
+        TopicConfig topicConfig = topic.getTopicConfig();
+
+        String[] value = topicConfig.getAggregateArrayPath2();
+        assertEquals(value[0], "/data/data2/value");
+        assertEquals(value[1], "/data/data3");
+
+        value = topicConfig.getFlattenArrayPath2();
+        assertEquals(value[0], "/data/data2/value");
+        assertEquals(value[1], "/data/data3");
+    }
+
+    @Test
     public void testIs() {
         Topic testTopic = new Topic("test");
 
diff --git a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/service/StoreServiceTest.java b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/service/StoreServiceTest.java
index 44e76328..fc05d1d4 100644
--- a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/service/StoreServiceTest.java
+++ b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/service/StoreServiceTest.java
@@ -93,6 +93,8 @@ public class StoreServiceTest {
 		testInit();
 
 		TopicConfig topicConfig = createTopicConfig("test1", "JSON");
+		topicConfig.setAggregateArrayPath("/test");
+		topicConfig.setFlattenArrayPath("/test");
 
 		topicConfig = createTopicConfig("test2", "XML");
 		topicConfig.setSaveRaw(false);
diff --git a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/service/TopicServiceTest.java b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/service/TopicServiceTest.java
index 265ec963..774cd229 100644
--- a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/service/TopicServiceTest.java
+++ b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/service/TopicServiceTest.java
@@ -21,6 +21,7 @@
 package org.onap.datalake.feeder.service;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -70,6 +71,8 @@ public class TopicServiceTest {
 		String name = "a";
 		when(topicRepository.findById(name)).thenReturn(Optional.of(new Topic(name)));
 		assertEquals(topicService.getTopic(name), new Topic(name));
+		
+		assertFalse(topicService.istDefaultTopic(new Topic(name)));
 	}
 
 	@Test