MaDgiK-CITE
/
file-transformer-rda-json
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename to OpenCDMP

This commit is contained in:
Efstratios Giannopoulos 2024-04-26 15:05:47 +03:00
parent 5dad708034
commit 5242120aea
67 changed files with 224 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/pom.xml
View File

@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>gr.cite.opendmp</groupId> <groupId>org.opencdmp</groupId>
<artifactId>file-transformer-rda-parent</artifactId> <artifactId>file-transformer-rda-parent</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>

4
core/src/main/java/eu/eudat/file/transformer/model/FundingModel.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/FundingModel.java
View File

@ -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{ public class FundingModel{
private ReferenceModel grant; private ReferenceModel grant;

4
core/src/main/java/eu/eudat/file/transformer/model/ProjectModel.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/ProjectModel.java
View File

@ -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{ public class ProjectModel{
private ReferenceModel project; private ReferenceModel project;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/Contact.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Contact.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/ContactId.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/ContactId.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/Contributor.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Contributor.java
View File

@ -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.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/ContributorId.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/ContributorId.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/Cost.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Cost.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/Dataset.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Dataset.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/DatasetId.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/DatasetId.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/Distribution.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Distribution.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/Dmp.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Dmp.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/DmpId.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/DmpId.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/FunderId.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/FunderId.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/Funding.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Funding.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/GrantId.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/GrantId.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/Host.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Host.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/Language.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Language.java
View File

@ -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.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/License.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/License.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/MetadataStandardId.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/MetadataStandardId.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/Metadatum.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Metadatum.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/PidSystem.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/PidSystem.java
View File

@ -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.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/Project.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Project.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/RDAModel.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/RDAModel.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/SecurityAndPrivacy.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/SecurityAndPrivacy.java
View File

@ -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.annotation.*;

2
core/src/main/java/eu/eudat/file/transformer/model/rda/TechnicalResource.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/TechnicalResource.java
View File

@ -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.annotation.*;

4
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContactIdRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContactIdRDAMapper.java
View File

@ -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 org.springframework.stereotype.Component;
import java.util.UUID; import java.util.UUID;

10
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContactRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContactRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.enums.ContactInfoType;
import eu.eudat.commonmodels.models.UserContactInfoModel; import org.opencdmp.commonmodels.models.UserContactInfoModel;
import eu.eudat.commonmodels.models.UserModel; import org.opencdmp.commonmodels.models.UserModel;
import eu.eudat.file.transformer.model.rda.Contact; import org.opencdmp.filetransformer.rda.model.rda.Contact;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;

4
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContributorIdRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContributorIdRDAMapper.java
View File

@ -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 org.springframework.stereotype.Component;
import java.util.Map; import java.util.Map;

10
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/CostRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/CostRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
import eu.eudat.file.transformer.model.rda.Cost; import org.opencdmp.filetransformer.rda.model.rda.Cost;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -15,14 +15,14 @@ import java.util.stream.Collectors;
public class CostRDAMapper{ public class CostRDAMapper{
private static final Logger logger = LoggerFactory.getLogger(DatasetRDAMapper.class); 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 (nodes == null) return null;
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
Map<String, Cost> rdaMap = new HashMap<>(); Map<String, Cost> rdaMap = new HashMap<>();
for(FieldModel node: nodes){ for(FieldModel node: nodes){
String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dmp.cost")).findFirst().orElse(""); 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()){ if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){
continue; continue;
} }

10
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DatasetIdRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DatasetIdRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
import eu.eudat.file.transformer.model.rda.DatasetId; import org.opencdmp.filetransformer.rda.model.rda.DatasetId;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -14,7 +14,7 @@ public class DatasetIdRDAMapper{
private static final Logger logger = LoggerFactory.getLogger(DatasetIdRDAMapper.class); 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 (nodes == null) return null;
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
@ -24,7 +24,7 @@ public class DatasetIdRDAMapper{
if (node.getData() == null) { if (node.getData() == null) {
continue; 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()){ if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){
continue; continue;
} }

58
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DatasetRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DatasetRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.description.DescriptionModel;
import eu.eudat.commonmodels.models.description.PropertyDefinitionFieldSetItemModel; import org.opencdmp.commonmodels.models.description.PropertyDefinitionFieldSetItemModel;
import eu.eudat.commonmodels.models.description.PropertyDefinitionFieldSetModel; import org.opencdmp.commonmodels.models.description.PropertyDefinitionFieldSetModel;
import eu.eudat.commonmodels.models.description.PropertyDefinitionModel; import org.opencdmp.commonmodels.models.description.PropertyDefinitionModel;
import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
import eu.eudat.file.transformer.model.rda.Dataset; import org.opencdmp.filetransformer.rda.model.rda.Dataset;
import eu.eudat.file.transformer.model.rda.DatasetId; import org.opencdmp.filetransformer.rda.model.rda.DatasetId;
import eu.eudat.file.transformer.model.rda.Dmp; import org.opencdmp.filetransformer.rda.model.rda.Dmp;
import eu.eudat.file.transformer.model.rda.Language; import org.opencdmp.filetransformer.rda.model.rda.Language;
import eu.eudat.file.transformer.service.descriptiontemplatesearcher.TemplateFieldSearcherService; import org.opencdmp.filetransformer.rda.service.descriptiontemplatesearcher.TemplateFieldSearcherService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -48,22 +48,22 @@ public class DatasetRDAMapper {
this.keywordRDAMapper = keywordRDAMapper; this.keywordRDAMapper = keywordRDAMapper;
} }
private List<eu.eudat.commonmodels.models.description.FieldModel> findValueField(FieldModel fieldModel, PropertyDefinitionModel descriptionTemplateModel){ private List<org.opencdmp.commonmodels.models.description.FieldModel> findValueField(FieldModel fieldModel, PropertyDefinitionModel descriptionTemplateModel){
List<eu.eudat.commonmodels.models.description.FieldModel> items = new ArrayList<>(); List<org.opencdmp.commonmodels.models.description.FieldModel> items = new ArrayList<>();
if (descriptionTemplateModel == null || descriptionTemplateModel.getFieldSets() == null) return items; if (descriptionTemplateModel == null || descriptionTemplateModel.getFieldSets() == null) return items;
for (PropertyDefinitionFieldSetModel propertyDefinitionFieldSetModel : descriptionTemplateModel.getFieldSets().values()){ for (PropertyDefinitionFieldSetModel propertyDefinitionFieldSetModel : descriptionTemplateModel.getFieldSets().values()){
if (propertyDefinitionFieldSetModel.getItems() == null) continue; if (propertyDefinitionFieldSetModel.getItems() == null) continue;
for (PropertyDefinitionFieldSetItemModel propertyDefinitionFieldSetItemModel : propertyDefinitionFieldSetModel.getItems()){ for (PropertyDefinitionFieldSetItemModel propertyDefinitionFieldSetItemModel : propertyDefinitionFieldSetModel.getItems()){
if (propertyDefinitionFieldSetItemModel.getFields() == null) continue; 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); if (valueField != null) items.add(valueField);
} }
} }
return items; return items;
} }
private List<eu.eudat.commonmodels.models.description.FieldModel> getAllValueFields(PropertyDefinitionModel descriptionTemplateModel){ private List<org.opencdmp.commonmodels.models.description.FieldModel> getAllValueFields(PropertyDefinitionModel descriptionTemplateModel){
List<eu.eudat.commonmodels.models.description.FieldModel> items = new ArrayList<>(); List<org.opencdmp.commonmodels.models.description.FieldModel> items = new ArrayList<>();
if (descriptionTemplateModel == null || descriptionTemplateModel.getFieldSets() == null) return items; if (descriptionTemplateModel == null || descriptionTemplateModel.getFieldSets() == null) return items;
for (PropertyDefinitionFieldSetModel propertyDefinitionFieldSetModel : descriptionTemplateModel.getFieldSets().values()){ for (PropertyDefinitionFieldSetModel propertyDefinitionFieldSetModel : descriptionTemplateModel.getFieldSets().values()){
if (propertyDefinitionFieldSetModel.getItems() == null) continue; if (propertyDefinitionFieldSetModel.getItems() == null) continue;
@ -102,8 +102,8 @@ public class DatasetRDAMapper {
List<FieldModel> typeNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.type"); List<FieldModel> typeNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.type");
for (FieldModel typeNode : typeNodes){ for (FieldModel typeNode : typeNodes){
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(typeNode, descriptionEntity.getProperties()); 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(eu.eudat.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null)); 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()) break;;
} }
if (rda.getType() == null || rda.getType().isBlank()) rda.setType("DMP Dataset"); 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"); List<FieldModel> languageNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.language");
for (FieldModel languageNode : languageNodes){ 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 { 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)); 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"); List<FieldModel> preservationNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.preservation_statement");
for (FieldModel preservationNode : preservationNodes){ for (FieldModel preservationNode : preservationNodes){
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(preservationNode, descriptionEntity.getProperties()); 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(eu.eudat.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null)); 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;; 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"); List<FieldModel> keywordNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.keyword");
for (FieldModel keywordNode : keywordNodes){ 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()) { if (!fieldValues.isEmpty()) {
rda.setKeyword(fieldValues.stream().filter(x -> (x.getTextValue() != null && x.getTextValue().isBlank()) || (x.getTextListValue() != null && !x.getTextListValue().isEmpty())).map(x -> { 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()) { 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"); List<FieldModel> personalDataNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.sensitive_data");
for (FieldModel personalDataNode : personalDataNodes){ 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 (!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; if (rda.getPersonalData() != null) break;
} }
@ -230,7 +230,7 @@ public class DatasetRDAMapper {
} }
List<FieldModel> sensitiveDataNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.sensitive_data"); List<FieldModel> sensitiveDataNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.sensitive_data");
for (FieldModel sensitiveDataNode : sensitiveDataNodes){ 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 (!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; if (rda.getSensitiveData() != null) break;
} }
@ -245,8 +245,8 @@ public class DatasetRDAMapper {
List<FieldModel> issuedNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.issued"); List<FieldModel> issuedNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.issued");
for (FieldModel issuedNode : issuedNodes){ for (FieldModel issuedNode : issuedNodes){
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(issuedNode, descriptionEntity.getProperties()); 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(eu.eudat.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null)); 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;; 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"); List<FieldModel> ethicsNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dmp.ethical_issues");
if (!ethicsNodes.isEmpty()) { if (!ethicsNodes.isEmpty()) {
for(FieldModel node: ethicsNodes){ for(FieldModel node: ethicsNodes){
List<eu.eudat.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(node, descriptionEntity.getProperties()); List<org.opencdmp.commonmodels.models.description.FieldModel> fieldValues = this.findValueField(node, descriptionEntity.getProperties());
eu.eudat.commonmodels.models.description.FieldModel fieldValue = fieldValues.getFirst(); org.opencdmp.commonmodels.models.description.FieldModel fieldValue = fieldValues.getFirst();
String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dmp.ethical_issues")).findFirst().orElse(""); String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dmp.ethical_issues")).findFirst().orElse("");
if (fieldValue == null) { if (fieldValue == null) {
continue; continue;

12
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DistributionRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DistributionRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
import eu.eudat.file.transformer.model.rda.Distribution; import org.opencdmp.filetransformer.rda.model.rda.Distribution;
import eu.eudat.file.transformer.model.rda.License; import org.opencdmp.filetransformer.rda.model.rda.License;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -22,7 +22,7 @@ public class DistributionRDAMapper {
this.hostRDAMapper = hostRDAMapper; 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 (nodes == null) return null;
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
Map<String, Distribution> rdaMap = new HashMap<>(); Map<String, Distribution> rdaMap = new HashMap<>();
@ -33,7 +33,7 @@ public class DistributionRDAMapper {
continue; 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)){ if(rdaValue == null || (rdaValue.getTextValue() == null && rdaValue.getReferences() == null)){
continue; continue;
} }

6
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpContactModelContactRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpContactModelContactRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.dmp.DmpContactModel;
import eu.eudat.file.transformer.model.rda.Contact; import org.opencdmp.filetransformer.rda.model.rda.Contact;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Map; import java.util.Map;

4
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpIdRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpIdRDAMapper.java
View File

@ -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 org.springframework.stereotype.Component;
import java.util.UUID; import java.util.UUID;

40
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.enums.DmpAccessType;
import eu.eudat.commonmodels.enums.DmpUserRole; import org.opencdmp.commonmodels.enums.DmpUserRole;
import eu.eudat.commonmodels.models.DmpUserModel; import org.opencdmp.commonmodels.models.DmpUserModel;
import eu.eudat.commonmodels.models.EntityDoiModel; import org.opencdmp.commonmodels.models.EntityDoiModel;
import eu.eudat.commonmodels.models.UserModel; import org.opencdmp.commonmodels.models.UserModel;
import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
import eu.eudat.commonmodels.models.dmp.DmpContactModel; import org.opencdmp.commonmodels.models.dmp.DmpContactModel;
import eu.eudat.commonmodels.models.dmp.DmpModel; import org.opencdmp.commonmodels.models.dmp.DmpModel;
import eu.eudat.commonmodels.models.dmp.DmpPropertiesModel; import org.opencdmp.commonmodels.models.dmp.DmpPropertiesModel;
import eu.eudat.commonmodels.models.dmpblueprint.DmpBlueprintModel; import org.opencdmp.commonmodels.models.dmpblueprint.DmpBlueprintModel;
import eu.eudat.commonmodels.models.dmpreference.DmpReferenceModel; import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceModel;
import eu.eudat.commonmodels.models.reference.ReferenceModel; import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import eu.eudat.file.transformer.model.ProjectModel; import org.opencdmp.filetransformer.rda.model.ProjectModel;
import eu.eudat.file.transformer.model.rda.DmpId; import org.opencdmp.filetransformer.rda.model.rda.DmpId;
import eu.eudat.file.transformer.model.rda.Dmp; import org.opencdmp.filetransformer.rda.model.rda.Dmp;
import eu.eudat.file.transformer.service.descriptiontemplatesearcher.TemplateFieldSearcherService; import org.opencdmp.filetransformer.rda.service.descriptiontemplatesearcher.TemplateFieldSearcherService;
import eu.eudat.file.transformer.service.json.JsonHandlingService; import org.opencdmp.filetransformer.rda.service.json.JsonHandlingService;
import eu.eudat.file.transformer.service.rdafiletransformer.RdaFileTransformerServiceProperties; import org.opencdmp.filetransformer.rda.service.rdafiletransformer.RdaFileTransformerServiceProperties;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

12
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpUserContributorRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpUserContributorRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.enums.ContactInfoType;
import eu.eudat.commonmodels.models.DmpUserModel; import org.opencdmp.commonmodels.models.DmpUserModel;
import eu.eudat.commonmodels.models.UserContactInfoModel; import org.opencdmp.commonmodels.models.UserContactInfoModel;
import eu.eudat.commonmodels.models.reference.ReferenceModel; import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import eu.eudat.file.transformer.model.rda.Contributor; import org.opencdmp.filetransformer.rda.model.rda.Contributor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;

4
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/FunderIdRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/FunderIdRDAMapper.java
View File

@ -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 org.springframework.stereotype.Component;
import java.util.Map; import java.util.Map;

12
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/FundingRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/FundingRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.reference.ReferenceModel;
import eu.eudat.commonmodels.models.reference.ReferenceTypeModel; import org.opencdmp.commonmodels.models.reference.ReferenceTypeModel;
import eu.eudat.file.transformer.model.FundingModel; import org.opencdmp.filetransformer.rda.model.FundingModel;
import eu.eudat.file.transformer.model.rda.Funding; import org.opencdmp.filetransformer.rda.model.rda.Funding;
import eu.eudat.file.transformer.service.rdafiletransformer.RdaFileTransformerServiceProperties; import org.opencdmp.filetransformer.rda.service.rdafiletransformer.RdaFileTransformerServiceProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;

4
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/GrantIdRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/GrantIdRDAMapper.java
View File

@ -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 org.springframework.stereotype.Component;
import java.util.Map; import java.util.Map;

12
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/HostRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/HostRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
import eu.eudat.file.transformer.model.rda.Host; import org.opencdmp.filetransformer.rda.model.rda.Host;
import eu.eudat.file.transformer.utils.string.MyStringUtils; import org.opencdmp.filetransformer.rda.utils.string.MyStringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -14,7 +14,7 @@ import java.util.*;
public class HostRDAMapper { public class HostRDAMapper {
private static final Logger logger = LoggerFactory.getLogger(HostRDAMapper.class); 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 (nodes == null) return null;
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
Host rda = new Host(); Host rda = new Host();
@ -24,7 +24,7 @@ public class HostRDAMapper {
if (rdaProperty.contains("host")) { if (rdaProperty.contains("host")) {
int firstDiff = MyStringUtils.getFirstDifference(numbering, node.getNumbering()); int firstDiff = MyStringUtils.getFirstDifference(numbering, node.getNumbering());
if (firstDiff == -1 || firstDiff >= 2) { 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()){ if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){
continue; continue;
} }

2
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/KeywordRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/KeywordRDAMapper.java
View File

@ -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; import org.springframework.stereotype.Component;

8
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/LanguageRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/LanguageRDAMapper.java
View File

@ -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 com.fasterxml.jackson.databind.ObjectMapper;
import eu.eudat.file.transformer.model.FundingModel; import org.opencdmp.filetransformer.rda.model.FundingModel;
import eu.eudat.file.transformer.model.rda.Funding; import org.opencdmp.filetransformer.rda.model.rda.Funding;
import eu.eudat.file.transformer.model.rda.Language; import org.opencdmp.filetransformer.rda.model.rda.Language;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

10
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/LicenseRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/LicenseRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
import eu.eudat.file.transformer.model.rda.License; import org.opencdmp.filetransformer.rda.model.rda.License;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -15,14 +15,14 @@ public class LicenseRDAMapper {
private static final Logger logger = LoggerFactory.getLogger(LicenseRDAMapper.class); 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 (nodes == null) return null;
if (valueFields == null) throw new IllegalArgumentException("extraData is missing"); if (valueFields == null) throw new IllegalArgumentException("extraData is missing");
License rda = new License(); License rda = new License();
for (FieldModel node: nodes) { for (FieldModel node: nodes) {
String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dataset.distribution.license")).findFirst().orElse(""); 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()){ if(valueField == null || valueField.getTextValue() == null || valueField.getTextValue().isBlank()){
continue; continue;
} }

16
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/MetadataRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/MetadataRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
import eu.eudat.commonmodels.models.reference.ReferenceFieldModel; import org.opencdmp.commonmodels.models.reference.ReferenceFieldModel;
import eu.eudat.commonmodels.models.reference.ReferenceModel; import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import eu.eudat.file.transformer.model.rda.Metadatum; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -22,7 +22,7 @@ public class MetadataRDAMapper{
this.metadataStandardIdRDAMapper = metadataStandardIdRDAMapper; 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 (nodes == null) return null;
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
@ -30,7 +30,7 @@ public class MetadataRDAMapper{
List<Metadatum> rdas = new ArrayList<>(); List<Metadatum> rdas = new ArrayList<>();
for (FieldModel node : nodes) { for (FieldModel node : nodes) {
String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dataset.metadata")).findFirst().orElse(""); 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()) { for (PropertyName propertyName : PropertyName.values()) {
if (rdaProperty.contains(propertyName.getName())) { if (rdaProperty.contains(propertyName.getName())) {

4
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/MetadataStandardIdRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/MetadataStandardIdRDAMapper.java
View File

@ -1,5 +1,5 @@
package eu.eudat.file.transformer.model.rda.mapper; package org.opencdmp.filetransformer.rda.model.rda.mapper;
import eu.eudat.file.transformer.model.rda.MetadataStandardId; import org.opencdmp.filetransformer.rda.model.rda.MetadataStandardId;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Map; import java.util.Map;

20
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ProjectRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ProjectRDAMapper.java
View File

@ -1,13 +1,13 @@
package eu.eudat.file.transformer.model.rda.mapper; package org.opencdmp.filetransformer.rda.model.rda.mapper;
import eu.eudat.commonmodels.models.reference.ReferenceDefinitionModel; import org.opencdmp.commonmodels.models.reference.ReferenceDefinitionModel;
import eu.eudat.commonmodels.models.reference.ReferenceFieldModel; import org.opencdmp.commonmodels.models.reference.ReferenceFieldModel;
import eu.eudat.commonmodels.models.reference.ReferenceModel; import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import eu.eudat.commonmodels.models.reference.ReferenceTypeModel; import org.opencdmp.commonmodels.models.reference.ReferenceTypeModel;
import eu.eudat.file.transformer.model.FundingModel; import org.opencdmp.filetransformer.rda.model.FundingModel;
import eu.eudat.file.transformer.model.ProjectModel; import org.opencdmp.filetransformer.rda.model.ProjectModel;
import eu.eudat.file.transformer.model.rda.Funding; import org.opencdmp.filetransformer.rda.model.rda.Funding;
import eu.eudat.file.transformer.model.rda.Project; import org.opencdmp.filetransformer.rda.model.rda.Project;
import eu.eudat.file.transformer.service.rdafiletransformer.RdaFileTransformerServiceProperties; import org.opencdmp.filetransformer.rda.service.rdafiletransformer.RdaFileTransformerServiceProperties;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

14
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ReferenceContributorRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ReferenceContributorRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.reference.ReferenceDefinitionModel;
import eu.eudat.commonmodels.models.reference.ReferenceFieldModel; import org.opencdmp.commonmodels.models.reference.ReferenceFieldModel;
import eu.eudat.commonmodels.models.reference.ReferenceModel; import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import eu.eudat.file.transformer.model.FundingModel; import org.opencdmp.filetransformer.rda.model.FundingModel;
import eu.eudat.file.transformer.model.rda.Contributor; import org.opencdmp.filetransformer.rda.model.rda.Contributor;
import eu.eudat.file.transformer.model.rda.Funding; import org.opencdmp.filetransformer.rda.model.rda.Funding;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;

12
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/SecurityAndPrivacyRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/SecurityAndPrivacyRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
import eu.eudat.file.transformer.model.rda.SecurityAndPrivacy; import org.opencdmp.filetransformer.rda.model.rda.SecurityAndPrivacy;
import eu.eudat.file.transformer.utils.string.MyStringUtils; import org.opencdmp.filetransformer.rda.utils.string.MyStringUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.*; import java.util.*;
@ -10,7 +10,7 @@ import java.util.stream.Collectors;
@Component @Component
public class SecurityAndPrivacyRDAMapper { 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 (nodes == null) return null;
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
@ -21,7 +21,7 @@ public class SecurityAndPrivacyRDAMapper {
if (node.getData() == null) { if (node.getData() == null) {
continue; 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()){ if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){
continue; continue;
} }

4
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/TagRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/TagRDAMapper.java
View File

@ -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 org.springframework.stereotype.Component;
import java.util.Map; import java.util.Map;

12
core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/TechnicalResourceRDAMapper.java → core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/TechnicalResourceRDAMapper.java
View File

@ -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 org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
import eu.eudat.file.transformer.model.rda.TechnicalResource; import org.opencdmp.filetransformer.rda.model.rda.TechnicalResource;
import eu.eudat.file.transformer.utils.string.MyStringUtils; import org.opencdmp.filetransformer.rda.utils.string.MyStringUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.*; import java.util.*;
@ -11,7 +11,7 @@ import java.util.stream.Collectors;
@Component @Component
public class TechnicalResourceRDAMapper { 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 (nodes == null) return null;
if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); if (valueFields == null) throw new IllegalArgumentException("valueFields is missing");
Map<String, TechnicalResource> rdaMap = new HashMap<>(); Map<String, TechnicalResource> rdaMap = new HashMap<>();
@ -21,7 +21,7 @@ public class TechnicalResourceRDAMapper {
if (node.getData() == null) { if (node.getData() == null) {
continue; 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()){ if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){
continue; continue;
} }

6
core/src/main/java/eu/eudat/file/transformer/service/descriptiontemplatesearcher/TemplateFieldSearcherService.java → core/src/main/java/org/opencdmp/filetransformer/rda/service/descriptiontemplatesearcher/TemplateFieldSearcherService.java
View File

@ -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 org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel;
import java.util.List; import java.util.List;

4
core/src/main/java/eu/eudat/file/transformer/service/descriptiontemplatesearcher/TemplateFieldSearcherServiceImpl.java → core/src/main/java/org/opencdmp/filetransformer/rda/service/descriptiontemplatesearcher/TemplateFieldSearcherServiceImpl.java
View File

@ -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 org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;

2
core/src/main/java/eu/eudat/file/transformer/service/json/JsonHandlingService.java → core/src/main/java/org/opencdmp/filetransformer/rda/service/json/JsonHandlingService.java
View File

@ -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.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;

30
core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerService.java → core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerService.java
View File

@ -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 org.opencdmp.commonmodels.models.FileEnvelopeModel;
import eu.eudat.commonmodels.models.description.DescriptionModel; import org.opencdmp.commonmodels.models.description.DescriptionModel;
import eu.eudat.commonmodels.models.dmp.DmpModel; import org.opencdmp.commonmodels.models.dmp.DmpModel;
import eu.eudat.file.transformer.enums.FileTransformerEntityType; import org.opencdmp.filetransformerbase.enums.FileTransformerEntityType;
import eu.eudat.file.transformer.interfaces.FileTransformerClient; import org.opencdmp.filetransformerbase.interfaces.FileTransformerClient;
import eu.eudat.file.transformer.interfaces.FileTransformerConfiguration; import org.opencdmp.filetransformerbase.interfaces.FileTransformerConfiguration;
import eu.eudat.file.transformer.models.misc.FileFormat; import org.opencdmp.filetransformer.rda.model.rda.Dataset;
import eu.eudat.file.transformer.model.rda.Dataset; import org.opencdmp.filetransformer.rda.model.rda.Dmp;
import eu.eudat.file.transformer.model.rda.Dmp; import org.opencdmp.filetransformer.rda.model.rda.RDAModel;
import eu.eudat.file.transformer.model.rda.RDAModel; import org.opencdmp.filetransformer.rda.model.rda.mapper.DatasetRDAMapper;
import eu.eudat.file.transformer.model.rda.mapper.DatasetRDAMapper; import org.opencdmp.filetransformer.rda.model.rda.mapper.DmpRDAMapper;
import eu.eudat.file.transformer.model.rda.mapper.DmpRDAMapper; import org.opencdmp.filetransformer.rda.service.json.JsonHandlingService;
import eu.eudat.file.transformer.service.json.JsonHandlingService; import org.opencdmp.filetransformer.rda.service.storage.FileStorageService;
import eu.eudat.file.transformer.service.storage.FileStorageService; import org.opencdmp.filetransformerbase.models.misc.FileFormat;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;

2
core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerServiceConfiguration.java → core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerServiceConfiguration.java
View File

@ -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.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

2
core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerServiceProperties.java → core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerServiceProperties.java
View File

@ -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; import org.springframework.boot.context.properties.ConfigurationProperties;

2
core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageService.java → core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageService.java
View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.storage; package org.opencdmp.filetransformer.rda.service.storage;
public interface FileStorageService { public interface FileStorageService {
String storeFile(byte[] data); String storeFile(byte[] data);

2
core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceConfiguration.java → core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceConfiguration.java
View File

@ -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.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

2
core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceImpl.java → core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceImpl.java
View File

@ -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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceProperties.java → core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceProperties.java
View File

@ -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.ConfigurationProperties;
import org.springframework.boot.context.properties.bind.ConstructorBinding; import org.springframework.boot.context.properties.bind.ConstructorBinding;

2
core/src/main/java/eu/eudat/file/transformer/utils/string/MyStringUtils.java → core/src/main/java/org/opencdmp/filetransformer/rda/utils/string/MyStringUtils.java
View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.utils.string; package org.opencdmp.filetransformer.rda.utils.string;
public class MyStringUtils { public class MyStringUtils {

6
pom.xml
View File

@ -9,7 +9,7 @@
<relativePath/> <relativePath/>
</parent> </parent>
<groupId>gr.cite.opendmp</groupId> <groupId>org.opencdmp</groupId>
<artifactId>file-transformer-rda-parent</artifactId> <artifactId>file-transformer-rda-parent</artifactId>
<version>${revision}</version> <version>${revision}</version>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -28,9 +28,9 @@
<version>2.2</version> <version>2.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>gr.cite.opendmp</groupId> <groupId>org.opencdmp</groupId>
<artifactId>file-transformer-base</artifactId> <artifactId>file-transformer-base</artifactId>
<version>0.0.14</version> <version>0.0.15</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
web/pom.xml
View File

@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>gr.cite.opendmp</groupId> <groupId>org.opencdmp</groupId>
<artifactId>file-transformer-rda-parent</artifactId> <artifactId>file-transformer-rda-parent</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
@ -22,7 +22,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>gr.cite.opendmp</groupId> <groupId>org.opencdmp</groupId>
<artifactId>file-transformer-rda</artifactId> <artifactId>file-transformer-rda</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>

5
web/src/main/java/eu/eudat/file/transformer/FileTransformerApplication.java → web/src/main/java/eu/eudat/filetransformer/rda/FileTransformerApplication.java
View File

@ -1,10 +1,11 @@
package eu.eudat.file.transformer; package eu.eudat.filetransformer.rda;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication(scanBasePackages = { @SpringBootApplication(scanBasePackages = {
"eu.eudat.file.transformer.*", "org.opencdmp.filetransformerbase.*",
"org.opencdmp.filetransformer.rda.*",
"gr.cite.tools", "gr.cite.tools",
"gr.cite.commons" "gr.cite.commons"
}) })

2
web/src/main/java/eu/eudat/file/transformer/config/SecurityConfiguration.java → web/src/main/java/eu/eudat/filetransformer/rda/config/SecurityConfiguration.java
View File

@ -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.WebSecurityProperties;
import gr.cite.commons.web.oidc.configuration.filter.ApiKeyFilter; import gr.cite.commons.web.oidc.configuration.filter.ApiKeyFilter;

14
web/src/main/java/eu/eudat/file/transformer/controller/FileTransformerController.java → web/src/main/java/eu/eudat/filetransformer/rda/controller/FileTransformerController.java
View File

@ -1,10 +1,10 @@
package eu.eudat.file.transformer.controller; package eu.eudat.filetransformer.rda.controller;
import eu.eudat.commonmodels.models.FileEnvelopeModel; import org.opencdmp.commonmodels.models.FileEnvelopeModel;
import eu.eudat.commonmodels.models.description.DescriptionModel; import org.opencdmp.commonmodels.models.description.DescriptionModel;
import eu.eudat.commonmodels.models.dmp.DmpModel; import org.opencdmp.commonmodels.models.dmp.DmpModel;
import eu.eudat.file.transformer.interfaces.FileTransformerClient; import org.opencdmp.filetransformerbase.interfaces.FileTransformerClient;
import eu.eudat.file.transformer.interfaces.FileTransformerConfiguration; import org.opencdmp.filetransformerbase.interfaces.FileTransformerConfiguration;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -12,7 +12,7 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/api/file-transformer") @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; private final FileTransformerClient fileTransformerExecutor;