introduce generics and deploy quarkus parent pom

openepcis · Jun 12, 2024 · 6855cf4 · 6855cf4
1 parent 6ad06ce
commit 6855cf4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/core/src/main/java/io/openepcis/converter/xml/XmlVersionTransformer.java b/core/src/main/java/io/openepcis/converter/xml/XmlVersionTransformer.java
@@ -35,24 +35,24 @@ public InputStream xmlConverter(
           InputStream inputStream, Conversion conversion)
       throws UnsupportedOperationException, IOException;
 
-  static XmlVersionTransformer newInstance() {
+  static <T extends XmlVersionTransformer> T newInstance() {
     return newInstance(Executors.newWorkStealingPool());
   }
 
-  static XmlVersionTransformer newInstance(Class<? extends XmlVersionTransformerFactory> factory) {
+  static <T extends XmlVersionTransformer> T newInstance(Class<? extends XmlVersionTransformerFactory> factory) {
     return newInstance(Executors.newWorkStealingPool(), factory);
   }
 
-  static XmlVersionTransformer newInstance(final ExecutorService executorService) {
+  static <T extends XmlVersionTransformer> T  newInstance(final ExecutorService executorService) {
     final Optional<XmlVersionTransformerFactory> optionalFactory =
         ServiceLoader.load(XmlVersionTransformerFactory.class).findFirst();
     if (optionalFactory.isPresent()) {
       return optionalFactory.get().newXmlVersionTransformer(executorService);
     }
-    return new DefaultXmlVersionTransformer(executorService);
+    return (T) new DefaultXmlVersionTransformer(executorService);
   }
 
-  static XmlVersionTransformer newInstance(
+  static <T extends XmlVersionTransformer> T newInstance(
       final ExecutorService executorService, Class<? extends XmlVersionTransformerFactory> factory)
       throws IllegalArgumentException {
     final Optional<ServiceLoader.Provider<XmlVersionTransformerFactory>> optionalFactory =

diff --git a/core/src/main/java/io/openepcis/converter/xml/XmlVersionTransformerFactory.java b/core/src/main/java/io/openepcis/converter/xml/XmlVersionTransformerFactory.java
@@ -19,5 +19,5 @@
 
 public interface XmlVersionTransformerFactory {
 
-  public XmlVersionTransformer newXmlVersionTransformer(final ExecutorService executorService);
+  public <T extends XmlVersionTransformer> T newXmlVersionTransformer(final ExecutorService executorService);
 }
diff --git a/quarkus/pom.xml b/quarkus/pom.xml
@@ -30,7 +30,7 @@
     <groupId>io.openepcis.quarkus</groupId>
     <artifactId>quarkus-document-converter-parent</artifactId>
     <packaging>pom</packaging>
-    <name>quarkus-document-converter-deployment-parent</name>
+    <name>quarkus-document-converter-parent</name>
     <description>Quarkus OpenEPCIS Document Converter Parent</description>
     <url>https://github.com/openepcis/openepcis-document-converter</url>
 
@@ -61,18 +61,6 @@
         <module>deployment</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-
     <repositories>
         <!-- sonatype releases -->
         <repository>

diff --git a/...e/src/main/java/io/openepcis/quarkus/converter/runtime/OpenEPCISConverterHealthCheck.java b/...e/src/main/java/io/openepcis/quarkus/converter/runtime/OpenEPCISConverterHealthCheck.java
@@ -35,6 +35,7 @@ public OpenEPCISConverterHealthCheck(final VersionTransformer versionTransformer
     @Override
     public HealthCheckResponse call() {
         HealthCheckResponseBuilder builder = HealthCheckResponse.named("OpenEPCIS Document Converter health check").up();
+        builder.up().withData("xmlVersionTransformer", versionTransformer.getXmlVersionTransformer().getClass().getName() );
         builder.up().withData("xmlToJsonConverter", versionTransformer.getXmlToJsonConverter().getClass().getName() );
         return builder.build();
     }