From 6c82fcf8b0a8cd0cb1a3297df74d1cf1c5919b8d Mon Sep 17 00:00:00 2001 From: amentis Date: Tue, 5 Mar 2024 13:59:53 +0200 Subject: [PATCH] builder component bean conflict fix --- .../commonmodels/description/FieldCommonModelBuilder.java | 2 +- .../descriptiontemplate/FieldCommonModelBuilder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/description/FieldCommonModelBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/description/FieldCommonModelBuilder.java index 15c6828d4..18e653be8 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/description/FieldCommonModelBuilder.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/description/FieldCommonModelBuilder.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; import java.util.*; import java.util.stream.Collectors; -@Component +@Component("commonmodels.description") @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) public class FieldCommonModelBuilder extends BaseCommonModelBuilder { private final BuilderFactory builderFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java index 71a778c85..6b6aafe9f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java @@ -23,7 +23,7 @@ import java.util.EnumSet; import java.util.List; import java.util.Optional; -@Component +@Component("commonmodels.descriptiontemplate") @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) public class FieldCommonModelBuilder extends BaseCommonModelBuilder { private final BuilderFactory builderFactory;