feat: Add CSV module

Fixes: #2018
atlasmap · May 8, 2020 · f13fead · f13fead
1 parent 10bc69f
commit f13fead
Show file tree

Hide file tree

Showing 43 changed files with 2,356 additions and 168 deletions.
diff --git a/camel/pom.xml b/camel/pom.xml
@@ -64,6 +64,10 @@
       <groupId>io.atlasmap</groupId>
       <artifactId>atlas-xml-module</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.atlasmap</groupId>
+      <artifactId>atlas-csv-module</artifactId>
+    </dependency>
     <!-- for testing -->
     <dependency>
       <groupId>io.atlasmap</groupId>

diff --git a/camel/src/main/java/org/apache/camel/component/atlasmap/AtlasEndpoint.java b/camel/src/main/java/org/apache/camel/component/atlasmap/AtlasEndpoint.java
@@ -26,9 +26,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;

diff --git a/camel3/pom.xml b/camel3/pom.xml
@@ -70,6 +70,10 @@
       <groupId>io.atlasmap</groupId>
       <artifactId>atlas-xml-module</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.atlasmap</groupId>
+      <artifactId>atlas-csv-module</artifactId>
+    </dependency>
     <!-- for testing -->
     <dependency>
       <groupId>io.atlasmap</groupId>

diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
@@ -132,6 +132,24 @@
           <artifactId>atlas-xml-service</artifactId>
         </dependency>
 
+        <!-- AtlasMap CSV -->
+        <dependency>
+          <groupId>io.atlasmap</groupId>
+          <artifactId>atlas-csv-core</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>io.atlasmap</groupId>
+          <artifactId>atlas-csv-model</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>io.atlasmap</groupId>
+          <artifactId>atlas-csv-module</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>io.atlasmap</groupId>
+          <artifactId>atlas-csv-service</artifactId>
+        </dependency>
+
         <!-- Others -->
         <dependency>
           <groupId>io.atlasmap</groupId>

diff --git a/docs/src/main/asciidoc/developer-guide/openapi/core/index.adoc b/docs/src/main/asciidoc/developer-guide/openapi/core/index.adoc
@@ -2234,6 +2234,12 @@ endif::internal-generation[]
 | 
 |  
 
+| name 
+|  
+| String  
+| 
+|  
+
 | jsonType 
 | X 
 | String  
@@ -2325,6 +2331,12 @@ endif::internal-generation[]
 | 
 |  
 
+| name 
+|  
+| String  
+| 
+|  
+
 | field 
 |  
 | List  of <<Field>> 

diff --git a/docs/src/main/asciidoc/developer-guide/openapi/dfdl/index.adoc b/docs/src/main/asciidoc/developer-guide/openapi/dfdl/index.adoc
@@ -402,6 +402,12 @@ endif::internal-generation[]
 | 
 |  
 
+| name 
+|  
+| String  
+| 
+|  
+
 | jsonType 
 | X 
 | String  

diff --git a/docs/src/main/asciidoc/developer-guide/openapi/java/index.adoc b/docs/src/main/asciidoc/developer-guide/openapi/java/index.adoc
@@ -462,6 +462,12 @@ endif::internal-generation[]
 | 
 |  
 
+| name 
+|  
+| String  
+| 
+|  
+
 | annotations 
 |  
 | StringList  
@@ -480,12 +486,6 @@ endif::internal-generation[]
 | 
 |  
 
-| name 
-|  
-| String  
-| 
-|  
-
 | className 
 |  
 | String  
@@ -807,6 +807,12 @@ endif::internal-generation[]
 | 
 |  
 
+| name 
+|  
+| String  
+| 
+|  
+
 | annotations 
 |  
 | StringList  
@@ -825,12 +831,6 @@ endif::internal-generation[]
 | 
 |  
 
-| name 
-|  
-| String  
-| 
-|  
-
 | className 
 |  
 | String  

diff --git a/docs/src/main/asciidoc/developer-guide/openapi/json/index.adoc b/docs/src/main/asciidoc/developer-guide/openapi/json/index.adoc
@@ -399,6 +399,12 @@ endif::internal-generation[]
 | 
 |  
 
+| name 
+|  
+| String  
+| 
+|  
+
 | jsonType 
 | X 
 | String  

diff --git a/docs/src/main/asciidoc/developer-guide/openapi/xml/index.adoc b/docs/src/main/asciidoc/developer-guide/openapi/xml/index.adoc
@@ -399,6 +399,12 @@ endif::internal-generation[]
 | 
 |  
 
+| name 
+|  
+| String  
+| 
+|  
+
 | jsonType 
 | X 
 | String  

diff --git a/lib/dist/assembly-aggregate.xml b/lib/dist/assembly-aggregate.xml
@@ -24,6 +24,9 @@
         <include>io.atlasmap:atlas-xml-core</include>
         <include>io.atlasmap:atlas-xml-model</include>
         <include>io.atlasmap:atlas-xml-module</include>
+        <include>io.atlasmap:atlas-csv-core</include>
+        <include>io.atlasmap:atlas-csv-model</include>
+        <include>io.atlasmap:atlas-csv-module</include>
       </includes>
       <binaries>
         <outputDirectory>.</outputDirectory>

diff --git a/lib/itests/core/pom.xml b/lib/itests/core/pom.xml
@@ -61,6 +61,10 @@
       <groupId>io.atlasmap</groupId>
       <artifactId>atlas-dfdl-module</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.atlasmap</groupId>
+      <artifactId>atlas-csv-module</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.atlasmap</groupId>
       <artifactId>atlas-dfdl-test-model</artifactId>

diff --git a/lib/itests/core/src/test/java/io/atlasmap/itests/core/CsvMappingTest.java b/lib/itests/core/src/test/java/io/atlasmap/itests/core/CsvMappingTest.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright (C) 2017 Red Hat, Inc.
+ *
+ * Licensed 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 io.atlasmap.itests.core;
+
+import io.atlasmap.api.AtlasContext;
+import io.atlasmap.api.AtlasSession;
+import io.atlasmap.core.AtlasMappingService;
+import io.atlasmap.core.DefaultAtlasContextFactory;
+import io.atlasmap.v2.AtlasMapping;
+import io.atlasmap.v2.Collection;
+import io.atlasmap.v2.Mapping;
+import org.hamcrest.CoreMatchers;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+
+public class CsvMappingTest {
+
+    public static final String MAPPINGS_JSON = "mappings/atlasmapping-csv.json";
+    private AtlasMappingService mappingService;
+
+    @Before
+    public void before() {
+        mappingService = DefaultAtlasContextFactory.getInstance().getMappingService();
+    }
+
+    @Test
+    public void testMapAllFields() throws Exception {
+        AtlasContext context = createContext(MAPPINGS_JSON, "1", "2");
+        AtlasSession session = context.createSession();
+        session.setSourceDocument("source", "first_name,last_name\r\nBob,Johnson\r\nAndrew,Smith\r\n");
+        context.process(session);
+
+        assertFalse(session.hasErrors());
+        Object csv = session.getTargetDocument("target-csv");
+        assertThat(csv, CoreMatchers.is("first,last\r\nBob,Johnson\r\nAndrew,Smith\r\n"));
+    }
+
+    @Test
+    public void testMapOneOfTwoFields() throws Exception {
+        AtlasContext context = createContext(MAPPINGS_JSON, "3");
+        AtlasSession session = context.createSession();
+        session.setSourceDocument("source", "first_name,last_name\r\nBob,Johnson\r\nAndrew,Smith\r\n");
+        context.process(session);
+
+        assertFalse(session.hasErrors());
+        Object csv = session.getTargetDocument("target-csv");
+        assertThat(csv, CoreMatchers.is("last\r\nJohnson\r\nSmith\r\n"));
+    }
+
+    @Test
+    public void testCapitalize() throws Exception {
+        AtlasContext context = createContext(MAPPINGS_JSON, "4");
+        AtlasSession session = context.createSession();
+        session.setSourceDocument("source", "first_name,last_name\r\nbob,johnson\r\nandrew,smith\r\n");
+        context.process(session);
+
+        assertFalse(session.hasErrors());
+        Object csv = session.getTargetDocument("target-csv");
+        assertThat(csv, CoreMatchers.is("first\r\nBob\r\nAndrew\r\n"));
+    }
+
+    public AtlasContext createContext(String file, String... mappingIds) throws Exception {
+        URL url = Thread.currentThread().getContextClassLoader().getResource("mappings/atlasmapping-csv.json");
+        AtlasMapping mapping = mappingService.loadMapping(url);
+        List<String> ids = Arrays.asList(mappingIds);
+        mapping.getMappings().getMapping().removeIf(m -> {
+            if (m instanceof Mapping) {
+                return !ids.contains(((Mapping) m).getId());
+            } else if (m instanceof Collection) {
+                Collection col = (Collection) m;
+                col.getMappings().getMapping().removeIf(map -> !ids.contains(((Mapping) map).getId()));
+                return col.getMappings().getMapping().isEmpty();
+            } else {
+                return false;
+            }
+        });
+        AtlasContext context = DefaultAtlasContextFactory.getInstance().createContext(mapping);
+        return context;
+    }
+
+}
diff --git a/lib/itests/core/src/test/java/io/atlasmap/itests/core/DefaultAtlasContextTest.java b/lib/itests/core/src/test/java/io/atlasmap/itests/core/DefaultAtlasContextTest.java
@@ -28,7 +28,7 @@ public class DefaultAtlasContextTest {
     public void testModuleInit() {
         DefaultAtlasContextFactory factory = DefaultAtlasContextFactory.getInstance();
         assertNotNull(factory.getModuleInfoRegistry());
-        assertEquals(new Integer(4), new Integer(factory.getModuleInfoRegistry().size()));
+        assertEquals(new Integer(5), new Integer(factory.getModuleInfoRegistry().size()));
     }
 
 }