Fixed a bug where the componentList.json files would contain all comp…

…onents currently loaded. And not just the components in the respective repository.
JULIELab · Jul 11, 2019 · c5611f2 · c5611f2
1 parent d8847e2
commit c5611f2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/.../de/julielab/jcore/pipeline/builder/base/interfaces/IComponentMetaInformationService.java b/.../de/julielab/jcore/pipeline/builder/base/interfaces/IComponentMetaInformationService.java
@@ -45,6 +45,8 @@ public interface IComponentMetaInformationService {
 
     Set<MavenArtifact> getArtifacts() throws GithubInformationException;
 
+    Collection<MetaDescription> getMetaInformation(ComponentRepository repository) throws GithubInformationException;
+
     /**
      * Lists all exposed components of the module this ComponentMetaInformation object belongs to/
      * was created from.

diff --git a/...in/java/de/julielab/jcore/pipeline/builder/base/main/ComponentMetaInformationService.java b/...in/java/de/julielab/jcore/pipeline/builder/base/main/ComponentMetaInformationService.java
@@ -58,12 +58,14 @@ public void loadMetaInformationFromDisk(ComponentRepository repository) throws G
         InputStream infile = null;
         File metaFile = Repositories.getMetaFile(repository);
         logger.trace("Loading component meta description file {} for module {}:{}", metaFile, repository);
+        System.out.println(metaFile.getAbsolutePath());
         try {
             infile = FileUtilities.getInputStreamFromFile(metaFile);
             ObjectMapper objectMapper = new ObjectMapper();
             List<MetaDescription> asList = objectMapper.readValue(
                     infile, new TypeReference<List<MetaDescription>>() {
                     });
+//            asList.stream().map(MetaDescription::getName).forEach(md -> {System.out.println(repository.getName() + ": " +md);});
             asList.forEach(md -> this.metaInformation.put(md.getName(), md));
             asList.forEach(md -> md.setModule(repository));
             if (logger.isTraceEnabled()) {
@@ -157,6 +159,11 @@ public Set<MavenArtifact> getArtifacts() throws GithubInformationException {
         return this.mavenDependencies;
     }
 
+    @Override
+    public Collection<MetaDescription> getMetaInformation(ComponentRepository repository) throws GithubInformationException {
+        return metaInformation.values().stream().filter(md -> md.getModule().getName().equals(repository.getName())).collect(Collectors.toList());
+    }
+
     @Override
     public Collection<MetaDescription> getMetaInformation() throws GithubInformationException {
         return this.getMetaInformation(false);

diff --git a/...builder-base/src/main/java/de/julielab/jcore/pipeline/builder/base/main/Repositories.java b/...builder-base/src/main/java/de/julielab/jcore/pipeline/builder/base/main/Repositories.java
@@ -130,7 +130,7 @@ public static void saveMetaInformationToDisk(ComponentRepository repository) thr
             mapper.addMixIn(Description.class, DescriptionRepositoryStorageMixin.class);
             // enable pretty printing
             mapper.enable(SerializationFeature.INDENT_OUTPUT);
-            mapper.writeValue(FileUtilities.getWriterToFile(metaFile), ComponentMetaInformationService.getInstance().getMetaInformation());
+            mapper.writeValue(FileUtilities.getWriterToFile(metaFile), ComponentMetaInformationService.getInstance().getMetaInformation(repository));
         } catch (IOException e) {
             throw new GithubInformationException(e);
         }