Merge pull request #130 from clarin-eric/issue_128

Issue 128

Author: wowasa

curation-core/pom.xml

@@ -9,7 +9,7 @@
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <log4j.version>2.17.2</log4j.version>
-      <rasa.version>5.0.2</rasa.version>
+      <rasa.version>5.0.3</rasa.version>
    </properties>
    <dependencies>
       <dependency>

curation-core/src/main/java/eu/clarin/cmdi/curation/report/CMDInstanceReport.java

@@ -6,8 +6,6 @@
 import eu.clarin.cmdi.curation.utils.TimeUtils;
 import eu.clarin.cmdi.curation.xml.XMLMarshaller;
 import eu.clarin.cmdi.rasa.DAO.CheckedLink;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.xml.bind.annotation.*;
 import java.io.OutputStream;
@@ -22,8 +20,6 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CMDInstanceReport implements Report<CollectionReport> {
 
-    private static final Logger logger = LoggerFactory.getLogger(CMDInstanceReport.class);
-
     public String parentName;
 
     @XmlAttribute
@@ -98,7 +94,7 @@ public static class URLElement {
         public String message;
 
         @XmlAttribute(name = "http-status")
-        public Integer status;
+        public String status;
 
         @XmlAttribute(name = "content-type")
         public String contentType;
@@ -120,13 +116,13 @@ public static class URLElement {
 
         public URLElement convertFromLinkCheckerURLElement(CheckedLink checkedLink) {
             url = checkedLink.getUrl();
-            method = checkedLink.getMethod();
-            status = checkedLink.getStatus();
+            method = checkedLink.getMethod()==null?"n/a":checkedLink.getMethod();
+            status = checkedLink.getStatus()==null?"n/a":String.valueOf(checkedLink.getStatus());
             category = checkedLink.getCategory().name();
-            contentType = checkedLink.getContentType();
-            expectedContentType = checkedLink.getExpectedMimeType();
-            byteSize = String.valueOf(checkedLink.getByteSize());
-            duration = TimeUtils.humanizeToTime(checkedLink.getDuration());
+            contentType = checkedLink.getContentType()==null?"n/a":checkedLink.getContentType();
+            expectedContentType = checkedLink.getExpectedMimeType()==null?"n/a":checkedLink.getExpectedMimeType();
+            byteSize = checkedLink.getByteSize()==null?"n/a":String.valueOf(checkedLink.getByteSize());
+            duration = checkedLink.getDuration()==null?"n/a":TimeUtils.humanizeToTime(checkedLink.getDuration());
             timestamp = checkedLink.getCheckingDate().toString();
 
             return this;

pom.xml

@@ -10,7 +10,7 @@
       <url>http://www.clarin.eu</url>
    </organization>
    <properties>
-      <revision>5.3.0</revision>
+      <revision>5.3.1</revision>
       <maven.compiler.source>11</maven.compiler.source>
       <maven.compiler.target>11</maven.compiler.target>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>