From 099d37c9b57b9f9b799b6b08ead9e23950661d1a Mon Sep 17 00:00:00 2001 From: pnoker Date: Fri, 5 Jun 2026 23:25:19 +0800 Subject: [PATCH] refactor: fix medium-severity code convention violations - Add @ToString.Exclude on self-referencing children fields in 6 tree BO/VO classes to prevent StackOverflowError on toString() - Fix TopicController/Service Page> to Page - Add @Validated to HmacAuthProperties, OkHttpProperties, NotifyCredentialProperties for JSR-303 validation support - Remove dead Eureka constants from EnvironmentConstant - Remove deprecated spring.main.allow-bean-definition-overriding from 3 YAML files (no-op in Spring Boot 3.x) - Extract hardcoded 'unknown' string to DataConstant.STATUS_UNKNOWN and reference it from 5 call sites --- .../pnoker/common/auth/entity/bo/MenuTreeBO.java | 1 + .../common/auth/entity/bo/ResourceTreeBO.java | 1 + .../pnoker/common/auth/entity/bo/RoleTreeBO.java | 1 + .../pnoker/common/auth/entity/vo/MenuTreeVO.java | 1 + .../common/auth/entity/vo/ResourceTreeVO.java | 1 + .../pnoker/common/auth/entity/vo/RoleTreeVO.java | 1 + .../constant/common/EnvironmentConstant.java | 15 ++------------- .../common/constant/service/DataConstant.java | 5 +++++ .../common/data/biz/alarm/NotifyTaskSender.java | 3 ++- .../data/biz/impl/DeviceStateServiceImpl.java | 3 ++- .../data/biz/impl/DriverStateServiceImpl.java | 3 ++- .../data/biz/impl/EntityStateExpiryScanner.java | 5 +++-- .../property/NotifyCredentialProperties.java | 2 ++ .../src/main/resources/application-driver.yml | 1 - .../manager/controller/TopicController.java | 6 +++--- .../common/manager/service/TopicService.java | 4 ++-- .../manager/service/impl/TopicServiceImpl.java | 10 ++++++---- .../pnoker/common/config/HmacAuthProperties.java | 2 ++ .../pnoker/common/config/OkHttpProperties.java | 2 ++ .../src/main/resources/application-test.yml | 1 - .../src/main/resources/application-web.yml | 2 -- 21 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/MenuTreeBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/MenuTreeBO.java index 5778b7121..bf9fe6c04 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/MenuTreeBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/MenuTreeBO.java @@ -41,6 +41,7 @@ import java.util.Objects; @EqualsAndHashCode(callSuper = true) public class MenuTreeBO extends MenuBO { + @ToString.Exclude private List children = new ArrayList<>(); public static MenuTreeBO fromBO(MenuBO source) { diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ResourceTreeBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ResourceTreeBO.java index 724198c3e..01261f51a 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ResourceTreeBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/ResourceTreeBO.java @@ -42,6 +42,7 @@ import java.util.Objects; @EqualsAndHashCode(callSuper = true) public class ResourceTreeBO extends ResourceBO { + @ToString.Exclude private List children = new ArrayList<>(); /** diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleTreeBO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleTreeBO.java index d14e1f023..d51d73ace 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleTreeBO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/bo/RoleTreeBO.java @@ -43,6 +43,7 @@ import java.util.Objects; @EqualsAndHashCode(callSuper = true) public class RoleTreeBO extends RoleBO { + @ToString.Exclude private List children = new ArrayList<>(); /** diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/MenuTreeVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/MenuTreeVO.java index 671f30963..c465ed237 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/MenuTreeVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/MenuTreeVO.java @@ -43,6 +43,7 @@ import java.util.List; @JsonInclude(JsonInclude.Include.NON_DEFAULT) public class MenuTreeVO extends MenuVO { + @ToString.Exclude private List children = new ArrayList<>(); } diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ResourceTreeVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ResourceTreeVO.java index 4b43c40c8..df5fd0a94 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ResourceTreeVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/ResourceTreeVO.java @@ -43,6 +43,7 @@ import java.util.List; @JsonInclude(JsonInclude.Include.NON_DEFAULT) public class ResourceTreeVO extends ResourceVO { + @ToString.Exclude private List children = new ArrayList<>(); } diff --git a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleTreeVO.java b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleTreeVO.java index 3b17641a2..ef82f9230 100644 --- a/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleTreeVO.java +++ b/dc3-common/dc3-common-auth/src/main/java/io/github/pnoker/common/auth/entity/vo/RoleTreeVO.java @@ -43,6 +43,7 @@ import java.util.List; @JsonInclude(JsonInclude.Include.NON_DEFAULT) public class RoleTreeVO extends RoleVO { + @ToString.Exclude private List children = new ArrayList<>(); } diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/EnvironmentConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/EnvironmentConstant.java index 045e27c06..5560a0dcf 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/EnvironmentConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/common/EnvironmentConstant.java @@ -20,8 +20,8 @@ package io.github.pnoker.common.constant.common; /** * Environment variables and configuration variables related constants *

- * Provides constants for environment types, Spring configuration properties, Eureka - * configuration, and driver-related configuration keys. + * Provides constants for environment types, Spring configuration properties, + * and driver-related configuration keys. *

* * @author pnoker @@ -50,17 +50,6 @@ public class EnvironmentConstant { */ public static final String ENV_PRO = "pro"; - /** - * Eureka TLS enable configuration key: "eureka.client.tls.enabled" - */ - public static final String EUREKA_TLS_ENABLE = "eureka.client.tls.enabled"; - - /** - * Eureka service registry URL configuration key: - * "eureka.client.service-url.defaultZone" - */ - public static final String EUREKA_SERVICE_URL = "eureka.client.service-url.defaultZone"; - /** * Current environment type configuration key: "spring.env" */ diff --git a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DataConstant.java b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DataConstant.java index f5530ffe9..1ad27efca 100644 --- a/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DataConstant.java +++ b/dc3-common/dc3-common-constant/src/main/java/io/github/pnoker/common/constant/service/DataConstant.java @@ -34,6 +34,11 @@ public class DataConstant { */ public static final String SERVICE_NAME = "dc3-center-data"; + /** + * Fallback status when an entity status cannot be resolved. + */ + public static final String STATUS_UNKNOWN = "unknown"; + public static final String POINT_VALUE_URL_PREFIX = "/point_value"; public static final String POINT_COMMAND_URL_PREFIX = "/point_command"; diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/alarm/NotifyTaskSender.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/alarm/NotifyTaskSender.java index 389df1139..809d9ba67 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/alarm/NotifyTaskSender.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/alarm/NotifyTaskSender.java @@ -18,6 +18,7 @@ package io.github.pnoker.common.data.biz.alarm; import io.github.pnoker.common.constant.driver.RabbitConstant; +import io.github.pnoker.common.constant.service.DataConstant; import io.github.pnoker.common.entity.dto.NotifyTaskDTO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -54,7 +55,7 @@ public class NotifyTaskSender { } String channelType = Objects.nonNull(task.getChannelTypeFlag()) ? task.getChannelTypeFlag().toString() - : "unknown"; + : DataConstant.STATUS_UNKNOWN; String routingKey = (RabbitConstant.ROUTING_NOTIFY_TASK_PREFIX + channelType).toLowerCase(Locale.ROOT); rabbitTemplate.convertAndSend(alarmExchange.getName(), routingKey, task); } diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceStateServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceStateServiceImpl.java index b65945176..f2c512e69 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceStateServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DeviceStateServiceImpl.java @@ -24,6 +24,7 @@ import io.github.pnoker.common.data.entity.model.EntityStateDO; import io.github.pnoker.common.data.mapper.EntityStateMapper; import io.github.pnoker.common.entity.dto.DeviceAlarmDTO; import io.github.pnoker.common.entity.dto.DeviceStateDTO; +import io.github.pnoker.common.constant.service.DataConstant; import io.github.pnoker.common.enums.EntityStatusEnum; import io.github.pnoker.common.enums.EntityTypeFlagEnum; import io.github.pnoker.common.enums.TimeoutSourceFlagEnum; @@ -102,7 +103,7 @@ public class DeviceStateServiceImpl implements DeviceStateService { byte lastIndex = stateDO.getLastStateFlag(); if (isFlip(lastIndex, current)) { String message = String.format("Device status changed: %s -> %s", - EntityStatusEnum.ofIndex(lastIndex) != null ? EntityStatusEnum.ofIndex(lastIndex).getCode() : "unknown", + EntityStatusEnum.ofIndex(lastIndex) != null ? EntityStatusEnum.ofIndex(lastIndex).getCode() : DataConstant.STATUS_UNKNOWN, current); DeviceAlarmDTO alarm = DeviceAlarmDTO.builder() .driverId(entityDTO.getDriverId()) diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverStateServiceImpl.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverStateServiceImpl.java index a765e9c2f..d04a90e33 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverStateServiceImpl.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/DriverStateServiceImpl.java @@ -19,6 +19,7 @@ package io.github.pnoker.common.data.biz.impl; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import io.github.pnoker.common.constant.driver.RabbitConstant; +import io.github.pnoker.common.constant.service.DataConstant; import io.github.pnoker.common.data.biz.DriverAlarmService; import io.github.pnoker.common.data.biz.DriverStateService; import io.github.pnoker.common.data.entity.model.EntityStateDO; @@ -111,7 +112,7 @@ public class DriverStateServiceImpl implements DriverStateService { byte lastIndex = stateDO.getLastStateFlag(); if (isFlip(lastIndex, current)) { String message = String.format("Driver status changed: %s -> %s", - EntityStatusEnum.ofIndex(lastIndex) != null ? EntityStatusEnum.ofIndex(lastIndex).getCode() : "unknown", + EntityStatusEnum.ofIndex(lastIndex) != null ? EntityStatusEnum.ofIndex(lastIndex).getCode() : DataConstant.STATUS_UNKNOWN, current); DriverAlarmDTO alarm = DriverAlarmDTO.builder() .tenantId(entityDTO.getTenantId()) diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/EntityStateExpiryScanner.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/EntityStateExpiryScanner.java index c8dc31372..70e0edc5e 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/EntityStateExpiryScanner.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/biz/impl/EntityStateExpiryScanner.java @@ -19,6 +19,7 @@ package io.github.pnoker.common.data.biz.impl; import com.rabbitmq.client.Channel; import io.github.pnoker.common.constant.driver.RabbitConstant; +import io.github.pnoker.common.constant.service.DataConstant; import io.github.pnoker.common.data.biz.alarm.AlarmRuleTriggerService; import io.github.pnoker.common.data.dal.EntityAlarmManager; import io.github.pnoker.common.data.dal.EntityStateManager; @@ -160,7 +161,7 @@ public class EntityStateExpiryScanner { private EntityAlarmDO buildOfflineAlarm(EntityStateDO scanned) { EntityStatusEnum prev = EntityStatusEnum.ofIndex(scanned.getLastStateFlag()); - String prevCode = Objects.nonNull(prev) ? prev.getCode() : "unknown"; + String prevCode = Objects.nonNull(prev) ? prev.getCode() : DataConstant.STATUS_UNKNOWN; String message = String.format("Device heartbeat timed out (last=%s); marked OFFLINE", prevCode); EntityAlarmDO alarm = new EntityAlarmDO(); @@ -185,7 +186,7 @@ public class EntityStateExpiryScanner { EntityStateDO scanned = ctx.state; EntityAlarmDO alarm = ctx.alarm; EntityStatusEnum prev = EntityStatusEnum.ofIndex(scanned.getLastStateFlag()); - String prevCode = Objects.nonNull(prev) ? prev.getCode() : "unknown"; + String prevCode = Objects.nonNull(prev) ? prev.getCode() : DataConstant.STATUS_UNKNOWN; // Update lastAlarmId entityStateManager.lambdaUpdate() diff --git a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/property/NotifyCredentialProperties.java b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/property/NotifyCredentialProperties.java index 0d6693fb5..ff8a4b7a6 100644 --- a/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/property/NotifyCredentialProperties.java +++ b/dc3-common/dc3-common-data/src/main/java/io/github/pnoker/common/data/entity/property/NotifyCredentialProperties.java @@ -20,6 +20,7 @@ package io.github.pnoker.common.data.entity.property; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.validation.annotation.Validated; import java.util.LinkedHashMap; import java.util.Map; @@ -36,6 +37,7 @@ import java.util.Map; */ @Getter @Setter +@Validated @ConfigurationProperties(prefix = "dc3.data.notify") public class NotifyCredentialProperties { diff --git a/dc3-common/dc3-common-driver/src/main/resources/application-driver.yml b/dc3-common/dc3-common-driver/src/main/resources/application-driver.yml index a9a00c20a..aa29f5e54 100644 --- a/dc3-common/dc3-common-driver/src/main/resources/application-driver.yml +++ b/dc3-common/dc3-common-driver/src/main/resources/application-driver.yml @@ -20,7 +20,6 @@ # the property values configured in application.yml will be the main ones. spring: main: - allow-bean-definition-overriding: true grpc: client: channels: diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/TopicController.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/TopicController.java index 568fc2790..483634175 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/TopicController.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/controller/TopicController.java @@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import reactor.core.publisher.Mono; -import java.util.List; + import java.util.Objects; /** @@ -52,11 +52,11 @@ public class TopicController implements BaseController { private final TopicService topicService; @PostMapping("/list") - public Mono>>> query(@RequestBody(required = false) TopicQuery topicQuery) { + public Mono>> query(@RequestBody(required = false) TopicQuery topicQuery) { return getTenantId().flatMap(tenantId -> async(() -> { TopicQuery query = Objects.isNull(topicQuery) ? new TopicQuery() : topicQuery; query.setTenantId(tenantId); - Page> topicVOList = topicService.query(query); + Page topicVOList = topicService.query(query); return R.ok(topicVOList); })); } diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/TopicService.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/TopicService.java index ae7e0161f..1f77567b8 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/TopicService.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/TopicService.java @@ -23,7 +23,7 @@ import io.github.pnoker.common.manager.entity.model.DeviceDO; import io.github.pnoker.common.manager.entity.query.TopicQuery; import io.github.pnoker.common.manager.entity.vo.TopicVO; -import java.util.List; + /** * Business service for topic operations. @@ -35,6 +35,6 @@ import java.util.List; public interface TopicService extends IService { - Page> query(TopicQuery topicQuery); + Page query(TopicQuery topicQuery); } diff --git a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/TopicServiceImpl.java b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/TopicServiceImpl.java index ff1bd09c6..cdb34859f 100644 --- a/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/TopicServiceImpl.java +++ b/dc3-common/dc3-common-manager/src/main/java/io/github/pnoker/common/manager/service/impl/TopicServiceImpl.java @@ -47,13 +47,13 @@ import java.util.Objects; public class TopicServiceImpl extends ServiceImpl implements TopicService { @Override - public Page> query(TopicQuery topicQuery) { + public Page query(TopicQuery topicQuery) { if (Objects.isNull(topicQuery.getPage())) { topicQuery.setPage(new Pages()); } int page = (int) topicQuery.getPage().getCurrent(); int size = (int) topicQuery.getPage().getSize(); - Page> resultPage = new Page<>(page, size); + Page resultPage = new Page<>(page, size); List topicVOList = new ArrayList<>(); String topic = topicQuery.getTopic(); Long deviceIdL = null; @@ -93,9 +93,11 @@ public class TopicServiceImpl extends ServiceImpl implem int totalItems = topicVOList.size(); int fromIndex = Math.max(0, (page - 1) * size); int toIndex = Math.min(fromIndex + size, totalItems); - List> paginatedData = new ArrayList<>(); + List paginatedData; if (fromIndex < toIndex) { - paginatedData.add(topicVOList.subList(fromIndex, toIndex)); + paginatedData = topicVOList.subList(fromIndex, toIndex); + } else { + paginatedData = new ArrayList<>(); } resultPage.setRecords(paginatedData); resultPage.setTotal(totalItems); diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/HmacAuthProperties.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/HmacAuthProperties.java index 39e1fca62..73e090bcf 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/HmacAuthProperties.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/HmacAuthProperties.java @@ -21,6 +21,7 @@ import io.github.pnoker.common.constant.common.EnvironmentConstant; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.validation.annotation.Validated; /** * Shared HMAC signing properties. @@ -31,6 +32,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; */ @Getter @Setter +@Validated @ConfigurationProperties(prefix = EnvironmentConstant.AUTH_HMAC_PREFIX) public class HmacAuthProperties { diff --git a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/OkHttpProperties.java b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/OkHttpProperties.java index 09b0e9f80..e0b018b8d 100644 --- a/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/OkHttpProperties.java +++ b/dc3-common/dc3-common-public/src/main/java/io/github/pnoker/common/config/OkHttpProperties.java @@ -21,6 +21,7 @@ import io.github.pnoker.common.constant.common.EnvironmentConstant; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.validation.annotation.Validated; import java.time.Duration; @@ -33,6 +34,7 @@ import java.time.Duration; */ @Getter @Setter +@Validated @ConfigurationProperties(prefix = EnvironmentConstant.HTTP_CLIENT_PREFIX) public class OkHttpProperties { diff --git a/dc3-common/dc3-common-test/src/main/resources/application-test.yml b/dc3-common/dc3-common-test/src/main/resources/application-test.yml index 460bcd8c2..3c7d2fde3 100644 --- a/dc3-common/dc3-common-test/src/main/resources/application-test.yml +++ b/dc3-common/dc3-common-test/src/main/resources/application-test.yml @@ -21,7 +21,6 @@ spring: main: banner-mode: off - allow-bean-definition-overriding: true rabbitmq: publisher-confirm-type: correlated publisher-returns: true diff --git a/dc3-common/dc3-common-web/src/main/resources/application-web.yml b/dc3-common/dc3-common-web/src/main/resources/application-web.yml index 4d434bc0e..8ecc3c3d9 100644 --- a/dc3-common/dc3-common-web/src/main/resources/application-web.yml +++ b/dc3-common/dc3-common-web/src/main/resources/application-web.yml @@ -24,8 +24,6 @@ spring: # Enable rollback if a failure occurs during transaction commit. rollback-on-commit-failure: true main: - # Allow bean definition overriding when multiple configurations define the same bean. - allow-bean-definition-overriding: true web: resources: # Disable Spring Boot's default static resource mappings.