Security Part 4 + QueryLanguage

core/src/main/java/de/fraunhofer/iosb/ilt/faaast/service/Service.java

@@ -35,6 +35,7 @@
 import de.fraunhofer.iosb.ilt.faaast.service.model.api.paging.PagingInfo;
 import de.fraunhofer.iosb.ilt.faaast.service.model.exception.PersistenceException;
 import de.fraunhofer.iosb.ilt.faaast.service.model.exception.ResourceNotFoundException;
+import de.fraunhofer.iosb.ilt.faaast.service.model.messagebus.SubscriptionId;
 import de.fraunhofer.iosb.ilt.faaast.service.model.serialization.DataFormat;
 import de.fraunhofer.iosb.ilt.faaast.service.persistence.AssetAdministrationShellSearchCriteria;
 import de.fraunhofer.iosb.ilt.faaast.service.persistence.ConceptDescriptionSearchCriteria;
@@ -73,6 +74,8 @@
 public class Service implements ServiceContext {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Service.class);
+    private static final String VALUE_NULL = "value must not be null";
+    private static final String ELEMENT_NULL = "element must not be null";
     private final ServiceConfig config;
     private AssetConnectionManager assetConnectionManager;
     private List<Endpoint> endpoints;
@@ -84,6 +87,8 @@ public class Service implements ServiceContext {
 
     private RegistrySynchronization registrySynchronization;
     private RequestHandlerManager requestHandler;
+    private List<SubmodelTemplateProcessor> submodelTemplateProcessors;
+    private List<SubscriptionId> subscriptions;
 
     /**
      * Creates a new instance of {@link Service}.
@@ -121,6 +126,8 @@ public Service(CoreConfig coreConfig,
         else {
             this.endpoints = endpoints;
         }
+        this.submodelTemplateProcessors = submodelTemplateProcessors;
+        this.subscriptions = new ArrayList<>();
         this.config = ServiceConfig.builder()
                 .core(coreConfig)
                 .build();
@@ -149,6 +156,7 @@ public Service(ServiceConfig config)
             throws ConfigurationException, AssetConnectionException, PersistenceException, MessageBusException {
         Ensure.requireNonNull(config, "config must be non-null");
         this.config = config;
+        this.subscriptions = new ArrayList<>();
         init();
     }
 
@@ -306,7 +314,7 @@ public void stop() {
     }
 
 
-    private void init() throws ConfigurationException {
+    private void init() throws ConfigurationException, PersistenceException, MessageBusException {
         Ensure.requireNonNull(config.getPersistence(), new InvalidConfigurationException("config.persistence must be non-null"));
         Ensure.requireNonNull(config.getFileStorage(), new InvalidConfigurationException("config.filestorage must be non-null"));
         Ensure.requireNonNull(config.getMessageBus(), new InvalidConfigurationException("config.messagebus must be non-null"));

core/src/main/java/de/fraunhofer/iosb/ilt/faaast/service/dataformat/environment/deserializer/AasxEnvironmentDeserializer.java

@@ -23,6 +23,7 @@
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.openxml4j.util.ZipSecureFile;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXDeserializer;
 
 
@@ -35,6 +36,8 @@ public class AasxEnvironmentDeserializer implements EnvironmentDeserializer {
     @Override
     public EnvironmentContext read(InputStream in, Charset charset) throws DeserializationException {
         try {
+            // temporary workaround to make sure, that all AASX files can be loaded.
+            ZipSecureFile.setMinInflateRatio(0);
             AASXDeserializer deserializer = new AASXDeserializer(in);
             return EnvironmentContext.builder()
                     .environment(deserializer.read())

core/src/main/java/de/fraunhofer/iosb/ilt/faaast/service/persistence/Persistence.java

@@ -24,6 +24,7 @@
 import de.fraunhofer.iosb.ilt.faaast.service.model.exception.ResourceAlreadyExistsException;
 import de.fraunhofer.iosb.ilt.faaast.service.model.exception.ResourceNotAContainerElementException;
 import de.fraunhofer.iosb.ilt.faaast.service.model.exception.ResourceNotFoundException;
+import de.fraunhofer.iosb.ilt.faaast.service.model.query.json.Query;
 import de.fraunhofer.iosb.ilt.faaast.service.util.Ensure;
 import de.fraunhofer.iosb.ilt.faaast.service.util.ReferenceHelper;
 import java.util.Objects;
@@ -233,6 +234,21 @@ public Page<AssetAdministrationShell> findAssetAdministrationShells(AssetAdminis
             throws PersistenceException;
 
 
+    /**
+     * Finds {@code org.eclipse.digitaltwin.aas4j.v3.model.AssetAdministrationShell}s by search criteria and query.
+     *
+     * @param criteria the search criteria
+     * @param modifier the modifier
+     * @param paging paging information
+     * @param query the query to be executed
+     * @return the found {@code org.eclipse.digitaltwin.aas4j.v3.model.AssetAdministrationShell}s
+     * @throws PersistenceException if there was an error with the storage.
+     */
+    public Page<AssetAdministrationShell> findAssetAdministrationShellsWithQuery(AssetAdministrationShellSearchCriteria criteria, QueryModifier modifier, PagingInfo paging,
+                                                                                 Query query)
+            throws PersistenceException;
+
+
     /**
      * Finds {@code org.eclipse.digitaltwin.aas4j.v3.model.Submodel}s by search criteria.
      *
@@ -245,6 +261,19 @@ public Page<AssetAdministrationShell> findAssetAdministrationShells(AssetAdminis
     public Page<Submodel> findSubmodels(SubmodelSearchCriteria criteria, QueryModifier modifier, PagingInfo paging) throws PersistenceException;
 
 
+    /**
+     * Finds {@code org.eclipse.digitaltwin.aas4j.v3.model.Submodel}s by search criteria and query.
+     *
+     * @param criteria the search criteria
+     * @param modifier the modifier
+     * @param paging paging information
+     * @param query query to execute
+     * @return the found {@code org.eclipse.digitaltwin.aas4j.v3.model.Submodel}s
+     * @throws PersistenceException if there was an error with the storage.
+     */
+    public Page<Submodel> findSubmodelsWithQuery(SubmodelSearchCriteria criteria, QueryModifier modifier, PagingInfo paging, Query query) throws PersistenceException;
+
+
     /**
      * Finds {@code org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement}s by search criteria.
      *
@@ -271,6 +300,20 @@ public Page<SubmodelElement> findSubmodelElements(SubmodelElementSearchCriteria
     public Page<ConceptDescription> findConceptDescriptions(ConceptDescriptionSearchCriteria criteria, QueryModifier modifier, PagingInfo paging) throws PersistenceException;
 
 
+    /**
+     * Finds {@code org.eclipse.digitaltwin.aas4j.v3.model.ConceptDescription}s by search criteria and query.
+     *
+     * @param criteria the search criteria
+     * @param modifier the modifier
+     * @param paging paging information
+     * @param query query to execute
+     * @return the found {@code org.eclipse.digitaltwin.aas4j.v3.model.ConceptDescription}s
+     * @throws PersistenceException if there was an error with the storage.
+     */
+    public Page<ConceptDescription> findConceptDescriptionsWithQuery(ConceptDescriptionSearchCriteria criteria, QueryModifier modifier, PagingInfo paging, Query query)
+            throws PersistenceException;
+
+
     /**
      * Save an {@code org.eclipse.digitaltwin.aas4j.v3.model.AssetAdministrationShell}.
      *