Merge pull request #168 from clarin-eric/dev

Dev

Author: wowasa

curation-api/src/main/java/eu/clarin/cmdi/curation/api/subprocessor/collection/CollectionAggregator.java

@@ -209,12 +209,10 @@ public synchronized void addReport(CollectionReport collectionReport, CMDInstanc
          collectionReport.xmlValidityReport.aggregatedScore += instanceReport.xmlValidityReport.score;
 
          // Facet
-         synchronized (this) {
-            instanceReport.facetReport.coverages.stream().filter(coverage -> coverage.coveredByInstance)
-                  .forEach(instanceFacet -> collectionReport.facetReport.facets.stream()
-                        .filter(collectionFacet -> collectionFacet.name.equals(instanceFacet.name)).findFirst()
-                        .get().count++);
-         }
+         instanceReport.facetReport.coverages.stream().filter(coverage -> coverage.coveredByInstance)
+               .forEach(instanceFacet -> collectionReport.facetReport.facets.stream()
+                     .filter(collectionFacet -> collectionFacet.name.equals(instanceFacet.name)).findFirst()
+                     .get().count++);
       }
       else {
          collectionReport.fileReport.numOfFilesNonProcessable++;

curation-api/src/main/java/eu/clarin/cmdi/curation/api/subprocessor/instance/FileSizeValidator.java

@@ -192,18 +192,21 @@ public void process(CMDInstance instance, CMDInstanceReport report){
       }
 
       CMDIData<Map<String, List<ValueSet>>> cmdiData = null;
-
-      try {
-         cmdiData = processor.process(instance.getPath().toFile(), new ResourceStructureGraph());
-      }
-      catch (Exception e) {
-
-         log.debug("can't create CMDData object from file '{}'", instance.getPath());
-         report.details.add(new Detail(Severity.FATAL, "file", "can't parse file '" + instance.getPath().getFileName() + "'"));
-         report.isProcessable=false;
-         
-         return;
+      
+      synchronized(this) { // the use of the process method has to be synchronized since it's not thread-safe
 
+         try {
+            
+            cmdiData = processor.process(instance.getPath().toFile(), new ResourceStructureGraph());
+         }
+         catch (Exception e) {
+   
+            log.debug("can't create CMDData object from file '{}'", instance.getPath());
+            report.details.add(new Detail(Severity.FATAL, "file", "can't parse file '" + instance.getPath().getFileName() + "'"));
+            report.isProcessable=false;
+            
+            return;            
+         }
       }
 
 

curation-app/src/main/java/eu/clarin/cmdi/curation/app/CurationApp.java

@@ -118,10 +118,17 @@ public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
          if("all".equalsIgnoreCase(conf.getMode())) {
             log.info("start deactivating links older than {} days", conf.getLinkDeactivationAfter());
             linkService.deactivateLinksOlderThan(conf.getLinkDeactivationAfter());
-            log.info("done deactivating links older than {} days", conf.getLinkDeactivationAfter());
+            log.info("done deactivating links");
             log.info("start deleting links older than {} days", conf.getLinkDeletionAfter());
             linkService.deleteLinksOderThan(conf.getLinkDeletionAfter());
-            log.info("done deleting links older than {} days", conf.getLinkDeletionAfter());
+            log.info("done deleting links");
+            log.info("start purging history table from records checked before {} days", conf.getPurgeHistoryAfter());
+            linkService.purgeHistory(conf.getPurgeHistoryAfter());
+            log.info("done purging history");
+            log.info("start purging obsolete table from records checked before {} days", conf.getPurgeObsoleteAfter());
+            linkService.purgeObsolete(conf.getPurgeObsoleteAfter());
+            log.info("done purging obsolete");
+            
          }
 
          log.info("end time: {}", LocalDateTime.now());

curation-app/src/main/java/eu/clarin/cmdi/curation/app/conf/AppConfig.java

@@ -31,6 +31,10 @@ public class AppConfig {
 
    private int linkDeletionAfter;
 
+   private int purgeHistoryAfter;
+   
+   private int purgeObsoleteAfter;
+   
    @Data
    public static class Directory {
 

curation-app/src/main/resources/application.yml

@@ -61,4 +61,6 @@ curation:
    doc_url:
    clientUsername: curation 
    link_deactivation_after: ${LINK_DEACTIVATION_AFTER:365}
-   link_deletion_after: ${LINK_DELETION_AFTER:365}
+   link_deletion_after: ${LINK_DELETION_AFTER:365}
+   purge_history_after: ${PURGE_HISTORY_AFTER:365}
+   purge_obsolete_after: ${PURGE_OBSOLETE_AFTER:100}

pom.xml

@@ -19,8 +19,8 @@
       <maven.compiler.source>17</maven.compiler.source>
       <maven.compiler.target>17</maven.compiler.target>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <linkchecker-persistence.version>0.0.5</linkchecker-persistence.version>
-      <global.version>6.0.2</global.version>
+      <linkchecker-persistence.version>0.0.6</linkchecker-persistence.version>
+      <global.version>6.0.3</global.version>
       <vlo.version>4.11.3</vlo.version>
    </properties>
    <dependencies>