Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rework infra logic onto IntegrationProperties (#3881)

Browse Source 
* Rework infra logic onto IntegrationProperties

The `Properties` bean has been deprecated since `5.5`

* Register a default `integrationGlobalProperties` as a `IntegrationProperties`
* Fix respective usages from the `Properties`

* * Remove unused constant from the `IntegrationContextUtils`

* * Fix language in the `whats-new.adoc`

Co-authored-by: Gary Russell <grussell@vmware.com>

Co-authored-by: Gary Russell <grussell@vmware.com>
This commit is contained in:
Artem Bilan
2022-09-06 10:50:34 -04:00
committed by GitHub
parent 8d241c60d2
commit 15e89c3b62
14 changed files with 105 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-integration-core/src/test/java/org/springframework/integration/context/IntegrationContextTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2021 the original author or authors.
* Copyright 2013-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@ package org.springframework.integration.context;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Properties;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +37,7 @@ public class IntegrationContextTests {
@Autowired
@Qualifier(IntegrationContextUtils.INTEGRATION_GLOBAL_PROPERTIES_BEAN_NAME)
private Properties integrationProperties;
private IntegrationProperties integrationProperties;
@Autowired
@Qualifier("fooService")
@@ -53,12 +51,10 @@ public class IntegrationContextTests {
private ThreadPoolTaskScheduler taskScheduler;
@Test
@SuppressWarnings("deprecation")
public void testIntegrationContextComponents() {
assertThat(this.integrationProperties.get(IntegrationProperties.THROW_EXCEPTION_ON_LATE_REPLY))
.isEqualTo("true");
assertThat(this.integrationProperties.get(IntegrationProperties.TASK_SCHEDULER_POOL_SIZE)).isEqualTo("20");
assertThat(this.serviceActivator.getIntegrationProperties()).isEqualTo(this.integrationProperties);
assertThat(this.integrationProperties.isMessagingTemplateThrowExceptionOnLateReply()).isTrue();
assertThat(this.integrationProperties.getTaskSchedulerPoolSize()).isEqualTo(20);
assertThat(this.serviceActivator.getIntegrationProperties()).isSameAs(this.integrationProperties);
assertThat(TestUtils.getPropertyValue(this.taskScheduler, "poolSize")).isEqualTo(20);
assertThat(this.serviceActivator.isAutoStartup()).isFalse();
assertThat(this.serviceActivator.isRunning()).isFalse();