Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
This commit is contained in:
commit
bd2a935606
|
@ -1,9 +1,9 @@
|
|||
package eu.eudat.model.mapper.publicapi;
|
||||
|
||||
import eu.eudat.commons.types.descriptiontemplate.RuleEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity;
|
||||
import eu.eudat.model.publicapi.datasetwizard.DefaultValueEntity;
|
||||
import eu.eudat.model.publicapi.datasetwizard.FieldDescriptionEntity;
|
||||
import eu.eudat.model.publicapi.datasetwizard.VisibilityEntity;
|
||||
import eu.eudat.model.publicapi.datasetwizard.Field;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@ package eu.eudat.model.publicapi.associatedprofile;
|
|||
import eu.eudat.model.DmpDescriptionTemplate;
|
||||
import jakarta.xml.bind.annotation.*;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
|
@ -52,6 +53,10 @@ public class AssociatedProfilePublicModel {
|
|||
|
||||
public static AssociatedProfilePublicModel fromDmpDescriptionTemplate(DmpDescriptionTemplate dmpDescriptionTemplate) {
|
||||
AssociatedProfilePublicModel model = new AssociatedProfilePublicModel();
|
||||
model.setId(dmpDescriptionTemplate.getCurrentDescriptionTemplate().getId());
|
||||
model.setDescriptionTemplateId(dmpDescriptionTemplate.getCurrentDescriptionTemplate().getId());
|
||||
model.setLabel(dmpDescriptionTemplate.getCurrentDescriptionTemplate().getLabel());
|
||||
model.setData(new HashMap<>());
|
||||
return model;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.commons.types.descriptiontemplate.todelete;
|
||||
package eu.eudat.model.publicapi.datasetwizard;
|
||||
|
||||
public class DefaultValueEntity {
|
||||
private String type;
|
|
@ -5,9 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|||
import eu.eudat.commons.enums.FieldValidationType;
|
||||
import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.MultiplicityEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity;
|
||||
import org.apache.commons.lang3.NotImplementedException;
|
||||
import org.json.JSONException;
|
||||
import org.slf4j.Logger;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.commons.types.descriptiontemplate.todelete;
|
||||
package eu.eudat.model.publicapi.datasetwizard;
|
||||
|
||||
import eu.eudat.commons.enums.FieldType;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.commons.types.descriptiontemplate.todelete;
|
||||
package eu.eudat.model.publicapi.datasetwizard;
|
||||
|
||||
import eu.eudat.commons.types.descriptiontemplate.RuleEntity;
|
||||
import jakarta.xml.bind.annotation.*;
|
|
@ -2,9 +2,9 @@ package eu.eudat.models.data.admin.components.datasetprofile;
|
|||
|
||||
import eu.eudat.commons.enums.FieldValidationType;
|
||||
import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity;
|
||||
import eu.eudat.model.publicapi.datasetwizard.DefaultValueEntity;
|
||||
import eu.eudat.model.publicapi.datasetwizard.FieldDescriptionEntity;
|
||||
import eu.eudat.model.publicapi.datasetwizard.VisibilityEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
|
||||
import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
|
||||
import org.apache.commons.lang3.NotImplementedException;
|
||||
|
|
|
@ -3,10 +3,10 @@ package eu.eudat.models.data.user.components.datasetprofile;
|
|||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import eu.eudat.commons.enums.FieldValidationType;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity;
|
||||
import eu.eudat.model.publicapi.datasetwizard.DefaultValueEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.MultiplicityEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity;
|
||||
import eu.eudat.model.publicapi.datasetwizard.FieldDescriptionEntity;
|
||||
import eu.eudat.model.publicapi.datasetwizard.VisibilityEntity;
|
||||
import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
|
||||
import eu.eudat.models.data.properties.PropertiesGenerator;
|
||||
import eu.eudat.models.data.user.composite.PropertiesModelBuilder;
|
||||
|
|
Loading…
Reference in New Issue