refactor event hash generator: rename packages

add support for Quarkus arc deployments

Author: sboeckelmann

.github/workflows/maven-cli.yml

@@ -16,11 +16,11 @@ jobs:
     steps:
       - name: checkout from git
         uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up GraalVM 21
+        uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
-          distribution: 'temurin'
+          java-version: '21'
+          distribution: 'graalvm-community'
           cache: maven
       - name: Install gpg secret key
         run: |
@@ -79,7 +79,7 @@ jobs:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         with:
           upload_url: ${{steps.create_release.outputs.upload_url}}
-          asset_path: 'quarkus-app/target/openepcis-event-hash-generator-service-runner.jar'
+          asset_path: 'quarkus/quarkus-app/target/openepcis-event-hash-generator-service-runner.jar'
           asset_name: 'openepcis-event-hash-generator-service-${{env.GIT_TAG_NAME}}.jar'
           asset_content_type: application/java-archive
       - name: 'Upload Release CLI Asset'
@@ -139,11 +139,11 @@ jobs:
           username: ${{github.actor}}
           password: ${{secrets.GITHUB_TOKEN}}
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up GraalVM 21
+        uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
-          distribution: 'temurin'
+          java-version: '21'
+          distribution: 'graalvm-community'
           cache: maven
 
       - name: "Prepare Build"
@@ -152,7 +152,7 @@ jobs:
 
       - name: "Build ${{matrix.platform}} native Image"
         run: |
-          mvn --no-transfer-progress --batch-mode -Pci-build package -Dnative -DskipTests -f ./quarkus-app/pom.xml \
+          mvn --no-transfer-progress --batch-mode -Pci-build package -Dnative -DskipTests -f ./quarkus/quarkus-app/pom.xml \
             -Dquarkus.native.container-build=true \
             -Dquarkus.container-image.build=true \
             -Dquarkus.container-image.name=event-hash-generator-service-native \
@@ -232,11 +232,11 @@ jobs:
         id: builder
         uses: docker/setup-buildx-action@v1
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up GraalVM 21
+        uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
-          distribution: 'temurin'
+          java-version: '21'
+          distribution: 'graalvm-community'
           cache: maven
 
       - name: "Prepare Build"
@@ -246,7 +246,7 @@ jobs:
       - name: "Build linux/amd64 Image"
         run: |
           mvn --no-transfer-progress --batch-mode \
-            clean package -Pci-build -f ./quarkus-app/pom.xml \
+            clean package -Pci-build -f ./quarkus/quarkus-app/pom.xml \
             -Dquarkus.container-image.name=event-hash-generator-service \
             -Dquarkus.container-image.build=true \
             -Dquarkus.container-image.registry=ghcr.io \
@@ -258,7 +258,7 @@ jobs:
       - name: "Build linux/arm64 Image"
         run: |
           mvn --no-transfer-progress --batch-mode \
-            clean package -Pci-build -f ./quarkus-app/pom.xml \
+            clean package -Pci-build -f ./quarkus/quarkus-app/pom.xml \
             -Dquarkus.container-image.name=event-hash-generator-service \
             -Dquarkus.container-image.build=true \
             -Dquarkus.container-image.registry=ghcr.io \
@@ -290,16 +290,19 @@ jobs:
 
     strategy:
       matrix:
-        os: ['ubuntu-latest', 'ubuntu-22.04-arm64', 'macos-latest', 'windows-latest']
+        os: ['ubuntu-latest', 'ubuntu-22.04-arm64', "macos-13", 'macos-latest', 'windows-latest']
         include:
           - os: 'ubuntu-latest'
             label: 'linux-amd64'
             exe: ""
           - os: 'ubuntu-22.04-arm64'
             label: 'linux-arm64'
             exe: ""
+          - os: 'macos-13'
+            label: 'mac-x64'
+            exe: ""
           - os: 'macos-latest'
-            label: 'mac'
+            label: 'mac-arm'
             exe: ""
           - os: 'windows-latest'
             label: 'windows'
@@ -330,10 +333,10 @@ jobs:
         run: |
           echo "::set-env name=UPLOAD_URL::$(cat upload_url.txt)"
 
-      - name: Set up GraalVM
+      - name: Set up GraalVM 21
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'graalvm-community'
           native-image-job-reports: 'true'
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -344,7 +347,7 @@ jobs:
 
       - name: "Build Native Quarkus Executable"
         run: |
-          mvn --no-transfer-progress --batch-mode clean package -Pnative -Pci-build -DskipTests -f ./quarkus-app/pom.xml
+          mvn --no-transfer-progress --batch-mode clean package -Pnative -Pci-build -DskipTests -f ./quarkus/quarkus-app/pom.xml
 
       - name: 'Release Native Quarkus Executable'
         if: success() && contains(github.ref, 'v')
@@ -355,24 +358,27 @@ jobs:
         with:
           upload_url: ${{env.UPLOAD_URL}}
           asset_name: 'openepcis-event-hash-generator-service-runner-${{env.GIT_TAG_NAME}}-${{matrix.label}}${{matrix.exe}}'
-          asset_path: 'quarkus-app/target/openepcis-event-hash-generator-service-runner${{matrix.exe}}'
+          asset_path: 'quarkus/quarkus-app/target/openepcis-event-hash-generator-service-runner${{matrix.exe}}'
           asset_content_type: application/octet-stream
 
   build-cli-native-executable:
     name: 'Build CLI Native Executable'
     needs: [build-jar-job]
     strategy:
       matrix:
-        os: ['ubuntu-latest', 'ubuntu-22.04-arm64', 'macos-latest', 'windows-latest']
+        os: ['ubuntu-latest', 'ubuntu-22.04-arm64', "macos-13", 'macos-latest', 'windows-latest']
         include:
           - os: 'ubuntu-latest'
             label: 'linux-amd64'
             exe: ""
           - os: 'ubuntu-22.04-arm64'
             label: 'linux-arm64'
             exe: ""
+          - os: 'macos-13'
+            label: 'mac-x64'
+            exe: ""
           - os: 'macos-latest'
-            label: 'mac'
+            label: 'mac-arm'
             exe: ""
           - os: 'windows-latest'
             label: 'windows'
@@ -382,13 +388,11 @@ jobs:
       - name: checkout from git
         uses: actions/checkout@v3
 
-      - name: Set up GraalVM
+      - name: Set up GraalVM 21
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'graalvm-community'
-          native-image-job-reports: 'true'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 'Get Version Number'
         env:

cli/pom.xml

@@ -94,7 +94,7 @@
                     <transformers>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                             <manifestEntries>
-                                <Main-Class>io.openepcis.epc.eventhash.main.HashGenerator</Main-Class>
+                                <Main-Class>io.openepcis.eventhash.main.HashGenerator</Main-Class>
                                 <Specification-Title>${project.artifactId}</Specification-Title>
                                 <Specification-Version>${project.version}</Specification-Version>
                                 <Implementation-Title>${project.artifactId}</Implementation-Title>
@@ -136,7 +136,7 @@
                         </executions>
                         <configuration>
                             <imageName>epcis-event-hash</imageName>
-                            <mainClass>io.openepcis.epc.eventhash.main.HashGenerator</mainClass>
+                            <mainClass>io.openepcis.eventhash.main.HashGenerator</mainClass>
                             <buildArgs>
                                 <arg>--enable-all-security-services</arg>
                                 <arg>--enable-http</arg>

cli/src/main/java/io/openepcis/epc/eventhash/main/HashGenerator.java renamed to cli/src/main/java/io/openepcis/eventhash/main/HashGenerator.java

@@ -13,11 +13,10 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash.main;
+package io.openepcis.eventhash.main;
 
-import io.openepcis.epc.eventhash.EventHashGenerator;
+import io.openepcis.eventhash.EventHashGenerator;
 import java.io.*;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

core/src/main/java/io/openepcis/epc/eventhash/ContextNode.java renamed to core/src/main/java/io/openepcis/eventhash/ContextNode.java

@@ -13,13 +13,13 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash;
+package io.openepcis.eventhash;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import io.openepcis.constants.CBVVersion;
 import io.openepcis.constants.EPCIS;
-import io.openepcis.epc.eventhash.constant.ConstantEventHashInfo;
+import io.openepcis.eventhash.constant.ConstantEventHashInfo;
 import io.openepcis.epc.translator.util.ConverterUtil;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -29,7 +29,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static io.openepcis.epc.eventhash.constant.ConstantEventHashInfo.*;
+import static io.openepcis.eventhash.constant.ConstantEventHashInfo.*;
 
 /**
  * This class is utilized by EventHash and SaxHandler during the parsing of XML/JSON EPCIS document

core/src/main/java/io/openepcis/epc/eventhash/DocumentWrapperSupport.java renamed to core/src/main/java/io/openepcis/eventhash/DocumentWrapperSupport.java

@@ -13,14 +13,13 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash;
+package io.openepcis.eventhash;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.openepcis.epc.eventhash.exception.EventHashException;
-import jakarta.inject.Inject;
+import io.openepcis.eventhash.exception.EventHashException;
 import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import org.eclipse.microprofile.context.ManagedExecutor;

core/src/main/java/io/openepcis/epc/eventhash/EventHashGenerator.java renamed to core/src/main/java/io/openepcis/eventhash/EventHashGenerator.java

@@ -13,14 +13,14 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash;
+package io.openepcis.eventhash;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.openepcis.constants.CBVVersion;
 import io.openepcis.constants.EPCIS;
-import io.openepcis.epc.eventhash.constant.ConstantEventHashInfo;
-import io.openepcis.epc.eventhash.exception.EventHashException;
+import io.openepcis.eventhash.constant.ConstantEventHashInfo;
+import io.openepcis.eventhash.exception.EventHashException;
 import io.openepcis.reactive.publisher.ObjectNodePublisher;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.subscription.MultiEmitter;
@@ -31,7 +31,6 @@
 import java.util.function.Consumer;
 import javax.xml.parsers.SAXParserFactory;
 
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 

core/src/main/java/io/openepcis/epc/eventhash/HashIdGenerator.java renamed to core/src/main/java/io/openepcis/eventhash/HashIdGenerator.java

@@ -13,7 +13,7 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash;
+package io.openepcis.eventhash;
 
 import io.openepcis.constants.CBVVersion;
 import jakarta.xml.bind.DatatypeConverter;

core/src/main/java/io/openepcis/epc/eventhash/HashNodeComparator.java renamed to core/src/main/java/io/openepcis/eventhash/HashNodeComparator.java

@@ -13,7 +13,7 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash;
+package io.openepcis.eventhash;
 
 import java.util.ArrayList;
 import java.util.Comparator;

core/src/main/java/io/openepcis/epc/eventhash/SaxHandler.java renamed to core/src/main/java/io/openepcis/eventhash/SaxHandler.java

@@ -13,10 +13,10 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash;
+package io.openepcis.eventhash;
 
 import io.openepcis.constants.EPCIS;
-import io.openepcis.epc.eventhash.constant.ConstantEventHashInfo;
+import io.openepcis.eventhash.constant.ConstantEventHashInfo;
 import io.smallrye.mutiny.subscription.MultiEmitter;
 import java.util.ArrayDeque;
 import java.util.Deque;

core/src/main/java/io/openepcis/epc/eventhash/TemplateNodeMap.java renamed to core/src/main/java/io/openepcis/eventhash/TemplateNodeMap.java

@@ -13,10 +13,10 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash;
+package io.openepcis.eventhash;
 
 import io.openepcis.constants.EPCIS;
-import io.openepcis.epc.eventhash.constant.ConstantEventHashInfo;
+import io.openepcis.eventhash.constant.ConstantEventHashInfo;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 

core/src/main/java/io/openepcis/epc/eventhash/constant/ConstantEventHashInfo.java renamed to core/src/main/java/io/openepcis/eventhash/constant/ConstantEventHashInfo.java

@@ -13,7 +13,7 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash.constant;
+package io.openepcis.eventhash.constant;
 
 import static java.util.Map.entry;
 

core/src/main/java/io/openepcis/epc/eventhash/exception/EventHashException.java renamed to core/src/main/java/io/openepcis/eventhash/exception/EventHashException.java

@@ -13,7 +13,7 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash.exception;
+package io.openepcis.eventhash.exception;
 
 public class EventHashException extends RuntimeException {
   public EventHashException(String msg, Throwable parent) {

core/src/test/java/io/openepcis/epc/eventhash/EventHashGeneratorPublisherTest.java renamed to core/src/test/java/io/openepcis/eventhash/EventHashGeneratorPublisherTest.java

@@ -13,7 +13,7 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash;
+package io.openepcis.eventhash;
 
 import io.openepcis.constants.CBVVersion;
 import io.smallrye.mutiny.Multi;

core/src/test/java/io/openepcis/epc/eventhash/ParallelExecutionTests.java renamed to core/src/test/java/io/openepcis/eventhash/ParallelExecutionTests.java

@@ -13,7 +13,7 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package io.openepcis.epc.eventhash;
+package io.openepcis.eventhash;
 
 import static org.junit.Assert.assertEquals;