Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

Commit 987a514

Browse files
author
weissarn
committed
Implement AASX Validation, set a couple of methods in Deserializer to public
1 parent 9969f22 commit 987a514

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

dataformat-aasx/src/main/java/io/adminshell/aas/v3/dataformat/aasx/AASXDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class AASXDeserializer {
5858
private XmlDeserializer deserializer = new XmlDeserializer();
5959

6060
private AssetAdministrationShellEnvironment environment;
61-
private OPCPackage aasxRoot;
61+
public OPCPackage aasxRoot;
6262

6363
public AASXDeserializer(InputStream inputStream) throws InvalidFormatException, IOException {
6464
aasxRoot = OPCPackage.open(inputStream);

dataformat-aasx/src/main/java/io/adminshell/aas/v3/dataformat/aasx/AASXValidator.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
import java.io.InputStream;
2525
import java.util.Set;
2626

27+
/**
28+
* Class to validate the XML file inside an AASX-package
29+
*/
2730
public class AASXValidator {
2831

2932
private XmlSchemaValidator xmlValidator;
@@ -34,8 +37,14 @@ public AASXValidator(InputStream is) throws SAXException, IOException, InvalidFo
3437
this.deserializer = new AASXDeserializer(is);
3538
}
3639

37-
public Set<String> validateSchema(OPCPackage p) throws IOException, InvalidFormatException {
38-
String file = deserializer.getXMLResourceString(p);
40+
/**
41+
* Calls XML-Validator
42+
* @return Set of Strings containing message on AASX-XML-Validation result
43+
* @throws IOException
44+
* @throws InvalidFormatException
45+
*/
46+
public Set<String> validateSchema() throws IOException, InvalidFormatException {
47+
String file = deserializer.getXMLResourceString(deserializer.aasxRoot);
3948
return xmlValidator.validateSchema(file);
4049
}
4150

0 commit comments

Comments
 (0)