Merge pull request #2648 from bosch-io/2629_generator_cache_fix

Fixes #2629.
eclipse-vorto · Oct 16, 2020 · b626525 · b626525
2 parents 387dbeb + 95e8b95
commit b626525
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/...ory/repository-core/src/main/java/org/eclipse/vorto/repository/core/IModelRepository.java b/...ory/repository-core/src/main/java/org/eclipse/vorto/repository/core/IModelRepository.java
@@ -295,7 +295,7 @@ List<Attachment> getAttachmentsByTag(ModelId modelId, Tag attachmentTag,
    * @param tags
    * @return
    */
-  List<Attachment> getAttachmentsByTags(ModelId modelId, Set<Tag> tags)
+  List<Attachment> getAttachmentsByTags(ModelId modelId, List<Tag> tags)
       throws NotAuthorizedException;
 
   /**

diff --git a/...repository-core/src/main/java/org/eclipse/vorto/repository/core/impl/ModelRepository.java b/...repository-core/src/main/java/org/eclipse/vorto/repository/core/impl/ModelRepository.java
@@ -987,8 +987,9 @@ public List<Attachment> getAttachmentsByTag(final ModelId modelId, final Tag tag
   }
 
   @Override
-  public List<Attachment> getAttachmentsByTags(final ModelId modelId, final Set<Tag> tag) {
+  public List<Attachment> getAttachmentsByTags(final ModelId modelId, final List<Tag> tag) {
     return getAttachments(modelId).stream()
+        .filter(attachment -> attachment.getTags().size() == tag.size())
         .filter(attachment -> attachment.getTags().containsAll(tag))
         .collect(Collectors.toList());
   }

diff --git a/.../org/eclipse/vorto/repository/plugin/generator/impl/GeneratedOutputAttachmentHandler.java b/.../org/eclipse/vorto/repository/plugin/generator/impl/GeneratedOutputAttachmentHandler.java
@@ -12,26 +12,20 @@
  */
 package org.eclipse.vorto.repository.plugin.generator.impl;
 
-import com.google.common.collect.Sets;
+import com.google.common.collect.Lists;
+import org.eclipse.vorto.model.ModelId;
+import org.eclipse.vorto.repository.core.*;
+import org.eclipse.vorto.repository.plugin.generator.GeneratedOutput;
+import org.eclipse.vorto.repository.plugin.generator.GeneratorPluginConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import org.eclipse.vorto.model.ModelId;
-import org.eclipse.vorto.repository.core.Attachment;
-import org.eclipse.vorto.repository.core.FileContent;
-import org.eclipse.vorto.repository.core.IModelRepository;
-import org.eclipse.vorto.repository.core.IModelRepositoryFactory;
-import org.eclipse.vorto.repository.core.IUserContext;
-import org.eclipse.vorto.repository.core.ModelInfo;
-import org.eclipse.vorto.repository.core.Tag;
-import org.eclipse.vorto.repository.core.impl.PrivilegedUserContextProvider;
-import org.eclipse.vorto.repository.plugin.generator.GeneratedOutput;
-import org.eclipse.vorto.repository.plugin.generator.GeneratorPluginConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 /**
  * @author kolotu This class handles the querying and the saving of attachments that contain the
@@ -86,7 +80,7 @@ Optional<GeneratedOutput> getGeneratedOutputFromAttachment(ModelInfo modelInfo,
 
     List<Attachment> attachments = repository
         .getAttachmentsByTags(modelInfo.getId(),
-            Sets.newHashSet(
+            Lists.newArrayList(
                 GeneratedOutputAttachmentHandler.tagsForRequest(plugin, requestParams)));
     if (Objects.nonNull(attachments)) {
       return attachments.stream()