Changes 15092022

This commit is contained in:
dimitrispie 2022-09-15 11:14:14 +03:00
parent be01ec8aea
commit 2debbccf2a
33 changed files with 11 additions and 5 deletions

2
.gitignore vendored
View File

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

0
README.md Normal file → Executable file
View File

0
pom.xml Normal file → Executable file
View File

View File

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

View File

View File

View File

View File

View File

View File

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