From 57908f342be87b6278584bde032823d46aebe9cc Mon Sep 17 00:00:00 2001 From: amentis Date: Mon, 26 Feb 2024 19:47:20 +0200 Subject: [PATCH] refactor reference type enums to prefilling source and ui code clean up --- ... => ExternalFetcherApiHTTPMethodType.java} | 8 +- ...pe.java => ExternalFetcherSourceType.java} | 9 +- .../AuthenticationConfigurationEntity.java | 8 +- ...alFetcherApiSourceConfigurationEntity.java | 10 +- ...lFetcherBaseSourceConfigurationEntity.java | 8 +- .../ReferenceTypeDefinitionEntity.java | 6 +- .../eu/eudat/data/PrefillingSourceEntity.java | 5 +- .../PrefillingSourceDefinitionBuilder.java | 7 + .../ReferenceTypeDefinitionBuilder.java | 6 +- .../AuthenticationConfiguration.java | 8 +- ...ExternalFetcherApiSourceConfiguration.java | 8 +- ...xternalFetcherBaseSourceConfiguration.java | 8 +- .../AuthenticationConfigurationPersist.java | 8 +- ...lFetcherApiSourceConfigurationPersist.java | 20 +- ...FetcherBaseSourceConfigurationPersist.java | 12 +- ...taticOptionSourceConfigurationPersist.java | 8 +- .../PrefillingSourceDefinitionPersist.java | 12 +- .../ReferenceTypeDefinitionPersist.java | 4 +- .../ExternalFetcherServiceImpl.java | 6 +- .../config/UrlConfiguration.java | 8 +- .../entities/AuthenticationConfiguration.java | 4 +- .../entities/SourceBaseConfiguration.java | 4 +- .../SourceExternalApiConfiguration.java | 4 +- .../PrefillingSourceServiceImpl.java | 11 + .../ReferenceTypeServiceImpl.java | 4 +- .../reference-type-editor.component.html | 358 ------------------ 26 files changed, 108 insertions(+), 446 deletions(-) rename dmp-backend/core/src/main/java/eu/eudat/commons/enums/{ReferenceTypeExternalApiHTTPMethodType.java => ExternalFetcherApiHTTPMethodType.java} (55%) rename dmp-backend/core/src/main/java/eu/eudat/commons/enums/{ReferenceTypeSourceType.java => ExternalFetcherSourceType.java} (63%) diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ReferenceTypeExternalApiHTTPMethodType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalFetcherApiHTTPMethodType.java similarity index 55% rename from dmp-backend/core/src/main/java/eu/eudat/commons/enums/ReferenceTypeExternalApiHTTPMethodType.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalFetcherApiHTTPMethodType.java index 5aed17828..ce9b24c81 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ReferenceTypeExternalApiHTTPMethodType.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalFetcherApiHTTPMethodType.java @@ -6,14 +6,14 @@ import jakarta.xml.bind.annotation.XmlEnumValue; import java.util.Map; -public enum ReferenceTypeExternalApiHTTPMethodType implements DatabaseEnum { +public enum ExternalFetcherApiHTTPMethodType implements DatabaseEnum { @XmlEnumValue(value = "0") GET((short) 0), @XmlEnumValue(value = "1") POST((short) 1); private final Short value; - ReferenceTypeExternalApiHTTPMethodType(Short value) { + ExternalFetcherApiHTTPMethodType(Short value) { this.value = value; } @@ -22,9 +22,9 @@ public enum ReferenceTypeExternalApiHTTPMethodType implements DatabaseEnum map = EnumUtils.getEnumValueMap(ReferenceTypeExternalApiHTTPMethodType.class); + private static final Map map = EnumUtils.getEnumValueMap(ExternalFetcherApiHTTPMethodType.class); - public static ReferenceTypeExternalApiHTTPMethodType of(Short i) { + public static ExternalFetcherApiHTTPMethodType of(Short i) { return map.get(i); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ReferenceTypeSourceType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalFetcherSourceType.java similarity index 63% rename from dmp-backend/core/src/main/java/eu/eudat/commons/enums/ReferenceTypeSourceType.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalFetcherSourceType.java index 3b6ff61f5..04240db3c 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ReferenceTypeSourceType.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalFetcherSourceType.java @@ -3,11 +3,10 @@ package eu.eudat.commons.enums; import com.fasterxml.jackson.annotation.JsonValue; import eu.eudat.data.converters.enums.DatabaseEnum; import jakarta.xml.bind.annotation.XmlEnumValue; -import jakarta.xml.bind.annotation.XmlValue; import java.util.Map; -public enum ReferenceTypeSourceType implements DatabaseEnum { +public enum ExternalFetcherSourceType implements DatabaseEnum { @XmlEnumValue(value = "0") API((short) 0), @XmlEnumValue(value = "1") @@ -19,7 +18,7 @@ public enum ReferenceTypeSourceType implements DatabaseEnum { public static final String STATIC = "static"; } - ReferenceTypeSourceType(Short value) { + ExternalFetcherSourceType(Short value) { this.value = value; } @@ -28,9 +27,9 @@ public enum ReferenceTypeSourceType implements DatabaseEnum { return value; } - private static final Map map = EnumUtils.getEnumValueMap(ReferenceTypeSourceType.class); + private static final Map map = EnumUtils.getEnumValueMap(ExternalFetcherSourceType.class); - public static ReferenceTypeSourceType of(Short i) { + public static ExternalFetcherSourceType of(Short i) { return map.get(i); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/AuthenticationConfigurationEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/AuthenticationConfigurationEntity.java index 2a40ec173..9b54d5244 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/AuthenticationConfigurationEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/AuthenticationConfigurationEntity.java @@ -1,6 +1,6 @@ package eu.eudat.commons.types.externalfetcher; -import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; +import eu.eudat.commons.enums.ExternalFetcherApiHTTPMethodType; import eu.eudat.service.externalfetcher.config.entities.AuthenticationConfiguration; import jakarta.xml.bind.annotation.XmlElement; @@ -8,7 +8,7 @@ public class AuthenticationConfigurationEntity implements AuthenticationConfigur private Boolean enabled; private String authUrl; - private ReferenceTypeExternalApiHTTPMethodType authMethod; + private ExternalFetcherApiHTTPMethodType authMethod; private String authTokenPath; private String authRequestBody; private String type; @@ -31,12 +31,12 @@ public class AuthenticationConfigurationEntity implements AuthenticationConfigur this.authUrl = authUrl; } - public ReferenceTypeExternalApiHTTPMethodType getAuthMethod() { + public ExternalFetcherApiHTTPMethodType getAuthMethod() { return authMethod; } @XmlElement(name = "authUrlMethod") - public void setAuthMethod(ReferenceTypeExternalApiHTTPMethodType authMethod) { + public void setAuthMethod(ExternalFetcherApiHTTPMethodType authMethod) { this.authMethod = authMethod; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/ExternalFetcherApiSourceConfigurationEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/ExternalFetcherApiSourceConfigurationEntity.java index 1c59b1cc5..1b6b9df09 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/ExternalFetcherApiSourceConfigurationEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/ExternalFetcherApiSourceConfigurationEntity.java @@ -1,7 +1,7 @@ package eu.eudat.commons.types.externalfetcher; -import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; +import eu.eudat.commons.enums.ExternalFetcherApiHTTPMethodType; import eu.eudat.service.externalfetcher.config.entities.SourceExternalApiConfiguration; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElementWrapper; @@ -14,7 +14,7 @@ public class ExternalFetcherApiSourceConfigurationEntity extends ExternalFetcher private String paginationPath; private String contentType; private String firstPage; - private ReferenceTypeExternalApiHTTPMethodType httpMethod; + private ExternalFetcherApiHTTPMethodType httpMethod; private String requestBody = ""; private String filterType = "remote"; private AuthenticationConfigurationEntity auth; @@ -62,12 +62,12 @@ public class ExternalFetcherApiSourceConfigurationEntity extends ExternalFetcher this.firstPage = firstPage; } - public ReferenceTypeExternalApiHTTPMethodType getHttpMethod() { + public ExternalFetcherApiHTTPMethodType getHttpMethod() { return httpMethod; } @XmlElement(name = "requestHttpMethod") - public void setHttpMethod(ReferenceTypeExternalApiHTTPMethodType httpMethod) { - this.httpMethod = httpMethod != null ? httpMethod : ReferenceTypeExternalApiHTTPMethodType.GET; + public void setHttpMethod(ExternalFetcherApiHTTPMethodType httpMethod) { + this.httpMethod = httpMethod != null ? httpMethod : ExternalFetcherApiHTTPMethodType.GET; } public String getRequestBody() { return requestBody; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/ExternalFetcherBaseSourceConfigurationEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/ExternalFetcherBaseSourceConfigurationEntity.java index 3c86c9a0f..d5d7810b7 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/ExternalFetcherBaseSourceConfigurationEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/externalfetcher/ExternalFetcherBaseSourceConfigurationEntity.java @@ -1,6 +1,6 @@ package eu.eudat.commons.types.externalfetcher; -import eu.eudat.commons.enums.ReferenceTypeSourceType; +import eu.eudat.commons.enums.ExternalFetcherSourceType; import eu.eudat.service.externalfetcher.config.entities.SourceBaseConfiguration; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElementWrapper; @@ -15,10 +15,10 @@ public abstract class ExternalFetcherBaseSourceConfigurationEntity implements So private String label; private Integer ordinal; - private ReferenceTypeSourceType type; + private ExternalFetcherSourceType type; private List referenceTypeDependencyIds; - public ReferenceTypeSourceType getType() { + public ExternalFetcherSourceType getType() { return type; } @@ -50,7 +50,7 @@ public abstract class ExternalFetcherBaseSourceConfigurationEntity implements So } @XmlElement(name = "type") - public void setType(ReferenceTypeSourceType type) { + public void setType(ExternalFetcherSourceType type) { this.type = type; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/referencetype/ReferenceTypeDefinitionEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/referencetype/ReferenceTypeDefinitionEntity.java index 90c1cd765..8bc96b6ce 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/referencetype/ReferenceTypeDefinitionEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/referencetype/ReferenceTypeDefinitionEntity.java @@ -1,6 +1,6 @@ package eu.eudat.commons.types.referencetype; -import eu.eudat.commons.enums.ReferenceTypeSourceType; +import eu.eudat.commons.enums.ExternalFetcherSourceType; import eu.eudat.commons.types.externalfetcher.ExternalFetcherBaseSourceConfigurationEntity; import eu.eudat.commons.types.externalfetcher.ExternalFetcherApiSourceConfigurationEntity; import eu.eudat.commons.types.externalfetcher.ExternalFetcherStaticOptionSourceConfigurationEntity; @@ -17,8 +17,8 @@ public class ReferenceTypeDefinitionEntity { @XmlElementWrapper(name = "sources") @XmlElements({ - @XmlElement(name = ReferenceTypeSourceType.Names.API, type = ExternalFetcherApiSourceConfigurationEntity.class), - @XmlElement(name = ReferenceTypeSourceType.Names.STATIC, type = ExternalFetcherStaticOptionSourceConfigurationEntity.class), + @XmlElement(name = ExternalFetcherSourceType.Names.API, type = ExternalFetcherApiSourceConfigurationEntity.class), + @XmlElement(name = ExternalFetcherSourceType.Names.STATIC, type = ExternalFetcherStaticOptionSourceConfigurationEntity.class), }) private List sources; diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/PrefillingSourceEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/PrefillingSourceEntity.java index 72d0e7235..f6afb774f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/PrefillingSourceEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/PrefillingSourceEntity.java @@ -3,7 +3,9 @@ package eu.eudat.data; import eu.eudat.commons.enums.IsActive; import eu.eudat.data.converters.enums.IsActiveConverter; import eu.eudat.data.tenant.TenantScopedBaseEntity; +import eu.eudat.data.types.SQLXMLType; import jakarta.persistence.*; +import org.hibernate.annotations.Type; import java.time.Instant; import java.util.UUID; @@ -22,7 +24,8 @@ public class PrefillingSourceEntity extends TenantScopedBaseEntity { public static final String _label = "label"; public static final int _labelLength = 250; - @Column(name = "definition") + @Type(value = SQLXMLType.class) + @Column(name = "definition", nullable = false, columnDefinition = "xml") private String definition; public static final String _definition = "definition"; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/prefillingsourcedefinition/PrefillingSourceDefinitionBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/prefillingsourcedefinition/PrefillingSourceDefinitionBuilder.java index d9c299777..95ba37811 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/prefillingsourcedefinition/PrefillingSourceDefinitionBuilder.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/prefillingsourcedefinition/PrefillingSourceDefinitionBuilder.java @@ -5,6 +5,7 @@ import eu.eudat.commons.types.prefillingsource.PrefillingSourceDefinitionEntity; import eu.eudat.convention.ConventionService; import eu.eudat.model.builder.BaseBuilder; import eu.eudat.model.builder.externalfetcher.ExternalFetcherApiSourceConfigurationBuilder; +import eu.eudat.model.externalfetcher.ExternalFetcherApiSourceConfiguration; import eu.eudat.model.prefillingsourcedefinition.PrefillingSourceDefinition; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.exception.MyApplicationException; @@ -53,6 +54,12 @@ public class PrefillingSourceDefinitionBuilder extends BaseBuilder externalApiConfigEntities = d.getSources().stream().filter(x-> ReferenceTypeSourceType.API.equals(x.getType())).map(x-> (ExternalFetcherApiSourceConfigurationEntity)x).toList(); - List staticOptionConfigEntities = d.getSources().stream().filter(x-> ReferenceTypeSourceType.STATIC.equals(x.getType())).map(x-> (ExternalFetcherStaticOptionSourceConfigurationEntity)x).toList(); + List externalApiConfigEntities = d.getSources().stream().filter(x-> ExternalFetcherSourceType.API.equals(x.getType())).map(x-> (ExternalFetcherApiSourceConfigurationEntity)x).toList(); + List staticOptionConfigEntities = d.getSources().stream().filter(x-> ExternalFetcherSourceType.STATIC.equals(x.getType())).map(x-> (ExternalFetcherStaticOptionSourceConfigurationEntity)x).toList(); m.setSources(new ArrayList<>()); m.getSources().addAll(this.builderFactory.builder(ExternalFetcherApiSourceConfigurationBuilder.class).authorize(this.authorize).build(sourcesFields, externalApiConfigEntities)); m.getSources().addAll(this.builderFactory.builder(ExternalFetcherStaticOptionSourceConfigurationBuilder.class).authorize(this.authorize).build(sourcesFields, staticOptionConfigEntities)); diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/AuthenticationConfiguration.java b/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/AuthenticationConfiguration.java index b4cf575f7..9f93f7498 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/AuthenticationConfiguration.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/AuthenticationConfiguration.java @@ -1,6 +1,6 @@ package eu.eudat.model.externalfetcher; -import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; +import eu.eudat.commons.enums.ExternalFetcherApiHTTPMethodType; public class AuthenticationConfiguration { @@ -11,7 +11,7 @@ public class AuthenticationConfiguration { private String authUrl; public final static String _authMethod = "authMethod"; - private ReferenceTypeExternalApiHTTPMethodType authMethod; + private ExternalFetcherApiHTTPMethodType authMethod; public final static String _authTokenPath = "authTokenPath"; private String authTokenPath; @@ -39,12 +39,12 @@ public class AuthenticationConfiguration { this.authUrl = authUrl; } - public ReferenceTypeExternalApiHTTPMethodType getAuthMethod() { + public ExternalFetcherApiHTTPMethodType getAuthMethod() { return authMethod; } - public void setAuthMethod(ReferenceTypeExternalApiHTTPMethodType authMethod) { + public void setAuthMethod(ExternalFetcherApiHTTPMethodType authMethod) { this.authMethod = authMethod; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/ExternalFetcherApiSourceConfiguration.java b/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/ExternalFetcherApiSourceConfiguration.java index 6e4a3ad64..db16a350a 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/ExternalFetcherApiSourceConfiguration.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/ExternalFetcherApiSourceConfiguration.java @@ -1,7 +1,7 @@ package eu.eudat.model.externalfetcher; -import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; +import eu.eudat.commons.enums.ExternalFetcherApiHTTPMethodType; import java.util.List; public class ExternalFetcherApiSourceConfiguration extends ExternalFetcherBaseSourceConfiguration { @@ -23,7 +23,7 @@ public class ExternalFetcherApiSourceConfiguration extends ExternalFetcherBaseSo private String firstPage; public final static String _httpMethod = "httpMethod"; - private ReferenceTypeExternalApiHTTPMethodType httpMethod; + private ExternalFetcherApiHTTPMethodType httpMethod; public final static String _requestBody = "requestBody"; private String requestBody = ""; @@ -78,11 +78,11 @@ public class ExternalFetcherApiSourceConfiguration extends ExternalFetcherBaseSo this.firstPage = firstPage; } - public ReferenceTypeExternalApiHTTPMethodType getHttpMethod() { + public ExternalFetcherApiHTTPMethodType getHttpMethod() { return httpMethod; } - public void setHttpMethod(ReferenceTypeExternalApiHTTPMethodType httpMethod) { + public void setHttpMethod(ExternalFetcherApiHTTPMethodType httpMethod) { this.httpMethod = httpMethod; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/ExternalFetcherBaseSourceConfiguration.java b/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/ExternalFetcherBaseSourceConfiguration.java index 4f06b3f99..6daf6ad69 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/ExternalFetcherBaseSourceConfiguration.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/externalfetcher/ExternalFetcherBaseSourceConfiguration.java @@ -1,6 +1,6 @@ package eu.eudat.model.externalfetcher; -import eu.eudat.commons.enums.ReferenceTypeSourceType; +import eu.eudat.commons.enums.ExternalFetcherSourceType; import eu.eudat.model.ReferenceType; import java.util.List; @@ -18,16 +18,16 @@ public abstract class ExternalFetcherBaseSourceConfiguration { private Integer ordinal; public final static String _type = "type"; - private ReferenceTypeSourceType type; + private ExternalFetcherSourceType type; public final static String _referenceTypeDependencies = "referenceTypeDependencies"; private List referenceTypeDependencies; - public ReferenceTypeSourceType getType() { + public ExternalFetcherSourceType getType() { return type; } - public void setType(ReferenceTypeSourceType type) { + public void setType(ExternalFetcherSourceType type) { this.type = type; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/AuthenticationConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/AuthenticationConfigurationPersist.java index 0c26032d0..92f023293 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/AuthenticationConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/AuthenticationConfigurationPersist.java @@ -1,6 +1,6 @@ package eu.eudat.model.persist.externalfetcher; -import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; +import eu.eudat.commons.enums.ExternalFetcherApiHTTPMethodType; import eu.eudat.commons.validation.BaseValidator; import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; @@ -24,7 +24,7 @@ public class AuthenticationConfigurationPersist { public static final String _authUrl = "authUrl"; - private ReferenceTypeExternalApiHTTPMethodType authMethod; + private ExternalFetcherApiHTTPMethodType authMethod; public static final String _authMethod = "authMethod"; @@ -56,11 +56,11 @@ public class AuthenticationConfigurationPersist { this.authUrl = authUrl; } - public ReferenceTypeExternalApiHTTPMethodType getAuthMethod() { + public ExternalFetcherApiHTTPMethodType getAuthMethod() { return authMethod; } - public void setAuthMethod(ReferenceTypeExternalApiHTTPMethodType authMethod) { + public void setAuthMethod(ExternalFetcherApiHTTPMethodType authMethod) { this.authMethod = authMethod; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherApiSourceConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherApiSourceConfigurationPersist.java index 8fe4faa4d..dc71ab873 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherApiSourceConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherApiSourceConfigurationPersist.java @@ -1,6 +1,6 @@ package eu.eudat.model.persist.externalfetcher; -import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; +import eu.eudat.commons.enums.ExternalFetcherApiHTTPMethodType; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import gr.cite.tools.validation.ValidatorFactory; @@ -36,13 +36,13 @@ public class ExternalFetcherApiSourceConfigurationPersist extends ExternalFetche public static final String _firstPage = "firstPage"; - private ReferenceTypeExternalApiHTTPMethodType httpMethod; + private ExternalFetcherApiHTTPMethodType httpMethod; public static final String _httpMethod = "httpMethod"; - private String requestBody = ""; + private String requestBody; - private String filterType = "remote"; + private String filterType; private AuthenticationConfigurationPersist auth; @@ -92,11 +92,11 @@ public class ExternalFetcherApiSourceConfigurationPersist extends ExternalFetche this.firstPage = firstPage; } - public ReferenceTypeExternalApiHTTPMethodType getHttpMethod() { + public ExternalFetcherApiHTTPMethodType getHttpMethod() { return httpMethod; } - public void setHttpMethod(ReferenceTypeExternalApiHTTPMethodType httpMethod) { + public void setHttpMethod(ExternalFetcherApiHTTPMethodType httpMethod) { this.httpMethod = httpMethod; } @@ -132,13 +132,13 @@ public class ExternalFetcherApiSourceConfigurationPersist extends ExternalFetche this.queries = queries; } - @Component(ReferenceTypeSourceExternalApiConfigurationPersistValidator.ValidatorName) + @Component(ExternalFetcherApiSourceConfigurationPersistValidator.ValidatorName) @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) - public static class ReferenceTypeSourceExternalApiConfigurationPersistValidator extends ReferenceTypeSourceBaseConfigurationPersistValidator { + public static class ExternalFetcherApiSourceConfigurationPersistValidator extends ExternalFetcherBaseSourceConfigurationPersistValidator { - public static final String ValidatorName = "ReferenceTypeSourceExternalApiConfigurationPersistValidator"; + public static final String ValidatorName = "ExternalFetcherApiSourceConfigurationPersistValidator"; - protected ReferenceTypeSourceExternalApiConfigurationPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) { + protected ExternalFetcherApiSourceConfigurationPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) { super(conventionService, errors, messageSource, validatorFactory); } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherBaseSourceConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherBaseSourceConfigurationPersist.java index 9ef910fbe..f21d77784 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherBaseSourceConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherBaseSourceConfigurationPersist.java @@ -2,7 +2,7 @@ package eu.eudat.model.persist.externalfetcher; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import eu.eudat.commons.enums.ReferenceTypeSourceType; +import eu.eudat.commons.enums.ExternalFetcherSourceType; import eu.eudat.commons.validation.BaseValidator; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; @@ -39,7 +39,7 @@ public abstract class ExternalFetcherBaseSourceConfigurationPersist { public static final String _ordinal = "ordinal"; - private ReferenceTypeSourceType type; + private ExternalFetcherSourceType type; public static final String _type = "type"; @@ -71,11 +71,11 @@ public abstract class ExternalFetcherBaseSourceConfigurationPersist { this.ordinal = ordinal; } - public ReferenceTypeSourceType getType() { + public ExternalFetcherSourceType getType() { return type; } - public void setType(ReferenceTypeSourceType type) { + public void setType(ExternalFetcherSourceType type) { this.type = type; } @@ -87,13 +87,13 @@ public abstract class ExternalFetcherBaseSourceConfigurationPersist { this.referenceTypeDependencyIds = referenceTypeDependencyIds; } - public static abstract class ReferenceTypeSourceBaseConfigurationPersistValidator extends BaseValidator { + public static abstract class ExternalFetcherBaseSourceConfigurationPersistValidator extends BaseValidator { protected final MessageSource messageSource; protected final ValidatorFactory validatorFactory; - protected ReferenceTypeSourceBaseConfigurationPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) { + protected ExternalFetcherBaseSourceConfigurationPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) { super(conventionService, errors); this.messageSource = messageSource; this.validatorFactory = validatorFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherStaticOptionSourceConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherStaticOptionSourceConfigurationPersist.java index 340a63724..de1e85e55 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherStaticOptionSourceConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/externalfetcher/ExternalFetcherStaticOptionSourceConfigurationPersist.java @@ -25,13 +25,13 @@ public class ExternalFetcherStaticOptionSourceConfigurationPersist extends Exter this.options = options; } - @Component(ReferenceTypeSourceStaticOptionConfigurationPersistValidator.ValidatorName) + @Component(ExternalFetcherStaticOptionSourceConfigurationPersistValidator.ValidatorName) @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) - public static class ReferenceTypeSourceStaticOptionConfigurationPersistValidator extends ReferenceTypeSourceBaseConfigurationPersistValidator { + public static class ExternalFetcherStaticOptionSourceConfigurationPersistValidator extends ExternalFetcherBaseSourceConfigurationPersistValidator { - public static final String ValidatorName = "ReferenceTypeSourceStaticOptionConfigurationPersistValidator"; + public static final String ValidatorName = "ExternalFetcherStaticOptionSourceConfigurationPersistValidator"; - protected ReferenceTypeSourceStaticOptionConfigurationPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) { + protected ExternalFetcherStaticOptionSourceConfigurationPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) { super(conventionService, errors, messageSource, validatorFactory); } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/prefillingsourcedefinition/PrefillingSourceDefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/prefillingsourcedefinition/PrefillingSourceDefinitionPersist.java index 007866ba5..ec8e8e503 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/prefillingsourcedefinition/PrefillingSourceDefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/prefillingsourcedefinition/PrefillingSourceDefinitionPersist.java @@ -81,12 +81,12 @@ public class PrefillingSourceDefinitionPersist { .iff(() -> !this.isNull(item.getSearchConfiguration())) .on(PrefillingSourceDefinitionPersist._searchConfiguration) .over(item.getSearchConfiguration()) - .using(() -> this.validatorFactory.validator(PrefillingSourceDefinitionPersist.PrefillingSourceDefinitionPersistValidator.class)), - this.refSpec() - .iff(() -> !this.isNull(item.getGetConfiguration())) - .on(PrefillingSourceDefinitionPersist._getConfiguration) - .over(item.getGetConfiguration()) - .using(() -> this.validatorFactory.validator(PrefillingSourceDefinitionPersist.PrefillingSourceDefinitionPersistValidator.class)), + .using(() -> this.validatorFactory.validator(ExternalFetcherApiSourceConfigurationPersist.ExternalFetcherApiSourceConfigurationPersistValidator.class)), +// this.refSpec() TODO +// .iff(() -> !this.isNull(item.getGetConfiguration())) +// .on(PrefillingSourceDefinitionPersist._getConfiguration) +// .over(item.getGetConfiguration()) +// .using(() -> this.validatorFactory.validator(ExternalFetcherApiSourceConfigurationPersist.ExternalFetcherApiSourceConfigurationPersistValidator.class)), this.navSpec() .iff(() -> !this.isListNullOrEmpty(item.getFields())) .on(PrefillingSourceDefinitionPersist._fields) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java index 74dc03446..39c167b2c 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java @@ -1,6 +1,6 @@ package eu.eudat.model.persist.referencetypedefinition; -import eu.eudat.commons.enums.ReferenceTypeSourceType; +import eu.eudat.commons.enums.ExternalFetcherSourceType; import eu.eudat.commons.validation.BaseValidator; import eu.eudat.model.persist.externalfetcher.ExternalFetcherBaseSourceConfigurationPersist; import eu.eudat.model.persist.externalfetcher.ExternalFetcherApiSourceConfigurationPersist; @@ -80,7 +80,7 @@ public class ReferenceTypeDefinitionPersist { .iff(() -> !this.isListNullOrEmpty(item.getSources())) .on(ReferenceTypeDefinitionPersist._sources) .over(item.getSources()) - .using((itm) -> ((ExternalFetcherBaseSourceConfigurationPersist) itm).getType() == ReferenceTypeSourceType.STATIC? this.validatorFactory.validator(ExternalFetcherStaticOptionSourceConfigurationPersist.ReferenceTypeSourceStaticOptionConfigurationPersistValidator.class): this.validatorFactory.validator(ExternalFetcherApiSourceConfigurationPersist.ReferenceTypeSourceExternalApiConfigurationPersistValidator.class)) + .using((itm) -> ((ExternalFetcherBaseSourceConfigurationPersist) itm).getType() == ExternalFetcherSourceType.STATIC? this.validatorFactory.validator(ExternalFetcherStaticOptionSourceConfigurationPersist.ExternalFetcherStaticOptionSourceConfigurationPersistValidator.class): this.validatorFactory.validator(ExternalFetcherApiSourceConfigurationPersist.ExternalFetcherApiSourceConfigurationPersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/ExternalFetcherServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/ExternalFetcherServiceImpl.java index 03c550be8..3f412db29 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/ExternalFetcherServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/ExternalFetcherServiceImpl.java @@ -6,7 +6,7 @@ import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.PathNotFoundException; import eu.eudat.commons.JsonHandlingService; -import eu.eudat.commons.enums.ReferenceTypeSourceType; +import eu.eudat.commons.enums.ExternalFetcherSourceType; import eu.eudat.convention.ConventionService; import eu.eudat.data.ReferenceEntity; import eu.eudat.model.Reference; @@ -81,7 +81,7 @@ public class ExternalFetcherServiceImpl implements ExternalFetcherService { if (this.conventionService.isListNullOrEmpty(sources)) return new ExternalDataResult(); for (SourceBaseConfiguration source : sources) { - if (source.getType() == null || source.getType().equals(ReferenceTypeSourceType.API)) { + if (source.getType() == null || source.getType().equals(ExternalFetcherSourceType.API)) { try { SourceExternalApiConfiguration, AuthenticationConfiguration, QueryConfig> apiSource = (SourceExternalApiConfiguration)source; // this.applyFunderToQuery(apiSource, externalReferenceCriteria); @@ -94,7 +94,7 @@ public class ExternalFetcherServiceImpl implements ExternalFetcherService { } catch (Exception e) { logger.error(e.getLocalizedMessage(), e); } - } else if (source.getType() != null && source.getType().equals(ReferenceTypeSourceType.STATIC)) { + } else if (source.getType() != null && source.getType().equals(ExternalFetcherSourceType.STATIC)) { SourceStaticOptionConfiguration staticSource = (SourceStaticOptionConfiguration)source; results.addAll(queryStaticData(staticSource, externalReferenceCriteria)); } diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/UrlConfiguration.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/UrlConfiguration.java index 575a2d1ac..53602665b 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/UrlConfiguration.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/UrlConfiguration.java @@ -1,7 +1,7 @@ package eu.eudat.service.externalfetcher.config; -import eu.eudat.commons.enums.ReferenceTypeSourceType; +import eu.eudat.commons.enums.ExternalFetcherSourceType; import eu.eudat.service.externalfetcher.config.entities.SourceBaseConfiguration; public class UrlConfiguration implements SourceBaseConfiguration { @@ -9,7 +9,7 @@ public class UrlConfiguration implements SourceBaseConfiguration { private String key; private String label; private Integer ordinal; - private ReferenceTypeSourceType type; + private ExternalFetcherSourceType type; public String getKey() { return key; @@ -35,11 +35,11 @@ public class UrlConfiguration implements SourceBaseConfiguration { this.ordinal = ordinal; } - public ReferenceTypeSourceType getType() { + public ExternalFetcherSourceType getType() { return type; } - public void setType(ReferenceTypeSourceType type) { + public void setType(ExternalFetcherSourceType type) { this.type = type; } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/AuthenticationConfiguration.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/AuthenticationConfiguration.java index c698b6bae..33fdd650e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/AuthenticationConfiguration.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/AuthenticationConfiguration.java @@ -1,6 +1,6 @@ package eu.eudat.service.externalfetcher.config.entities; -import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; +import eu.eudat.commons.enums.ExternalFetcherApiHTTPMethodType; public interface AuthenticationConfiguration { @@ -8,7 +8,7 @@ public interface AuthenticationConfiguration { String getAuthUrl(); - ReferenceTypeExternalApiHTTPMethodType getAuthMethod(); + ExternalFetcherApiHTTPMethodType getAuthMethod(); String getAuthTokenPath(); diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/SourceBaseConfiguration.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/SourceBaseConfiguration.java index 7dd7939da..eba1d420e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/SourceBaseConfiguration.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/SourceBaseConfiguration.java @@ -1,10 +1,10 @@ package eu.eudat.service.externalfetcher.config.entities; -import eu.eudat.commons.enums.ReferenceTypeSourceType; +import eu.eudat.commons.enums.ExternalFetcherSourceType; public interface SourceBaseConfiguration { String getKey(); String getLabel(); Integer getOrdinal(); - ReferenceTypeSourceType getType(); + ExternalFetcherSourceType getType(); } diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/SourceExternalApiConfiguration.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/SourceExternalApiConfiguration.java index 2f4271512..b65df2fd4 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/SourceExternalApiConfiguration.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/entities/SourceExternalApiConfiguration.java @@ -1,6 +1,6 @@ package eu.eudat.service.externalfetcher.config.entities; -import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; +import eu.eudat.commons.enums.ExternalFetcherApiHTTPMethodType; import java.util.List; @@ -15,7 +15,7 @@ public interface SourceExternalApiConfiguration - - - - -