rename to OpenCDMP
This commit is contained in:
parent
5dad708034
commit
5242120aea
|
@ -3,7 +3,7 @@
|
|||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>gr.cite.opendmp</groupId>
|
||||
<groupId>org.opencdmp</groupId>
|
||||
<artifactId>file-transformer-rda-parent</artifactId>
|
||||
<version>${revision}</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package eu.eudat.file.transformer.model;
|
||||
package org.opencdmp.filetransformer.rda.model;
|
||||
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceModel;
|
||||
|
||||
public class FundingModel{
|
||||
private ReferenceModel grant;
|
|
@ -1,6 +1,6 @@
|
|||
package eu.eudat.file.transformer.model;
|
||||
package org.opencdmp.filetransformer.rda.model;
|
||||
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceModel;
|
||||
|
||||
public class ProjectModel{
|
||||
private ReferenceModel project;
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package eu.eudat.file.transformer.model.rda;
|
||||
package org.opencdmp.filetransformer.rda.model.rda;
|
||||
|
||||
import com.fasterxml.jackson.annotation.*;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.file.transformer.model.rda.ContactId;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.ContactId;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.UUID;
|
|
@ -1,9 +1,9 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.enums.ContactInfoType;
|
||||
import eu.eudat.commonmodels.models.UserContactInfoModel;
|
||||
import eu.eudat.commonmodels.models.UserModel;
|
||||
import eu.eudat.file.transformer.model.rda.Contact;
|
||||
import org.opencdmp.commonmodels.enums.ContactInfoType;
|
||||
import org.opencdmp.commonmodels.models.UserContactInfoModel;
|
||||
import org.opencdmp.commonmodels.models.UserModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Contact;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
|
@ -1,7 +1,7 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
|
||||
import eu.eudat.file.transformer.model.rda.ContributorId;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.ContributorId;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Map;
|
|
@ -1,7 +1,7 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import eu.eudat.file.transformer.model.rda.Cost;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Cost;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
@ -15,14 +15,14 @@ import java.util.stream.Collectors;
|
|||
public class CostRDAMapper{
|
||||
private static final Logger logger = LoggerFactory.getLogger(DatasetRDAMapper.class);
|
||||
|
||||
public List<Cost> toRDA(List<FieldModel> nodes, List<eu.eudat.commonmodels.models.description.FieldModel> valueFields ) {
|
||||
public List<Cost> toRDA(List<FieldModel> nodes, List<org.opencdmp.commonmodels.models.description.FieldModel> valueFields ) {
|
||||
if (nodes == null) return null;
|
||||
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
|
||||
|
||||
Map<String, Cost> rdaMap = new HashMap<>();
|
||||
for(FieldModel node: nodes){
|
||||
String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dmp.cost")).findFirst().orElse("");
|
||||
eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){
|
||||
continue;
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import eu.eudat.file.transformer.model.rda.DatasetId;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.DatasetId;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
@ -14,7 +14,7 @@ public class DatasetIdRDAMapper{
|
|||
private static final Logger logger = LoggerFactory.getLogger(DatasetIdRDAMapper.class);
|
||||
|
||||
|
||||
public DatasetId toRDA(List<FieldModel> nodes, List<eu.eudat.commonmodels.models.description.FieldModel> valueFields) {
|
||||
public DatasetId toRDA(List<FieldModel> nodes, List<org.opencdmp.commonmodels.models.description.FieldModel> valueFields) {
|
||||
if (nodes == null) return null;
|
||||
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
|
||||
|
||||
|
@ -24,7 +24,7 @@ public class DatasetIdRDAMapper{
|
|||
if (node.getData() == null) {
|
||||
continue;
|
||||
}
|
||||
eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){
|
||||
continue;
|
||||
}
|
|
@ -1,16 +1,16 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.description.DescriptionModel;
|
||||
import eu.eudat.commonmodels.models.description.PropertyDefinitionFieldSetItemModel;
|
||||
import eu.eudat.commonmodels.models.description.PropertyDefinitionFieldSetModel;
|
||||
import eu.eudat.commonmodels.models.description.PropertyDefinitionModel;
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import eu.eudat.file.transformer.model.rda.Dataset;
|
||||
import eu.eudat.file.transformer.model.rda.DatasetId;
|
||||
import eu.eudat.file.transformer.model.rda.Dmp;
|
||||
import eu.eudat.file.transformer.model.rda.Language;
|
||||
import eu.eudat.file.transformer.service.descriptiontemplatesearcher.TemplateFieldSearcherService;
|
||||
import org.opencdmp.commonmodels.models.description.DescriptionModel;
|
||||
import org.opencdmp.commonmodels.models.description.PropertyDefinitionFieldSetItemModel;
|
||||
import org.opencdmp.commonmodels.models.description.PropertyDefinitionFieldSetModel;
|
||||
import org.opencdmp.commonmodels.models.description.PropertyDefinitionModel;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Dataset;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.DatasetId;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Dmp;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Language;
|
||||
import org.opencdmp.filetransformer.rda.service.descriptiontemplatesearcher.TemplateFieldSearcherService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
@ -48,22 +48,22 @@ public class DatasetRDAMapper {
|
|||
this.keywordRDAMapper = keywordRDAMapper;
|
||||
}
|
||||
|
||||
private List<eu.eudat.commonmodels.models.description.FieldModel> findValueField(FieldModel fieldModel, PropertyDefinitionModel descriptionTemplateModel){
|
||||
List<eu.eudat.commonmodels.models.description.FieldModel> items = new ArrayList<>();
|
||||
private List<org.opencdmp.commonmodels.models.description.FieldModel> findValueField(FieldModel fieldModel, PropertyDefinitionModel descriptionTemplateModel){
|
||||
List<org.opencdmp.commonmodels.models.description.FieldModel> items = new ArrayList<>();
|
||||
if (descriptionTemplateModel == null || descriptionTemplateModel.getFieldSets() == null) return items;
|
||||
for (PropertyDefinitionFieldSetModel propertyDefinitionFieldSetModel : descriptionTemplateModel.getFieldSets().values()){
|
||||
if (propertyDefinitionFieldSetModel.getItems() == null) continue;
|
||||
for (PropertyDefinitionFieldSetItemModel propertyDefinitionFieldSetItemModel : propertyDefinitionFieldSetModel.getItems()){
|
||||
if (propertyDefinitionFieldSetItemModel.getFields() == null) continue;
|
||||
eu.eudat.commonmodels.models.description.FieldModel valueField = propertyDefinitionFieldSetItemModel.getFields().getOrDefault(fieldModel.getId(), null);
|
||||
org.opencdmp.commonmodels.models.description.FieldModel valueField = propertyDefinitionFieldSetItemModel.getFields().getOrDefault(fieldModel.getId(), null);
|
||||
if (valueField != null) items.add(valueField);
|
||||
}
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
private List<eu.eudat.commonmodels.models.description.FieldModel> getAllValueFields(PropertyDefinitionModel descriptionTemplateModel){
|
||||
List<eu.eudat.commonmodels.models.description.FieldModel> items = new ArrayList<>();
|
||||
private List<org.opencdmp.commonmodels.models.description.FieldModel> getAllValueFields(PropertyDefinitionModel descriptionTemplateModel){
|
||||
List<org.opencdmp.commonmodels.models.description.FieldModel> items = new ArrayList<>();
|
||||
if (descriptionTemplateModel == null || descriptionTemplateModel.getFieldSets() == null) return items;
|
||||
for (PropertyDefinitionFieldSetModel propertyDefinitionFieldSetModel : descriptionTemplateModel.getFieldSets().values()){
|
||||
if (propertyDefinitionFieldSetModel.getItems() == null) continue;
|
||||
|
@ -102,8 +102,8 @@ public class DatasetRDAMapper {
|
|||
|
||||
List<FieldModel> typeNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.type");
|
||||
for (FieldModel typeNode : typeNodes){
|
||||
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(typeNode, descriptionEntity.getProperties());
|
||||
if (!fieldValues.isEmpty()) rda.setType(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(eu.eudat.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null));
|
||||
List<org.opencdmp.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(typeNode, descriptionEntity.getProperties());
|
||||
if (!fieldValues.isEmpty()) rda.setType(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(org.opencdmp.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null));
|
||||
if (rda.getType() != null && !rda.getType().isBlank()) break;;
|
||||
}
|
||||
if (rda.getType() == null || rda.getType().isBlank()) rda.setType("DMP Dataset");
|
||||
|
@ -112,7 +112,7 @@ public class DatasetRDAMapper {
|
|||
|
||||
List<FieldModel> languageNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.language");
|
||||
for (FieldModel languageNode : languageNodes){
|
||||
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(languageNode, descriptionEntity.getProperties());
|
||||
List<org.opencdmp.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(languageNode, descriptionEntity.getProperties());
|
||||
try {
|
||||
if (!fieldValues.isEmpty()) rda.setLanguage(fieldValues.stream().filter(x -> x.getTextValue() != null && x.getTextValue().isBlank()).map(x -> Language.fromValue(x.getTextValue())).findFirst().orElse(null));
|
||||
}
|
||||
|
@ -175,8 +175,8 @@ public class DatasetRDAMapper {
|
|||
|
||||
List<FieldModel> preservationNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.preservation_statement");
|
||||
for (FieldModel preservationNode : preservationNodes){
|
||||
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(preservationNode, descriptionEntity.getProperties());
|
||||
if (!fieldValues.isEmpty()) rda.setPreservationStatement(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(eu.eudat.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null));
|
||||
List<org.opencdmp.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(preservationNode, descriptionEntity.getProperties());
|
||||
if (!fieldValues.isEmpty()) rda.setPreservationStatement(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(org.opencdmp.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null));
|
||||
if (rda.getPreservationStatement() != null && !rda.getPreservationStatement().isBlank()) break;;
|
||||
}
|
||||
|
||||
|
@ -191,7 +191,7 @@ public class DatasetRDAMapper {
|
|||
|
||||
List<FieldModel> keywordNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.keyword");
|
||||
for (FieldModel keywordNode : keywordNodes){
|
||||
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(keywordNode, descriptionEntity.getProperties());
|
||||
List<org.opencdmp.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(keywordNode, descriptionEntity.getProperties());
|
||||
if (!fieldValues.isEmpty()) {
|
||||
rda.setKeyword(fieldValues.stream().filter(x -> (x.getTextValue() != null && x.getTextValue().isBlank()) || (x.getTextListValue() != null && !x.getTextListValue().isEmpty())).map(x -> {
|
||||
if (x.getTextListValue() != null && !x.getTextListValue().isEmpty()) {
|
||||
|
@ -216,7 +216,7 @@ public class DatasetRDAMapper {
|
|||
// }
|
||||
List<FieldModel> personalDataNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.sensitive_data");
|
||||
for (FieldModel personalDataNode : personalDataNodes){
|
||||
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(personalDataNode, descriptionEntity.getProperties());
|
||||
List<org.opencdmp.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(personalDataNode, descriptionEntity.getProperties());
|
||||
if (!fieldValues.isEmpty()) rda.setPersonalData(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(x-> Dataset.PersonalData.fromValue(x.getTextValue())).findFirst().orElse(null));
|
||||
if (rda.getPersonalData() != null) break;
|
||||
}
|
||||
|
@ -230,7 +230,7 @@ public class DatasetRDAMapper {
|
|||
}
|
||||
List<FieldModel> sensitiveDataNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.sensitive_data");
|
||||
for (FieldModel sensitiveDataNode : sensitiveDataNodes){
|
||||
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(sensitiveDataNode, descriptionEntity.getProperties());
|
||||
List<org.opencdmp.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(sensitiveDataNode, descriptionEntity.getProperties());
|
||||
if (!fieldValues.isEmpty()) rda.setSensitiveData(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(x-> Dataset.SensitiveData.fromValue(x.getTextValue())).findFirst().orElse(null));
|
||||
if (rda.getSensitiveData() != null) break;
|
||||
}
|
||||
|
@ -245,8 +245,8 @@ public class DatasetRDAMapper {
|
|||
|
||||
List<FieldModel> issuedNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.issued");
|
||||
for (FieldModel issuedNode : issuedNodes){
|
||||
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(issuedNode, descriptionEntity.getProperties());
|
||||
if (!fieldValues.isEmpty()) rda.setIssued(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(eu.eudat.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null));
|
||||
List<org.opencdmp.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(issuedNode, descriptionEntity.getProperties());
|
||||
if (!fieldValues.isEmpty()) rda.setIssued(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(org.opencdmp.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null));
|
||||
if (rda.getIssued() != null && !rda.getIssued().isBlank()) break;;
|
||||
}
|
||||
|
||||
|
@ -274,8 +274,8 @@ public class DatasetRDAMapper {
|
|||
List<FieldModel> ethicsNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dmp.ethical_issues");
|
||||
if (!ethicsNodes.isEmpty()) {
|
||||
for(FieldModel node: ethicsNodes){
|
||||
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(node, descriptionEntity.getProperties());
|
||||
eu.eudat.commonmodels.models.description.FieldModel fieldValue = fieldValues.getFirst();
|
||||
List<org.opencdmp.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(node, descriptionEntity.getProperties());
|
||||
org.opencdmp.commonmodels.models.description.FieldModel fieldValue = fieldValues.getFirst();
|
||||
String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dmp.ethical_issues")).findFirst().orElse("");
|
||||
if (fieldValue == null) {
|
||||
continue;
|
|
@ -1,8 +1,8 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import eu.eudat.file.transformer.model.rda.Distribution;
|
||||
import eu.eudat.file.transformer.model.rda.License;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Distribution;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.License;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
@ -22,7 +22,7 @@ public class DistributionRDAMapper {
|
|||
this.hostRDAMapper = hostRDAMapper;
|
||||
}
|
||||
|
||||
public List<Distribution> toRDA(List<FieldModel> nodes, List<eu.eudat.commonmodels.models.description.FieldModel> valueFields) {
|
||||
public List<Distribution> toRDA(List<FieldModel> nodes, List<org.opencdmp.commonmodels.models.description.FieldModel> valueFields) {
|
||||
if (nodes == null) return null;
|
||||
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
|
||||
Map<String, Distribution> rdaMap = new HashMap<>();
|
||||
|
@ -33,7 +33,7 @@ public class DistributionRDAMapper {
|
|||
continue;
|
||||
}
|
||||
|
||||
eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
if(rdaValue == null || (rdaValue.getTextValue() == null && rdaValue.getReferences() == null)){
|
||||
continue;
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.dmp.DmpContactModel;
|
||||
import eu.eudat.file.transformer.model.rda.Contact;
|
||||
import org.opencdmp.commonmodels.models.dmp.DmpContactModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Contact;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Map;
|
|
@ -1,6 +1,6 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.file.transformer.model.rda.DmpId;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.DmpId;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.UUID;
|
|
@ -1,24 +1,24 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.enums.DmpAccessType;
|
||||
import eu.eudat.commonmodels.enums.DmpUserRole;
|
||||
import eu.eudat.commonmodels.models.DmpUserModel;
|
||||
import eu.eudat.commonmodels.models.EntityDoiModel;
|
||||
import eu.eudat.commonmodels.models.UserModel;
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import eu.eudat.commonmodels.models.dmp.DmpContactModel;
|
||||
import eu.eudat.commonmodels.models.dmp.DmpModel;
|
||||
import eu.eudat.commonmodels.models.dmp.DmpPropertiesModel;
|
||||
import eu.eudat.commonmodels.models.dmpblueprint.DmpBlueprintModel;
|
||||
import eu.eudat.commonmodels.models.dmpreference.DmpReferenceModel;
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceModel;
|
||||
import eu.eudat.file.transformer.model.ProjectModel;
|
||||
import eu.eudat.file.transformer.model.rda.DmpId;
|
||||
import eu.eudat.file.transformer.model.rda.Dmp;
|
||||
import eu.eudat.file.transformer.service.descriptiontemplatesearcher.TemplateFieldSearcherService;
|
||||
import eu.eudat.file.transformer.service.json.JsonHandlingService;
|
||||
import eu.eudat.file.transformer.service.rdafiletransformer.RdaFileTransformerServiceProperties;
|
||||
import org.opencdmp.commonmodels.enums.DmpAccessType;
|
||||
import org.opencdmp.commonmodels.enums.DmpUserRole;
|
||||
import org.opencdmp.commonmodels.models.DmpUserModel;
|
||||
import org.opencdmp.commonmodels.models.EntityDoiModel;
|
||||
import org.opencdmp.commonmodels.models.UserModel;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import org.opencdmp.commonmodels.models.dmp.DmpContactModel;
|
||||
import org.opencdmp.commonmodels.models.dmp.DmpModel;
|
||||
import org.opencdmp.commonmodels.models.dmp.DmpPropertiesModel;
|
||||
import org.opencdmp.commonmodels.models.dmpblueprint.DmpBlueprintModel;
|
||||
import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceModel;
|
||||
import org.opencdmp.filetransformer.rda.model.ProjectModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.DmpId;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Dmp;
|
||||
import org.opencdmp.filetransformer.rda.service.descriptiontemplatesearcher.TemplateFieldSearcherService;
|
||||
import org.opencdmp.filetransformer.rda.service.json.JsonHandlingService;
|
||||
import org.opencdmp.filetransformer.rda.service.rdafiletransformer.RdaFileTransformerServiceProperties;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.enums.ContactInfoType;
|
||||
import eu.eudat.commonmodels.models.DmpUserModel;
|
||||
import eu.eudat.commonmodels.models.UserContactInfoModel;
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceModel;
|
||||
import eu.eudat.file.transformer.model.rda.Contributor;
|
||||
import org.opencdmp.commonmodels.enums.ContactInfoType;
|
||||
import org.opencdmp.commonmodels.models.DmpUserModel;
|
||||
import org.opencdmp.commonmodels.models.UserContactInfoModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Contributor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
|
@ -1,6 +1,6 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.file.transformer.model.rda.FunderId;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.FunderId;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Map;
|
|
@ -1,10 +1,10 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceModel;
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceTypeModel;
|
||||
import eu.eudat.file.transformer.model.FundingModel;
|
||||
import eu.eudat.file.transformer.model.rda.Funding;
|
||||
import eu.eudat.file.transformer.service.rdafiletransformer.RdaFileTransformerServiceProperties;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceTypeModel;
|
||||
import org.opencdmp.filetransformer.rda.model.FundingModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Funding;
|
||||
import org.opencdmp.filetransformer.rda.service.rdafiletransformer.RdaFileTransformerServiceProperties;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
|
@ -1,6 +1,6 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.file.transformer.model.rda.GrantId;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.GrantId;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Map;
|
|
@ -1,8 +1,8 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import eu.eudat.file.transformer.model.rda.Host;
|
||||
import eu.eudat.file.transformer.utils.string.MyStringUtils;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Host;
|
||||
import org.opencdmp.filetransformer.rda.utils.string.MyStringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
@ -14,7 +14,7 @@ import java.util.*;
|
|||
public class HostRDAMapper {
|
||||
private static final Logger logger = LoggerFactory.getLogger(HostRDAMapper.class);
|
||||
|
||||
public Host toRDA(List<FieldModel> nodes, List<eu.eudat.commonmodels.models.description.FieldModel> valueFields, String numbering){
|
||||
public Host toRDA(List<FieldModel> nodes, List<org.opencdmp.commonmodels.models.description.FieldModel> valueFields, String numbering){
|
||||
if (nodes == null) return null;
|
||||
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
|
||||
Host rda = new Host();
|
||||
|
@ -24,7 +24,7 @@ public class HostRDAMapper {
|
|||
if (rdaProperty.contains("host")) {
|
||||
int firstDiff = MyStringUtils.getFirstDifference(numbering, node.getNumbering());
|
||||
if (firstDiff == -1 || firstDiff >= 2) {
|
||||
eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){
|
||||
continue;
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import eu.eudat.file.transformer.model.FundingModel;
|
||||
import eu.eudat.file.transformer.model.rda.Funding;
|
||||
import eu.eudat.file.transformer.model.rda.Language;
|
||||
import org.opencdmp.filetransformer.rda.model.FundingModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Funding;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Language;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
|
@ -1,7 +1,7 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import eu.eudat.file.transformer.model.rda.License;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.License;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
@ -15,14 +15,14 @@ public class LicenseRDAMapper {
|
|||
private static final Logger logger = LoggerFactory.getLogger(LicenseRDAMapper.class);
|
||||
|
||||
|
||||
public License toRDA(List<FieldModel> nodes, List<eu.eudat.commonmodels.models.description.FieldModel> valueFields) {
|
||||
public License toRDA(List<FieldModel> nodes, List<org.opencdmp.commonmodels.models.description.FieldModel> valueFields) {
|
||||
if (nodes == null) return null;
|
||||
if (valueFields == null) throw new IllegalArgumentException("extraData is missing");
|
||||
|
||||
License rda = new License();
|
||||
for (FieldModel node: nodes) {
|
||||
String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dataset.distribution.license")).findFirst().orElse("");
|
||||
eu.eudat.commonmodels.models.description.FieldModel valueField = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
org.opencdmp.commonmodels.models.description.FieldModel valueField = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
if(valueField == null || valueField.getTextValue() == null || valueField.getTextValue().isBlank()){
|
||||
continue;
|
||||
}
|
|
@ -1,11 +1,11 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceFieldModel;
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceModel;
|
||||
import eu.eudat.file.transformer.model.rda.Metadatum;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceFieldModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Metadatum;
|
||||
|
||||
import eu.eudat.file.transformer.utils.string.MyStringUtils;
|
||||
import org.opencdmp.filetransformer.rda.utils.string.MyStringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
@ -22,7 +22,7 @@ public class MetadataRDAMapper{
|
|||
this.metadataStandardIdRDAMapper = metadataStandardIdRDAMapper;
|
||||
}
|
||||
|
||||
public List<Metadatum> toRDA(List<FieldModel> nodes, List<eu.eudat.commonmodels.models.description.FieldModel> valueFields) {
|
||||
public List<Metadatum> toRDA(List<FieldModel> nodes, List<org.opencdmp.commonmodels.models.description.FieldModel> valueFields) {
|
||||
if (nodes == null) return null;
|
||||
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
|
||||
|
||||
|
@ -30,7 +30,7 @@ public class MetadataRDAMapper{
|
|||
List<Metadatum> rdas = new ArrayList<>();
|
||||
for (FieldModel node : nodes) {
|
||||
String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dataset.metadata")).findFirst().orElse("");
|
||||
eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x -> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x -> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
|
||||
for (PropertyName propertyName : PropertyName.values()) {
|
||||
if (rdaProperty.contains(propertyName.getName())) {
|
|
@ -1,5 +1,5 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
import eu.eudat.file.transformer.model.rda.MetadataStandardId;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.MetadataStandardId;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Map;
|
|
@ -1,13 +1,13 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceDefinitionModel;
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceFieldModel;
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceModel;
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceTypeModel;
|
||||
import eu.eudat.file.transformer.model.FundingModel;
|
||||
import eu.eudat.file.transformer.model.ProjectModel;
|
||||
import eu.eudat.file.transformer.model.rda.Funding;
|
||||
import eu.eudat.file.transformer.model.rda.Project;
|
||||
import eu.eudat.file.transformer.service.rdafiletransformer.RdaFileTransformerServiceProperties;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceDefinitionModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceFieldModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceTypeModel;
|
||||
import org.opencdmp.filetransformer.rda.model.FundingModel;
|
||||
import org.opencdmp.filetransformer.rda.model.ProjectModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Funding;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Project;
|
||||
import org.opencdmp.filetransformer.rda.service.rdafiletransformer.RdaFileTransformerServiceProperties;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Component;
|
|
@ -1,11 +1,11 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceDefinitionModel;
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceFieldModel;
|
||||
import eu.eudat.commonmodels.models.reference.ReferenceModel;
|
||||
import eu.eudat.file.transformer.model.FundingModel;
|
||||
import eu.eudat.file.transformer.model.rda.Contributor;
|
||||
import eu.eudat.file.transformer.model.rda.Funding;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceDefinitionModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceFieldModel;
|
||||
import org.opencdmp.commonmodels.models.reference.ReferenceModel;
|
||||
import org.opencdmp.filetransformer.rda.model.FundingModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Contributor;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Funding;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
|
@ -1,8 +1,8 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import eu.eudat.file.transformer.model.rda.SecurityAndPrivacy;
|
||||
import eu.eudat.file.transformer.utils.string.MyStringUtils;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.SecurityAndPrivacy;
|
||||
import org.opencdmp.filetransformer.rda.utils.string.MyStringUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.*;
|
||||
|
@ -10,7 +10,7 @@ import java.util.stream.Collectors;
|
|||
|
||||
@Component
|
||||
public class SecurityAndPrivacyRDAMapper {
|
||||
public List<SecurityAndPrivacy> toRDA(List<FieldModel> nodes, List<eu.eudat.commonmodels.models.description.FieldModel> valueFields) {
|
||||
public List<SecurityAndPrivacy> toRDA(List<FieldModel> nodes, List<org.opencdmp.commonmodels.models.description.FieldModel> valueFields) {
|
||||
if (nodes == null) return null;
|
||||
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
|
||||
|
||||
|
@ -21,7 +21,7 @@ public class SecurityAndPrivacyRDAMapper {
|
|||
if (node.getData() == null) {
|
||||
continue;
|
||||
}
|
||||
eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){
|
||||
continue;
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.TagModel;
|
||||
import org.opencdmp.commonmodels.models.TagModel;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Map;
|
|
@ -1,8 +1,8 @@
|
|||
package eu.eudat.file.transformer.model.rda.mapper;
|
||||
package org.opencdmp.filetransformer.rda.model.rda.mapper;
|
||||
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import eu.eudat.file.transformer.model.rda.TechnicalResource;
|
||||
import eu.eudat.file.transformer.utils.string.MyStringUtils;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.TechnicalResource;
|
||||
import org.opencdmp.filetransformer.rda.utils.string.MyStringUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.*;
|
||||
|
@ -11,7 +11,7 @@ import java.util.stream.Collectors;
|
|||
@Component
|
||||
public class TechnicalResourceRDAMapper {
|
||||
|
||||
public List<TechnicalResource> toRDA(List<FieldModel> nodes, List<eu.eudat.commonmodels.models.description.FieldModel> valueFields ) {
|
||||
public List<TechnicalResource> toRDA(List<FieldModel> nodes, List<org.opencdmp.commonmodels.models.description.FieldModel> valueFields ) {
|
||||
if (nodes == null) return null;
|
||||
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
|
||||
Map<String, TechnicalResource> rdaMap = new HashMap<>();
|
||||
|
@ -21,7 +21,7 @@ public class TechnicalResourceRDAMapper {
|
|||
if (node.getData() == null) {
|
||||
continue;
|
||||
}
|
||||
eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null);
|
||||
if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){
|
||||
continue;
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package eu.eudat.file.transformer.service.descriptiontemplatesearcher;
|
||||
package org.opencdmp.filetransformer.rda.service.descriptiontemplatesearcher;
|
||||
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
|
||||
|
||||
import java.util.List;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package eu.eudat.file.transformer.service.descriptiontemplatesearcher;
|
||||
package org.opencdmp.filetransformer.rda.service.descriptiontemplatesearcher;
|
||||
|
||||
import eu.eudat.commonmodels.models.descriptiotemplate.*;
|
||||
import org.opencdmp.commonmodels.models.descriptiotemplate.*;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.file.transformer.service.json;
|
||||
package org.opencdmp.filetransformer.rda.service.json;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
@ -1,19 +1,19 @@
|
|||
package eu.eudat.file.transformer.service.rdafiletransformer;
|
||||
package org.opencdmp.filetransformer.rda.service.rdafiletransformer;
|
||||
|
||||
import eu.eudat.commonmodels.models.FileEnvelopeModel;
|
||||
import eu.eudat.commonmodels.models.description.DescriptionModel;
|
||||
import eu.eudat.commonmodels.models.dmp.DmpModel;
|
||||
import eu.eudat.file.transformer.enums.FileTransformerEntityType;
|
||||
import eu.eudat.file.transformer.interfaces.FileTransformerClient;
|
||||
import eu.eudat.file.transformer.interfaces.FileTransformerConfiguration;
|
||||
import eu.eudat.file.transformer.models.misc.FileFormat;
|
||||
import eu.eudat.file.transformer.model.rda.Dataset;
|
||||
import eu.eudat.file.transformer.model.rda.Dmp;
|
||||
import eu.eudat.file.transformer.model.rda.RDAModel;
|
||||
import eu.eudat.file.transformer.model.rda.mapper.DatasetRDAMapper;
|
||||
import eu.eudat.file.transformer.model.rda.mapper.DmpRDAMapper;
|
||||
import eu.eudat.file.transformer.service.json.JsonHandlingService;
|
||||
import eu.eudat.file.transformer.service.storage.FileStorageService;
|
||||
import org.opencdmp.commonmodels.models.FileEnvelopeModel;
|
||||
import org.opencdmp.commonmodels.models.description.DescriptionModel;
|
||||
import org.opencdmp.commonmodels.models.dmp.DmpModel;
|
||||
import org.opencdmp.filetransformerbase.enums.FileTransformerEntityType;
|
||||
import org.opencdmp.filetransformerbase.interfaces.FileTransformerClient;
|
||||
import org.opencdmp.filetransformerbase.interfaces.FileTransformerConfiguration;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Dataset;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.Dmp;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.RDAModel;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.mapper.DatasetRDAMapper;
|
||||
import org.opencdmp.filetransformer.rda.model.rda.mapper.DmpRDAMapper;
|
||||
import org.opencdmp.filetransformer.rda.service.json.JsonHandlingService;
|
||||
import org.opencdmp.filetransformer.rda.service.storage.FileStorageService;
|
||||
import org.opencdmp.filetransformerbase.models.misc.FileFormat;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
|
||||
import org.springframework.context.annotation.Scope;
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.file.transformer.service.rdafiletransformer;
|
||||
package org.opencdmp.filetransformer.rda.service.rdafiletransformer;
|
||||
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.context.annotation.Configuration;
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.file.transformer.service.rdafiletransformer;
|
||||
package org.opencdmp.filetransformer.rda.service.rdafiletransformer;
|
||||
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.file.transformer.service.storage;
|
||||
package org.opencdmp.filetransformer.rda.service.storage;
|
||||
|
||||
public interface FileStorageService {
|
||||
String storeFile(byte[] data);
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.file.transformer.service.storage;
|
||||
package org.opencdmp.filetransformer.rda.service.storage;
|
||||
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.context.annotation.Configuration;
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.file.transformer.service.storage;
|
||||
package org.opencdmp.filetransformer.rda.service.storage;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.file.transformer.service.storage;
|
||||
package org.opencdmp.filetransformer.rda.service.storage;
|
||||
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.boot.context.properties.bind.ConstructorBinding;
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.file.transformer.utils.string;
|
||||
package org.opencdmp.filetransformer.rda.utils.string;
|
||||
|
||||
public class MyStringUtils {
|
||||
|
6
pom.xml
6
pom.xml
|
@ -9,7 +9,7 @@
|
|||
<relativePath/>
|
||||
</parent>
|
||||
|
||||
<groupId>gr.cite.opendmp</groupId>
|
||||
<groupId>org.opencdmp</groupId>
|
||||
<artifactId>file-transformer-rda-parent</artifactId>
|
||||
<version>${revision}</version>
|
||||
<packaging>pom</packaging>
|
||||
|
@ -28,9 +28,9 @@
|
|||
<version>2.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>gr.cite.opendmp</groupId>
|
||||
<groupId>org.opencdmp</groupId>
|
||||
<artifactId>file-transformer-base</artifactId>
|
||||
<version>0.0.14</version>
|
||||
<version>0.0.15</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>gr.cite.opendmp</groupId>
|
||||
<groupId>org.opencdmp</groupId>
|
||||
<artifactId>file-transformer-rda-parent</artifactId>
|
||||
<version>${revision}</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
|
@ -22,7 +22,7 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>gr.cite.opendmp</groupId>
|
||||
<groupId>org.opencdmp</groupId>
|
||||
<artifactId>file-transformer-rda</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
package eu.eudat.file.transformer;
|
||||
package eu.eudat.filetransformer.rda;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
@SpringBootApplication(scanBasePackages = {
|
||||
"eu.eudat.file.transformer.*",
|
||||
"org.opencdmp.filetransformerbase.*",
|
||||
"org.opencdmp.filetransformer.rda.*",
|
||||
"gr.cite.tools",
|
||||
"gr.cite.commons"
|
||||
})
|
|
@ -1,4 +1,4 @@
|
|||
package eu.eudat.file.transformer.config;
|
||||
package eu.eudat.filetransformer.rda.config;
|
||||
|
||||
import gr.cite.commons.web.oidc.configuration.WebSecurityProperties;
|
||||
import gr.cite.commons.web.oidc.configuration.filter.ApiKeyFilter;
|
|
@ -1,10 +1,10 @@
|
|||
package eu.eudat.file.transformer.controller;
|
||||
package eu.eudat.filetransformer.rda.controller;
|
||||
|
||||
import eu.eudat.commonmodels.models.FileEnvelopeModel;
|
||||
import eu.eudat.commonmodels.models.description.DescriptionModel;
|
||||
import eu.eudat.commonmodels.models.dmp.DmpModel;
|
||||
import eu.eudat.file.transformer.interfaces.FileTransformerClient;
|
||||
import eu.eudat.file.transformer.interfaces.FileTransformerConfiguration;
|
||||
import org.opencdmp.commonmodels.models.FileEnvelopeModel;
|
||||
import org.opencdmp.commonmodels.models.description.DescriptionModel;
|
||||
import org.opencdmp.commonmodels.models.dmp.DmpModel;
|
||||
import org.opencdmp.filetransformerbase.interfaces.FileTransformerClient;
|
||||
import org.opencdmp.filetransformerbase.interfaces.FileTransformerConfiguration;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
|
@ -12,7 +12,7 @@ import java.util.List;
|
|||
|
||||
@RestController
|
||||
@RequestMapping("/api/file-transformer")
|
||||
public class FileTransformerController implements eu.eudat.file.transformer.interfaces.FileTransformerController {
|
||||
public class FileTransformerController implements org.opencdmp.filetransformerbase.interfaces.FileTransformerController {
|
||||
|
||||
private final FileTransformerClient fileTransformerExecutor;
|
||||
|
Loading…
Reference in New Issue