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

GH-3686: Apply SF editor config

Browse Source 
Fixes https://github.com/spring-projects/spring-integration/issues/3686

* Add `src/idea` with respective editor config for IntelliJ IDEA.
Must be imported into an IDE
* Add `src/eclipse` with respective editor config for Eclipse/STS
* Reformat imports in source code according a new editor config
This commit is contained in:
abilan
2022-11-14 10:55:21 -05:00
parent bca9d27a65
commit 7864658d01
1385 changed files with 7627 additions and 6931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/AttributePollingMessageSourceTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.concurrent.atomic.AtomicInteger;
import javax.management.MBeanServer;
@@ -28,6 +26,8 @@ import org.springframework.jmx.support.MBeanServerFactoryBean;
import org.springframework.jmx.support.ObjectNameManager;
import org.springframework.messaging.Message;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Mark Fisher
* @author Artem Bilan

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2020 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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -34,6 +32,8 @@ import org.springframework.messaging.PollableChannel;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Stuart Williams
* @author Gary Russell

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanTreePollingMessageSourceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2019 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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.HashMap;
import java.util.Map;
@@ -29,6 +27,8 @@ import org.junit.Test;
import org.springframework.jmx.support.MBeanServerFactoryBean;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Stuart Williams
* @author Artem Bilan

8
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationListeningMessageProducerTests.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.
@@ -16,9 +16,6 @@
package org.springframework.integration.jmx;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import java.util.concurrent.atomic.AtomicInteger;
import javax.management.MBeanServer;
@@ -43,6 +40,9 @@ import org.springframework.jmx.support.MBeanServerFactoryBean;
import org.springframework.jmx.support.ObjectNameManager;
import org.springframework.messaging.Message;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
/**
* @author Mark Fisher
* @author Artem Bilan

8
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.List;
@@ -40,6 +38,8 @@ import org.springframework.jmx.support.ObjectNameManager;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.support.GenericMessage;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Mark Fisher
* @author Artem Bilan
@@ -60,7 +60,7 @@ public class NotificationPublishingMessageHandlerTests {
this.context.registerBean("mbeanServer", MBeanServerFactoryBean.class, MBeanServerFactoryBean::new);
this.context.registerSingleton("exporter", IntegrationMBeanExporter.class,
new MutablePropertyValues()
.add("server", new RuntimeBeanReference("mbeanServer")));
.add("server", new RuntimeBeanReference("mbeanServer")));
this.context.registerSingleton("anotherExporter", MBeanExporter.class);
RootBeanDefinition publisherDefinition = new RootBeanDefinition(NotificationPublishingMessageHandler.class);

10
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/OperationInvokingMessageHandlerTests.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.
@@ -16,9 +16,6 @@
package org.springframework.integration.jmx;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -41,6 +38,9 @@ import org.springframework.jmx.support.ObjectNameManager;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessagingException;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
/**
* See DynamicRouterTests for additional tests where the MBean is registered by the Spring exporter.
*
@@ -143,7 +143,7 @@ public class OperationInvokingMessageHandlerTests {
handler.setOperationName("x");
handler.setBeanFactory(mock(BeanFactory.class));
handler.afterPropertiesSet();
List<Object> params = Arrays.asList(new Object[] { "foo", 123 });
List<Object> params = Arrays.asList(new Object[] {"foo", 123});
Message<?> message = MessageBuilder.withPayload(params).build();
handler.handleMessage(message);
Message<?> reply = outputChannel.receive(0);

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/ServiceActivatorDefaultFrameworkMethodTests.java
View File

@@ -16,9 +16,6 @@
package org.springframework.integration.jmx;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanCreationException;
@@ -37,6 +34,9 @@ import org.springframework.messaging.MessageHandler;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* See INT-1688 for background.
*

10
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -40,6 +38,8 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Gary Russell
* @since 2.1
@@ -95,7 +95,7 @@ public class UpdateMappingsTests {
MessagingTemplate messagingTemplate = new MessagingTemplate();
messagingTemplate.setReceiveTimeout(1000);
Set<ObjectName> names = this.server.queryNames(ObjectName
.getInstance("update.mapping.domain:type=MessageHandler,name=router,bean=endpoint"),
.getInstance("update.mapping.domain:type=MessageHandler,name=router,bean=endpoint"),
null);
assertThat(names.size()).isEqualTo(1);
Map<String, String> map = new HashMap<String, String>();
@@ -103,7 +103,7 @@ public class UpdateMappingsTests {
map.put("baz", "qux");
Object[] params = new Object[] {map};
this.server.invoke(names.iterator().next(), "setChannelMappings", params,
new String[] { "java.util.Map" });
new String[] {"java.util.Map"});
Map<?, ?> mappings = messagingTemplate.convertSendAndReceive(control, "@'router.handler'.getChannelMappings()", Map.class);
assertThat(mappings).isNotNull();
assertThat(mappings.size()).isEqualTo(2);

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,6 +30,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Mark Fisher
* @author Gary Russell

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -28,6 +26,8 @@ import org.springframework.messaging.MessageChannel;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Mark Fisher
* @author Gary Russell

8
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/CustomObjectNameTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2019 the original author or authors.
* Copyright 2015-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.
@@ -16,9 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -47,6 +44,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.Transactional;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
/**
* @author Gary Russell
* @since 4.2.1

21
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.HashMap;
import java.util.Map;
@@ -36,6 +34,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Oleg Zhurakousky
* @author Gary Russell
@@ -70,20 +70,22 @@ public class DynamicRouterTests {
private NullChannel nullChannel;
@Test @DirtiesContext
@Test
@DirtiesContext
public void testRouteChange() throws Exception {
routingChannel.send(new GenericMessage<String>("123"));
assertThat(processAChannel.receive(0).getPayload()).isEqualTo("123");
routingChannel.send(MessageBuilder.withPayload(123).build());
assertThat(processBChannel.receive(0).getPayload()).isEqualTo(123);
controlChannel.send(MessageBuilder.withPayload(new String[]{"java.lang.String", "processCChannel"}).build());
controlChannel.send(MessageBuilder.withPayload(new String[] {"java.lang.String", "processCChannel"}).build());
routingChannel.send(new GenericMessage<String>("123"));
assertThat(processCChannel.receive(0).getPayload()).isEqualTo("123");
}
@Test @DirtiesContext
@Test
@DirtiesContext
public void testRouteChangeMap() throws Exception {
routingChannel.send(new GenericMessage<String>("123"));
assertThat(processAChannel.receive(0).getPayload()).isEqualTo("123");
@@ -99,7 +101,8 @@ public class DynamicRouterTests {
assertThat(processCChannel.receive(0).getPayload()).isEqualTo("123");
}
@Test @DirtiesContext
@Test
@DirtiesContext
public void testRouteChangeMapNamedArgs() throws Exception {
routingChannel.send(new GenericMessage<String>("123"));
assertThat(processAChannel.receive(0).getPayload()).isEqualTo("123");
@@ -115,7 +118,9 @@ public class DynamicRouterTests {
assertThat(processCChannel.receive(0).getPayload()).isEqualTo("123");
}
@Test @DirtiesContext @Ignore
@Test
@DirtiesContext
@Ignore
public void testPerf() throws Exception {
// this.nullChannel.enableStats(false);
for (int i = 0; i < 1000000000; i++) {

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanAutoDetectTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import javax.management.MBeanServer;
@@ -28,6 +26,8 @@ import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
* @author Artem Bilan

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Properties;
import javax.management.MBeanServer;
@@ -31,6 +29,8 @@ import org.springframework.integration.test.util.TestUtils;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Mark Fisher
* @author Oleg Zhurakousky

7
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationCustomNamingTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2019 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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import javax.management.MBeanServer;
@@ -34,6 +32,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
* @author Gary Russell
@@ -73,6 +73,7 @@ public class MBeanRegistrationCustomNamingTests {
public static class Namer implements ObjectNamingStrategy {
private final ObjectNamingStrategy realNamer = new KeyNamingStrategy();
@Override
public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException {
String actualBeanKey = beanKey.replace("type=", "type=Integration,componentType=");

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -36,6 +34,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
* @author Gary Russell

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanTreePollingChannelAdapterParserTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.HashMap;
import java.util.Map;
@@ -36,6 +34,8 @@ import org.springframework.messaging.PollableChannel;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Stuart Williams
* @author Gary Russell

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MessageStoreTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import javax.management.MBeanServer;
@@ -31,6 +29,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
* @author Gary Russell

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MethodInvokerTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import javax.management.MBeanServer;
@@ -34,6 +32,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
* @author Gary Russell

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import javax.management.Notification;
import org.junit.Test;
@@ -34,6 +32,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Mark Fisher
* @author Gary Russell

13
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.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.
@@ -16,9 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import java.util.Set;
import javax.management.Attribute;
@@ -44,6 +41,9 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
/**
* @author Mark Fisher
* @author Artem Bilan
@@ -141,7 +141,8 @@ public class NotificationPublishingChannelAdapterParserTests {
assertThat(names.size()).isEqualTo(1);
}
@Test @DirtiesContext
@Test
@DirtiesContext
public void changeMessageHistoryPatterns() throws Exception {
Set<ObjectInstance> mbeans = server.queryMBeans(null, null);
boolean tested = false;
@@ -159,7 +160,7 @@ public class NotificationPublishingChannelAdapterParserTests {
catch (Exception e) {
throw e;
}
server.invoke(objectName, "stop", new Object[]{}, new String[]{});
server.invoke(objectName, "stop", new Object[] {}, new String[] {});
server.setAttribute(objectName, new Attribute("ComponentNamePatternsString", "foo, bar"));
assertThat(server.getAttribute(objectName, "ComponentNamePatternsString")).isEqualTo("bar,foo");
tested = true;

12
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 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.
@@ -16,11 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.willReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -39,6 +34,11 @@ import org.springframework.messaging.support.GenericMessage;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.willReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
/**
* @author Mark Fisher
* @author Oleg Zhurakousky

11
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.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.
@@ -16,9 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -44,6 +41,9 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
/**
* @author Oleg Zhurakousky
@@ -79,7 +79,6 @@ public class OperationInvokingOutboundGatewayTests {
private MessageHandler operationInvokingWithinChain;
private static volatile int adviceCalled;
@After
@@ -100,7 +99,7 @@ public class OperationInvokingOutboundGatewayTests {
@Test
public void gatewayWithPrimitiveArgs() throws Exception {
primitiveChannel.send(new GenericMessage<Object[]>(new Object[] { true, 0L, 1 }));
primitiveChannel.send(new GenericMessage<Object[]>(new Object[] {true, 0L, 1}));
assertThat(testBean.messages.size()).isEqualTo(1);
List<Object> argList = new ArrayList<Object>();
argList.add(false);

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import javax.management.MBeanServer;
@@ -31,6 +29,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
* @author Gary Russell

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PriorityChannelTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import javax.management.MBeanServer;
@@ -33,6 +31,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
* @author Gary Russell

14
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
@@ -33,6 +31,8 @@ import org.junit.runners.Parameterized.Parameters;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
* @since 2.0
@@ -52,10 +52,10 @@ public class RouterMBeanTests {
@Parameters
public static List<Object[]> getParameters() {
return Arrays.asList(
new Object[] { "RouterMBeanTests-context.xml" },
new Object[] { "RouterMBeanGatewayTests-context.xml" },
new Object[] { "RouterMBeanNoneTests-context.xml" },
new Object[] { "RouterMBeanSwitchTests-context.xml" });
new Object[] {"RouterMBeanTests-context.xml"},
new Object[] {"RouterMBeanGatewayTests-context.xml"},
new Object[] {"RouterMBeanNoneTests-context.xml"},
new Object[] {"RouterMBeanSwitchTests-context.xml"});
}
@After

6
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanVanillaTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.config;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import javax.management.MBeanServer;
@@ -31,6 +29,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
* @author Gary Russell

8
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/SimpleDynamicRouter.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.
@@ -27,6 +27,7 @@ import org.springframework.util.Assert;
* @author Oleg Zhurakousky
*
*/
/**
*
*
@@ -34,6 +35,7 @@ import org.springframework.util.Assert;
@ManagedResource
public class SimpleDynamicRouter {
private final Map<String, String> channelMappings = new HashMap<String, String>();
/**
*
* @param channelMappings
@@ -44,6 +46,7 @@ public class SimpleDynamicRouter {
this.channelMappings.put(key, channelMappings.get(key));
}
}
/**
*
* @param key
@@ -53,6 +56,7 @@ public class SimpleDynamicRouter {
public void addChannelMapping(String key, String channelName) {
this.channelMappings.put(key, channelName);
}
/**
*
* @param key
@@ -60,12 +64,14 @@ public class SimpleDynamicRouter {
public void removeChannelMapping(String key) {
this.channelMappings.remove(key);
}
/**
*
*/
public Map<String, String> getChannelMappings() {
return channelMappings;
}
/**
*
* @param key

3
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/TestPublisher.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.
@@ -41,6 +41,7 @@ public class TestPublisher implements NotificationPublisherAware, BeanNameAware
public void setBeanName(String name) {
this.beanName = name;
}
public void send(String s) {
Notification notification = new Notification("test.type",
"org.springframework.integration.jmx.config:type=TestPublisher,name=" + this.beanName, 1, s);

4
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/configuration/DslMBeanTests.java
View File

@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.configuration;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import javax.management.MBeanServer;
@@ -36,6 +34,8 @@ import org.springframework.jmx.support.MBeanServerFactoryBean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Gary Russell
* @author Artem Bilan

8
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/configuration/EnableMBeanExportTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2021 the original author or authors.
* Copyright 2014-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.
@@ -16,8 +16,6 @@
package org.springframework.integration.jmx.configuration;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
import java.util.Set;
@@ -45,6 +43,8 @@ import org.springframework.mock.env.MockEnvironment;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Artem Bilan
* @author Gary Russell
@@ -105,7 +105,7 @@ public class EnableMBeanExportTests {
@EnableIntegrationMBeanExport(
server = "#{mbeanServer}",
defaultDomain = "${managed.domain}",
managedComponents = { "input", "${managed.component}" })
managedComponents = {"input", "${managed.component}"})
@EnableIntegrationManagement(defaultLoggingEnabled = "false")
public static class ContextConfiguration {

10
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.monitor;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,6 +25,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Oleg Zhurakousky
* @author Gunnar Hillert
@@ -52,7 +52,9 @@ public class ChainWithMessageProducingHandlersTests {
return value;
}
}
public static class SampleService {
public void echo(String value) { }
public void echo(String value) {
}
}
}

6
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/HandlerMonitoringIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2009-2020 the original author or authors.
* Copyright 2009-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.
@@ -16,8 +16,6 @@
package org.springframework.integration.monitor;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import org.apache.commons.logging.Log;
@@ -31,6 +29,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.support.GenericMessage;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
* @author Gary Russell

8
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2009-2020 the original author or authors.
* Copyright 2009-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.
@@ -16,9 +16,6 @@
package org.springframework.integration.monitor;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import java.util.Arrays;
import java.util.Date;
import java.util.Set;
@@ -54,6 +51,9 @@ import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.util.Assert;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
/**
* @author Dave Syer
* @author Gary Russell

4
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageMetricsAdviceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2011-2019 the original author or authors.
* Copyright 2011-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.
@@ -76,7 +76,7 @@ public class MessageMetricsAdviceTests {
this.beanDefinitionRegistry.registerBeanDefinition("test",
BeanDefinitionBuilder.genericBeanDefinition(MessageHandler.class, () -> advised)
.getRawBeanDefinition());
.getRawBeanDefinition());
MessageHandler exported = this.beanFactory.getBean("test", MessageHandler.class);
exported.handleMessage(MessageBuilder.withPayload("test").build());

6
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageSourceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 the original author or authors.
* Copyright 2016-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.
@@ -16,8 +16,6 @@
package org.springframework.integration.monitor;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import javax.management.Attribute;
@@ -41,6 +39,8 @@ import org.springframework.messaging.PollableChannel;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Gary Russell
* @since 5.0

6
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessagingGatewaySupportRegistrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2019 the original author or authors.
* Copyright 2015-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.
@@ -16,8 +16,6 @@
package org.springframework.integration.monitor;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import javax.management.MBeanServer;
@@ -39,6 +37,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Artem Bilan
* @author Gary Russell

7
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/RemoteMBeanServerTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.monitor;
import static org.assertj.core.api.Assertions.assertThat;
import javax.management.Notification;
import org.junit.Test;
@@ -32,6 +30,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* To run, add JVM Args:
* <p>
@@ -109,6 +109,5 @@ public class RemoteMBeanServerTests {
return "bar";
}
}
}

4
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ScatterGatherHandlerIntegrationTests.java
View File

@@ -16,8 +16,6 @@
package org.springframework.integration.monitor;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Executor;
@@ -56,6 +54,8 @@ import org.springframework.messaging.support.MessageBuilder;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Artem Bilan
* @author Gary Russell

6
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/TransformerContextTests.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.
@@ -16,8 +16,6 @@
package org.springframework.integration.monitor;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,6 +31,8 @@ import org.springframework.messaging.support.GenericMessage;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Mark Fisher
* @author Gary Russell

6
spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/Int2307Tests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 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.
@@ -16,8 +16,6 @@
package org.springframework.integration_.mbeanexporterhelper;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
import java.util.Set;
@@ -30,6 +28,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.jmx.export.MBeanExporter;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Oleg Zhurakousky
* @author Gary Russell