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

Fix ControlBusTests for DefaultHeaderChannelReg

Browse Source 
We cannot use a `DFA` to set value to the `record` property:
it is marked as `trustedFinal` and cannot be modified via reflection.
Therefore, rework `ControlBusTests` to do other logic than reflection.
The reflection in the unit test is not a justification to stay away
from the `record` structure
This commit is contained in:
Artem Bilan
2022-01-13 12:40:55 -05:00
parent 8e7a0a0de5
commit c28e251091
3 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java
View File

@@ -186,11 +186,12 @@ public class DefaultHeaderChannelRegistry extends IntegrationObjectSupport
else {
messageChannelWrapper = this.channels.get(name);
}
if (messageChannelWrapper != null) {
logger.debug(() -> "Retrieved " + messageChannelWrapper.getChannel() + " with " + name);
}
return messageChannelWrapper == null ? null : messageChannelWrapper.getChannel();
if (messageChannelWrapper != null) {
MessageChannel channel = messageChannelWrapper.channel();
logger.debug(() -> "Retrieved " + channel + " with " + name);
return channel;
}
}
return null;
}
@@ -215,8 +216,8 @@ public class DefaultHeaderChannelRegistry extends IntegrationObjectSupport
long now = System.currentTimeMillis();
while (iterator.hasNext()) {
Entry<String, MessageChannelWrapper> entry = iterator.next();
if (entry.getValue().getExpireAt() < now) {
logger.debug(() -> "Expiring " + entry.getKey() + " (" + entry.getValue().getChannel() + ")");
if (entry.getValue().expireAt() < now) {
logger.debug(() -> "Expiring " + entry.getKey() + " (" + entry.getValue().channel() + ")");
iterator.remove();
}
}
@@ -228,15 +229,7 @@ public class DefaultHeaderChannelRegistry extends IntegrationObjectSupport
}
protected record MessageChannelWrapper(MessageChannel channel, long expireAt) {
public long getExpireAt() {
return this.expireAt;
}
public MessageChannel getChannel() {
return this.channel;
}
protected static final record MessageChannelWrapper(MessageChannel channel, long expireAt) {
}

7
spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests-context.xml
View File

@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns="http://www.springframework.org/schema/integration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:groovy="http://www.springframework.org/schema/integration/groovy"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/integration
https://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans.xsd">
<beans:bean id="integrationHeaderChannelRegistry"
class="org.springframework.integration.channel.DefaultHeaderChannelRegistry">
<beans:constructor-arg value="1000"/>
</beans:bean>
<channel id="output">
<queue/>
</channel>

30
spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-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.
@@ -23,10 +23,8 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -34,15 +32,13 @@ import org.springframework.integration.channel.DefaultHeaderChannelRegistry;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.jmx.export.annotation.ManagedOperation;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
* @author Dave Syer
@@ -52,8 +48,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*
* @since 2.0
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
@SpringJUnitConfig
@DirtiesContext
public class ControlBusTests {
@@ -71,7 +66,10 @@ public class ControlBusTests {
@Test
public void testDefaultEvaluationContext() {
Message<?> message = MessageBuilder.withPayload("@service.convert('aardvark')+headers.foo").setHeader("foo", "bar").build();
Message<?> message =
MessageBuilder.withPayload("@service.convert('aardvark')+headers.foo")
.setHeader("foo", "bar")
.build();
this.input.send(message);
assertThat(output.receive(0).getPayload()).isEqualTo("catbar");
assertThat(output.receive(0)).isNull();
@@ -106,17 +104,12 @@ public class ControlBusTests {
// No channels in the registry
assertThat(result.getPayload()).isEqualTo(0);
this.registry.channelToChannelName(new DirectChannel());
// Sleep a bit to be sure that we aren't reaped by registry TTL as 60000
Thread.sleep(10);
messagingTemplate.convertAndSend(input, "@integrationHeaderChannelRegistry.size()");
result = this.output.receive(0);
assertThat(result).isNotNull();
assertThat(result.getPayload()).isEqualTo(1);
// Some DirectFieldAccessor magic to modify 'expireAt' to the past to avoid timing issues on high-loaded build
Object messageChannelWrapper =
TestUtils.getPropertyValue(this.registry, "channels", Map.class).values().iterator().next();
DirectFieldAccessor dfa = new DirectFieldAccessor(messageChannelWrapper);
dfa.setPropertyValue("expireAt", System.currentTimeMillis() - 60000);
// Let the registry to reap old channels
Thread.sleep(1000);
messagingTemplate.convertAndSend(input, "@integrationHeaderChannelRegistry.runReaper()");
messagingTemplate.convertAndSend(input, "@integrationHeaderChannelRegistry.size()");
result = this.output.receive(0);
@@ -161,8 +154,9 @@ public class ControlBusTests {
}
public static class AdapterService {
public Message<String> receive() {
return new GenericMessage<String>(new Date().toString());
return new GenericMessage<>(new Date().toString());
}
}