From a717330b6b6b19be67e12dd23e8513c28bdc84bc Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Thu, 1 Feb 2024 18:16:25 +0200 Subject: [PATCH] Update Description Template Field Data Classes --- .../file/transformer/enums/FieldType.java | 8 +- .../AutoCompleteDataFileTransformerModel.java | 20 --- ...ompleteSingleDataFileTransformerModel.java | 24 --- .../BaseFieldDataFileTransformerModel.java | 56 ++----- .../ComboBoxOptionFileTransformerModel.java | 42 ----- ...ternalDatasetDataFileTransformerModel.java | 2 +- ...xternalSelectDataFileTransformerModel.java | 150 ++++++++++++++++++ ...dMultiplicityDataFileTransformerModel.java | 13 ++ ...iplicityFieldDataFileTransformerModel.java | 14 -- .../LabelDataFileTransformerModel.java | 4 + .../LabelFieldDataFileTransformerModel.java | 5 - .../RadioBoxDataFileTransformerModel.java | 27 +++- .../RadioBoxOptionFileTransformerModel.java | 22 --- .../SelectDataFileTransformerModel.java | 35 ++++ .../UploadDataFileTransformerModel.java | 39 +++-- .../UploadOptionFileTransformerModel.java | 22 --- .../WordListDataFileTransformerModel.java | 24 --- 17 files changed, 269 insertions(+), 238 deletions(-) delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/AutoCompleteDataFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/AutoCompleteSingleDataFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ComboBoxOptionFileTransformerModel.java create mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ExternalSelectDataFileTransformerModel.java create 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/LabelAndMultiplicityFieldDataFileTransformerModel.java create 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/LabelFieldDataFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/RadioBoxOptionFileTransformerModel.java create 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/UploadOptionFileTransformerModel.java delete mode 100644 src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/WordListDataFileTransformerModel.java diff --git a/src/main/java/eu/eudat/file/transformer/enums/FieldType.java b/src/main/java/eu/eudat/file/transformer/enums/FieldType.java index cc0fc69..1f77f87 100644 --- a/src/main/java/eu/eudat/file/transformer/enums/FieldType.java +++ b/src/main/java/eu/eudat/file/transformer/enums/FieldType.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.Map; public enum FieldType implements DatabaseEnum { - AUTO_COMPLETE(Names.Autocomplete), - WORD_LIST(Names.Wordlist), + EXTERNAL_SELECT(Names.ExternalSelect), + SELECT(Names.Select), BOOLEAN_DECISION(Names.BooleanDecision), RADIO_BOX(Names.RadioBox), INTERNAL_DMP_ENTRIES_RESEARCHERS(Names.InternalDmpResearchers), @@ -36,8 +36,8 @@ public enum FieldType implements DatabaseEnum { private final String value; public static class Names { - public static final String Autocomplete = "autocomplete"; - public static final String Wordlist = "wordlist"; + 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"; diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/AutoCompleteDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/AutoCompleteDataFileTransformerModel.java deleted file mode 100644 index fedbfeb..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/AutoCompleteDataFileTransformerModel.java +++ /dev/null @@ -1,20 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -import java.util.List; - -public class AutoCompleteDataFileTransformerModel extends BaseFieldDataFileTransformerModel { - private Boolean multiAutoComplete; - private List autoCompleteSingleDataFileTransformerModelList; - - public Boolean getMultiAutoComplete() { return multiAutoComplete; } - public void setMultiAutoComplete(Boolean multiAutoComplete) { this.multiAutoComplete = multiAutoComplete; } - - public List getAutoCompleteSingleDataList() { - return autoCompleteSingleDataFileTransformerModelList; - } - - public void setAutoCompleteSingleDataList(List autoCompleteSingleDataFileTransformerModelList) { - this.autoCompleteSingleDataFileTransformerModelList = autoCompleteSingleDataFileTransformerModelList; - } -} - diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/AutoCompleteSingleDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/AutoCompleteSingleDataFileTransformerModel.java deleted file mode 100644 index 3c14316..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/AutoCompleteSingleDataFileTransformerModel.java +++ /dev/null @@ -1,24 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -public class AutoCompleteSingleDataFileTransformerModel { - - private String url; - private ComboBoxOptionFileTransformerModel autoCompleteOptions; - - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public ComboBoxOptionFileTransformerModel getAutoCompleteOptions() { - return autoCompleteOptions; - } - - public void setAutoCompleteOptions(ComboBoxOptionFileTransformerModel autoCompleteOptions) { - this.autoCompleteOptions = autoCompleteOptions; - } -} 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 index f685d86..a7ea51b 100644 --- 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 @@ -1,61 +1,25 @@ 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 = AutoCompleteDataFileTransformerModel.class, name = FieldType.Names.Autocomplete), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.BooleanDecision), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.InternalDmpDatasets), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.InternalDmpDmps), - @JsonSubTypes.Type(value = LabelFieldDataFileTransformerModel.class, name = FieldType.Names.CheckBox), - @JsonSubTypes.Type(value = LabelFieldDataFileTransformerModel.class, name = FieldType.Names.DatePicker), - @JsonSubTypes.Type(value = ExternalDatasetDataFileTransformerModel.class, name = FieldType.Names.ExternalDatasets), - @JsonSubTypes.Type(value = LabelFieldDataFileTransformerModel.class, name = FieldType.Names.FreeText), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.Licenses), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.Organizations), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.Publications), - @JsonSubTypes.Type(value = RadioBoxDataFileTransformerModel.class, name = FieldType.Names.RadioBox), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.Registries), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.InternalDmpResearchers), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.Researchers), - @JsonSubTypes.Type(value = LabelFieldDataFileTransformerModel.class, name = FieldType.Names.RichTextarea), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.Services), - @JsonSubTypes.Type(value = LabelFieldDataFileTransformerModel.class, name = FieldType.Names.Tags), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.Taxonomies), - @JsonSubTypes.Type(value = LabelFieldDataFileTransformerModel.class, name = FieldType.Names.TextArea), - @JsonSubTypes.Type(value = UploadDataFileTransformerModel.class, name = FieldType.Names.Upload), - @JsonSubTypes.Type(value = LabelFieldDataFileTransformerModel.class, name = FieldType.Names.Validation), - @JsonSubTypes.Type(value = LabelFieldDataFileTransformerModel.class, name = FieldType.Names.DatasetIdentifier), - @JsonSubTypes.Type(value = LabelFieldDataFileTransformerModel.class, name = FieldType.Names.Currency), - @JsonSubTypes.Type(value = WordListDataFileTransformerModel.class, name = FieldType.Names.Wordlist), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.DataRepositories), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.JournalRepositories), - @JsonSubTypes.Type(value = LabelAndMultiplicityFieldDataFileTransformerModel.class, name = FieldType.Names.Publications), -}) + public abstract class BaseFieldDataFileTransformerModel { private String label; private FieldType fieldType; private String value; - public String getLabel() { - return label; - } + public String getLabel() { + return label; + } - public void setLabel(String label) { - this.label = label; - } + public void setLabel(String label) { + this.label = label; + } - public FieldType getFieldType() { - return fieldType; - } + public FieldType getFieldType() { + return fieldType; + } public void setFieldType(FieldType fieldType) { this.fieldType = fieldType; diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ComboBoxOptionFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ComboBoxOptionFileTransformerModel.java deleted file mode 100644 index acf3bf3..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ComboBoxOptionFileTransformerModel.java +++ /dev/null @@ -1,42 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -public class ComboBoxOptionFileTransformerModel { - private String label; - private String value; - private String source; - private String uri; - - 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 String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - -} 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 index 8c67b2b..58f7e0c 100644 --- 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 @@ -3,7 +3,7 @@ package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddat import eu.eudat.file.transformer.enums.FieldDataExternalDatasetType; -public class ExternalDatasetDataFileTransformerModel extends LabelAndMultiplicityFieldDataFileTransformerModel { +public class ExternalDatasetDataFileTransformerModel extends LabelAndMultiplicityDataFileTransformerModel { private FieldDataExternalDatasetType type; public FieldDataExternalDatasetType getType() { 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 new file mode 100644 index 0000000..2a48071 --- /dev/null +++ b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/ExternalSelectDataFileTransformerModel.java @@ -0,0 +1,150 @@ +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 new file mode 100644 index 0000000..a9da0d0 --- /dev/null +++ b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelAndMultiplicityDataFileTransformerModel.java @@ -0,0 +1,13 @@ +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/LabelAndMultiplicityFieldDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelAndMultiplicityFieldDataFileTransformerModel.java deleted file mode 100644 index 3b9c855..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelAndMultiplicityFieldDataFileTransformerModel.java +++ /dev/null @@ -1,14 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -public class LabelAndMultiplicityFieldDataFileTransformerModel extends BaseFieldDataFileTransformerModel { - private Boolean multiAutoComplete; - - public Boolean getMultiAutoComplete() { - return multiAutoComplete; - } - - public void setMultiAutoComplete(Boolean multiAutoComplete) { - this.multiAutoComplete = multiAutoComplete; - } - -} 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 new file mode 100644 index 0000000..9c0ba87 --- /dev/null +++ b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelDataFileTransformerModel.java @@ -0,0 +1,4 @@ +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/LabelFieldDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelFieldDataFileTransformerModel.java deleted file mode 100644 index 1eaa260..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/LabelFieldDataFileTransformerModel.java +++ /dev/null @@ -1,5 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -public class LabelFieldDataFileTransformerModel 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 index 71193dd..3746d20 100644 --- 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 @@ -1,17 +1,36 @@ 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; - private List options; + public String getLabel() { + return label; + } - public List getOptions() { + 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) { + public void setOptions(List options) { this.options = options; } } diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/RadioBoxOptionFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/RadioBoxOptionFileTransformerModel.java deleted file mode 100644 index 0bc1a4d..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/RadioBoxOptionFileTransformerModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -public class RadioBoxOptionFileTransformerModel { - 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/SelectDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/SelectDataFileTransformerModel.java new file mode 100644 index 0000000..18ca632 --- /dev/null +++ b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/SelectDataFileTransformerModel.java @@ -0,0 +1,35 @@ +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 index 3a459dc..d6d162a 100644 --- 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 @@ -1,21 +1,43 @@ package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - import java.util.List; -public class UploadDataFileTransformerModel extends BaseFieldDataFileTransformerModel { - private List types; - public List getTypes() { +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) { + public void setTypes(List types) { this.types = types; } - private Integer maxFileSizeInMB; - public Integer getMaxFileSizeInMB() { return maxFileSizeInMB; } @@ -23,7 +45,4 @@ public class UploadDataFileTransformerModel extends BaseFieldDataFileTransformer public void setMaxFileSizeInMB(Integer maxFileSizeInMB) { this.maxFileSizeInMB = maxFileSizeInMB; } - - } - diff --git a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/UploadOptionFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/UploadOptionFileTransformerModel.java deleted file mode 100644 index b1d8174..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/UploadOptionFileTransformerModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -public class UploadOptionFileTransformerModel { - 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/WordListDataFileTransformerModel.java b/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/WordListDataFileTransformerModel.java deleted file mode 100644 index e7cb1f7..0000000 --- a/src/main/java/eu/eudat/file/transformer/models/descriptiontemplate/definition/fielddata/WordListDataFileTransformerModel.java +++ /dev/null @@ -1,24 +0,0 @@ -package eu.eudat.file.transformer.models.descriptiontemplate.definition.fielddata; - -import java.util.List; - -public class WordListDataFileTransformerModel extends BaseFieldDataFileTransformerModel { - private List options; - private Boolean multiList; - - public List getOptions() { - return options; - } - - public void setOptions(List options) { - this.options = options; - } - - public Boolean getMultiList() { - return multiList; - } - - public void setMultiList(Boolean multiList) { - this.multiList = multiList; - } -}