Merge pull request #16 from assimbly/develop

Release 4.0.1
assimbly · Jun 12, 2023 · 0890178 · 0890178
2 parents 8edbc5f + 5d9950e
commit 0890178
Show file tree

Hide file tree

Showing 52 changed files with 350 additions and 397 deletions.
diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml
@@ -0,0 +1,70 @@
+name: New Release Workflow
+
+on:
+
+  release:
+    types: [ released ]
+
+jobs:
+
+  publish_prod_packages:
+
+    name: Publish Snapshot Packages
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: 'main'
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+
+      - name: Update to snapshot version
+        env:
+          VERSION: ${{ github.ref_name }}
+        run: |
+            echo "Updating to version: ${VERSION}"
+            mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${VERSION}
+            mvn versions:set-property -Dproperty=assimbly.version -DnewVersion=${VERSION}
+
+      - name: Publish package
+        run: mvn --batch-mode deploy
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish_snapshot_packages:
+
+    name: Publish Snapshot Packages
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: 'develop'
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+
+      - name: Update to snapshot version
+        env:
+          SNAPSHOT_VERSION: ${{ github.ref_name }}-SNAPSHOT
+        run: |
+            echo "Updating to version: ${SNAPSHOT_VERSION}"
+            mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${SNAPSHOT_VERSION}
+            mvn versions:set-property -Dproperty=assimbly.version -DnewVersion=${SNAPSHOT_VERSION}
+
+      - name: Publish package
+        run: mvn --batch-mode deploy
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
diff --git a/aggregate/pom.xml b/aggregate/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>custom-components</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
   </parent>
 
   <artifactId>aggregate</artifactId>

diff --git a/aleris/pom.xml b/aleris/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>custom-components</artifactId>
     <groupId>org.assimbly</groupId>
-	  <version>4.0.0</version>
+	  <version>4.0.1</version>
   </parent>
 
   <artifactId>aleris</artifactId>

diff --git a/amazon/pom.xml b/amazon/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>custom-components</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
   </parent>
 
   <artifactId>amazon</artifactId>

diff --git a/archive/pom.xml b/archive/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>custom-components</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
   </parent>
 
   <artifactId>archive</artifactId>

diff --git a/auth/pom.xml b/auth/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
   <artifactId>auth</artifactId>

diff --git a/cookies/pom.xml b/cookies/pom.xml
@@ -4,7 +4,7 @@
   <parent>
 	<artifactId>custom-components</artifactId>
 	<groupId>org.assimbly</groupId>
-	<version>4.0.0</version>
+	<version>4.0.1</version>
   </parent>
 
   <artifactId>cookies</artifactId>

diff --git a/csvtoxml/pom.xml b/csvtoxml/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
   <artifactId>csvtoxml</artifactId>

diff --git a/docconverter/pom.xml b/docconverter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
 	<artifactId>custom-components</artifactId>
 	<groupId>org.assimbly</groupId>
-	<version>4.0.0</version>
+	<version>4.0.1</version>
   </parent>
 
   <artifactId>docconverter</artifactId>

diff --git a/edi/pom.xml b/edi/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
 

diff --git a/edifact/pom.xml b/edifact/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
 

diff --git a/edifactcommon/pom.xml b/edifactcommon/pom.xml
@@ -4,7 +4,7 @@
   <parent>
 	<artifactId>custom-components</artifactId>
 	<groupId>org.assimbly</groupId>
-	<version>4.0.0</version>
+	<version>4.0.1</version>
   </parent>
 
 

diff --git a/edifactdotweb/pom.xml b/edifactdotweb/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
   <artifactId>edifactdotweb</artifactId>

diff --git a/edifactstandards/pom.xml b/edifactstandards/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
   <artifactId>edifactstandards</artifactId>

diff --git a/encoder/pom.xml b/encoder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
   <artifactId>encoder</artifactId>

diff --git a/enrich/pom.xml b/enrich/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
   <artifactId>enrich</artifactId>

diff --git a/exceltoxml/pom.xml b/exceltoxml/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
   <artifactId>exceltoxml</artifactId>

diff --git a/flv/pom.xml b/flv/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
   <artifactId>flv</artifactId>

diff --git a/fmuta/pom.xml b/fmuta/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
   <artifactId>fmuta</artifactId>

diff --git a/formtoxml/pom.xml b/formtoxml/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
   <artifactId>formtoxml</artifactId>

diff --git a/globalvariables/pom.xml b/globalvariables/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>4.0.0</version>
+		<version>4.0.1</version>
 	</parent>
 
   <artifactId>globalvariables</artifactId>

diff --git a/globalvariables/src/main/java/org/assimbly/globalvariables/GlobalVariablesProcessor.java b/globalvariables/src/main/java/org/assimbly/globalvariables/GlobalVariablesProcessor.java
@@ -16,7 +16,6 @@
 import org.assimbly.globalvariables.domain.EnvironmentValue;
 import org.assimbly.globalvariables.domain.GlobalEnvironmentVariable;
 import org.assimbly.globalvariables.mongo.MongoDao;
-import org.assimbly.globalvariables.mongo.MongoDaoImpl;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -73,15 +72,13 @@ public String encrypt(String value) {
     }
 
     private void getGlobalVariable(Exchange exchange) {
-        MongoDao mongoDao = new MongoDaoImpl();
-
         String name = endpoint.getConfiguration().getName();
         String tenant = (endpoint.getConfiguration().getTenant()!=null ? endpoint.getConfiguration().getTenant() : TENANT_DEFAULT);
         String environment = (endpoint.getConfiguration().getEnvironment()!=null ? endpoint.getConfiguration().getEnvironment() : getEnvironment());
 
         name = interpolateVar(name, exchange, false);
 
-        GlobalEnvironmentVariable gVariable = mongoDao.findVariableByName(name, tenant);
+        GlobalEnvironmentVariable gVariable = MongoDao.findVariableByName(name, tenant);
 
         if(gVariable == null)
             throw new GlobalVariableNotFoundException("The Global Variable \"" + name + "\" was not found in the database.");
@@ -99,8 +96,6 @@ private void getGlobalVariable(Exchange exchange) {
     }
 
     private void setGlobalVariable(Exchange exchange) {
-        MongoDao mongoDao = new MongoDaoImpl();
-
         String expressionType = endpoint.getConfiguration().getExpressionType();
         String value = endpoint.getConfiguration().getValue();
         String name = endpoint.getConfiguration().getName();
@@ -113,7 +108,7 @@ private void setGlobalVariable(Exchange exchange) {
 
         value = interpolateVar(Base64Helper.unmarshal(value, UTF_8), exchange, expressionType);
 
-        GlobalEnvironmentVariable gVariable = mongoDao.findVariableByName(name, tenant);
+        GlobalEnvironmentVariable gVariable = MongoDao.findVariableByName(name, tenant);
 
         if(Objects.isNull(gVariable)) {
             gVariable = new GlobalEnvironmentVariable(name);
@@ -144,24 +139,22 @@ private void setGlobalVariable(Exchange exchange) {
         variable.setUpdatedAt(modifyDate);
         variable.setUpdatedBy(modifier);
 
-        mongoDao.updateVariable(gVariable, tenant);
+        MongoDao.updateVariable(gVariable, tenant);
     }
 
     private void deleteGlobalVariable(Exchange exchange) {
-        MongoDao mongoDao = new MongoDaoImpl();
-
         String name = endpoint.getConfiguration().getName();
         String tenant = (endpoint.getConfiguration().getTenant()!=null ? endpoint.getConfiguration().getTenant() : TENANT_DEFAULT);
 
         if(ExchangeHelper.hasVariables(name))
             name = ExchangeHelper.interpolate(name, exchange);
 
-        GlobalEnvironmentVariable variable = mongoDao.findVariableByName(name, tenant);
+        GlobalEnvironmentVariable variable = MongoDao.findVariableByName(name, tenant);
 
         if(variable == null)
             throw new GlobalVariableNotFoundException("The Global Variable \"" + name + "\" was not found in the database.");
 
-        mongoDao.deleteVariable(variable, tenant);
+        MongoDao.deleteVariable(variable, tenant);
     }
 
     private String interpolateVar(String varValue, Exchange exchange, boolean bodyFlag) {

diff --git a/...c/main/java/org/assimbly/globalvariables/exception/EnvironmentValueNotFoundException.java b/...c/main/java/org/assimbly/globalvariables/exception/EnvironmentValueNotFoundException.java
@@ -0,0 +1,7 @@
+package org.assimbly.globalvariables.exception;
+
+public class EnvironmentValueNotFoundException extends RuntimeException {
+    public EnvironmentValueNotFoundException(String s) {
+        super(s);
+    }
+}