From ba2734814421c3a6e7e8dcb20640ed5b895feff8 Mon Sep 17 00:00:00 2001
From: "Lange, Dr. Herbert" <herbert.lange@uni-hamburg.de>
Date: Tue, 5 Apr 2022 10:35:27 +0200
Subject: [PATCH] fix issues with changes of corpus services

---
 .../de/uni_hamburg/corpora/server/CorpusChecker.java   |  5 +++--
 .../de/uni_hamburg/corpora/server/CorpusServices.java  | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/de/uni_hamburg/corpora/server/CorpusChecker.java b/src/main/java/de/uni_hamburg/corpora/server/CorpusChecker.java
index 02ef6a2..31780be 100644
--- a/src/main/java/de/uni_hamburg/corpora/server/CorpusChecker.java
+++ b/src/main/java/de/uni_hamburg/corpora/server/CorpusChecker.java
@@ -68,7 +68,7 @@ class CorpusThread extends Thread {
 
         try {
             // Create corpus from given input file/folder
-            Corpus corpus = new Corpus(cio.read(new File(inFile).toURI().toURL())) ;
+            Corpus corpus = new Corpus(cio.read(new File(inFile).toURI().toURL(),report)) ;
             logger.info("Loaded " + corpus.getCorpusData().size() + " corpus files");
             // For all functions to be applied, get their canonical name and create an object for them
             Set<CorpusFunction> functions = new HashSet<>() ;
@@ -123,7 +123,8 @@ class CorpusThread extends Thread {
         }
         // Generate HTML report
         Collection<ReportItem> rawStatistics = report.getRawStatistics();
-        String reportOutput = ReportItem.generateDataTableHTML(rawStatistics, report.getSummaryLines());
+        String reportOutput = ReportItem.generateDataTableHTML(new ArrayList<>(rawStatistics),
+                report.getSummaryLines());
         // Alternative: Generate XML
         //XStream xstream = new XStream();
         //String reportOutput = xstream.toXML(rawStatistics);
diff --git a/src/main/java/de/uni_hamburg/corpora/server/CorpusServices.java b/src/main/java/de/uni_hamburg/corpora/server/CorpusServices.java
index a507625..ec2b8f9 100644
--- a/src/main/java/de/uni_hamburg/corpora/server/CorpusServices.java
+++ b/src/main/java/de/uni_hamburg/corpora/server/CorpusServices.java
@@ -7,7 +7,6 @@ import de.uni_hamburg.corpora.ReportItem;
 import org.reflections.Reflections;
 
 import java.lang.reflect.Modifier;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
@@ -15,8 +14,8 @@ import java.util.stream.Collectors;
 
 /**
  * @author bba1792 Dr. Herbert Lange
- * @version 20210708
- * Class encapsulating some of the corpus services functionality
+ * @version 20220404
+ * Class encapsulating some corpus services functionality
  */
 public class CorpusServices {
     /**
@@ -29,7 +28,10 @@ public class CorpusServices {
         Reflections reflections = new Reflections("de.uni_hamburg.corpora");
         Set<Class<? extends CorpusFunction>> classes = reflections.getSubTypesOf(CorpusFunction.class);
         // Convert classes to class names
-        return classes.stream().filter((c) -> !Modifier.isAbstract(c.getModifiers())).map(Class::getCanonicalName).collect(Collectors.toSet());
+        return classes.stream()
+                .filter((c) -> Modifier.isPublic(c.getModifiers()) && !Modifier.isAbstract(c.getModifiers()))
+                .map(Class::getCanonicalName)
+                .collect(Collectors.toSet());
     }
 
     /**
-- 
GitLab