Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create scd with header and import ICD #39

Merged
merged 9 commits into from
Nov 18, 2021
Merged

Create scd with header and import ICD #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6e70727
Issue : Create a new SCD file with header
syllamoh Sep 20, 2021
8b6edcd
implement marshallers for SCL type
syllamoh Oct 12, 2021
c6dc257
import IED with it DataTypeTemplate
syllamoh Oct 18, 2021
0b97ded
correct sonar alert
syllamoh Oct 18, 2021
9e4ced7
reuse compliance
syllamoh Oct 18, 2021
5e36b16
compas package dependencies version
syllamoh Oct 18, 2021
6b30ae2
update SCL COM adapater by adding subnetwork creation and connectedAP…
syllamoh Oct 25, 2021
32d3249
Implements sct-data for postgres (using spring-data)
syllamoh Nov 17, 2021
452ca41
add copyRight info to files
syllamoh Nov 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 47 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,57 @@
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.7.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.7.2</version>
</dependency>
<dependency>
<groupId>org.lfenergy.compas.core</groupId>
<artifactId>scl2007b4</artifactId>
<version>0.2.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.6</version>
</dependency>
<!--<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.32</version>
<scope>test</scope>
</dependency>-->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.lfenergy.compas.core</groupId>
<artifactId>scl2007b4</artifactId>
<version>0.2.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
</dependencies>
<modules>
<module>sct-commons</module>
<module>sct-coverage</module>
<module>sct-data</module>
<module>sct-data-pg</module>
<module>sct-service</module>
</modules>

<build>
Expand All @@ -55,6 +96,11 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
</plugins>
</pluginManagement>

Expand Down
70 changes: 60 additions & 10 deletions sct-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,23 @@
<groupId>org.lfenergy.compas</groupId>
<artifactId>sct-commons</artifactId>
<version>local-SNAPSHOT</version>
<name>SCT-COMMONS</name>


<properties>
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.3.3</version>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.11</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
Expand All @@ -38,21 +45,19 @@
<version>2.3.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
<version>5.3.2</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.16</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -67,6 +72,12 @@
<version>3.6.28</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>4.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
Expand All @@ -86,6 +97,45 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>initialize</phase>
<goals>
<goal>unpack</goal>
</goals>

<configuration>
<artifactItems>
<artifactItem>
<groupId>org.lfenergy.compas.xsd</groupId>
<artifactId>compas-scl-xsd</artifactId>
<version>0.0.4</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down
66 changes: 66 additions & 0 deletions sct-commons/src/main/java/org/lfenergy/compas/sct/commons/MarshallerWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
// SPDX-FileCopyrightText: 2021 RTE FRANCE
//
// SPDX-License-Identifier: Apache-2.0

package org.lfenergy.compas.sct.commons;

import lombok.extern.slf4j.Slf4j;
import org.lfenergy.compas.core.commons.exception.CompasErrorCode;
import org.lfenergy.compas.core.commons.exception.CompasException;

import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.Result;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import java.io.*;

@Slf4j
public class MarshallerWrapper {
private final Unmarshaller unmarshaller;
private final Marshaller marshaller;

protected MarshallerWrapper(Unmarshaller unmarshaller, Marshaller marshaller) {
this.unmarshaller = unmarshaller;
this.marshaller = marshaller;
}

public static SclMarshallerBuilder builder(){
return new SclMarshallerBuilder();
}

public <T> String marshall(final T obj) {
try {
StringWriter sw = new StringWriter();
Result result = new StreamResult(sw);
marshaller.marshal(obj, result);

return sw.toString();
} catch (JAXBException exp) {
String message = String.format("Error marshalling the Class: %s", exp);
log.error(message);
throw new CompasException(CompasErrorCode.MARSHAL_ERROR_CODE, message);
}
}

public <T> T unmarshall(final byte[] xml, Class<T> cls) {
ByteArrayInputStream input = new ByteArrayInputStream(xml);
return unmarshall(input, cls);
}

public <T> T unmarshall(final InputStream xml, Class<T> cls) {
try {
Object result = unmarshaller.unmarshal(new StreamSource(xml));
if (!result.getClass().isAssignableFrom(cls)) {
throw new CompasException(CompasErrorCode.UNMARSHAL_ERROR_CODE,
"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);
throw new CompasException(CompasErrorCode.UNMARSHAL_ERROR_CODE, message);
}
}
}
Loading