chore(deps): bump maven-plugin-plugin.version from 3.6.1 to 3.7.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,33 +8,49 @@ assignees: ''
 ---
 
 **Describe the bug**
+<!--
 A clear and concise description of what the bug is. The more info is provided, the more likely we can fix it earlier.
+-->
 
 **Attach .adm file and source document examples**
+<!--
 The .adm archive file you can export from AtlasMap UI contains all metadata to reproduce your mapping. Also don't forget to provide source document examples to reproduce the runtime behavior exactly what you see.
+ -->
 
 **Attach debug logs**
+<!--
 If it's a design time issue, attach a backend log with debug enabled
 `java -Dlogging.level.io.atlasmap=debug -jar atlasmap-standalone.jar`
 or for runtime issue, set the log level for `io.atlasmap` package to debug in your log4j config
+ -->
 
 **To Reproduce**
+<!--
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+-->
 
 **Expected behavior**
+<!--
 A clear and concise description of what you expected to happen.
+-->
 
 **Screenshots**
+<!--
 If applicable, add screenshots to help explain your problem.
+-->
 
 **Environment (please complete the following information):**
- - OS: [e.g. iOS]
+<!--
+- OS: [e.g. iOS]
  - Browser [e.g. chrome, safari]
  - Version [e.g. 22]
+-->
 
 **Additional context**
+<!--
 Add any other context about the problem here.
+-->

.github/ISSUE_TEMPLATE/enhancement-request.md

@@ -8,16 +8,26 @@ assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**
+<!--
 A clear and concise description of what the problem is. Ex. I expected xxx to be happen but instead yyy[...]
+-->
 
 **Attach .adm file and source document examples if you are looking at specific current behavior**
+<!--
 The .adm archive file you can export from AtlasMap UI contains all metadata to reproduce your mapping. Also don't forget to provide source document examples to reproduce the runtime behavior exactly what you see.
+-->
 
 **Describe the solution you'd like**
+<!--
 A clear and concise description of what you want to happen.
+-->
 
 **Describe alternatives you've considered**
+<!--
 A clear and concise description of any alternative solutions or features you've considered.
+-->
 
 **Additional context**
+<!--
 Add any other context or screenshots about the feature request here.
+-->

docs/src/main/asciidoc/user-guide/topics/creating-a-custom-transformation.adoc

@@ -17,31 +17,77 @@ transformation and prints it on the target side with the string 'concur-'
 and the user-specified concur parameter.
 Implement the `AtlasFieldAction` class as follows:
 +
+.src/main/java/io/atlasmap/maven/test/PaulsFieldActions.java
 [source,java]
 ----
-package io.atlasmap.service.my;
+package io.atlasmap.maven.test;
 
-import java.io.Serializable;
-import io.atlasmap.v2.*
-import io.atlasmap.spi.AtlasFieldAction;
 import io.atlasmap.spi.AtlasActionProcessor;
+import io.atlasmap.spi.AtlasFieldAction;
 
 public class PaulsFieldActions implements AtlasFieldAction {
 
-    public static class Concur extends Action implements Serializable {
-        @AtlasActionProperty(title = "Pauls Concur Param", type = FieldType.STRING)
-        public String concurarg = "-paul-";
-
-    }
-
     @AtlasActionProcessor
-    public static String concur(Concur action, String userInput) {
-        return "concur-" + action.concurarg + userInput;
+    public static String myCustomFieldAction(PaulsFieldActionsModel myCustomFieldAction, String input) {
+        return "Paul's custom field action: " + myCustomFieldAction.getPaulsParam() + " payload: " + input;
     }
 
 }
 ----
++
+And also implement a model class `PaulsFieldActionsModel` - model class can declare transformation parameters as follows:
++
+.src/main/java/io/atlasmap/maven/test/PaulsFieldActionsModel.java
+[source,java]
+----
+package io.atlasmap.maven.test;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
+
+import io.atlasmap.v2.Action;
+import io.atlasmap.v2.AtlasActionProperty;
+import io.atlasmap.v2.FieldType;
+
+public class PaulsFieldActionsModel extends Action implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+    private String paulsParam = "";
+    /**
+     * Example of a custom field action with a string parameter.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String}
+     *     
+     */
+    @JsonPropertyDescription("Paul's custom field action parameter to display")
+    @AtlasActionProperty(title = "Paul's custom field action string parameter", type = FieldType.STRING)
+    public void setPaulsParam(String value) {
+        paulsParam = value;
+    }
+
+    public String getPaulsParam() {
+        return paulsParam;
+    }
+}
+----
++
+. Declare for Java service loader
++
+Then both class needs to be declared in `META-INF/services` to get them registered through Java service loader.
++
+.src/main/resources/META-INF/services/io.atlasmap.v2.Action
+----
+io.atlasmap.maven.test.PaulsFieldActionsModel
+----
++
+.src/main/resources/META-INF/services/io.atlasmap.spi.AtlasFieldAction
+----
+io.atlasmap.maven.test.PaulsFieldActions
+----
++
 . Build your Java archive file.
 +
 The `io.atlasmap.v2`, `io.atlasmap.api` and `io.atlasmap.spi` target 

docs/src/main/asciidoc/user-guide/topics/exporting-mappings-to-an-atlasmap-catalog-file.adoc → docs/src/main/asciidoc/user-guide/topics/exporting-mappings-to-an-atlasmap-adm-archive-file.adoc

@@ -1,8 +1,8 @@
-[id='exporting-mappings-to-an-atlasmap-catalog-file']
-= Exporting mappings to an AtlasMap catalog file
+[id='exporting-mappings-to-an-adm-archive-file']
+= Exporting mappings to an ADM archive file
 
 After all mappings are defined, save the mappings by exporting
-them to an AtlasMap `.adm` catalog file:
+them to an ADM archive file:
 
 . Click the *AtlasMap* menu and select *Export the current mappings and support files into a catalog (.adm)*
 +

lib/core/src/main/java/io/atlasmap/core/AtlasUtil.java

@@ -477,6 +477,11 @@ public static String unescapeFromUri(String uri) {
                   .replaceAll("%5D", "]");
     }
 
+    /**
+     * Delete specified directory and the contents in it.
+     * @see #deleteDirectoryContents
+     * @param targetDir
+     */
     public static void deleteDirectory(File targetDir) {
         File[] allContents = targetDir.listFiles();
         if (allContents != null) {
@@ -492,6 +497,12 @@ public static void deleteDirectory(File targetDir) {
         return;
     }
 
+    /**
+     * Delete all contents in the specified directory.
+     * 
+     * @see #deleteDirectory
+     * @param targetDir
+     */
     public static void deleteDirectoryContents(File targetDir) {
         File[] allContents = targetDir.listFiles();
         if (allContents != null) {

lib/core/src/main/java/io/atlasmap/core/DefaultAtlasFieldActionService.java

@@ -659,6 +659,12 @@ public Field processActions(AtlasInternalSession session, Field field) throws At
         FieldType currentType = determineFieldType(field);
         for (Action action : actions) {
             ActionProcessor processor = findActionProcessor(action, currentType);
+            if (processor == null) {
+                AtlasUtil.addAudit(session, field, String.format(
+                    "Couldn't find metadata for a FieldAction '%s', please make sure it's in the classpath, and also have a service declaration under META-INF/services. Ignoring...", action.getDisplayName()),
+                    AuditStatus.WARN, null);
+                continue;
+            }
             ActionDetail detail = processor.getActionDetail();
             if (detail == null) {
                 AtlasUtil.addAudit(session, field, String.format(

lib/core/src/main/java/io/atlasmap/core/DefaultAtlasPreviewContext.java

@@ -135,6 +135,7 @@ public Audits processPreview(Mapping mapping) throws AtlasException {
                             AtlasUtil.addAudit(session, targetField,
                                     "It's not yet supported to have a collection field as a part of multiple target fields in a same mapping",
                                     AuditStatus.ERROR, null);
+                            session.getAudits().getAudit().addAll(session.head().getAudits());
                             return session.getAudits();
                         }
                         if (index != null) {
@@ -153,6 +154,7 @@ public Audits processPreview(Mapping mapping) throws AtlasException {
                             collectionHelper.copyCollectionIndexes(sourceFieldGroup, subSourceField, subTargetField, previousTargetField);
                             previousTargetField = subTargetField;
                             if (!convertSourceToTarget(session, subSourceField, subTargetField)) {
+                                session.getAudits().getAudit().addAll(session.head().getAudits());
                                 return session.getAudits();
                             };
                             Field processed = subTargetField;
@@ -177,9 +179,11 @@ public Audits processPreview(Mapping mapping) throws AtlasException {
                     }
                 }
                 if (session.hasErrors()) {
+                    session.getAudits().getAudit().addAll(session.head().getAudits());
                     return session.getAudits();
                 }
                 if (!convertSourceToTarget(session, session.head().getSourceField(), targetField)) {
+                    session.getAudits().getAudit().addAll(session.head().getAudits());
                     return session.getAudits();
                 }
                 Field processed = targetField;
@@ -193,6 +197,7 @@ public Audits processPreview(Mapping mapping) throws AtlasException {
             targetField = targetFields.get(0);
             Field combined = processCombineField(session, cloned, sourceFields, targetField);
             if (!convertSourceToTarget(session, combined, targetField)) {
+                session.getAudits().getAudit().addAll(session.head().getAudits());
                 return session.getAudits();
             }
             applyFieldActions(session, targetField);
@@ -208,9 +213,11 @@ public Audits processPreview(Mapping mapping) throws AtlasException {
                 if (LOG.isDebugEnabled()) {
                     LOG.error("", e);
                 }
+                session.getAudits().getAudit().addAll(session.head().getAudits());
                 return session.getAudits();
             }
             if (separatedFields == null) {
+                session.getAudits().getAudit().addAll(session.head().getAudits());
                 return session.getAudits();
             }
             for (Field f : targetFields) {
@@ -241,6 +248,7 @@ public Audits processPreview(Mapping mapping) throws AtlasException {
         }
         mapping.getOutputField().clear();
         mapping.getOutputField().addAll(cloned.getOutputField());
+        session.getAudits().getAudit().addAll(session.head().getAudits());
         return session.getAudits();
     }
 

lib/modules/csv/service/src/main/java/io/atlasmap/csv/service/CsvService.java

@@ -34,6 +34,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.atlasmap.csv.core.CsvConfig;
 import io.atlasmap.csv.core.CsvFieldReader;
@@ -97,6 +98,9 @@ public Response inspect(InputStream request, @QueryParam("format") String format
 
         CsvInspectionResponse response = new CsvInspectionResponse();
         try {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Options: delimiter={}, firstRecordAsHeader={}", delimiter, firstRecordAsHeader);
+            }
             CsvConfig csvConfig = new CsvConfig(format);
             if (delimiter != null) {
                 csvConfig.setDelimiter(delimiter.charAt(0));
@@ -134,6 +138,9 @@ public Response inspect(InputStream request, @QueryParam("format") String format
             response.setExecutionTime(System.currentTimeMillis() - startTime);
         }
 
+        if (LOG.isDebugEnabled()) {
+            LOG.debug(("Response: {}" + new ObjectMapper().writeValueAsString(response)));
+        }
         return Response.ok().entity(toJson(response)).build();
     }
 }

lib/modules/csv/service/src/test/java/io/atlasmap/csv/service/CsvServiceTest.java

@@ -91,4 +91,23 @@ public void testSchemaNoParametersSpecified() throws Exception {
         assertEquals("2", fields.get(2).getName());
     }
 
+    @Test
+    public void testSchemaFile() throws Exception {
+        InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("test.csv");
+
+        Response res = csvService.inspect(inputStream, null, ",", true, null, null,
+            null, null, null, null, null, null,
+            null, null, null);
+        Object entity = res.getEntity();
+        assertEquals(byte[].class, entity.getClass());
+        CsvInspectionResponse csvInspectionResponse = Json.mapper().readValue((byte[])entity, CsvInspectionResponse.class);
+        CsvComplexType complexType = (CsvComplexType) csvInspectionResponse.getCsvDocument().getFields().getField().get(0);
+        List<CsvField> fields = complexType.getCsvFields().getCsvField();
+        assertEquals(5, fields.size());
+        assertEquals("sourceCsvString", fields.get(0).getName());
+        assertEquals("sourceCsvNumber", fields.get(1).getName());
+        assertEquals("sourceCsvDecimal", fields.get(2).getName());
+        assertEquals("sourceCsvDate", fields.get(3).getName());
+        assertEquals("sourceCsvBoolean", fields.get(4).getName());
+    }
 }

lib/modules/csv/service/src/test/resources/test.csv

@@ -0,0 +1,7 @@
+sourceCsvString,sourceCsvNumber,sourceCsvDecimal,sourceCsvDate,sourceCsvBoolean
+csv0,0,0.0,1989-05-05,true
+csv1,10,10.0,1989-05-05,true
+csv2,20,20.0,1989-05-05,true
+csv3,30,30.0,1989-05-05,false
+csv4,40,40.0,1989-05-05,false
+

lib/service/src/main/java/io/atlasmap/service/AtlasLibraryLoader.java

@@ -24,6 +24,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -85,13 +86,26 @@ public void addJarFromStream(InputStream is) throws Exception {
         reload();
     }
 
-    public void clearLibaries() {
+    public void clearLibraries() {
+        if (this.urlClassLoader != null) {
+            try {
+                this.urlClassLoader.close();
+            } catch (Exception e) {
+                LOG.warn("Ignoring an error while closing an old URLClassLoader: {}", e.getMessage());
+            }
+            this.urlClassLoader = null;
+        }
+
         File[] files = saveDir.listFiles();
         if (!saveDir.exists() || !saveDir.isDirectory() || files == null) {
             return;
         }
         for (File f : saveDir.listFiles()) {
-            f.delete();
+            try {
+                Files.delete(f.toPath());
+             } catch (Exception e) {
+                LOG.warn("Failed to remove jar file: '{}'", e.getMessage());
+            };
         }
         reload();
     }