Merge pull request #67 from assimbly/develop

Release 3.8.1
assimbly · Dec 14, 2022 · 4169db9 · 4169db9
2 parents eadf2cb + 83a10c9
commit 4169db9
Show file tree

Hide file tree

Showing 24 changed files with 1,131 additions and 279 deletions.
diff --git a/.github/issue-branch.yml b/.github/issue-branch.yml
@@ -0,0 +1,36 @@
+mode: auto
+
+silent: false
+
+commentMessage: 'Branch ${branchName} created for issue: ${issue.number}-${issue.title}'
+
+defaultBranch: 'develop'
+
+branchName: 'issue-${issue.number}/${issue.title,}'
+
+gitSafeReplacementChar: '-'
+
+branches:
+  - label: [ feature ]
+    prefix: feature/
+
+  - label: [ bug ]
+    prefix: bugfix/
+
+  - label: [ documentation ]
+    prefix: documentation/
+
+  - label: '*'
+    prefix: issues/
+
+  - label: no-branch
+    skip: true
+
+autoCloseIssue: true
+openDraftPR: true
+
+copyIssueDescriptionToPR: true
+copyIssueLabelsToPR: true
+copyIssueAssigneeToPR: true
+copyIssueProjectsToPR: false
+copyIssueMilestoneToPR: false
diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
@@ -0,0 +1,3 @@
+feature: ['feature/*', 'feat/*']
+fix: ['fix/*', 'bug-fix/*']
+chore: ['chore/*', 'maintenance/*', 'wip/*']
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,33 +1,38 @@
-name-template: 'v$RESOLVED_VERSION'
-tag-template: 'v$RESOLVED_VERSION'
+name-template: '$RESOLVED_VERSION'
+tag-template: '$RESOLVED_VERSION'
 categories:
   - title: '🚀 Features'
+    collapse-after: 5
     labels:
       - 'feature'
       - 'enhancement'
   - title: '🐛 Bug Fixes'
+    collapse-after: 5
     labels:
       - 'fix'
       - 'bugfix'
       - 'bug'
   - title: '🧰 Maintenance'
+    collapse-after: 5
     labels:
       - 'chore'
-      - 'maintenance'
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+      - 'wip'
+exclude-labels:
+  - 'skip-changelog'
+change-template: '- $TITLE (#$NUMBER)'
 change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
-#version-resolver:
-#  major:
-#    labels:
-#      - 'major'
-#  minor:
-#    labels:
-#      - 'minor'
-#  patch:
-#    labels:
-#      - 'patch'
-#  default: patch
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+  patch:
+    labels:
+      - 'patch'
+  default: patch
 template: |
   ## Changes
 
-  $CHANGES
+  $CHANGES
diff --git a/.github/workflows/issue-branch.yml b/.github/workflows/issue-branch.yml
@@ -0,0 +1,14 @@
+name: Create Issue Branch
+
+on:
+  issues:
+    types: [ created, assigned ]
+
+jobs:
+  create_issue_branch_job:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create Issue Branch
+        uses: robvanderleek/create-issue-branch@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -1,10 +1,8 @@
 name: Publish package to GitHub Packages
 on:
   release:
-    types: [created, updated]
-  push:
-    branches:
-      - master
+    types: [ released ]
+
 jobs:
   publish:
     runs-on: ubuntu-latest 
@@ -18,7 +16,6 @@ jobs:
           java-version: '11'
           distribution: 'adopt'
       - name: Publish package
-        run: |
-          sh ./bin/mac/deploy.sh
+        run: sh ./bin/mac/deploymodules.sh
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
@@ -0,0 +1,23 @@
+name: PR Labeler
+on:
+  pull_request:
+    types: [opened, reopened, synchronize, assigned]
+    branches:
+      - develop     # matches develop branch
+      - '*/*'       # matches every branch containing a single '/'
+      - '!master'     # excludes master branch (production)
+
+permissions:
+  contents: read
+
+jobs:
+  pr-labeler:
+    permissions:
+      contents: read
+      pull-requests: write 
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add labels to PR
+        uses: TimonVS/pr-labeler-action@v4
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - master
-      - develop
+
   pull_request:
     types: [opened, reopened, synchronize]
+    branches: 
+      - master
 
 permissions:
   contents: read
@@ -15,11 +17,10 @@ jobs:
   update_release_draft:
     permissions:
       contents: write
-      pull-requests: write
-
+      pull-requests: write 
     runs-on: ubuntu-latest
-
     steps:
-      - uses: release-drafter/release-drafter@v5
+      - name: Draft a Release
+        uses: release-drafter/release-drafter@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/broker/pom.xml b/broker/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.8.0</version>
+    <version>3.8.1</version>
   </parent>
 
   <name>broker</name>

diff --git a/brokerRest/pom.xml b/brokerRest/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.8.0</version>
+    <version>3.8.1</version>
   </parent>
 
   <name>broker-rest</name>

diff --git a/dil/pom.xml b/dil/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.8.0</version>
+    <version>3.8.1</version>
   </parent>
 
   <name>dil</name>

diff --git a/dil/src/main/java/org/assimbly/dil/blocks/templates/Hl7.java b/dil/src/main/java/org/assimbly/dil/blocks/templates/Hl7.java
@@ -0,0 +1,66 @@
+package org.assimbly.dil.blocks.templates;
+
+import org.apache.camel.builder.RouteBuilder;
+
+public class Hl7 extends RouteBuilder {
+
+     @Override
+     public void configure() throws Exception {
+
+         routeTemplate("hl7xml-source")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateParameter("path")
+                 .templateParameter("out")
+                 .from("mllp:{{path}}")
+                 .unmarshal().hl7(true)
+                 .to("bean:Hl7ToXmlConverter")
+                 .routeConfigurationId("{{routeconfiguration_id}}")
+                 .to("{{out}}");
+
+         routeTemplate("hl7xml-action")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateParameter("path")
+                 .templateParameter("in")
+                 .templateParameter("out")
+                 .from("{{in}}")
+                 .to("bean:XmlToHl7Converter")
+                 .to("mllp:{{path}}")
+                 .to("{{out}}");
+
+         routeTemplate("hl7xml-sink")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateParameter("path")
+                 .templateParameter("in")
+                 .templateParameter("out")
+                 .from("{{in}}")
+                 .to("bean:XmlToHl7Converter")
+                 .to("mllp:{{path}}");
+
+         routeTemplate("hl7er7-source")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateParameter("path")
+                 .templateParameter("out")
+                 .from("mllp:{{path}}")
+                 .routeConfigurationId("{{routeconfiguration_id}}")
+                 .to("{{out}}");
+
+         routeTemplate("hl7er7-action")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateParameter("path")
+                 .templateParameter("in")
+                 .templateParameter("out")
+                 .from("{{in}}")
+                 .to("mllp:{{path}}")
+                 .to("{{out}}");
+
+         routeTemplate("hl7er7-sink")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateParameter("path")
+                 .templateParameter("in")
+                 .templateParameter("out")
+                 .from("{{in}}")
+                 .to("mllp:{{path}}");
+
+     }
+
+}
diff --git a/dil/src/main/java/org/assimbly/dil/loader/FlowLoader.java b/dil/src/main/java/org/assimbly/dil/loader/FlowLoader.java
@@ -1,5 +1,6 @@
 package org.assimbly.dil.loader;
 
+import java.util.Set;
 import java.util.TreeMap;
 import org.apache.camel.*;
 import org.apache.camel.builder.*;
@@ -25,6 +26,9 @@ public class FlowLoader extends RouteBuilder {
 	private DeadLetterChannelBuilder routeErrorHandler;
 	private String flowId;
 	private String flowName;
+	private String flowEvent;
+	private String flowVersion;
+	private String flowEnvironment;
 
 	private boolean isFlowLoaded = true;
 
@@ -57,6 +61,8 @@ private void init(){
 
 		flowId = props.get("id");
 		flowName = props.get("flow.name");
+		flowVersion = props.get("flow.version");
+		flowEnvironment = props.get("environment");
 
 		flowLoaderReport = new FlowLoaderReport();
 
@@ -66,8 +72,12 @@ private void init(){
 
 	}
 
-	private void finish(){
-		flowLoaderReport.finishReport(flowId, flowName);
+	private void finish() {
+		if (isFlowLoaded){
+			flowLoaderReport.finishReport(flowId, flowName, flowEvent, flowVersion, flowEnvironment, "Started flow successfully");
+		}else{
+			flowLoaderReport.finishReport(flowId, flowName, flowEvent, flowVersion, flowEnvironment, "Failed to load flow");
+		}
 	}
 
 	private void setExtendedCamelContext() {		
@@ -187,19 +197,28 @@ private void updateStep(Resource resource, String route, String type, String id,
 		try {
 			log.info(logMessage("Updating step", id, type, route));
 			loader.updateRoutes(resource);
+
+			//context
 			flowLoaderReport.setStep(id, uri, type, "success", null);
+			flowEvent = "start";
 		}catch (Exception e) {
 			String errorMessage = e.getMessage();
 			log.error("Failed updating step | stepid=" + id);
 			flowLoaderReport.setStep(id, uri, type, "error", errorMessage);
+			flowEvent = "error";
 			isFlowLoaded = false;
 		}
 	}
 
 	private void loadStep(Resource resource, String route, String type, String id, String uri){
+
+		System.out.println("1. id=" + id);
+		System.out.println("1. StepUri=" + uri);
+
 		try {
 			log.info(logMessage("Loading step", id, type, route));
 			loader.loadRoutes(resource);
+			flowEvent = "start";
 			flowLoaderReport.setStep(id, uri, type, "success", null);
 		}catch (Exception e){
 			try {
@@ -212,11 +231,13 @@ private void loadStep(Resource resource, String route, String type, String id, S
 				}else{
 					log.error("Failed loading step | stepid=" + id);
 					isFlowLoaded = false;
+					flowEvent = "error";
 					flowLoaderReport.setStep(id, uri, type,"error",errorMessage);
 				}
 			}catch (Exception e2){
 				log.error("Failed updating step | stepid=" + id);
 				isFlowLoaded = false;
+				flowEvent = "error";
 				flowLoaderReport.setStep(id,uri, type,"error",e2.getMessage());
 			}
 		}