Changes 15092022

.gitignore

@@ -1 +1,3 @@
 /target/
+/.idea/
+*.iml

src/main/java/eu/dnetlib/usagestats/sushilite/domain/COUNTER_Dataset_Usage.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * Created by D.Pierrakos
  */
-@JsonPropertyOrder({"Dataset_Title", "Publisher", "YOP","Access_Method", "Performance"})
+@JsonPropertyOrder({"Dataset_Title", "Publisher", "YOP", "Access_Method", "Performance"})
 //old ReportItem class
 public class COUNTER_Dataset_Usage {
 
@@ -40,6 +40,8 @@ public class COUNTER_Dataset_Usage {
         this.platform = platform;
         this.dataType = dataType;
         this.yop = yop;
+        if(accessMethod.equals("Regular"))
+            this.accessMethod = "Regular";
         if(accessMethod.equals("regular"))
             this.accessMethod = "Regular";
         if(accessMethod.equals("machine"))
@@ -135,9 +137,11 @@ public class COUNTER_Dataset_Usage {
     public void addIdentifier(COUNTER_Dataset_Identifiers datasetIdentifier) {
         datasetIdentifiers.add(datasetIdentifier);
     }
+
     public void setIdentifier(List<COUNTER_Dataset_Identifiers> datasetIdentifier) {
-        this.datasetIdentifiers=datasetIdentifier;
+        this.datasetIdentifiers = datasetIdentifier;
     }
+
     public void addDatasetContributors(COUNTER_Dataset_Contributors datasetContributor) {
         datasetContributors.add(datasetContributor);
     }
@@ -166,5 +170,4 @@ public class COUNTER_Dataset_Usage {
         datasetPerformances.add(datasetPerformance);
     }
 
-    
 }

src/main/java/eu/dnetlib/usagestats/sushilite/domain/SUSHI_Error_Model.java

@@ -1,5 +1,6 @@
 package eu.dnetlib.usagestats.sushilite.domain;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.text.DateFormat;
@@ -28,7 +29,7 @@ public class SUSHI_Error_Model {
         this.message = message;
         this.data = data;
     }
-
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("Help_URL")
     public String getHelpURL() {
         return helpURL;