Merge pull request #503 from assimbly/develop

build.gradle

@@ -35,7 +35,7 @@ plugins {
 }
 
 group = "org.assimbly.gateway"
-version = '3.3.0'
+version = '3.4.0'
 
 description = ""
 
@@ -309,8 +309,8 @@ dependencies {
     implementation "org.mapstruct:mapstruct-jdk8:${mapstruct_version}"
 
 	// custom dependencies (non-jhipster)
-    implementation group: "org.assimbly", name: "connectorModule", version: "3.3.0", changing: true
-    implementation group: "org.assimbly", name: "brokerModule", version: "3.3.0", changing: true
+    implementation group: "org.assimbly", name: "connectorModule", version: "3.4.0", changing: true
+    implementation group: "org.assimbly", name: "brokerModule", version: "3.4.0", changing: true
 	implementation "io.github.assimbly:docconverter:1.4.0"
 	implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.10.3"
 	implementation "org.jdom:jdom2:2.0.6"

gradle.properties

@@ -50,7 +50,7 @@ checkstyle_version=8.29
 ## Default value: -Xmx1024m -XX:MaxPermSize=256m
 ## un comment the below line to override the daemon defaults
 org.gradle.java.home=C:/Users/AVRMEEST/scoop/apps/adopt11-hotspot/11.0.10-9
-org.gradle.jvmargs=-Xmx1524m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx1524m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dserver.port=8888
 
 ## When configured, Gradle will run in incubating parallel mode.
 ## This option should only be used with decoupled projects. More details, visit

jhipster-jdl.jh

@@ -27,8 +27,8 @@ entity Flow {
 entity Endpoint {
 	endpointType EndpointType,
 	compponentType ComponentType,
-	uri String,
-    options String,
+	uri TextBlob,
+    options TextBlob,
     responseId Integer
 }
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "gateway",
-    "version": "3.3.0",
+    "version": "3.4.0",
     "description": "A message gateway based on Apache camel",
     "private": true,
     "license": "Apache License 2.0",

src/main/java/org/assimbly/gateway/GatewayApp.java

@@ -125,7 +125,7 @@ private static void logApplicationStartup(Environment env) {
                 "External URL: \t\t{}://{}:{}{}\n\t" +
                 "Java Version: \t\t{}\n\t" +
                 "Java WorkingDir: \t{}\n\t" +
-                "Apache Camel version: \t3.7.1 \n\t" +
+                "Apache Camel version: \t3.7.3 \n\t" +
                 "Profile(s): \t\t{}\n----------------------------------------------------------",
             applicationName,
             applicationVersion,

src/main/java/org/assimbly/gateway/config/CommandsUtil.java

@@ -48,11 +48,7 @@ public static boolean parseParameters(String[] args) {
         try {
             cmd = parser.parse(options, args);
         } catch (ParseException e) {
-            System.out.println(e.getMessage());
-            formatter.setNewLine("Command line parameters");
-            formatter.setNewLine("");
-            formatter.printHelp("Assimbly Gateway", options);
-            System.exit(1);
+        	return true;
         }
 
         String baseDirectoryParam = cmd.getOptionValue("application.gateway.base-directory");

src/main/java/org/assimbly/gateway/config/environment/DBExportXMLConfiguration.java

@@ -17,10 +17,7 @@
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @Service
 @Transactional
@@ -286,6 +283,9 @@ public void setXMLFlowPropertiesFromDB(Flow flowDB) throws Exception {
 		lastModified.appendChild(doc.createTextNode(flowLastModified));
 		flow.appendChild(lastModified);
 
+        // set components
+        setComponentFromDB(endpoints);
+
 		// set endpoints
 		setEndpointsFromDB(endpoints);
 
@@ -373,7 +373,32 @@ public void setXMLWireTapEndpointFromDB(WireTapEndpoint wireTapEndpointDB) throw
 	}
 
 
-	public void setEndpointsFromDB(Set<Endpoint> endpointsDB) throws Exception {
+    public void setComponentFromDB(Set<Endpoint> endpointsDB) throws Exception {
+
+        Set<String> componentsList = new HashSet<>();
+
+        Element components = doc.createElement("components");
+        flow.appendChild(components);
+
+        for (Endpoint endpointDB : endpointsDB) {
+
+            String confComponentType = endpointDB.getComponentType().getEndpoint();
+
+            if(!componentsList.contains(confComponentType)){
+                componentsList.add(confComponentType);
+
+                Element component = doc.createElement("component");
+                component.setTextContent(confComponentType);
+                components.appendChild(component);
+
+            }
+        }
+    }
+
+    public void setEndpointsFromDB(Set<Endpoint> endpointsDB) throws Exception {
+
+        Element endpoints = doc.createElement("endpoints");
+        flow.appendChild(endpoints);
 
 		for (Endpoint endpointDB : endpointsDB) {
 
@@ -389,7 +414,7 @@ public void setEndpointsFromDB(Set<Endpoint> endpointsDB) throws Exception {
 			if (confUri != null) {
 
 				Element endpoint = doc.createElement("endpoint");
-				flow.appendChild(endpoint);
+                endpoints.appendChild(endpoint);
 
 				Element id = doc.createElement("id");
 				id.setTextContent(confId);
@@ -604,7 +629,13 @@ public void setXMLEnvironmentVariablesFromDB(String connectorId) throws Exceptio
 				environmentValueNode.appendChild(doc.createTextNode(environmentValue));
 				environmentVariableNode.appendChild(environmentValueNode);
 
-			}
+                // set environmentVariableValue
+                Boolean environmentEncrypted = environmentVariable.isEncrypted();
+                Element environmentEncryptedNode = doc.createElement("encrypted");
+                environmentEncryptedNode.appendChild(doc.createTextNode(environmentEncrypted.toString()));
+                environmentVariableNode.appendChild(environmentEncryptedNode);
+
+            }
 		}
 
 	}