rename to OpenCDMP

This commit is contained in:
Efstratios Giannopoulos 2024-04-26 16:26:11 +03:00
parent b981876d86
commit e5fbf5d0ca
29 changed files with 98 additions and 100 deletions

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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>gr.cite.opendmp</groupId>
<groupId>org.opencdmp</groupId>
<artifactId>file-transformer-document-parent</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.model;
package org.opencdmp.filetransformer.docx.model;
public class PidLink {
private String pid;

View File

@ -1,9 +1,9 @@
package eu.eudat.file.transformer.model.enums;
package org.opencdmp.filetransformer.docx.model.enums;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import eu.eudat.commonmodels.enums.EnumUtils;
import eu.eudat.commonmodels.enums.EnumValueProvider;
import org.opencdmp.commonmodels.enums.EnumUtils;
import org.opencdmp.commonmodels.enums.EnumValueProvider;
import java.util.Map;

View File

@ -1,9 +1,9 @@
package eu.eudat.file.transformer.model.enums;
package org.opencdmp.filetransformer.docx.model.enums;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import eu.eudat.commonmodels.enums.EnumUtils;
import eu.eudat.commonmodels.enums.EnumValueProvider;
import org.opencdmp.commonmodels.enums.EnumUtils;
import org.opencdmp.commonmodels.enums.EnumValueProvider;
import java.util.Map;

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.model.interfaces;
package org.opencdmp.filetransformer.docx.model.interfaces;
/**
* Created by ikalyvas on 2/27/2018.

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.pdf;
package org.opencdmp.filetransformer.docx.service.pdf;
public interface PdfService {
byte[] convertToPDF(byte[] file);

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.pdf;
package org.opencdmp.filetransformer.docx.service.pdf;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.pdf;
package org.opencdmp.filetransformer.docx.service.pdf;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.http.MediaType;

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.pdf;
package org.opencdmp.filetransformer.docx.service.pdf;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.bind.ConstructorBinding;

View File

@ -1,6 +1,6 @@
package eu.eudat.file.transformer.service.pid;
package org.opencdmp.filetransformer.docx.service.pid;
import eu.eudat.file.transformer.model.PidLink;
import org.opencdmp.filetransformer.docx.model.PidLink;
import java.util.List;

View File

@ -1,8 +1,8 @@
package eu.eudat.file.transformer.service.pid;
package org.opencdmp.filetransformer.docx.service.pid;
import com.fasterxml.jackson.databind.ObjectMapper;
import eu.eudat.file.transformer.service.wordfiletransformer.WordFileTransformerServiceProperties;
import eu.eudat.file.transformer.model.PidLink;
import org.opencdmp.filetransformer.docx.service.wordfiletransformer.WordFileTransformerServiceProperties;
import org.opencdmp.filetransformer.docx.model.PidLink;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;

View File

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

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.storage;
package org.opencdmp.filetransformer.docx.service.storage;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.storage;
package org.opencdmp.filetransformer.docx.service.storage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.storage;
package org.opencdmp.filetransformer.docx.service.storage;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.bind.ConstructorBinding;

View File

@ -1,27 +1,27 @@
package eu.eudat.file.transformer.service.wordfiletransformer;
package org.opencdmp.filetransformer.docx.service.wordfiletransformer;
import eu.eudat.commonmodels.enums.DescriptionStatus;
import eu.eudat.commonmodels.enums.DmpAccessType;
import eu.eudat.commonmodels.enums.DmpBlueprintSystemFieldType;
import eu.eudat.commonmodels.enums.DmpStatus;
import eu.eudat.commonmodels.models.dmp.DmpBlueprintValueModel;
import eu.eudat.commonmodels.models.dmp.DmpModel;
import eu.eudat.commonmodels.models.FileEnvelopeModel;
import eu.eudat.commonmodels.models.description.DescriptionModel;
import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
import eu.eudat.commonmodels.models.dmpblueprint.*;
import eu.eudat.commonmodels.models.dmpreference.DmpReferenceModel;
import eu.eudat.commonmodels.models.reference.ReferenceModel;
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.model.enums.FileFormats;
import eu.eudat.file.transformer.models.misc.FileFormat;
import eu.eudat.file.transformer.service.pdf.PdfService;
import eu.eudat.file.transformer.model.enums.ParagraphStyle;
import eu.eudat.file.transformer.service.storage.FileStorageService;
import eu.eudat.file.transformer.service.wordfiletransformer.visibility.VisibilityServiceImpl;
import eu.eudat.file.transformer.service.wordfiletransformer.word.WordBuilder;
import org.opencdmp.commonmodels.enums.DescriptionStatus;
import org.opencdmp.commonmodels.enums.DmpAccessType;
import org.opencdmp.commonmodels.enums.DmpBlueprintSystemFieldType;
import org.opencdmp.commonmodels.enums.DmpStatus;
import org.opencdmp.commonmodels.models.dmp.DmpBlueprintValueModel;
import org.opencdmp.commonmodels.models.dmp.DmpModel;
import org.opencdmp.commonmodels.models.FileEnvelopeModel;
import org.opencdmp.commonmodels.models.description.DescriptionModel;
import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
import org.opencdmp.commonmodels.models.dmpblueprint.*;
import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceModel;
import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import org.opencdmp.filetransformerbase.enums.FileTransformerEntityType;
import org.opencdmp.filetransformerbase.interfaces.FileTransformerClient;
import org.opencdmp.filetransformerbase.interfaces.FileTransformerConfiguration;
import org.opencdmp.filetransformer.docx.model.enums.FileFormats;
import org.opencdmp.filetransformerbase.models.misc.FileFormat;
import org.opencdmp.filetransformer.docx.service.pdf.PdfService;
import org.opencdmp.filetransformer.docx.model.enums.ParagraphStyle;
import org.opencdmp.filetransformer.docx.service.storage.FileStorageService;
import org.opencdmp.filetransformer.docx.service.wordfiletransformer.visibility.VisibilityServiceImpl;
import org.opencdmp.filetransformer.docx.service.wordfiletransformer.word.WordBuilder;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.apache.poi.xwpf.usermodel.XWPFParagraph;
import org.apache.poi.xwpf.usermodel.XWPFRun;

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.wordfiletransformer;
package org.opencdmp.filetransformer.docx.service.wordfiletransformer;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.wordfiletransformer;
package org.opencdmp.filetransformer.docx.service.wordfiletransformer;
import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.wordfiletransformer.visibility;
package org.opencdmp.filetransformer.docx.service.wordfiletransformer.visibility;
import java.util.Objects;

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.wordfiletransformer.visibility;
package org.opencdmp.filetransformer.docx.service.wordfiletransformer.visibility;
import java.util.Map;

View File

@ -1,6 +1,6 @@
package eu.eudat.file.transformer.service.wordfiletransformer.visibility;
package org.opencdmp.filetransformer.docx.service.wordfiletransformer.visibility;
import eu.eudat.commonmodels.models.description.VisibilityStateModel;
import org.opencdmp.commonmodels.models.description.VisibilityStateModel;
import java.util.HashMap;
import java.util.List;

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.service.wordfiletransformer.word;
package org.opencdmp.filetransformer.docx.service.wordfiletransformer.word;
import org.apache.poi.xwpf.usermodel.*;
import org.apache.xmlbeans.XmlCursor;

View File

@ -1,11 +1,11 @@
package eu.eudat.file.transformer.service.wordfiletransformer.word;
package org.opencdmp.filetransformer.docx.service.wordfiletransformer.word;
import eu.eudat.commonmodels.models.description.DescriptionModel;
import eu.eudat.commonmodels.models.description.PropertyDefinitionModel;
import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
import eu.eudat.commonmodels.models.dmp.DmpModel;
import eu.eudat.file.transformer.model.enums.ParagraphStyle;
import eu.eudat.file.transformer.service.wordfiletransformer.visibility.VisibilityService;
import org.opencdmp.commonmodels.models.description.DescriptionModel;
import org.opencdmp.commonmodels.models.description.PropertyDefinitionModel;
import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
import org.opencdmp.commonmodels.models.dmp.DmpModel;
import org.opencdmp.filetransformer.docx.model.enums.ParagraphStyle;
import org.opencdmp.filetransformer.docx.service.wordfiletransformer.visibility.VisibilityService;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.apache.poi.xwpf.usermodel.XWPFParagraph;

View File

@ -1,23 +1,23 @@
package eu.eudat.file.transformer.service.wordfiletransformer.word;
package org.opencdmp.filetransformer.docx.service.wordfiletransformer.word;
import eu.eudat.commonmodels.enums.FieldType;
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.*;
import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.*;
import eu.eudat.commonmodels.models.dmp.DmpModel;
import eu.eudat.commonmodels.models.dmpreference.DmpReferenceModel;
import eu.eudat.commonmodels.models.reference.ReferenceFieldModel;
import eu.eudat.commonmodels.models.reference.ReferenceModel;
import eu.eudat.file.transformer.service.storage.FileStorageServiceProperties;
import eu.eudat.file.transformer.service.wordfiletransformer.WordFileTransformerServiceProperties;
import eu.eudat.file.transformer.model.PidLink;
import eu.eudat.file.transformer.model.interfaces.ApplierWithValue;
import eu.eudat.file.transformer.service.pid.PidService;
import eu.eudat.file.transformer.model.enums.ParagraphStyle;
import eu.eudat.file.transformer.service.wordfiletransformer.visibility.VisibilityService;
import org.opencdmp.commonmodels.enums.FieldType;
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.*;
import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.*;
import org.opencdmp.commonmodels.models.dmp.DmpModel;
import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceModel;
import org.opencdmp.commonmodels.models.reference.ReferenceFieldModel;
import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import org.opencdmp.filetransformer.docx.service.storage.FileStorageServiceProperties;
import org.opencdmp.filetransformer.docx.service.wordfiletransformer.WordFileTransformerServiceProperties;
import org.opencdmp.filetransformer.docx.model.PidLink;
import org.opencdmp.filetransformer.docx.model.interfaces.ApplierWithValue;
import org.opencdmp.filetransformer.docx.service.pid.PidService;
import org.opencdmp.filetransformer.docx.model.enums.ParagraphStyle;
import org.opencdmp.filetransformer.docx.service.wordfiletransformer.visibility.VisibilityService;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.util.Units;
import org.apache.poi.xwpf.usermodel.*;
@ -41,12 +41,9 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.math.BigInteger;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
import static org.apache.poi.xwpf.usermodel.Document.*;
@ -451,7 +448,7 @@ public class WordBuilderImpl implements WordBuilder {
if (field.getIncludeInExport() && visibilityService.isVisible(field.getId(), propertyDefinitionFieldSetItemModel.getOrdinal())) {
if (!createListing) {
try {
eu.eudat.commonmodels.models.description.FieldModel fieldValueModel = propertyDefinitionFieldSetItemModel.getFields().getOrDefault(field.getId(), null);
org.opencdmp.commonmodels.models.description.FieldModel fieldValueModel = propertyDefinitionFieldSetItemModel.getFields().getOrDefault(field.getId(), null);
if (field.getData().getFieldType().equals(FieldType.UPLOAD)) {
boolean isImage = false;
for (UploadDataModel.UploadOptionModel type : ((UploadDataModel) field.getData()).getTypes()) {
@ -596,7 +593,7 @@ public class WordBuilderImpl implements WordBuilder {
if (field.getIncludeInExport() && visibilityService.isVisible(field.getId(), propertyDefinitionFieldSetItemModel.getOrdinal())) {
if (!createListing) {
try {
eu.eudat.commonmodels.models.description.FieldModel fieldValueModel = propertyDefinitionFieldSetItemModel.getFields().getOrDefault(field.getId(), null);
org.opencdmp.commonmodels.models.description.FieldModel fieldValueModel = propertyDefinitionFieldSetItemModel.getFields().getOrDefault(field.getId(), null);
if (field.getData() != null) {
if (field.getData().getFieldType().equals(FieldType.UPLOAD)) {
boolean isImage = false;
@ -785,7 +782,7 @@ public class WordBuilderImpl implements WordBuilder {
}
}
private String formatter(FieldModel field, eu.eudat.commonmodels.models.description.FieldModel fieldValueModel) throws InvalidApplicationException {
private String formatter(FieldModel field, org.opencdmp.commonmodels.models.description.FieldModel fieldValueModel) throws InvalidApplicationException {
if (fieldValueModel == null || field == null || field.getData() == null) {
return null;
}

View File

@ -9,7 +9,7 @@
<relativePath/>
</parent>
<groupId>gr.cite.opendmp</groupId>
<groupId>org.opencdmp</groupId>
<artifactId>file-transformer-document-parent</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
@ -23,9 +23,9 @@
<dependencies>
<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>
<dependency>
<groupId>org.yaml</groupId>

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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>gr.cite.opendmp</groupId>
<groupId>org.opencdmp</groupId>
<artifactId>file-transformer-document-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-document</artifactId>
<version>${revision}</version>
</dependency>

View File

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

View File

@ -1,4 +1,4 @@
package eu.eudat.file.transformer.web.config;
package org.opencdmp.filetransformer.docx.web.config;
import gr.cite.commons.web.oidc.configuration.WebSecurityProperties;
import gr.cite.commons.web.oidc.configuration.filter.ApiKeyFilter;

View File

@ -1,17 +1,17 @@
package eu.eudat.file.transformer.web.controller;
package org.opencdmp.filetransformer.docx.web.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 eu.eudat.file.transformer.service.wordfiletransformer.WordFileTransformerService;
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.opencdmp.filetransformer.docx.service.wordfiletransformer.WordFileTransformerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@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;