From aa75b3e3abbbde63f6c98ce211dcd2ea037db7b7 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Wed, 17 Jan 2024 14:31:31 +0200 Subject: [PATCH] Update file transformer Service and add xml transformer config --- .../eu/eudat/repository/TransformerRepository.java | 4 ++-- .../service/transformer/FileTransformerService.java | 3 ++- .../web/src/main/resources/config/transformer.yml | 12 ++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dmp-backend/core/src/main/java/eu/eudat/repository/TransformerRepository.java b/dmp-backend/core/src/main/java/eu/eudat/repository/TransformerRepository.java index dd3077b78..2e125f607 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/repository/TransformerRepository.java +++ b/dmp-backend/core/src/main/java/eu/eudat/repository/TransformerRepository.java @@ -20,8 +20,8 @@ public class TransformerRepository implements FileTransformerClient { } @Override - public FileEnvelope exportDmp(DmpFileTransformerModel dmpFileTransformerModel, String format) throws InvalidApplicationException, IOException { - return transformerClient.post().uri("/export/dmp", uriBuilder -> uriBuilder.queryParam("format", format).build()).bodyValue(dmpFileTransformerModel).exchangeToMono(mono -> mono.bodyToMono(FileEnvelope.class)).block(); + public FileEnvelope exportDmp(DmpFileTransformerModel dmpFileTransformerModel) throws InvalidApplicationException, IOException { + return transformerClient.post().uri("/export/dmp").bodyValue(dmpFileTransformerModel).exchangeToMono(mono -> mono.bodyToMono(FileEnvelope.class)).block(); } @Override diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerService.java b/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerService.java index e2f76104a..e142fcc0d 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerService.java @@ -293,7 +293,8 @@ public class FileTransformerService { );*/ DmpQuery query = this.queryFactory.query(DmpQuery.class).authorize(AuthorizationFlags.OwnerOrDmpAssociatedOrPermissionOrPublic).ids(dmpId); DmpFileTransformerModel dmpFileTransformerModel = this.builderFactory.builder(DmpFileTransformerBuilder.class).authorize(AuthorizationFlags.OwnerOrDmpAssociatedOrPermissionOrPublic).build(query.first()); - FileEnvelope fileEnvelope = repository.exportDmp(dmpFileTransformerModel, format); + dmpFileTransformerModel.setVariant(format); + FileEnvelope fileEnvelope = repository.exportDmp(dmpFileTransformerModel); eu.eudat.model.file.FileEnvelope result = new eu.eudat.model.file.FileEnvelope(); byte[] data = storageFileService.readByFileRefAsBytesSafe(fileEnvelope.getFile(), StorageType.Transformer); File temp = new File(environment.getProperty("path.path") + UUID.randomUUID()); diff --git a/dmp-backend/web/src/main/resources/config/transformer.yml b/dmp-backend/web/src/main/resources/config/transformer.yml index 6416b0de4..683221506 100644 --- a/dmp-backend/web/src/main/resources/config/transformer.yml +++ b/dmp-backend/web/src/main/resources/config/transformer.yml @@ -6,6 +6,18 @@ transformer: client-id: ${IDP_APIKEY_CLIENT_ID:} client-secret: ${IDP_APIKEY_CLIENT_SECRET:} scope: ${IDP_APIKEY_SCOPE:} + - url: http://localhost:8086 + codes: [ json ] + issuer-url: ${IDP_ISSUER_URI_TOKEN:} + client-id: ${IDP_APIKEY_CLIENT_ID:} + client-secret: ${IDP_APIKEY_CLIENT_SECRET:} + scope: ${IDP_APIKEY_SCOPE:} + - url: http://localhost:8087 + codes: [ xml ] + issuer-url: ${IDP_ISSUER_URI_TOKEN:} + client-id: ${IDP_APIKEY_CLIENT_ID:} + client-secret: ${IDP_APIKEY_CLIENT_SECRET:} + scope: ${IDP_APIKEY_SCOPE:} temp: temp: ${TEMP_STORAGE} \ No newline at end of file