From 1a8180c64e22c45bf4e7b445394a056ae895050a Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Wed, 28 Feb 2024 18:51:16 +0200 Subject: [PATCH] merge fix --- .../old/eudat/migration/DatasetMigrationService.java | 2 +- .../DescriptionTemplateXmlMigrationService.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java index 09fb7fab8..8b3f2e3f1 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java @@ -741,7 +741,7 @@ public class DatasetMigrationService { } if (this.conventionService.isNullOrEmpty(data.getReference())) { - if (referenceTypeDefinition.getSources().stream().filter(x-> x.getType().equals(ReferenceTypeSourceType.API)).map(x-> (ExternalFetcherApiSourceConfigurationEntity)x).anyMatch(x-> x.getUrl().toLowerCase(Locale.ROOT).contains("eestore.paas2.uninett.no"))){ + if (referenceTypeDefinition.getSources().stream().filter(x-> x.getType().equals(ExternalFetcherSourceType.API)).map(x-> (ExternalFetcherApiSourceConfigurationEntity)x).anyMatch(x-> x.getUrl().toLowerCase(Locale.ROOT).contains("eestore.paas2.uninett.no"))){ if (data.getLabel().equalsIgnoreCase("Attribution 4.0 International")){ data.setReference("CC-BY-4.0"); } else if (data.getLabel().equalsIgnoreCase("Attribution-NonCommercial 4.0 International")){ diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java index 806b1c618..4849c2e91 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java @@ -537,7 +537,7 @@ public class DescriptionTemplateXmlMigrationService { apiEntity.setQueries(new ArrayList<>()); apiEntity.getQueries().add(this.buildQueryConfigEntity(parsedUrl)); - apiEntity.setType(ReferenceTypeSourceType.API); + apiEntity.setType(ExternalFetcherSourceType.API); apiEntity.setKey(source); apiEntity.setLabel(source); apiEntity.setOrdinal(ordinal); @@ -603,15 +603,15 @@ public class DescriptionTemplateXmlMigrationService { return data; } - private ReferenceTypeExternalApiHTTPMethodType toReferenceTypeExternalApiHTTPMethodType(String method){ + private ExternalFetcherApiHTTPMethodType toReferenceTypeExternalApiHTTPMethodType(String method){ if (this.conventionService.isNullOrEmpty(method)) { logger.error("Migrate DescriptionTemplate autocomplete method not set use default GET"); - return ReferenceTypeExternalApiHTTPMethodType.GET; + return ExternalFetcherApiHTTPMethodType.GET; } else if (method.toLowerCase(Locale.ROOT).trim().equals("get")) { - return ReferenceTypeExternalApiHTTPMethodType.GET; + return ExternalFetcherApiHTTPMethodType.GET; } else if (method.toLowerCase(Locale.ROOT).trim().equals("post")) { - return ReferenceTypeExternalApiHTTPMethodType.POST; + return ExternalFetcherApiHTTPMethodType.POST; } else { logger.error("Migrate DescriptionTemplate autocomplete method is invalid " + method); throw new MyApplicationException("Migrate DescriptionTemplate autocomplete method is invalid " + method);