-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into feature/integ-aas4j…
…-ser
- Loading branch information
Showing
161 changed files
with
5,810 additions
and
1,174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
175 changes: 175 additions & 0 deletions
175
...gitaltwin/basyx/aasenvironment/preconfiguration/AasEnvironmentPreconfigurationLoader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| /******************************************************************************* | ||
| * Copyright (C) 2023 the Eclipse BaSyx Authors | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining | ||
| * a copy of this software and associated documentation files (the | ||
| * "Software"), to deal in the Software without restriction, including | ||
| * without limitation the rights to use, copy, modify, merge, publish, | ||
| * distribute, sublicense, and/or sell copies of the Software, and to | ||
| * permit persons to whom the Software is furnished to do so, subject to | ||
| * the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be | ||
| * included in all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| * | ||
| * SPDX-License-Identifier: MIT | ||
| ******************************************************************************/ | ||
|
|
||
| package org.eclipse.digitaltwin.basyx.aasenvironment.preconfiguration; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileInputStream; | ||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import org.apache.poi.openxml4j.exceptions.InvalidFormatException; | ||
| import org.eclipse.digitaltwin.aas4j.v3.dataformat.DeserializationException; | ||
| import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXDeserializer; | ||
| import org.eclipse.digitaltwin.aas4j.v3.dataformat.json.JsonDeserializer; | ||
| import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlDeserializer; | ||
| import org.eclipse.digitaltwin.aas4j.v3.model.AssetAdministrationShell; | ||
| import org.eclipse.digitaltwin.aas4j.v3.model.ConceptDescription; | ||
| import org.eclipse.digitaltwin.aas4j.v3.model.Environment; | ||
| import org.eclipse.digitaltwin.aas4j.v3.model.Submodel; | ||
| import org.eclipse.digitaltwin.basyx.aasrepository.AasRepository; | ||
| import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.ConceptDescriptionRepository; | ||
| import org.eclipse.digitaltwin.basyx.submodelrepository.SubmodelRepository; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.core.io.ResourceLoader; | ||
| import org.springframework.integration.file.RecursiveDirectoryScanner; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| /** | ||
| * Loader for AAS environment pre-configuration | ||
| * | ||
| * @author fried, mateusmolina, despen, witt, jungjan | ||
| * | ||
| */ | ||
| @Component | ||
| public class AasEnvironmentPreconfigurationLoader { | ||
|
|
||
| @Value("${basyx.environment:#{null}}") | ||
| private List<String> pathsToLoad; | ||
|
|
||
| private ResourceLoader resourceLoader; | ||
|
|
||
| @Autowired | ||
| public AasEnvironmentPreconfigurationLoader(ResourceLoader resourceLoader, List<String> pathsToLoad) { | ||
| this.resourceLoader = resourceLoader; | ||
| this.pathsToLoad = pathsToLoad; | ||
| } | ||
|
|
||
| public boolean shouldLoadPreconfiguredEnvironment() { | ||
| return pathsToLoad != null; | ||
| } | ||
|
|
||
| public void loadPreconfiguredEnvironment(AasRepository aasRepository, SubmodelRepository submodelRepository, ConceptDescriptionRepository conceptDescriptionRepository) | ||
| throws IOException, DeserializationException, InvalidFormatException { | ||
| List<File> files = resolveFiles(pathsToLoad); | ||
| for (File file : files) { | ||
| Environment environment = getEnvironmentFromFile(file); | ||
| loadEnvironmentFromFile(aasRepository, submodelRepository, conceptDescriptionRepository, environment); | ||
| } | ||
| } | ||
|
|
||
| private List<File> resolveFiles(List<String> paths) throws IOException { | ||
| ArrayList<File> files = new ArrayList<>(); | ||
|
|
||
| for (String path : paths) { | ||
| resolvePathAndAddFilesToList(files, path); | ||
| } | ||
| return files; | ||
| } | ||
|
|
||
| private void resolvePathAndAddFilesToList(ArrayList<File> files, String path) throws IOException { | ||
| if (!getFile(path).isFile()) { | ||
| List<File> filesFromDir = extractFilesToLoadFromEnvironmentDirectory(path); | ||
| files.addAll(filesFromDir); | ||
| } else { | ||
| files.add(getFile(path)); | ||
| } | ||
| } | ||
|
|
||
| private File getFile(String filePath) throws IOException { | ||
| return resourceLoader.getResource(filePath) | ||
| .getFile(); | ||
| } | ||
|
|
||
| private void loadEnvironmentFromFile(AasRepository aasRepository, SubmodelRepository submodelRepository, ConceptDescriptionRepository conceptDescriptionRepository, Environment environment) { | ||
| if (isEnvironmentLoaded(environment)) { | ||
| createShellsOnRepositoryFromEnvironment(aasRepository, environment); | ||
| createSubmodelsOnRepositoryFromEnvironment(submodelRepository, environment); | ||
| createConceptDescriptionsOnRepositoryFromEnvironment(conceptDescriptionRepository, environment); | ||
| } | ||
| } | ||
|
|
||
| private List<File> extractFilesToLoadFromEnvironmentDirectory(String directoryToLoad) throws IllegalArgumentException, IOException { | ||
| File rootDirectory = getFile(directoryToLoad); | ||
| RecursiveDirectoryScanner directoryScanner = new RecursiveDirectoryScanner(); | ||
|
|
||
| List<File> potentialEnvironments = directoryScanner.listFiles(rootDirectory); | ||
| return potentialEnvironments.stream() | ||
| .filter(file -> isAasxFile(file.getPath()) || isJsonFile(file.getPath()) || isXmlFile(file.getPath())) | ||
| .collect(Collectors.toList()); | ||
| } | ||
|
|
||
| private void createConceptDescriptionsOnRepositoryFromEnvironment(ConceptDescriptionRepository conceptDescriptionRepository, Environment environment) { | ||
| for (ConceptDescription conceptDescription : environment.getConceptDescriptions()) { | ||
| conceptDescriptionRepository.createConceptDescription(conceptDescription); | ||
| } | ||
| } | ||
|
|
||
| private void createSubmodelsOnRepositoryFromEnvironment(SubmodelRepository submodelRepository, Environment environment) { | ||
| for (Submodel submodel : environment.getSubmodels()) { | ||
| submodelRepository.createSubmodel(submodel); | ||
| } | ||
| } | ||
|
|
||
| private void createShellsOnRepositoryFromEnvironment(AasRepository aasRepository, Environment environment) { | ||
| for (AssetAdministrationShell aas : environment.getAssetAdministrationShells()) { | ||
| aasRepository.createAas(aas); | ||
| } | ||
| } | ||
|
|
||
| private Environment getEnvironmentFromFile(File file) throws DeserializationException, InvalidFormatException, IOException { | ||
| Environment environment = null; | ||
| if (isJsonFile(file.getPath())) { | ||
| JsonDeserializer deserializer = new JsonDeserializer(); | ||
| environment = deserializer.read(new FileInputStream(file)); | ||
| } else if (isXmlFile(file.getPath())) { | ||
| XmlDeserializer deserializer = new XmlDeserializer(); | ||
| environment = deserializer.read(new FileInputStream(file)); | ||
| } else if (isAasxFile(file.getPath())) { | ||
| AASXDeserializer deserializer = new AASXDeserializer(new FileInputStream(file)); | ||
| environment = deserializer.read(); | ||
| } | ||
| return environment; | ||
| } | ||
|
|
||
| private static boolean isJsonFile(String filePath) { | ||
| return filePath.endsWith(".json"); | ||
| } | ||
|
|
||
| private static boolean isXmlFile(String filePath) { | ||
| return filePath.endsWith(".xml"); | ||
| } | ||
|
|
||
| private static boolean isAasxFile(String filePath) { | ||
| return filePath.endsWith(".aasx"); | ||
| } | ||
|
|
||
| private boolean isEnvironmentLoaded(Environment environment) { | ||
| return environment != null; | ||
| } | ||
| } |
Oops, something went wrong.