Skip to content

Allow to use custom instances of XMLInputFactory and XMLOutputFactory #54

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

Closed
kenwenzel wants to merge 1 commit into from
Closed

Allow to use custom instances of XMLInputFactory and XMLOutputFactory #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...aasx/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/AASXDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class AASXDeserializer {
private static final String XML_TYPE = "http://www.admin-shell.io/aasx/relationships/aas-spec";
private static final String AASX_ORIGIN = "/aasx/aasx-origin";

private XmlDeserializer deserializer = new XmlDeserializer();
private final XmlDeserializer deserializer;

private Environment environment;
private final OPCPackage aasxRoot;
Expand All @@ -61,6 +61,7 @@ public class AASXDeserializer {
*/
public AASXDeserializer(InputStream inputStream) throws InvalidFormatException, IOException {
aasxRoot = OPCPackage.open(inputStream);
this.deserializer = new XmlDeserializer();
}

/**
Expand Down
3 changes: 2 additions & 1 deletion ...t-aasx/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/AASXSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,13 @@ public class AASXSerializer {

private static final String AASSUPPL_RELTYPE = "http://www.admin-shell.io/aasx/relationships/aas-suppl";

private Serializer xmlSerializer = new XmlSerializer();
private final Serializer xmlSerializer;

/**
* Default constructor
*/
public AASXSerializer() {
this.xmlSerializer = new XmlSerializer();
}

/**
Expand Down
10 changes: 9 additions & 1 deletion ...at-xml/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/xml/XmlDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,31 @@
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.module.SimpleAbstractTypeResolver;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.dataformat.xml.XmlFactory;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;

public class XmlDeserializer implements Deserializer {

protected final XmlFactory xmlFactory;
protected XmlMapper mapper;
protected SimpleAbstractTypeResolver typeResolver;
@SuppressWarnings("rawtypes")
protected static Map<Class<?>, JsonDeserializer> customDeserializers = Map.of(
SubmodelElement.class, new SubmodelElementDeserializer());

public XmlDeserializer() {
this(new XmlFactory());
}

public XmlDeserializer(XmlFactory xmlFactory) {
this.xmlFactory = xmlFactory;
initTypeResolver();
buildMapper();
}

protected void buildMapper() {
mapper = XmlMapper.builder().enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
mapper = XmlMapper.builder(xmlFactory)
.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
.serializationInclusion(JsonInclude.Include.NON_NULL)
.annotationIntrospector(new XmlDataformatAnnotationIntrospector())
Expand Down
9 changes: 8 additions & 1 deletion ...rmat-xml/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/xml/XmlSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@
import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.dataformat.xml.XmlFactory;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;


public class XmlSerializer implements Serializer {
protected final XmlFactory xmlFactory;
protected XmlMapper mapper;
protected Map<String, String> namespacePrefixes;

Expand All @@ -49,12 +51,17 @@ public XmlSerializer() {
}

public XmlSerializer(Map<String, String> namespacePrefixes) {
this(new XmlFactory(), namespacePrefixes);
}

public XmlSerializer(XmlFactory xmlFactory, Map<String, String> namespacePrefixes) {
this.xmlFactory = xmlFactory;
this.namespacePrefixes = namespacePrefixes;
buildMapper();
}

protected void buildMapper() {
mapper = XmlMapper.builder()
mapper = XmlMapper.builder(xmlFactory)
.enable(SerializationFeature.INDENT_OUTPUT)
.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
.serializationInclusion(JsonInclude.Include.NON_NULL)
Expand Down