Modify internal state of AASXDeserializer to be private

Author: Daespen

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

@@ -58,7 +58,7 @@ public class AASXDeserializer {
     private XmlDeserializer deserializer = new XmlDeserializer();
 
     private AssetAdministrationShellEnvironment environment;
-    public OPCPackage aasxRoot;
+    private final OPCPackage aasxRoot;
 
     public AASXDeserializer(InputStream inputStream) throws InvalidFormatException, IOException {
         aasxRoot = OPCPackage.open(inputStream);
@@ -70,28 +70,27 @@ public AASXDeserializer(XmlDeserializer deserializer, InputStream inputStream) t
     }
 
     public AssetAdministrationShellEnvironment read() throws InvalidFormatException, IOException, DeserializationException {
-
         // If the XML was already parsed return cached environment
         if (environment != null) {
             return environment;
         }
-
         environment = deserializer.read(getXMLResourceString(aasxRoot));
-
         return environment;
     }
 
     /**
      * Return the Content of the xml file in the aasx-package as String
      * 
-     * @param aasxPackage
-     *            - the root package of the AASX
+     * @param aasxPackage - the root package of the AASX
      * @return Content of XML as String
      * @throws InvalidFormatException
      * @throws IOException
      */
-    public String getXMLResourceString(OPCPackage aasxPackage) throws InvalidFormatException, IOException {
+    public String getXMLResourceString() throws InvalidFormatException, IOException {
+        return getXMLResourceString(this.aasxRoot);
+    }
 
+    private String getXMLResourceString(OPCPackage aasxPackage) throws InvalidFormatException, IOException {
         // Get the "/aasx/aasx-origin" Part. It is Relationship source for the
         // XML-Document
         PackagePart originPart = aasxPackage.getPart(PackagingURIHelper.createPartName(AASX_ORIGIN));
@@ -129,11 +128,9 @@ public String getXMLResourceString(OPCPackage aasxPackage) throws InvalidFormatE
      * 
      */
     private List<String> parseReferencedFilePathsFromAASX() throws IOException, InvalidFormatException, DeserializationException {
+        read();
 
-        AssetAdministrationShellEnvironment environment = read();
-
-        List<String> paths = new ArrayList<String>();
-
+        List<String> paths = new ArrayList<>();
         for (Submodel sm : environment.getSubmodels()) {
             paths.addAll(parseElements(sm.getSubmodelElements()));
         }
@@ -147,8 +144,7 @@ private List<String> parseReferencedFilePathsFromAASX() throws IOException, Inva
      * @return the Paths from the File elements
      */
     private List<String> parseElements(Collection<SubmodelElement> elements) {
-        List<String> paths = new ArrayList<String>();
-
+        List<String> paths = new ArrayList<>();
         for (SubmodelElement element : elements) {
             if (element instanceof File) {
                 File file = (File) element;
@@ -168,13 +164,10 @@ private List<String> parseElements(Collection<SubmodelElement> elements) {
 
     public List<InMemoryFile> getRelatedFiles() throws InvalidFormatException, IOException, DeserializationException {
         List<String> filePaths = parseReferencedFilePathsFromAASX();
-
         List<InMemoryFile> files = new ArrayList<>();
-
         for (String filePath : filePaths) {
             files.add(readFile(aasxRoot, filePath));
         }
-
         return files;
     }
 

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

@@ -15,15 +15,15 @@
  */
 package io.adminshell.aas.v3.dataformat.aasx;
 
-import io.adminshell.aas.v3.dataformat.xml.XmlSchemaValidator;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.xml.sax.SAXException;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Set;
 
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.xml.sax.SAXException;
+
+import io.adminshell.aas.v3.dataformat.xml.XmlSchemaValidator;
+
 /**
  * Class to validate the XML file inside an AASX-package
  */
@@ -39,12 +39,13 @@ public AASXValidator(InputStream is) throws SAXException, IOException, InvalidFo
 
     /**
      * Calls XML-Validator
+     * 
      * @return Set of Strings containing message on AASX-XML-Validation result
      * @throws IOException
      * @throws InvalidFormatException
      */
     public Set<String> validateSchema() throws IOException, InvalidFormatException {
-        String file = deserializer.getXMLResourceString(deserializer.aasxRoot);
+        String file = deserializer.getXMLResourceString();
         return xmlValidator.validateSchema(file);
     }