From cdae5b2bd378632fe5892032c8cbdf3627ff5746 Mon Sep 17 00:00:00 2001 From: amentis Date: Tue, 9 Apr 2024 16:30:05 +0300 Subject: [PATCH] no message --- .../ReferenceTypeServiceImpl.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/referencetype/ReferenceTypeServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/referencetype/ReferenceTypeServiceImpl.java index 2e182190a..4dea7bf54 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/referencetype/ReferenceTypeServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/referencetype/ReferenceTypeServiceImpl.java @@ -168,10 +168,10 @@ public class ReferenceTypeServiceImpl implements ReferenceTypeService { }else { ExternalFetcherStaticOptionSourceConfigurationEntity staticEntity = new ExternalFetcherStaticOptionSourceConfigurationEntity(); - if (!this.conventionService.isListNullOrEmpty(((ExternalFetcherStaticOptionSourceConfigurationPersist) persist).getOptions())){ - staticEntity.setOptions(new ArrayList<>()); - for (StaticOptionPersist optionPersist: ((ExternalFetcherStaticOptionSourceConfigurationPersist) persist).getOptions()) { - staticEntity.getOptions().add(this.buildStaticOptionEntity(optionPersist)); + if (!this.conventionService.isListNullOrEmpty(((ExternalFetcherStaticOptionSourceConfigurationPersist) persist).getItems())){ + staticEntity.setItems(new ArrayList<>()); + for (StaticPersist optionPersist: ((ExternalFetcherStaticOptionSourceConfigurationPersist) persist).getItems()) { + staticEntity.getItems().add(this.buildStaticEntity(optionPersist)); } } @@ -256,6 +256,20 @@ public class ReferenceTypeServiceImpl implements ReferenceTypeService { return data; } + private @NotNull StaticEntity buildStaticEntity(StaticPersist persist){ + StaticEntity data = new StaticEntity(); + if (persist == null) return data; + + if (!this.conventionService.isListNullOrEmpty(persist.getOptions())){ + data.setOptions(new ArrayList<>()); + for (StaticOptionPersist staticOptionPersist: persist.getOptions()) { + data.getOptions().add(this.buildStaticOptionEntity(staticOptionPersist)); + } + } + + return data; + } + private @NotNull StaticOptionEntity buildStaticOptionEntity(StaticOptionPersist persist){ StaticOptionEntity data = new StaticOptionEntity(); if (persist == null) return data;