From 2f0056c62b28ef7a63b5efd04623c6a753e3f5a4 Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Wed, 17 Apr 2024 13:54:00 +0300 Subject: [PATCH] config changes --- .../java/eu/eudat/query/ReferenceQuery.java | 2 +- .../reference/ReferenceServiceImpl.java | 2 +- .../FileTransformerCacheOptions.java | 2 +- .../transformer/FileTransformerProperties.java | 2 +- .../src/main/resources/config/application.yml | 2 +- .../web/src/main/resources/config/cache.yml | 6 +++--- .../main/resources/config/deposit-devel.yml | 18 ++++++++++++++++++ .../web/src/main/resources/config/deposit.yml | 18 +----------------- ...nsformer.yml => file-transformer-devel.yml} | 2 +- .../main/resources/config/file-transformer.yml | 2 ++ 10 files changed, 30 insertions(+), 26 deletions(-) create mode 100644 dmp-backend/web/src/main/resources/config/deposit-devel.yml rename dmp-backend/web/src/main/resources/config/{transformer.yml => file-transformer-devel.yml} (90%) create mode 100644 dmp-backend/web/src/main/resources/config/file-transformer.yml diff --git a/dmp-backend/core/src/main/java/eu/eudat/query/ReferenceQuery.java b/dmp-backend/core/src/main/java/eu/eudat/query/ReferenceQuery.java index 2cf6c4dc4..c3cc407c9 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/query/ReferenceQuery.java +++ b/dmp-backend/core/src/main/java/eu/eudat/query/ReferenceQuery.java @@ -257,7 +257,7 @@ public class ReferenceQuery extends QueryBase { if (this.like != null && !this.like.isEmpty()) { predicates.add(queryContext.CriteriaBuilder.or(queryUtilsService.ilike(queryContext.CriteriaBuilder, queryContext.Root.get(ReferenceEntity._label), this.like), queryUtilsService.ilike(queryContext.CriteriaBuilder, queryContext.Root.get(ReferenceEntity._description), this.like), - queryUtilsService.ilike(queryContext.CriteriaBuilder, queryContext.Root.get(ReferenceEntity._source), this.like) + queryUtilsService.ilike(queryContext.CriteriaBuilder, queryContext.Root.get(ReferenceEntity._reference), this.like) )); } if (this.isActives != null) { diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/reference/ReferenceServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/reference/ReferenceServiceImpl.java index 2060e2e8b..13d12eb58 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/reference/ReferenceServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/reference/ReferenceServiceImpl.java @@ -233,7 +233,7 @@ public class ReferenceServiceImpl implements ReferenceService { private List fetchReferenceFromDb(ReferenceSearchLookup lookup){ ReferenceQuery query = lookup.enrich(this.queryFactory).authorize(AuthorizationFlags.OwnerOrDmpAssociatedOrPermission).sourceTypes(ReferenceSourceType.Internal).typeIds(lookup.getTypeId()); - + if (!this.conventionService.isNullOrEmpty(lookup.getLike())) query.like(lookup.getLike()); List data = query.collectAs(lookup.getProject()); return this.builderFactory.builder(ReferenceBuilder.class).authorize(AuthorizationFlags.OwnerOrDmpAssociatedOrPermission).build(lookup.getProject(), data); } diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerCacheOptions.java b/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerCacheOptions.java index 32ec50d5c..38418c19a 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerCacheOptions.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerCacheOptions.java @@ -3,6 +3,6 @@ package eu.eudat.service.transformer; import gr.cite.tools.cache.CacheOptions; import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "cache.transformer") +@ConfigurationProperties(prefix = "cache.file-transformer") public class FileTransformerCacheOptions extends CacheOptions { } diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerProperties.java b/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerProperties.java index 0ce22241e..fdb7da2ba 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerProperties.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerProperties.java @@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.bind.ConstructorBinding; import java.util.List; -@ConfigurationProperties(prefix = "transformer") +@ConfigurationProperties(prefix = "file-transformer") public class FileTransformerProperties { private final List sources; diff --git a/dmp-backend/web/src/main/resources/config/application.yml b/dmp-backend/web/src/main/resources/config/application.yml index f45286cbb..9f5af550c 100644 --- a/dmp-backend/web/src/main/resources/config/application.yml +++ b/dmp-backend/web/src/main/resources/config/application.yml @@ -28,7 +28,7 @@ spring: optional:classpath:config/locale.yml[.yml], optional:classpath:config/locale-${spring.profiles.active}.yml[.yml], optional:file:../config/locale-${spring.profiles.active}.yml[.yml], optional:classpath:config/public-api.yml[.yml], optional:classpath:config/public-api-${spring.profiles.active}.yml[.yml], optional:file:../config/public-api-${spring.profiles.active}.yml[.yml], optional:classpath:config/dashboard.yml[.yml], optional:classpath:config/dashboard-${spring.profiles.active}.yml[.yml], optional:file:../config/dashboard-${spring.profiles.active}.yml[.yml], - optional:classpath:config/transformer.yml[.yml], optional:classpath:config/transformer-${spring.profiles.active}.yml[.yml], optional:file:../config/transformer-${spring.profiles.active}.yml[.yml], + optional:classpath:config/file-transformer.yml[.yml], optional:classpath:config/file-transformer-${spring.profiles.active}.yml[.yml], optional:file:../config/file-transformer-${spring.profiles.active}.yml[.yml], optional:classpath:config/authorization.yml[.yml], optional:classpath:config/authorization-${spring.profiles.active}.yml[.yml], optional:file:../config/authorization-${spring.profiles.active}.yml[.yml], optional:classpath:config/metrics.yml[.yml], optional:classpath:config/metrics-${spring.profiles.active}.yml[.yml], optional:file:../config/metrics-${spring.profiles.active}.yml[.yml], optional:classpath:config/lock.yml[.yml], optional:classpath:config/lock-${spring.profiles.active}.yml[.yml], optional:file:../config/lock-${spring.profiles.active}.yml[.yml] diff --git a/dmp-backend/web/src/main/resources/config/cache.yml b/dmp-backend/web/src/main/resources/config/cache.yml index a34735def..cd63200b4 100644 --- a/dmp-backend/web/src/main/resources/config/cache.yml +++ b/dmp-backend/web/src/main/resources/config/cache.yml @@ -38,7 +38,7 @@ cache: maximumSize: 500 enableRecordStats: false expireAfterWriteSeconds: 30 - - names: [ "transformer" ] + - names: [ "fileTransformer" ] allowNullValues: true initialCapacity: 100 maximumSize: 500 @@ -102,8 +102,8 @@ cache: depositConfigById: name: depositConfigById keyPattern: deposit_config_by_id_$repositoryId$:v0 - transformer: - name: transformer + fileTransformer: + name: fileTransformer keyPattern: base:v0 token-exchange-key: name: tokenExchangeKey diff --git a/dmp-backend/web/src/main/resources/config/deposit-devel.yml b/dmp-backend/web/src/main/resources/config/deposit-devel.yml new file mode 100644 index 000000000..d806116c7 --- /dev/null +++ b/dmp-backend/web/src/main/resources/config/deposit-devel.yml @@ -0,0 +1,18 @@ +deposit: + sources: + - url: http://dev04.local.cite.gr:55330/zenodo + repositoryId: zenodo + pdfTransformerId: docx-file-transformer + rdaTransformerId: rda-file-transformer + issuer-url: ${IDP_ISSUER_URI_TOKEN} + client-id: ${IDP_APIKEY_CLIENT_ID} + client-secret: ${IDP_APIKEY_CLIENT_SECRET} + scope: ${IDP_APIKEY_SCOPE} + - url: http://dev04.local.cite.gr:55330/zenodo1 + repositoryId: zenodo1 + pdfTransformerId: docx-file-transformer + rdaTransformerId: rda-file-transformer + issuer-url: ${IDP_ISSUER_URI_TOKEN} + client-id: ${IDP_APIKEY_CLIENT_ID} + client-secret: ${IDP_APIKEY_CLIENT_SECRET} + scope: ${IDP_APIKEY_SCOPE} \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/config/deposit.yml b/dmp-backend/web/src/main/resources/config/deposit.yml index 79d67a7d0..50528311d 100644 --- a/dmp-backend/web/src/main/resources/config/deposit.yml +++ b/dmp-backend/web/src/main/resources/config/deposit.yml @@ -1,18 +1,2 @@ deposit: - sources: - - url: http://dev04.local.cite.gr:55330/zenodo - repositoryId: Zenodo - pdfTransformerId: docx-file-transformer - rdaTransformerId: rda-file-transformer - issuer-url: ${IDP_ISSUER_URI_TOKEN} - client-id: ${IDP_APIKEY_CLIENT_ID} - client-secret: ${IDP_APIKEY_CLIENT_SECRET} - scope: ${IDP_APIKEY_SCOPE} - - url: http://dev04.local.cite.gr:55330/zenodo1 - repositoryId: Zenodo1 - pdfTransformerId: docx-file-transformer - rdaTransformerId: rda-file-transformer - issuer-url: ${IDP_ISSUER_URI_TOKEN} - client-id: ${IDP_APIKEY_CLIENT_ID} - client-secret: ${IDP_APIKEY_CLIENT_SECRET} - scope: ${IDP_APIKEY_SCOPE} \ No newline at end of file + sources: [] \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/config/transformer.yml b/dmp-backend/web/src/main/resources/config/file-transformer-devel.yml similarity index 90% rename from dmp-backend/web/src/main/resources/config/transformer.yml rename to dmp-backend/web/src/main/resources/config/file-transformer-devel.yml index 0c16733c6..91120d01d 100644 --- a/dmp-backend/web/src/main/resources/config/transformer.yml +++ b/dmp-backend/web/src/main/resources/config/file-transformer-devel.yml @@ -1,4 +1,4 @@ -transformer: +file-transformer: sources: - url: http://dev04.local.cite.gr:55330/file/docx transformerId: docx-file-transformer diff --git a/dmp-backend/web/src/main/resources/config/file-transformer.yml b/dmp-backend/web/src/main/resources/config/file-transformer.yml new file mode 100644 index 000000000..bb87bfe57 --- /dev/null +++ b/dmp-backend/web/src/main/resources/config/file-transformer.yml @@ -0,0 +1,2 @@ +file-transformer: + sources: [] \ No newline at end of file