From 1943b09276820d65c68c8a2d3b89d8fc33f9dc3f Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Tue, 5 Mar 2024 16:41:30 +0200 Subject: [PATCH] use common models --- pom.xml | 5 + .../transformer/enums/ContactInfoType.java | 29 --- .../file/transformer/enums/DatabaseEnum.java | 8 - .../transformer/enums/DescriptionStatus.java | 30 --- .../file/transformer/enums/DmpAccessType.java | 29 --- .../enums/DmpBlueprintExtraFieldDataType.java | 34 --- .../enums/DmpBlueprintFieldCategory.java | 27 --- .../enums/DmpBlueprintSystemFieldType.java | 36 --- .../file/transformer/enums/DmpStatus.java | 30 --- .../file/transformer/enums/DmpUserRole.java | 29 --- .../transformer/enums/DmpVersionStatus.java | 28 --- .../file/transformer/enums/EnumUtils.java | 15 -- .../enums/FieldDataExternalDatasetType.java | 27 --- .../file/transformer/enums/FieldType.java | 83 ------- .../enums/FieldValidationType.java | 30 --- .../enums/ReferenceSourceType.java | 26 --- .../file/transformer/enums/ReferenceType.java | 38 ---- .../interfaces/FileTransformerClient.java | 15 +- .../FileTransformerConfiguration.java | 72 ++++++ .../DescriptionFileTransformerModel.java | 132 ----------- ...criptionReferenceFileTransformerModel.java | 30 --- .../DescriptionTagFileTransformerModel.java | 29 --- ...scriptionTemplateFileTransformerModel.java | 73 ------- ...ptionTemplateTypeFileTransformerModel.java | 28 --- .../DefinitionFileTransformerModel.java | 16 -- .../definition/FieldFileTransformerModel.java | 91 -------- .../FieldSetFileTransformerModel.java | 97 --------- .../MultiplicityFileTransformerModel.java | 41 ---- .../definition/PageFileTransformerModel.java | 45 ---- .../definition/RuleFileTransformerModel.java | 25 --- .../SectionFileTransformerModel.java | 100 --------- .../BaseFieldDataFileTransformerModel.java | 71 ------ ...ternalDatasetDataFileTransformerModel.java | 16 -- ...xternalSelectDataFileTransformerModel.java | 150 ------------- ...dMultiplicityDataFileTransformerModel.java | 13 -- .../LabelDataFileTransformerModel.java | 4 - .../RadioBoxDataFileTransformerModel.java | 36 --- .../SelectDataFileTransformerModel.java | 35 --- .../UploadDataFileTransformerModel.java | 48 ---- .../models/dmp/DmpFileTransformerModel.java | 206 ------------------ .../dmp/DmpReferenceFileTransformerModel.java | 38 ---- .../dmp/DmpUserFileTransformerModel.java | 39 ---- .../DmpBlueprintFileTransformerModel.java | 41 ---- .../DefinitionFileTransformerModel.java | 16 -- ...scriptionTemplateFileTransformerModel.java | 52 ----- ...eTransformerModelFileTransformerModel.java | 16 -- .../definition/FieldFileTransformerModel.java | 84 ------- .../SectionFileTransformerModel.java | 73 ------- .../SystemFieldFileTransformerModel.java | 16 -- .../EntityDoiFileTransformerModel.java | 36 --- .../transformer/models/misc/FileEnvelope.java | 22 -- .../DefinitionFileTransformerModel.java | 16 -- .../reference/FieldFileTransformerModel.java | 26 --- .../ReferenceFileTransformerModel.java | 93 -------- .../models/tag/TagFileTransformerModel.java | 28 --- ...serAdditionalInfoFileTransformerModel.java | 62 ------ .../UserContactInfoFileTransformerModel.java | 44 ---- .../models/user/UserFileTransformerModel.java | 47 ---- 58 files changed, 85 insertions(+), 2541 deletions(-) delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/ContactInfoType.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/DatabaseEnum.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/DescriptionStatus.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/DmpAccessType.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintExtraFieldDataType.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintFieldCategory.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintSystemFieldType.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/DmpStatus.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/DmpUserRole.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/DmpVersionStatus.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/EnumUtils.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/FieldDataExternalDatasetType.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/FieldType.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/FieldValidationType.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/ReferenceSourceType.java delete mode 100644 src/main/java/eu/eudat/file/transformer/enums/ReferenceType.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/description/DescriptionFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/description/DescriptionReferenceFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/description/DescriptionTagFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/DescriptionTemplateFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/DescriptionTemplateTypeFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/DefinitionFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/FieldFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/FieldSetFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/MultiplicityFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/PageFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/RuleFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/SectionFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/BaseFieldDataFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ExternalDatasetDataFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ExternalSelectDataFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelAndMultiplicityDataFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelDataFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/RadioBoxDataFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/SelectDataFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/UploadDataFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/dmp/DmpFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/dmp/DmpReferenceFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/dmp/DmpUserFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/dmpblueprint/DmpBlueprintFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/DefinitionFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/DescriptionTemplateFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/ExtraFieldFileTransformerModelFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/FieldFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/SectionFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/SystemFieldFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/entitydoi/EntityDoiFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/misc/FileEnvelope.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/reference/DefinitionFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/reference/FieldFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/reference/ReferenceFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/tag/TagFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/user/UserAdditionalInfoFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/user/UserContactInfoFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/user/UserFileTransformerModel.java diff --git a/pom.xml b/pom.xml index be99ff9..830f802 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,11 @@ + + gr.cite.opendmp + common-models + 0.0.2 + com.fasterxml.jackson.core jackson-core diff --git a/src/main/java/eu/eudat/file/transformer/enums/ContactInfoType.java b/src/main/java/eu/eudat/file/transformer/enums/ContactInfoType.java deleted file mode 100644 index 369cdbb..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/ContactInfoType.java +++ /dev/null @@ -1,29 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum ContactInfoType implements DatabaseEnum { - - Email((short) 0); - - private final Short value; - - ContactInfoType(Short value) { - this.value = value; - } - - @Override - @JsonValue - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(ContactInfoType.class); - - public static ContactInfoType of(Short i) { - return map.get(i); - } - -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/DatabaseEnum.java b/src/main/java/eu/eudat/file/transformer/enums/DatabaseEnum.java deleted file mode 100644 index 9042a67..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/DatabaseEnum.java +++ /dev/null @@ -1,8 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -public interface DatabaseEnum { - @JsonValue - T getValue(); -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/DescriptionStatus.java b/src/main/java/eu/eudat/file/transformer/enums/DescriptionStatus.java deleted file mode 100644 index 5b280b4..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/DescriptionStatus.java +++ /dev/null @@ -1,30 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum DescriptionStatus implements DatabaseEnum { - - Draft((short) 0), - Finalized((short) 1), - Canceled((short) 2); - - private final Short value; - - DescriptionStatus(Short value) { - this.value = value; - } - - @JsonValue - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(DescriptionStatus.class); - - public static DescriptionStatus of(Short i) { - return map.get(i); - } - -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/DmpAccessType.java b/src/main/java/eu/eudat/file/transformer/enums/DmpAccessType.java deleted file mode 100644 index ceee0f7..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/DmpAccessType.java +++ /dev/null @@ -1,29 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum DmpAccessType implements DatabaseEnum { - - Public((short) 0), Restricted((short) 1); - - private final Short value; - - DmpAccessType(Short value) { - this.value = value; - } - - @Override - @JsonValue - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(DmpAccessType.class); - - public static DmpAccessType of(Short i) { - return map.get(i); - } - -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintExtraFieldDataType.java b/src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintExtraFieldDataType.java deleted file mode 100644 index 2ab2217..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintExtraFieldDataType.java +++ /dev/null @@ -1,34 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; -import eu.eudat.file.transformer.enums.DmpVersionStatus; -import eu.eudat.file.transformer.enums.EnumUtils; - -import java.util.Map; - -public enum DmpBlueprintExtraFieldDataType implements DatabaseEnum { - - Text((short) 0), - RichTex((short) 1), - Date((short) 2), - Number((short) 3), - ; - - private final Short value; - - DmpBlueprintExtraFieldDataType(Short value) { - this.value = value; - } - - @JsonValue - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(DmpBlueprintExtraFieldDataType.class); - - public static DmpBlueprintExtraFieldDataType of(Short i) { - return map.get(i); - } - -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintFieldCategory.java b/src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintFieldCategory.java deleted file mode 100644 index 780cf6a..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintFieldCategory.java +++ /dev/null @@ -1,27 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum DmpBlueprintFieldCategory implements DatabaseEnum { - System((short)0), - Extra((short)1); - - private final Short value; - - DmpBlueprintFieldCategory(Short value) { - this.value = value; - } - - @JsonValue - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(DmpBlueprintFieldCategory.class); - - public static DmpBlueprintFieldCategory of(Short i) { - return map.get(i); - } -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintSystemFieldType.java b/src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintSystemFieldType.java deleted file mode 100644 index 2b144e1..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/DmpBlueprintSystemFieldType.java +++ /dev/null @@ -1,36 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum DmpBlueprintSystemFieldType implements DatabaseEnum { - - Text((short)0), - HtmlText((short)1), - Researchers((short)2), - Organizations((short)3), - Language((short)4), - Contact((short)5), - Funder((short)6), - Grant((short)7), - Project((short)8), - License((short)9), - AccessRights((short)10); - private final Short value; - - DmpBlueprintSystemFieldType(Short value) { - this.value = value; - } - - @JsonValue - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(DmpBlueprintSystemFieldType.class); - - public static DmpBlueprintSystemFieldType of(Short i) { - return map.get(i); - } -} \ No newline at end of file diff --git a/src/main/java/eu/eudat/file/transformer/enums/DmpStatus.java b/src/main/java/eu/eudat/file/transformer/enums/DmpStatus.java deleted file mode 100644 index a8e1f56..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/DmpStatus.java +++ /dev/null @@ -1,30 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum DmpStatus implements DatabaseEnum { - - Draft((short) 0), Finalized((short) 1); - - private final Short value; - - DmpStatus(Short value) { - this.value = value; - } - - @Override - @JsonValue - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(DmpStatus.class); - - public static DmpStatus of(Short i) { - return map.get(i); - } - - -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/DmpUserRole.java b/src/main/java/eu/eudat/file/transformer/enums/DmpUserRole.java deleted file mode 100644 index c7bb093..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/DmpUserRole.java +++ /dev/null @@ -1,29 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum DmpUserRole implements DatabaseEnum { - - Owner((short) 0), User((short) 1); - - private final Short value; - - DmpUserRole(Short value) { - this.value = value; - } - - @Override - @JsonValue - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(DmpUserRole.class); - - public static DmpUserRole of(Short i) { - return map.get(i); - } - -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/DmpVersionStatus.java b/src/main/java/eu/eudat/file/transformer/enums/DmpVersionStatus.java deleted file mode 100644 index f505a72..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/DmpVersionStatus.java +++ /dev/null @@ -1,28 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum DmpVersionStatus implements DatabaseEnum { - - Current((short) 0), Previous ((short) 1); - - private final Short value; - - DmpVersionStatus(Short value) { - this.value = value; - } - - @Override - @JsonValue - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(DmpVersionStatus.class); - - public static DmpVersionStatus of(Short i) { - return map.get(i); - } -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/EnumUtils.java b/src/main/java/eu/eudat/file/transformer/enums/EnumUtils.java deleted file mode 100644 index f4e9ff0..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/EnumUtils.java +++ /dev/null @@ -1,15 +0,0 @@ -package eu.eudat.file.transformer.enums; - - -import java.util.HashMap; -import java.util.Map; - -public class EnumUtils { - public static & DatabaseEnum, EnumValue> Map getEnumValueMap(Class enumType){ - HashMap map = new HashMap<>(); - for (EnumType v : enumType.getEnumConstants()) { - map.put(v.getValue(), v); - } - return map; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/FieldDataExternalDatasetType.java b/src/main/java/eu/eudat/file/transformer/enums/FieldDataExternalDatasetType.java deleted file mode 100644 index 8e3b083..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/FieldDataExternalDatasetType.java +++ /dev/null @@ -1,27 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum FieldDataExternalDatasetType implements DatabaseEnum { - ReusedDataset("reused_dataset"), - ProducedDataset("produced_dataset"), - Other("other"); - private final String value; - - FieldDataExternalDatasetType(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(FieldDataExternalDatasetType.class); - - public static FieldDataExternalDatasetType of(String i) { - return map.get(i); - } -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/FieldType.java b/src/main/java/eu/eudat/file/transformer/enums/FieldType.java deleted file mode 100644 index 1f77f87..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/FieldType.java +++ /dev/null @@ -1,83 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum FieldType implements DatabaseEnum { - EXTERNAL_SELECT(Names.ExternalSelect), - SELECT(Names.Select), - BOOLEAN_DECISION(Names.BooleanDecision), - RADIO_BOX(Names.RadioBox), - INTERNAL_DMP_ENTRIES_RESEARCHERS(Names.InternalDmpResearchers), - INTERNAL_DMP_ENTRIES_DMPS(Names.InternalDmpDmps), - INTERNAL_DMP_ENTRIES_DATASETS(Names.InternalDmpDatasets), - CHECK_BOX(Names.CheckBox), - FREE_TEXT(Names.FreeText), - TEXT_AREA(Names.TextArea), - RICH_TEXT_AREA(Names.RichTextarea), - UPLOAD(Names.Upload), - DATE_PICKER(Names.DatePicker), - EXTERNAL_DATASETS(Names.ExternalDatasets), - DATA_REPOSITORIES(Names.DataRepositories), - JOURNAL_REPOSITORIES(Names.JournalRepositories), - PUB_REPOSITORIES(Names.PubRepositories), - LICENSES(Names.Licenses), - TAXONOMIES(Names.Taxonomies), - PUBLICATIONS(Names.Publications), - REGISTRIES(Names.Registries), - SERVICES(Names.Services), - TAGS(Names.Tags), - RESEARCHERS(Names.Researchers), - ORGANIZATIONS(Names.Organizations), - DATASET_IDENTIFIER(Names.DatasetIdentifier), - CURRENCY(Names.Currency), - VALIDATION(Names.Validation); - private final String value; - - public static class Names { - public static final String ExternalSelect = "externalSelect"; - public static final String Select = "select"; - public static final String BooleanDecision = "booleanDecision"; - public static final String RadioBox = "radiobox"; - public static final String InternalDmpResearchers = "internalDmpResearchers"; - public static final String InternalDmpDmps = "internalDmpDmps"; - public static final String InternalDmpDatasets = "internalDmpDatasets"; - public static final String CheckBox = "checkBox"; - public static final String FreeText = "freetext"; - public static final String TextArea = "textarea"; - public static final String RichTextarea = "richTextarea"; - public static final String Upload = "upload"; - public static final String DatePicker = "datePicker"; - public static final String ExternalDatasets = "externalDatasets"; - public static final String DataRepositories = "dataRepositories"; - public static final String JournalRepositories = "journalRepositories"; - public static final String PubRepositories = "pubRepositories"; - public static final String Licenses = "licenses"; - public static final String Taxonomies = "taxonomies"; - public static final String Publications = "publications"; - public static final String Registries = "registries"; - public static final String Services = "services"; - public static final String Tags = "tags"; - public static final String Researchers = "researchers"; - public static final String Organizations = "organizations"; - public static final String DatasetIdentifier = "datasetIdentifier"; - public static final String Currency = "currency"; - public static final String Validation = "validation"; - } - - FieldType(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(FieldType.class); - - public static FieldType of(String i) { - return map.get(i); - } -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/FieldValidationType.java b/src/main/java/eu/eudat/file/transformer/enums/FieldValidationType.java deleted file mode 100644 index 1c3cd3b..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/FieldValidationType.java +++ /dev/null @@ -1,30 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum FieldValidationType implements DatabaseEnum { - - None((short) 0), - Required((short) 1), - Url((short) 2); - - private final Short value; - - FieldValidationType(Short value) { - this.value = value; - } - - @JsonValue - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(FieldValidationType.class); - - public static FieldValidationType of(Short i) { - return map.get(i); - } - -} \ No newline at end of file diff --git a/src/main/java/eu/eudat/file/transformer/enums/ReferenceSourceType.java b/src/main/java/eu/eudat/file/transformer/enums/ReferenceSourceType.java deleted file mode 100644 index 1c15e32..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/ReferenceSourceType.java +++ /dev/null @@ -1,26 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import java.util.Map; - -public enum ReferenceSourceType implements DatabaseEnum { - - Internal((short) 0), - External((short) 1); - - private final Short value; - - ReferenceSourceType(Short value) { - this.value = value; - } - - @Override - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(ReferenceSourceType.class); - - public static ReferenceSourceType of(Short i) { - return map.get(i); - } -} diff --git a/src/main/java/eu/eudat/file/transformer/enums/ReferenceType.java b/src/main/java/eu/eudat/file/transformer/enums/ReferenceType.java deleted file mode 100644 index 94e8107..0000000 --- a/src/main/java/eu/eudat/file/transformer/enums/ReferenceType.java +++ /dev/null @@ -1,38 +0,0 @@ -package eu.eudat.file.transformer.enums; - -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Map; - -public enum ReferenceType implements DatabaseEnum { - Taxonomies((short) 0), - Licenses((short) 1), - Publications((short) 2), - Journals((short) 3), - PubRepositories((short) 4), - DataRepositories((short) 5), - Registries((short) 6), - Services((short) 7), - Project((short) 8), - Funder((short) 9), - Datasets((short) 10), - Organizations((short) 11), - Grants((short) 12), - Researcher((short) 13); - private final Short value; - - ReferenceType(Short value) { - this.value = value; - } - - @JsonValue - public Short getValue() { - return value; - } - - private static final Map map = EnumUtils.getEnumValueMap(ReferenceType.class); - - public static ReferenceType of(Short i) { - return map.get(i); - } -} diff --git a/src/main/java/eu/eudat/file/transformer/interfaces/FileTransformerClient.java b/src/main/java/eu/eudat/file/transformer/interfaces/FileTransformerClient.java index 5e01da1..b20919e 100644 --- a/src/main/java/eu/eudat/file/transformer/interfaces/FileTransformerClient.java +++ b/src/main/java/eu/eudat/file/transformer/interfaces/FileTransformerClient.java @@ -1,8 +1,9 @@ package eu.eudat.file.transformer.interfaces; -import eu.eudat.file.transformer.models.description.DescriptionFileTransformerModel; -import eu.eudat.file.transformer.models.dmp.DmpFileTransformerModel; -import eu.eudat.file.transformer.models.misc.FileEnvelope; +import com.sun.jdi.InvalidTypeException; +import eu.eudat.commonmodels.models.dmp.DmpModel; +import eu.eudat.commonmodels.models.FileEnvelopeModel; +import eu.eudat.commonmodels.models.description.DescriptionModel; import javax.management.InvalidApplicationException; import java.io.IOException; @@ -22,11 +23,11 @@ public interface FileTransformerClient { * @return a string representing the persistent digital object identifier (DOI) * @throws Exception if an error occurs while trying to deposit the dmp */ - FileEnvelope exportDmp(DmpFileTransformerModel dmp) throws InvalidApplicationException, IOException; - DmpFileTransformerModel importDmp(FileEnvelope file); + FileEnvelopeModel exportDmp(DmpModel dmp, String variant) throws InvalidApplicationException, IOException, InvalidTypeException; + DmpModel importDmp(FileEnvelopeModel file); - FileEnvelope exportDescription(DescriptionFileTransformerModel descriptionFileTransformerModel, String format) throws InvalidApplicationException, IOException; - DescriptionFileTransformerModel importDescription(FileEnvelope file); + FileEnvelopeModel exportDescription(DescriptionModel descriptionFileTransformerModel, String format) throws InvalidApplicationException, IOException; + DescriptionModel importDescription(FileEnvelopeModel file); FileTransformerConfiguration getConfiguration(); diff --git a/src/main/java/eu/eudat/file/transformer/interfaces/FileTransformerConfiguration.java b/src/main/java/eu/eudat/file/transformer/interfaces/FileTransformerConfiguration.java index 8e9c7b7..972f5e0 100644 --- a/src/main/java/eu/eudat/file/transformer/interfaces/FileTransformerConfiguration.java +++ b/src/main/java/eu/eudat/file/transformer/interfaces/FileTransformerConfiguration.java @@ -10,6 +10,14 @@ public class FileTransformerConfiguration { private String fileTransformerId; private List exportVariants; private List importVariants; + private String organizationReferenceCode; + private String grantReferenceCode; + private String funderReferenceCode; + private String researcherReferenceCode; + private String licenceReferenceCode; + private String projectReferenceCode; + private String datasetReferenceCode; + private String publicationReferenceCode; public String getFileTransformerId() { return fileTransformerId; @@ -34,4 +42,68 @@ public class FileTransformerConfiguration { public void setImportVariants(List importVariants) { this.importVariants = importVariants; } + + public String getOrganizationReferenceCode() { + return organizationReferenceCode; + } + + public void setOrganizationReferenceCode(String organizationReferenceCode) { + this.organizationReferenceCode = organizationReferenceCode; + } + + public String getGrantReferenceCode() { + return grantReferenceCode; + } + + public void setGrantReferenceCode(String grantReferenceCode) { + this.grantReferenceCode = grantReferenceCode; + } + + public String getFunderReferenceCode() { + return funderReferenceCode; + } + + public void setFunderReferenceCode(String funderReferenceCode) { + this.funderReferenceCode = funderReferenceCode; + } + + public String getResearcherReferenceCode() { + return researcherReferenceCode; + } + + public void setResearcherReferenceCode(String researcherReferenceCode) { + this.researcherReferenceCode = researcherReferenceCode; + } + + public String getLicenceReferenceCode() { + return licenceReferenceCode; + } + + public void setLicenceReferenceCode(String licenceReferenceCode) { + this.licenceReferenceCode = licenceReferenceCode; + } + + public String getProjectReferenceCode() { + return projectReferenceCode; + } + + public void setProjectReferenceCode(String projectReferenceCode) { + this.projectReferenceCode = projectReferenceCode; + } + + public String getDatasetReferenceCode() { + return datasetReferenceCode; + } + + public void setDatasetReferenceCode(String datasetReferenceCode) { + this.datasetReferenceCode = datasetReferenceCode; + } + + public String getPublicationReferenceCode() { + return publicationReferenceCode; + } + + public void setPublicationReferenceCode(String publicationReferenceCode) { + this.publicationReferenceCode = publicationReferenceCode; + } } diff --git a/src/main/java/eu/eudat/file/transformer/models/description/DescriptionFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/description/DescriptionFileTransformerModel.java deleted file mode 100644 index fcde431..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/description/DescriptionFileTransformerModel.java +++ /dev/null @@ -1,132 +0,0 @@ -package eu.eudat.file.transformer.models.description; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import eu.eudat.file.transformer.enums.DescriptionStatus; -import eu.eudat.file.transformer.models.descriptiontemplate.DescriptionTemplateFileTransformerModel; -import eu.eudat.file.transformer.models.dmp.DmpFileTransformerModel; -import eu.eudat.file.transformer.models.user.UserFileTransformerModel; - -import java.time.Instant; -import java.util.List; -import java.util.UUID; -@JsonIgnoreProperties(ignoreUnknown = true) -public class DescriptionFileTransformerModel { - - private UUID id; - private String label; - private String description; - private DescriptionStatus status; - private UserFileTransformerModel createdBy; - private Instant createdAt; - private Instant updatedAt; - private Instant finalizedAt; - private List descriptionReferenceFileTransformerModels; - private List descriptionTagFileTransformerModels; - private UUID sectionId; - private DescriptionTemplateFileTransformerModel descriptionTemplate; - private DmpFileTransformerModel dmp; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public DescriptionStatus getStatus() { - return status; - } - - public void setStatus(DescriptionStatus status) { - this.status = status; - } - - public UserFileTransformerModel getCreatedBy() { - return createdBy; - } - - public void setCreatedBy(UserFileTransformerModel createdBy) { - this.createdBy = createdBy; - } - - public Instant getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Instant createdAt) { - this.createdAt = createdAt; - } - - public Instant getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Instant updatedAt) { - this.updatedAt = updatedAt; - } - - public Instant getFinalizedAt() { - return finalizedAt; - } - - public void setFinalizedAt(Instant finalizedAt) { - this.finalizedAt = finalizedAt; - } - - public List getDescriptionReferenceFileTransformerModels() { - return descriptionReferenceFileTransformerModels; - } - - public void setDescriptionReferenceFileTransformerModels(List descriptionReferenceFileTransformerModels) { - this.descriptionReferenceFileTransformerModels = descriptionReferenceFileTransformerModels; - } - - public List getDescriptionTagFileTransformerModels() { - return descriptionTagFileTransformerModels; - } - - public void setDescriptionTagFileTransformerModels(List descriptionTagFileTransformerModels) { - this.descriptionTagFileTransformerModels = descriptionTagFileTransformerModels; - } - - public UUID getSectionId() { - return sectionId; - } - - public void setSectionId(UUID sectionId) { - this.sectionId = sectionId; - } - - public DescriptionTemplateFileTransformerModel getDescriptionTemplate() { - return descriptionTemplate; - } - - public void setDescriptionTemplate(DescriptionTemplateFileTransformerModel descriptionTemplate) { - this.descriptionTemplate = descriptionTemplate; - } - - public DmpFileTransformerModel getDmp() { - return dmp; - } - - public void setDmp(DmpFileTransformerModel dmp) { - this.dmp = dmp; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/description/DescriptionReferenceFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/description/DescriptionReferenceFileTransformerModel.java deleted file mode 100644 index b18662b..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/description/DescriptionReferenceFileTransformerModel.java +++ /dev/null @@ -1,30 +0,0 @@ -package eu.eudat.file.transformer.models.description; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import eu.eudat.file.transformer.models.reference.ReferenceFileTransformerModel; - -import java.util.UUID; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class DescriptionReferenceFileTransformerModel { - - private UUID id; - - private ReferenceFileTransformerModel reference; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public ReferenceFileTransformerModel getReference() { - return reference; - } - - public void setReference(ReferenceFileTransformerModel reference) { - this.reference = reference; - } - -} diff --git a/src/main/java/eu/eudat/file/transformer/models/description/DescriptionTagFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/description/DescriptionTagFileTransformerModel.java deleted file mode 100644 index 275ca77..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/description/DescriptionTagFileTransformerModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package eu.eudat.file.transformer.models.description; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import eu.eudat.file.transformer.models.tag.TagFileTransformerModel; - -import java.util.UUID; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class DescriptionTagFileTransformerModel { - - private UUID id; - private TagFileTransformerModel tagFileTransformerModel; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public TagFileTransformerModel getTagFileTransformerModel() { - return tagFileTransformerModel; - } - - public void setTagFileTransformerModel(TagFileTransformerModel tagFileTransformerModel) { - this.tagFileTransformerModel = tagFileTransformerModel; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/DescriptionTemplateFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/DescriptionTemplateFileTransformerModel.java deleted file mode 100644 index 237e9cf..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/DescriptionTemplateFileTransformerModel.java +++ /dev/null @@ -1,73 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import eu.eudat.file.transformer.models.descriptiontemplate.definition.DefinitionFileTransformerModel; - -import java.util.UUID; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class DescriptionTemplateFileTransformerModel { - private UUID id; - private String label; - private String description; - private Short version; - private String language; - private DescriptionTemplateTypeFileTransformerModel type; - private DefinitionFileTransformerModel definition; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Short getVersion() { - return version; - } - - public void setVersion(Short version) { - this.version = version; - } - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public DescriptionTemplateTypeFileTransformerModel getType() { - return type; - } - - public void setType(DescriptionTemplateTypeFileTransformerModel type) { - this.type = type; - } - - public DefinitionFileTransformerModel getDefinition() { - return definition; - } - - public void setDefinition(DefinitionFileTransformerModel definition) { - this.definition = definition; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/DescriptionTemplateTypeFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/DescriptionTemplateTypeFileTransformerModel.java deleted file mode 100644 index 4895e42..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/DescriptionTemplateTypeFileTransformerModel.java +++ /dev/null @@ -1,28 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -import java.util.UUID; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class DescriptionTemplateTypeFileTransformerModel { - - private UUID id; - private String name; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/DefinitionFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/DefinitionFileTransformerModel.java deleted file mode 100644 index 12688a2..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/DefinitionFileTransformerModel.java +++ /dev/null @@ -1,16 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition; - -import java.util.List; - -public class DefinitionFileTransformerModel { - - private List pages; - - public List getPages() { - return pages; - } - - public void setPages(List pages) { - this.pages = pages; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/FieldFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/FieldFileTransformerModel.java deleted file mode 100644 index 16a592f..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/FieldFileTransformerModel.java +++ /dev/null @@ -1,91 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition; - -import eu.eudat.file.transformer.enums.FieldValidationType; -import eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata.BaseFieldDataFileTransformerModel; - -import java.util.List; - -public class FieldFileTransformerModel { - - private String id; - private Integer ordinal; - private String numbering; //TODO maybe remove - private List schematics; - private String defaultValue; - private List visibilityRules; - private List validations; - private Boolean includeInExport; - private BaseFieldDataFileTransformerModel data; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getOrdinal() { - return ordinal; - } - - public void setOrdinal(Integer ordinal) { - this.ordinal = ordinal; - } - - public String getNumbering() { - return numbering; - } - - public void setNumbering(String numbering) { - this.numbering = numbering; - } - - public List getSchematics() { - return schematics; - } - - public void setSchematics(List schematics) { - this.schematics = schematics; - } - - public String getDefaultValue() { - return defaultValue; - } - - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - public List getVisibilityRules() { - return visibilityRules; - } - - public void setVisibilityRules(List visibilityRuleFileTransformerModels) { - this.visibilityRules = visibilityRuleFileTransformerModels; - } - - public List getValidations() { - return validations; - } - - public void setValidations(List validations) { - this.validations = validations; - } - - public Boolean getIncludeInExport() { - return includeInExport; - } - - public void setIncludeInExport(Boolean includeInExport) { - this.includeInExport = includeInExport; - } - - public BaseFieldDataFileTransformerModel getData() { - return data; - } - - public void setData(BaseFieldDataFileTransformerModel data) { - this.data = data; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/FieldSetFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/FieldSetFileTransformerModel.java deleted file mode 100644 index 991c9e7..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/FieldSetFileTransformerModel.java +++ /dev/null @@ -1,97 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition; - -import java.util.List; - -public class FieldSetFileTransformerModel { - - private String id; - private Integer ordinal; - private String numbering; - private String title; - private String description; - private String extendedDescription; - private String additionalInformation; - private MultiplicityFileTransformerModel multiplicity; - private Boolean hasCommentField; - private List fields; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getOrdinal() { - return ordinal; - } - - public void setOrdinal(Integer ordinal) { - this.ordinal = ordinal; - } - - public String getNumbering() { - return numbering; - } - - public void setNumbering(String numbering) { - this.numbering = numbering; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getExtendedDescription() { - return extendedDescription; - } - - public void setExtendedDescription(String extendedDescription) { - this.extendedDescription = extendedDescription; - } - - public String getAdditionalInformation() { - return additionalInformation; - } - - public void setAdditionalInformation(String additionalInformation) { - this.additionalInformation = additionalInformation; - } - - public MultiplicityFileTransformerModel getMultiplicity() { - return multiplicity; - } - - public void setMultiplicity(MultiplicityFileTransformerModel multiplicityFileTransformerModel) { - this.multiplicity = multiplicityFileTransformerModel; - } - - public Boolean getHasCommentField() { - return hasCommentField; - } - - public void setHasCommentField(Boolean hasCommentField) { - this.hasCommentField = hasCommentField; - } - - public List getFields() { - return fields; - } - - public void setFields(List fieldFileTransformerModels) { - this.fields = fieldFileTransformerModels; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/MultiplicityFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/MultiplicityFileTransformerModel.java deleted file mode 100644 index c881235..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/MultiplicityFileTransformerModel.java +++ /dev/null @@ -1,41 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition; - -public abstract class MultiplicityFileTransformerModel { - - private Integer min; - private Integer max; - private String placeholder; - private Boolean tableView; - - public Integer getMin() { - return min; - } - - public void setMin(Integer min) { - this.min = min; - } - - public Integer getMax() { - return max; - } - - public void setMax(Integer max) { - this.max = max; - } - - public String getPlaceholder() { - return placeholder; - } - - public void setPlaceholder(String placeholder) { - this.placeholder = placeholder; - } - - public Boolean getTableView() { - return tableView; - } - - public void setTableView(Boolean tableView) { - this.tableView = tableView; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/PageFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/PageFileTransformerModel.java deleted file mode 100644 index 6a5d497..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/PageFileTransformerModel.java +++ /dev/null @@ -1,45 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition; - - -import java.util.List; - -public class PageFileTransformerModel { - private String id; - private Integer ordinal; - private String title; - private List sections; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getOrdinal() { - return ordinal; - } - - public void setOrdinal(Integer ordinal) { - this.ordinal = ordinal; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public List getSections() { - return sections; - } - - public void setSections(List sectionFileTransformerModels) { - this.sections = sectionFileTransformerModels; - } -} - - diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/RuleFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/RuleFileTransformerModel.java deleted file mode 100644 index e5d9343..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/RuleFileTransformerModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition; - -public class RuleFileTransformerModel { - - private String target; - private String value; - - - public String getTarget() { - return target; - } - - public void setTarget(String target) { - this.target = target; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/SectionFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/SectionFileTransformerModel.java deleted file mode 100644 index 5c4424e..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/SectionFileTransformerModel.java +++ /dev/null @@ -1,100 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition; - - -import java.util.List; - -public class SectionFileTransformerModel { - - private String id; - private Integer ordinal; - private Boolean defaultVisibility; - private Boolean multiplicity; - private String numbering; //TODO maybe remove - private String title; - private String description; - private String extendedDescription; //TODO maybe remove - private List sections; - private List fieldSets; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getOrdinal() { - return ordinal; - } - - public void setOrdinal(Integer ordinal) { - this.ordinal = ordinal; - } - - public Boolean getDefaultVisibility() { - return defaultVisibility; - } - - public void setDefaultVisibility(Boolean defaultVisibility) { - this.defaultVisibility = defaultVisibility; - } - - public Boolean getMultiplicity() { - return multiplicity; - } - - public void setMultiplicity(Boolean multiplicity) { - this.multiplicity = multiplicity; - } - - public String getNumbering() { - return numbering; - } - - public void setNumbering(String numbering) { - this.numbering = numbering; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getExtendedDescription() { - return extendedDescription; - } - - public void setExtendedDescription(String extendedDescription) { - this.extendedDescription = extendedDescription; - } - - public List getSections() { - return sections; - } - - public void setSections(List sectionFileTransformerModels) { - this.sections = sectionFileTransformerModels; - } - - public List getFieldSets() { - return fieldSets; - } - - public void setFieldSets(List fieldSetFileTransformerModels) { - this.fieldSets = fieldSetFileTransformerModels; - } -} - - diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/BaseFieldDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/BaseFieldDataFileTransformerModel.java deleted file mode 100644 index d1731d1..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/BaseFieldDataFileTransformerModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import eu.eudat.file.transformer.enums.FieldType; - -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "fieldType", - visible = true) -@JsonSubTypes({ - @JsonSubTypes.Type(value = ExternalSelectDataFileTransformerModel.class, name = FieldType.Names.ExternalSelect), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.BooleanDecision), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.InternalDmpDatasets), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.InternalDmpDmps), - @JsonSubTypes.Type(value = LabelDataFileTransformerModel.class, name = FieldType.Names.CheckBox), - @JsonSubTypes.Type(value = LabelDataFileTransformerModel.class, name = FieldType.Names.DatePicker), - @JsonSubTypes.Type(value = ExternalDatasetDataFileTransformerModel.class, name = FieldType.Names.ExternalDatasets), - @JsonSubTypes.Type(value = LabelDataFileTransformerModel.class, name = FieldType.Names.FreeText), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.Licenses), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.Organizations), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.Publications), - @JsonSubTypes.Type(value = RadioBoxDataFileTransformerModel.class, name = FieldType.Names.RadioBox), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.Registries), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.InternalDmpResearchers), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.Researchers), - @JsonSubTypes.Type(value = LabelDataFileTransformerModel.class, name = FieldType.Names.RichTextarea), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.Services), - @JsonSubTypes.Type(value = LabelDataFileTransformerModel.class, name = FieldType.Names.Tags), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.Taxonomies), - @JsonSubTypes.Type(value = LabelDataFileTransformerModel.class, name = FieldType.Names.TextArea), - @JsonSubTypes.Type(value = UploadDataFileTransformerModel.class, name = FieldType.Names.Upload), - @JsonSubTypes.Type(value = LabelDataFileTransformerModel.class, name = FieldType.Names.Validation), - @JsonSubTypes.Type(value = LabelDataFileTransformerModel.class, name = FieldType.Names.DatasetIdentifier), - @JsonSubTypes.Type(value = LabelDataFileTransformerModel.class, name = FieldType.Names.Currency), - @JsonSubTypes.Type(value = SelectDataFileTransformerModel.class, name = FieldType.Names.Select), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.DataRepositories), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.JournalRepositories), - @JsonSubTypes.Type(value = LabelAndMultiplicityDataFileTransformerModel.class, name = FieldType.Names.Publications), -}) -public abstract class BaseFieldDataFileTransformerModel { - - private String label; - private FieldType fieldType; - private String value; - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public FieldType getFieldType() { - return fieldType; - } - - public void setFieldType(FieldType fieldType) { - this.fieldType = fieldType; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ExternalDatasetDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ExternalDatasetDataFileTransformerModel.java deleted file mode 100644 index 58f7e0c..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ExternalDatasetDataFileTransformerModel.java +++ /dev/null @@ -1,16 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - - -import eu.eudat.file.transformer.enums.FieldDataExternalDatasetType; - -public class ExternalDatasetDataFileTransformerModel extends LabelAndMultiplicityDataFileTransformerModel { - private FieldDataExternalDatasetType type; - - public FieldDataExternalDatasetType getType() { - return type; - } - - public void setType(FieldDataExternalDatasetType type) { - this.type = type; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ExternalSelectDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ExternalSelectDataFileTransformerModel.java deleted file mode 100644 index 2a48071..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ExternalSelectDataFileTransformerModel.java +++ /dev/null @@ -1,150 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -import jakarta.xml.bind.annotation.*; - -import java.util.List; - - -@XmlAccessorType(XmlAccessType.FIELD) -public class ExternalSelectDataFileTransformerModel extends LabelAndMultiplicityDataFileTransformerModel { - public static class ExternalSelectAuthDataFileTransformerModel { - private String url; - private String method; - private String body; - private String path; - private String type; - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getMethod() { - return method; - } - - public void setMethod(String method) { - this.method = method; - } - - public String getBody() { - return body; - } - - public void setBody(String body) { - this.body = body; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - } - - public static class ExternalSelectSourceBindingFileTransformerModel { - private String label; - private String value; - private String source; - - public String getLabel() { - return label; - } - public void setLabel(String label) { - this.label = label; - } - - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - - public String getSource() { - return source; - } - public void setSource(String source) { - this.source = source; - } - } - - public static class ExternalSelectSourceFileTransformerModel { - private String url; - private String method; - private String optionsRoot; - private ExternalSelectSourceBindingFileTransformerModel sourceBinding; - private Boolean hasAuth; - private ExternalSelectAuthDataFileTransformerModel auth; - - public String getOptionsRoot() { - return optionsRoot; - } - public void setOptionsRoot(String optionsRoot) { - this.optionsRoot = optionsRoot; - } - - public String getUrl() { - return url; - } - public void setUrl(String url) { - this.url = url; - } - - public Boolean getHasAuth() { - return hasAuth; - } - - public void setHasAuth(Boolean hasAuth) { - this.hasAuth = hasAuth; - } - - public ExternalSelectAuthDataFileTransformerModel getAuth() { - return auth; - } - - public void setAuth(ExternalSelectAuthDataFileTransformerModel auth) { - this.auth = auth; - } - - public ExternalSelectSourceBindingFileTransformerModel getSourceBinding() { - return sourceBinding; - } - public void setSourceBinding(ExternalSelectSourceBindingFileTransformerModel sourceBinding) { - this.sourceBinding = sourceBinding; - } - - public String getMethod() { - return method; - } - - public void setMethod(String method) { - this.method = method; - } - } - - private List sources; - - public List getSources() { - return sources; - } - - public void setSources(List externalSelectSourceFileTransformerModelList) { - this.sources = externalSelectSourceFileTransformerModelList; - } -} - - diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelAndMultiplicityDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelAndMultiplicityDataFileTransformerModel.java deleted file mode 100644 index a9da0d0..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelAndMultiplicityDataFileTransformerModel.java +++ /dev/null @@ -1,13 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -public class LabelAndMultiplicityDataFileTransformerModel extends BaseFieldDataFileTransformerModel { - private Boolean multipleSelect; - - public Boolean getMultipleSelect() { - return multipleSelect; - } - - public void setMultipleSelect(Boolean multipleSelect) { - this.multipleSelect = multipleSelect; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelDataFileTransformerModel.java deleted file mode 100644 index 9c0ba87..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelDataFileTransformerModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -public class LabelDataFileTransformerModel extends BaseFieldDataFileTransformerModel { -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/RadioBoxDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/RadioBoxDataFileTransformerModel.java deleted file mode 100644 index 3746d20..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/RadioBoxDataFileTransformerModel.java +++ /dev/null @@ -1,36 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -import java.util.List; - -public class RadioBoxDataFileTransformerModel extends BaseFieldDataFileTransformerModel { - public static class RadioBoxDataOptionFileTransformerModel { - private String label; - private String value; - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } - - private List options; - - public List getOptions() { - return options; - } - - public void setOptions(List options) { - this.options = options; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/SelectDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/SelectDataFileTransformerModel.java deleted file mode 100644 index 18ca632..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/SelectDataFileTransformerModel.java +++ /dev/null @@ -1,35 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -import java.util.List; - -public class SelectDataFileTransformerModel extends LabelAndMultiplicityDataFileTransformerModel { - private List options; - - public List getOptions() { - return options; - } - - public void setOptions(List optionEntities) { - this.options = optionEntities; - } - - public static class OptionFileTransformerModel { - private String label; - private String value; - - public String getLabel() { - return label; - } - public void setLabel(String label) { - this.label = label; - } - - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - } -} - diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/UploadDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/UploadDataFileTransformerModel.java deleted file mode 100644 index d6d162a..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/UploadDataFileTransformerModel.java +++ /dev/null @@ -1,48 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -import java.util.List; - - -public class UploadDataFileTransformerModel extends BaseFieldDataFileTransformerModel { - public static class UploadDataOptionFileTransformerModel { - private String label; - private String value; - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } - - private List types; - - private Integer maxFileSizeInMB; - - - public List getTypes() { - return types; - } - - public void setTypes(List types) { - this.types = types; - } - - public Integer getMaxFileSizeInMB() { - return maxFileSizeInMB; - } - - public void setMaxFileSizeInMB(Integer maxFileSizeInMB) { - this.maxFileSizeInMB = maxFileSizeInMB; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/dmp/DmpFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/dmp/DmpFileTransformerModel.java deleted file mode 100644 index fd52563..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/dmp/DmpFileTransformerModel.java +++ /dev/null @@ -1,206 +0,0 @@ -package eu.eudat.file.transformer.models.dmp; - -import eu.eudat.file.transformer.enums.DmpAccessType; -import eu.eudat.file.transformer.enums.DmpStatus; -import eu.eudat.file.transformer.enums.DmpVersionStatus; -import eu.eudat.file.transformer.models.dmpblueprint.DmpBlueprintFileTransformerModel; -import eu.eudat.file.transformer.models.entitydoi.EntityDoiFileTransformerModel; -import eu.eudat.file.transformer.models.description.DescriptionFileTransformerModel; -import eu.eudat.file.transformer.models.user.UserFileTransformerModel; - -import java.time.Instant; -import java.util.List; -import java.util.UUID; - -public class DmpFileTransformerModel { - - private UUID id; - private String variant; - private String label; - private String description; - private Short version; - private DmpStatus status; - private DmpVersionStatus versionStatus; - private String properties; - private Instant createdAt; - private Instant updatedAt; - private Instant finalizedAt; - private Instant publishedAt; - private UserFileTransformerModel creator; - private DmpAccessType accessType; - private DmpBlueprintFileTransformerModel blueprint; - private String language; - private Instant publicAfter; - private List dmpReferences; - private List dmpUsers; - private List descriptions; - private List entityDois; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getVariant() { - return variant; - } - - public void setVariant(String variant) { - this.variant = variant; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Short getVersion() { - return version; - } - - public void setVersion(Short version) { - this.version = version; - } - - public DmpStatus getStatus() { - return status; - } - - public void setStatus(DmpStatus status) { - this.status = status; - } - - public DmpVersionStatus getVersionStatus() { - return versionStatus; - } - - public void setVersionStatus(DmpVersionStatus versionStatus) { - this.versionStatus = versionStatus; - } - - public String getProperties() { - return properties; - } - - public void setProperties(String properties) { - this.properties = properties; - } - - public Instant getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Instant createdAt) { - this.createdAt = createdAt; - } - - public Instant getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Instant updatedAt) { - this.updatedAt = updatedAt; - } - - public Instant getFinalizedAt() { - return finalizedAt; - } - - public void setFinalizedAt(Instant finalizedAt) { - this.finalizedAt = finalizedAt; - } - - public Instant getPublishedAt() { - return publishedAt; - } - - public void setPublishedAt(Instant publishedAt) { - this.publishedAt = publishedAt; - } - - public UserFileTransformerModel getCreator() { - return creator; - } - - public void setCreator(UserFileTransformerModel creator) { - this.creator = creator; - } - - public DmpAccessType getAccessType() { - return accessType; - } - - public void setAccessType(DmpAccessType accessType) { - this.accessType = accessType; - } - - public DmpBlueprintFileTransformerModel getBlueprint() { - return blueprint; - } - - public void setBlueprint(DmpBlueprintFileTransformerModel blueprint) { - this.blueprint = blueprint; - } - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public Instant getPublicAfter() { - return publicAfter; - } - - public void setPublicAfter(Instant publicAfter) { - this.publicAfter = publicAfter; - } - - public List getDmpReferences() { - return dmpReferences; - } - - public void setDmpReferences(List dmpReferences) { - this.dmpReferences = dmpReferences; - } - - public List getDmpUsers() { - return dmpUsers; - } - - public void setDmpUsers(List dmpUsers) { - this.dmpUsers = dmpUsers; - } - - public List getDescriptions() { - return descriptions; - } - - public void setDescriptions(List descriptions) { - this.descriptions = descriptions; - } - - public List getEntityDois() { - return entityDois; - } - - public void setEntityDois(List entityDois) { - this.entityDois = entityDois; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/dmp/DmpReferenceFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/dmp/DmpReferenceFileTransformerModel.java deleted file mode 100644 index 4d2e412..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/dmp/DmpReferenceFileTransformerModel.java +++ /dev/null @@ -1,38 +0,0 @@ -package eu.eudat.file.transformer.models.dmp; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import eu.eudat.file.transformer.models.reference.ReferenceFileTransformerModel; - -import java.util.UUID; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class DmpReferenceFileTransformerModel { - - private UUID id; - private ReferenceFileTransformerModel reference; - private String data; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public ReferenceFileTransformerModel getReference() { - return reference; - } - - public void setReference(ReferenceFileTransformerModel reference) { - this.reference = reference; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/dmp/DmpUserFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/dmp/DmpUserFileTransformerModel.java deleted file mode 100644 index 7f91811..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/dmp/DmpUserFileTransformerModel.java +++ /dev/null @@ -1,39 +0,0 @@ -package eu.eudat.file.transformer.models.dmp; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import eu.eudat.file.transformer.enums.DmpUserRole; -import eu.eudat.file.transformer.models.user.UserFileTransformerModel; - -import java.util.UUID; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class DmpUserFileTransformerModel { - - private UUID id; - private UserFileTransformerModel user; - private DmpUserRole role; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public UserFileTransformerModel getUser() { - return user; - } - - public void setUser(UserFileTransformerModel user) { - this.user = user; - } - - public DmpUserRole getRole() { - return role; - } - - public void setRole(DmpUserRole role) { - this.role = role; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/DmpBlueprintFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/DmpBlueprintFileTransformerModel.java deleted file mode 100644 index 02a7d79..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/DmpBlueprintFileTransformerModel.java +++ /dev/null @@ -1,41 +0,0 @@ -package eu.eudat.file.transformer.models.dmpblueprint; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import eu.eudat.file.transformer.models.dmpblueprint.definition.DefinitionFileTransformerModel; - -import java.util.UUID; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class DmpBlueprintFileTransformerModel { - - private UUID id; - private String label; - private DefinitionFileTransformerModel definitionFileTransformerModel; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public DefinitionFileTransformerModel getDefinitionFileTransformerModel() { - return definitionFileTransformerModel; - } - - public void setDefinitionFileTransformerModel(DefinitionFileTransformerModel definitionFileTransformerModel) { - this.definitionFileTransformerModel = definitionFileTransformerModel; - } -} - - - diff --git a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/DefinitionFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/DefinitionFileTransformerModel.java deleted file mode 100644 index 9f96964..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/DefinitionFileTransformerModel.java +++ /dev/null @@ -1,16 +0,0 @@ -package eu.eudat.file.transformer.models.dmpblueprint.definition; - -import java.util.List; - -public class DefinitionFileTransformerModel { - - private List sectionFileTransformerModels; - - public List getSections() { - return sectionFileTransformerModels; - } - - public void setSections(List sectionFileTransformerModels) { - this.sectionFileTransformerModels = sectionFileTransformerModels; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/DescriptionTemplateFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/DescriptionTemplateFileTransformerModel.java deleted file mode 100644 index 3932479..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/DescriptionTemplateFileTransformerModel.java +++ /dev/null @@ -1,52 +0,0 @@ -package eu.eudat.file.transformer.models.dmpblueprint.definition; - -import java.util.UUID; - -public class DescriptionTemplateFileTransformerModel { - - private UUID id; - private UUID descriptionTemplateId; - private String label; - private Integer minMultiplicity; - private Integer maxMultiplicity; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public UUID getDescriptionTemplateId() { - return descriptionTemplateId; - } - - public void setDescriptionTemplateId(UUID descriptionTemplateId) { - this.descriptionTemplateId = descriptionTemplateId; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public Integer getMinMultiplicity() { - return minMultiplicity; - } - - public void setMinMultiplicity(Integer minMultiplicity) { - this.minMultiplicity = minMultiplicity; - } - - public Integer getMaxMultiplicity() { - return maxMultiplicity; - } - - public void setMaxMultiplicity(Integer maxMultiplicity) { - this.maxMultiplicity = maxMultiplicity; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/ExtraFieldFileTransformerModelFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/ExtraFieldFileTransformerModelFileTransformerModel.java deleted file mode 100644 index 7eefdbc..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/ExtraFieldFileTransformerModelFileTransformerModel.java +++ /dev/null @@ -1,16 +0,0 @@ -package eu.eudat.file.transformer.models.dmpblueprint.definition; - -import eu.eudat.file.transformer.enums.DmpBlueprintExtraFieldDataType; - -public class ExtraFieldFileTransformerModelFileTransformerModel extends FieldFileTransformerModel { - - private DmpBlueprintExtraFieldDataType dataType; - - public DmpBlueprintExtraFieldDataType getDataType() { - return dataType; - } - - public void setDataType(DmpBlueprintExtraFieldDataType dataType) { - this.dataType = dataType; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/FieldFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/FieldFileTransformerModel.java deleted file mode 100644 index 54ee493..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/FieldFileTransformerModel.java +++ /dev/null @@ -1,84 +0,0 @@ -package eu.eudat.file.transformer.models.dmpblueprint.definition; - -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import eu.eudat.file.transformer.enums.DmpBlueprintFieldCategory; - -import java.util.UUID; - -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "category", - visible = true) -@JsonSubTypes({ - @JsonSubTypes.Type(value = SystemFieldFileTransformerModel.class, name = "0"), - @JsonSubTypes.Type(value = ExtraFieldFileTransformerModelFileTransformerModel.class, name = "1") -}) -public abstract class FieldFileTransformerModel { - - private UUID id; - private DmpBlueprintFieldCategory category; - private String label; - private String placeholder; - private String description; - private Integer ordinal; - private Boolean required; - - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public DmpBlueprintFieldCategory getCategory() { - return category; - } - - public void setCategory(DmpBlueprintFieldCategory category) { - this.category = category; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getPlaceholder() { - return placeholder; - } - - public void setPlaceholder(String placeholder) { - this.placeholder = placeholder; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getOrdinal() { - return ordinal; - } - - public void setOrdinal(Integer ordinal) { - this.ordinal = ordinal; - } - - public Boolean isRequired() { - return required; - } - - public void setRequired(Boolean required) { - this.required = required; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/SectionFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/SectionFileTransformerModel.java deleted file mode 100644 index 06e5d01..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/SectionFileTransformerModel.java +++ /dev/null @@ -1,73 +0,0 @@ -package eu.eudat.file.transformer.models.dmpblueprint.definition; - - -import java.util.List; -import java.util.UUID; - -public class SectionFileTransformerModel { - private UUID id; - private String description; - private String label; - private Integer ordinal; - private Boolean hasTemplates; - private List fieldFileTransformerModels; - private List descriptionTemplates; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getOrdinal() { - return ordinal; - } - - public void setOrdinal(Integer ordinal) { - this.ordinal = ordinal; - } - - public Boolean getHasTemplates() { - return hasTemplates; - } - - public void setHasTemplates(Boolean hasTemplates) { - this.hasTemplates = hasTemplates; - } - - public List getFields() { - return fieldFileTransformerModels; - } - - public void setFields(List fieldFileTransformerModels) { - this.fieldFileTransformerModels = fieldFileTransformerModels; - } - - public List getDescriptionTemplates() { - return descriptionTemplates; - } - - public void setDescriptionTemplates(List descriptionTemplates) { - this.descriptionTemplates = descriptionTemplates; - } -} - - diff --git a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/SystemFieldFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/SystemFieldFileTransformerModel.java deleted file mode 100644 index c05f528..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/dmpblueprint/definition/SystemFieldFileTransformerModel.java +++ /dev/null @@ -1,16 +0,0 @@ -package eu.eudat.file.transformer.models.dmpblueprint.definition; - -import eu.eudat.file.transformer.enums.DmpBlueprintSystemFieldType; - -public class SystemFieldFileTransformerModel extends FieldFileTransformerModel { - - private DmpBlueprintSystemFieldType systemFieldType; - - public DmpBlueprintSystemFieldType getSystemFieldType() { - return systemFieldType; - } - - public void setSystemFieldType(DmpBlueprintSystemFieldType systemFieldType) { - this.systemFieldType = systemFieldType; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/entitydoi/EntityDoiFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/entitydoi/EntityDoiFileTransformerModel.java deleted file mode 100644 index a2b0a20..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/entitydoi/EntityDoiFileTransformerModel.java +++ /dev/null @@ -1,36 +0,0 @@ -package eu.eudat.file.transformer.models.entitydoi; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import java.util.UUID; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class EntityDoiFileTransformerModel { - - private UUID id; - private String repositoryId; - private String doi; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getRepositoryId() { - return repositoryId; - } - - public void setRepositoryId(String repositoryId) { - this.repositoryId = repositoryId; - } - - public String getDoi() { - return doi; - } - - public void setDoi(String doi) { - this.doi = doi; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/misc/FileEnvelope.java b/src/main/java/eu/eudat/file/transformer/models/misc/FileEnvelope.java deleted file mode 100644 index a5cd979..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/misc/FileEnvelope.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.eudat.file.transformer.models.misc; - -public class FileEnvelope { - private String filename; - private String file; - - public String getFilename() { - return filename; - } - - public void setFilename(String filename) { - this.filename = filename; - } - - public String getFile() { - return file; - } - - public void setFile(String file) { - this.file = file; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/reference/DefinitionFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/reference/DefinitionFileTransformerModel.java deleted file mode 100644 index 1f4ef29..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/reference/DefinitionFileTransformerModel.java +++ /dev/null @@ -1,16 +0,0 @@ -package eu.eudat.file.transformer.models.reference; - -import java.util.List; - -public class DefinitionFileTransformerModel { - private List fields; - - public List getFields() { - return fields; - } - - public void setFields(List fields) { - this.fields = fields; - } - -} diff --git a/src/main/java/eu/eudat/file/transformer/models/reference/FieldFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/reference/FieldFileTransformerModel.java deleted file mode 100644 index b7c34d6..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/reference/FieldFileTransformerModel.java +++ /dev/null @@ -1,26 +0,0 @@ -package eu.eudat.file.transformer.models.reference; - -public class FieldFileTransformerModel { - - private String code; - private String value; - - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - -} diff --git a/src/main/java/eu/eudat/file/transformer/models/reference/ReferenceFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/reference/ReferenceFileTransformerModel.java deleted file mode 100644 index b41b743..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/reference/ReferenceFileTransformerModel.java +++ /dev/null @@ -1,93 +0,0 @@ -package eu.eudat.file.transformer.models.reference; - - -import eu.eudat.file.transformer.enums.ReferenceSourceType; -import eu.eudat.file.transformer.enums.ReferenceType; -import eu.eudat.file.transformer.models.reference.DefinitionFileTransformerModel; - -import java.util.UUID; - -public class ReferenceFileTransformerModel { - - private UUID id; - private String label; - private ReferenceType type; - private String description; - private DefinitionFileTransformerModel definition; - private String reference; - private String abbreviation; - private String source; - private ReferenceSourceType sourceType; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public ReferenceType getType() { - return type; - } - - public void setType(ReferenceType type) { - this.type = type; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public DefinitionFileTransformerModel getDefinition() { - return definition; - } - - public void setDefinition(DefinitionFileTransformerModel definition) { - this.definition = definition; - } - - public String getReference() { - return reference; - } - - public void setReference(String reference) { - this.reference = reference; - } - - public String getAbbreviation() { - return abbreviation; - } - - public void setAbbreviation(String abbreviation) { - this.abbreviation = abbreviation; - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public ReferenceSourceType getSourceType() { - return sourceType; - } - - public void setSourceType(ReferenceSourceType sourceType) { - this.sourceType = sourceType; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/tag/TagFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/tag/TagFileTransformerModel.java deleted file mode 100644 index caeb7e1..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/tag/TagFileTransformerModel.java +++ /dev/null @@ -1,28 +0,0 @@ -package eu.eudat.file.transformer.models.tag; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -import java.util.UUID; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class TagFileTransformerModel { - - private UUID id; - private String label; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/user/UserAdditionalInfoFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/user/UserAdditionalInfoFileTransformerModel.java deleted file mode 100644 index 9db52f9..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/user/UserAdditionalInfoFileTransformerModel.java +++ /dev/null @@ -1,62 +0,0 @@ -package eu.eudat.file.transformer.models.user; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import eu.eudat.file.transformer.models.reference.ReferenceFileTransformerModel; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class UserAdditionalInfoFileTransformerModel { - private String avatarUrl; - private String timezone; - private String culture; - private String language; - private String roleOrganization; - private ReferenceFileTransformerModel organization; - - public String getAvatarUrl() { - return avatarUrl; - } - - public void setAvatarUrl(String avatarUrl) { - this.avatarUrl = avatarUrl; - } - - public String getTimezone() { - return timezone; - } - - public void setTimezone(String timezone) { - this.timezone = timezone; - } - - public String getCulture() { - return culture; - } - - public void setCulture(String culture) { - this.culture = culture; - } - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public String getRoleOrganization() { - return roleOrganization; - } - - public void setRoleOrganization(String roleOrganization) { - this.roleOrganization = roleOrganization; - } - - public ReferenceFileTransformerModel getOrganization() { - return organization; - } - - public void setOrganization(ReferenceFileTransformerModel organization) { - this.organization = organization; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/user/UserContactInfoFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/user/UserContactInfoFileTransformerModel.java deleted file mode 100644 index d6a110c..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/user/UserContactInfoFileTransformerModel.java +++ /dev/null @@ -1,44 +0,0 @@ -package eu.eudat.file.transformer.models.user; - -import eu.eudat.file.transformer.enums.ContactInfoType; - -import java.util.UUID; - -public class UserContactInfoFileTransformerModel { - private UUID id; - private String value; - private ContactInfoType type; - private int ordinal; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public ContactInfoType getType() { - return type; - } - - public void setType(ContactInfoType type) { - this.type = type; - } - - public int getOrdinal() { - return ordinal; - } - - public void setOrdinal(int ordinal) { - this.ordinal = ordinal; - } -} diff --git a/src/main/java/eu/eudat/file/transformer/models/user/UserFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/user/UserFileTransformerModel.java deleted file mode 100644 index eeb938d..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/user/UserFileTransformerModel.java +++ /dev/null @@ -1,47 +0,0 @@ -package eu.eudat.file.transformer.models.user; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -import java.util.List; -import java.util.UUID; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class UserFileTransformerModel { - - private UUID id; - private String name; - private UserAdditionalInfoFileTransformerModel additionalInfo; - private List contacts; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public UserAdditionalInfoFileTransformerModel getAdditionalInfo() { - return additionalInfo; - } - - public void setAdditionalInfo(UserAdditionalInfoFileTransformerModel additionalInfo) { - this.additionalInfo = additionalInfo; - } - - public List getContacts() { - return contacts; - } - - public void setContacts(List contacts) { - this.contacts = contacts; - } -}