diff --git a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Community.java b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Community.java index 530e41c..969ecff 100644 --- a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Community.java +++ b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Community.java @@ -8,7 +8,13 @@ import lombok.NonNull; @NoArgsConstructor public class Community { - @NonNull +// @NonNull private String identifier; + + public Community(String identifier) { + super(); + this.identifier = identifier; + } + } diff --git a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Contributor.java b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Contributor.java index d07035b..36b7d35 100644 --- a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Contributor.java +++ b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Contributor.java @@ -10,7 +10,7 @@ import lombok.ToString; @Getter @Setter @ToString -@RequiredArgsConstructor +//@RequiredArgsConstructor @NoArgsConstructor public class Contributor extends Creator { @@ -40,9 +40,11 @@ public class Contributor extends Creator { } - @NonNull +// @NonNull private Type type; + + @Override public int hashCode() { @@ -66,6 +68,12 @@ public class Contributor extends Creator { return false; return true; } + + + public Contributor(Type type) { + super(); + this.type = type; + } } diff --git a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Creator.java b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Creator.java index 9c24417..38a3755 100644 --- a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Creator.java +++ b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Creator.java @@ -7,12 +7,18 @@ import lombok.RequiredArgsConstructor; @Data @NoArgsConstructor -@RequiredArgsConstructor +//@RequiredArgsConstructor public class Creator { - @NonNull +// @NonNull private String name; private String affiliation; private String orcid; private String gnd; + public Creator(String name) { + super(); + this.name = name; + } + + } diff --git a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/DateInterval.java b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/DateInterval.java index 8e3a6bb..6e4564b 100644 --- a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/DateInterval.java +++ b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/DateInterval.java @@ -15,8 +15,9 @@ public class DateInterval { private Date start; private Date end; - @NonNull +// @NonNull private Type type; private String description; + } diff --git a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/DepositionMetadata.java b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/DepositionMetadata.java index ebe7095..d816243 100644 --- a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/DepositionMetadata.java +++ b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/DepositionMetadata.java @@ -12,7 +12,7 @@ import lombok.RequiredArgsConstructor; @Data @NoArgsConstructor -@RequiredArgsConstructor +//@RequiredArgsConstructor public class DepositionMetadata { public static enum UploadType{ @@ -64,20 +64,20 @@ public class DepositionMetadata { closed } - @NonNull +// @NonNull private UploadType upload_type; private PublicationType publication_type; private ImageType image_type; - @NonNull +// @NonNull @JsonFormat(pattern = Commons.ISO_DATE_PATTERN) private Date publication_date; - @NonNull +// @NonNull private String title; - @NonNull +// @NonNull private List creators; - @NonNull +// @NonNull private String description; // TODO HTML - @NonNull +// @NonNull private AccessRights access_right; private String license; // TODO ENUM https://licenses.opendefinition.org/licenses/groups/all.json @JsonFormat(pattern = Commons.ISO_DATE_PATTERN) @@ -117,4 +117,17 @@ public class DepositionMetadata { private List dates; private String method; //TODO html + public DepositionMetadata(UploadType upload_type, Date publication_date, String title, List creators, + String description, AccessRights access_right) { + super(); + this.upload_type = upload_type; + this.publication_date = publication_date; + this.title = title; + this.creators = creators; + this.description = description; + this.access_right = access_right; + } + + + } diff --git a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Grant.java b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Grant.java index 2abd426..213d7f2 100644 --- a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Grant.java +++ b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Grant.java @@ -8,6 +8,6 @@ import lombok.NonNull; @NoArgsConstructor public class Grant { - @NonNull +// @NonNull private String id; } diff --git a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Location.java b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Location.java index 1dba798..713606d 100644 --- a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Location.java +++ b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Location.java @@ -10,7 +10,7 @@ public class Location { private Double lat; private Double lon; - @NonNull +// @NonNull private String place; private String description; diff --git a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/RelatedIdentifier.java b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/RelatedIdentifier.java index 94d7155..b609e2a 100644 --- a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/RelatedIdentifier.java +++ b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/RelatedIdentifier.java @@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor; @Data @NoArgsConstructor -@RequiredArgsConstructor +//@RequiredArgsConstructor public class RelatedIdentifier { public static enum Relation{ @@ -25,9 +25,16 @@ public class RelatedIdentifier { isAlternateIdentifier } - @NonNull +// @NonNull private String identifier; - @NonNull +// @NonNull private Relation relation; + public RelatedIdentifier(String identifier, Relation relation) { + super(); + this.identifier = identifier; + this.relation = relation; + } + + } diff --git a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Subject.java b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Subject.java index 79e9a30..6197648 100644 --- a/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Subject.java +++ b/src/main/java/org/gcube/data/publishing/ckan2zenodo/model/zenodo/Subject.java @@ -8,10 +8,17 @@ import lombok.NonNull; @NoArgsConstructor public class Subject { - @NonNull +// @NonNull private String term; - @NonNull +// @NonNull private String identifier; private String scheme; + public Subject(String term, String identifier) { + super(); + this.term = term; + this.identifier = identifier; + } + + }