Merge pull request #127 from com-pas/develop

New release
com-pas · Oct 14, 2021 · 8e3136a · 8e3136a
2 parents c39d5ab + 2539dc8
commit 8e3136a
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 12 deletions.
diff --git a/app/pom.xml b/app/pom.xml
@@ -161,7 +161,6 @@ SPDX-License-Identifier: Apache-2.0
                 <quarkus.package.type>native</quarkus.package.type>
                 <!-- Allows for creating a Linux executable without GraalVM being installed -->
                 <quarkus.native.container-build>true</quarkus.native.container-build>
-                <quarkus.native.additional-build-args>-H:ReflectionConfigurationFiles=reflection-config.json</quarkus.native.additional-build-args>
             </properties>
 
             <build>

diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasReflectionConfiguration.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasReflectionConfiguration.java
@@ -0,0 +1,19 @@
+// SPDX-FileCopyrightText: 2021 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.data.rest;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+/**
+ * Configure class for Quarkus Native Build to be included.
+ */
+@RegisterForReflection(
+        targets = {
+                org.lfenergy.compas.core.jaxrs.model.ErrorMessage.class,
+                org.lfenergy.compas.core.jaxrs.model.ErrorResponse.class,
+                org.lfenergy.compas.scl.data.model.SclMetaInfo.class,
+                org.lfenergy.compas.scl.data.model.ObjectFactory.class
+        })
+public class CompasReflectionConfiguration {
+}
diff --git a/app/src/main/resources/reflection-config.json b/app/src/main/resources/reflection-config.json
diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/rest/CompasReflectionConfigurationTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/rest/CompasReflectionConfigurationTest.java
@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2021 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.data.rest;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+class CompasReflectionConfigurationTest {
+    @Test
+    void constructor_WhenCalled_ThenNoExceptions() {
+        var config = new CompasReflectionConfiguration();
+        assertNotNull(config);
+    }
+}
diff --git a/...rc/test/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceConfigurationTest.java b/...rc/test/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceConfigurationTest.java
@@ -8,20 +8,24 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class CompasSclDataServiceConfigurationTest {
-    private CompasSclDataServiceConfiguration configuration = new CompasSclDataServiceConfiguration();
+    @Test
+    void constructor_WhenCalled_ThenNoExceptions() {
+        var config = new CompasSclDataServiceConfiguration();
+        assertNotNull(config);
+    }
 
     @Test
     void createElementConverter_WhenCalled_ThenObjectReturned() {
-        assertNotNull(configuration.createElementConverter());
+        assertNotNull(new CompasSclDataServiceConfiguration().createElementConverter());
     }
 
     @Test
     void creatSclElementProcessor_WhenCalled_ThenObjectReturned() {
-        assertNotNull(configuration.creatSclElementProcessor());
+        assertNotNull(new CompasSclDataServiceConfiguration().creatSclElementProcessor());
     }
 
     @Test
     void createSclDataModelMarshaller_WhenCalled_ThenObjectReturned() {
-        assertNotNull(configuration.createSclDataModelMarshaller());
+        assertNotNull(new CompasSclDataServiceConfiguration().createSclDataModelMarshaller());
     }
 }