Merge pull request #283 from com-pas/feat/282-RSR-748_remove-dependency-to-compas-corescl2007b4

fix(#282): RSR-748 Remove dependency to compas-core.scl2007b4

Author: massifben

pom.xml

@@ -44,17 +44,10 @@
         <logback-classic.version>1.4.5</logback-classic.version>
         <assertj.version>3.22.0</assertj.version>
         <lombok.version>1.18.24</lombok.version>
+        <jackson-databind.version>2.13.4.1</jackson-databind.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.lfenergy.compas.core</groupId>
-            <artifactId>scl2007b4</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.lfenergy.compas.core</groupId>
-            <artifactId>scl-extension</artifactId>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -85,11 +78,6 @@
                 <version>${junit-version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.lfenergy.compas.core</groupId>
-                <artifactId>scl2007b4</artifactId>
-                <version>${compas-core.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.lfenergy.compas.core</groupId>
                 <artifactId>scl-extension</artifactId>
@@ -110,6 +98,11 @@
                 <artifactId>assertj-core</artifactId>
                 <version>${assertj.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson-databind.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <modules>
@@ -122,16 +115,6 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.lfenergy.compas.xsd</groupId>
-                    <artifactId>compas-scl-xsd</artifactId>
-                    <version>${compas-scl-xsd.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.lfenergy.compas.core</groupId>
-                    <artifactId>scl-extension</artifactId>
-                    <version>${compas-core.version}</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>

sct-commons/pom.xml

@@ -35,6 +35,10 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.12.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
@@ -170,7 +174,7 @@
                                     <artifactId>scl-extension</artifactId>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -189,8 +193,8 @@
                 </executions>
                 <configuration>
                     <sources>
-                        <source>${project.build.directory}/xsd/SCL2007B4/SCL.xsd</source>
-                        <source>${project.build.directory}/xsd/SCL_CoMPAS.xsd</source>
+                        <source>${project.build.outputDirectory}/xsd/SCL2007B4/SCL.xsd</source>
+                        <source>${project.build.outputDirectory}/xsd/SCL_CoMPAS.xsd</source>
                     </sources>
                     <xjbSources>
                         <xjbSource>${project.basedir}/src/main/resources/binding_configuration.xjb</xjbSource>

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/util/PrivateEnum.java

@@ -7,7 +7,6 @@
 import lombok.Getter;
 import org.lfenergy.compas.scl2007b4.model.*;
 
-import javax.validation.constraints.NotNull;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -43,7 +42,6 @@ <T> PrivateEnum(String privateType, Class<T> compasClass) {
         this.compasClass = compasClass;
     }
 
-    @NotNull
     public static PrivateEnum fromClass(Class<?> compasClass) {
         PrivateEnum result = classToEnum.get(compasClass);
         if (result == null) {

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/testhelpers/MarshallerWrapper.java

@@ -8,9 +8,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.assertj.core.api.Assertions;
-import org.lfenergy.compas.core.commons.exception.CompasErrorCode;
-import org.lfenergy.compas.core.commons.exception.CompasException;
 import org.lfenergy.compas.scl2007b4.model.SCL;
+import org.opentest4j.AssertionFailedError;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
@@ -54,7 +53,7 @@ public static String marshall(final Object obj) {
         } catch (JAXBException exp) {
             String message = String.format("Error marshalling the Class: %s", exp);
             log.error(message, exp);
-            throw new CompasException(CompasErrorCode.MARSHAL_ERROR_CODE, message);
+            throw new AssertionFailedError(message, exp);
         }
     }
 
@@ -67,14 +66,13 @@ public static <T> T unmarshall(final InputStream xml, Class<T> cls) {
         try {
             Object result = getInstance().unmarshaller.unmarshal(new StreamSource(xml));
             if (!result.getClass().isAssignableFrom(cls)) {
-                throw new CompasException(CompasErrorCode.UNMARSHAL_ERROR_CODE,
-                    "Error unmarshalling to the Class. Invalid class");
+                throw new AssertionFailedError("Error unmarshalling to the Class. Invalid class");
             }
             return cls.cast(result);
         } catch (JAXBException exp) {
             String message = String.format("Error unmarshalling to the Class: %s", exp.getLocalizedMessage());
             log.error(message, exp);
-            throw new CompasException(CompasErrorCode.UNMARSHAL_ERROR_CODE, message, exp);
+            throw new AssertionFailedError(message, exp);
         }
     }
 
@@ -85,7 +83,7 @@ private static MarshallerWrapper getInstance() {
             } catch (JAXBException | SAXException | ParserConfigurationException exp) {
                 var message = "Error creating JAXB Marshaller and Unmarshaller.";
                 log.error(message, exp);
-                throw new CompasException(CompasErrorCode.CREATION_ERROR_CODE, message, exp);
+                throw new AssertionFailedError(message, exp);
             }
         }
         return singleton;
@@ -122,7 +120,7 @@ private static Source toSchemaSource(String path, XMLReader xmlReader) {
         } catch (IOException e) {
             var message = "Error loading XML schema : " + path;
             log.error(message, e);
-            throw new CompasException(CompasErrorCode.CREATION_ERROR_CODE, message);
+            throw new AssertionFailedError(message, e);
         }
         InputSource inputSource = new InputSource(url.toString());
         return new SAXSource(xmlReader, inputSource);