diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd index b08d3033cc..7a0c74f795 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd @@ -370,6 +370,7 @@ + diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml index 338aaa2c0f..3173f7fd5c 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml @@ -17,7 +17,9 @@ amqp-template="amqpTemplate" auto-startup="false" order="5" - return-channel="returnChannel"/> + return-channel="returnChannel"> + + @@ -25,7 +27,9 @@ - + + + diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests-context.xml index 3fd372132c..7fef86f1bc 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests-context.xml +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests-context.xml @@ -55,9 +55,13 @@ mapped-request-headers="foo*" amqp-template="amqpTemplateConfirmsAdapter" confirm-correlation-expression="headers['amqp_confirmCorrelationData']" - confirm-ack-channel="ackChannel" /> + confirm-ack-channel="ackChannel" > + + - + + + diff --git a/spring-integration-core/src/main/resources/META-INF/spring.schemas b/spring-integration-core/src/main/resources/META-INF/spring.schemas index d3ad83e1fe..ce566aeee2 100644 --- a/spring-integration-core/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-core/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/spring-integration-4.3.xsd=org/springframework/integration/config/xml/spring-integration-4.3.xsd -http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-4.3.xsd +http\://www.springframework.org/schema/integration/spring-integration-4.3.xsd=org/springframework/integration/config/spring-integration-4.3.xsd +http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/spring-integration-4.3.xsd diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.3.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd similarity index 100% rename from spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.3.xsd rename to spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration.gif b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration.gif similarity index 100% rename from spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration.gif rename to spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration.gif diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.3.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.3.xsd index c66f9dbd8a..aac3c2a17d 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.3.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.3.xsd @@ -24,6 +24,7 @@ + diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml index 3930e621de..680a1c2f0a 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + - + + remote-filename-generator="fileNameGenerator"> + + @@ -69,7 +71,9 @@ - + + + diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java index 2cf3627fbc..4544230ecb 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2016 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. @@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; +import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.file.DefaultFileNameGenerator; import org.springframework.integration.file.FileNameGenerator; import org.springframework.integration.file.remote.handler.FileTransferringMessageHandler; @@ -53,6 +54,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @author Oleg Zhurakousky * @author Gary Russell * @author Gunnar Hillert + * @author Artem Bilan * @since 2.0 */ @ContextConfiguration @@ -78,7 +80,7 @@ public class FtpOutboundChannelAdapterParserTests { private EventDrivenConsumer ftpOutbound2; @Autowired - private EventDrivenConsumer ftpOutbound3; + private PollingConsumer ftpOutbound3; @Autowired private PublishSubscribeChannel ftpChannel; @@ -87,10 +89,11 @@ public class FtpOutboundChannelAdapterParserTests { private FileNameGenerator fileNameGenerator; @Test - public void testFtpOutboundChannelAdapterComplete() throws Exception{ + public void testFtpOutboundChannelAdapterComplete() throws Exception { assertEquals(ftpChannel, TestUtils.getPropertyValue(ftpOutbound, "inputChannel")); assertEquals("ftpOutbound", ftpOutbound.getComponentName()); - FileTransferringMessageHandler handler = TestUtils.getPropertyValue(ftpOutbound, "handler", FileTransferringMessageHandler.class); + FileTransferringMessageHandler handler = + TestUtils.getPropertyValue(ftpOutbound, "handler", FileTransferringMessageHandler.class); String remoteFileSeparator = (String) TestUtils.getPropertyValue(handler, "remoteFileTemplate.remoteFileSeparator"); assertNotNull(remoteFileSeparator); assertEquals(".foo", TestUtils.getPropertyValue(handler, "remoteFileTemplate.temporaryFileSuffix", String.class)); @@ -106,21 +109,18 @@ public class FtpOutboundChannelAdapterParserTests { assertEquals(22, TestUtils.getPropertyValue(sessionFactory, "port")); assertEquals(23, TestUtils.getPropertyValue(handler, "order")); //verify subscription order + Object dispatcher = TestUtils.getPropertyValue(ftpChannel, "dispatcher"); @SuppressWarnings("unchecked") - Set handlers = (Set) TestUtils - .getPropertyValue( - TestUtils.getPropertyValue(ftpChannel, "dispatcher"), - "handlers"); + Set handlers = (Set) TestUtils.getPropertyValue(dispatcher, "handlers"); Iterator iterator = handlers.iterator(); assertSame(TestUtils.getPropertyValue(this.ftpOutbound2, "handler"), iterator.next()); assertSame(handler, iterator.next()); assertEquals(FileExistsMode.APPEND, TestUtils.getPropertyValue(ftpOutbound, "handler.mode")); } - @SuppressWarnings("resource") - @Test(expected=BeanCreationException.class) - public void testFailWithEmptyRfsAndAcdTrue() throws Exception{ - new ClassPathXmlApplicationContext("FtpOutboundChannelAdapterParserTests-fail.xml", this.getClass()); + @Test(expected = BeanCreationException.class) + public void testFailWithEmptyRfsAndAcdTrue() throws Exception { + new ClassPathXmlApplicationContext("FtpOutboundChannelAdapterParserTests-fail.xml", this.getClass()).close(); } @Test @@ -142,13 +142,14 @@ public class FtpOutboundChannelAdapterParserTests { @Test public void testTemporaryFileSuffix() { FileTransferringMessageHandler handler = - (FileTransferringMessageHandler)TestUtils.getPropertyValue(ftpOutbound3, "handler"); - assertFalse((Boolean)TestUtils.getPropertyValue(handler,"remoteFileTemplate.useTemporaryFileName")); + (FileTransferringMessageHandler) TestUtils.getPropertyValue(ftpOutbound3, "handler"); + assertFalse(TestUtils.getPropertyValue(handler, "remoteFileTemplate.useTemporaryFileName", Boolean.class)); } @Test - public void testBeanExpressions() throws Exception{ - FileTransferringMessageHandler handler = TestUtils.getPropertyValue(withBeanExpressions, "handler", FileTransferringMessageHandler.class); + public void testBeanExpressions() throws Exception { + FileTransferringMessageHandler handler = + TestUtils.getPropertyValue(withBeanExpressions, "handler", FileTransferringMessageHandler.class); ExpressionEvaluatingMessageProcessor dirExpProc = TestUtils.getPropertyValue(handler, "remoteFileTemplate.directoryExpressionProcessor", ExpressionEvaluatingMessageProcessor.class); assertNotNull(dirExpProc); @@ -173,4 +174,5 @@ public class FtpOutboundChannelAdapterParserTests { } } + } diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd index d5ff36483e..cbbcc6a480 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.3.xsd @@ -134,7 +134,7 @@ writes Message to a Gemfire cache - + @@ -144,6 +144,7 @@ + diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests-context.xml b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests-context.xml index 1beb540ae9..9bfb1fcbc2 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests-context.xml @@ -10,9 +10,12 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + + + + diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests.java index d1a706ac91..3df99add9c 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2016 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. You may obtain a copy of the License at @@ -14,9 +14,13 @@ package org.springframework.integration.gemfire.config.xml; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.springframework.integration.gemfire.config.xml.ParserTestUtil.createFakeParserContext; import static org.springframework.integration.gemfire.config.xml.ParserTestUtil.loadXMLFrom; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + import org.junit.Test; import org.junit.runner.RunWith; import org.w3c.dom.Element; @@ -30,20 +34,23 @@ import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvi import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; 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; /** * @author Dan Oxlade * @author Liujiong + * @author Artem Bilan */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration +@DirtiesContext public class GemfireOutboundChannelAdapterParserTests { private GemfireOutboundChannelAdapterParser underTest = new GemfireOutboundChannelAdapterParser(); - private volatile static int adviceCalled; + private static final CountDownLatch adviceCalled = new CountDownLatch(1); @Autowired @Qualifier("adapter") @@ -60,11 +67,11 @@ public class GemfireOutboundChannelAdapterParserTests { } @Test - public void withAdvice() { + public void withAdvice() throws InterruptedException { adapter1.start(); MessageChannel channel = ctx.getBean("input", MessageChannel.class); channel.send(new GenericMessage("foo")); - assertEquals(1, adviceCalled); + assertTrue(adviceCalled.await(10, TimeUnit.SECONDS)); } @Test @@ -81,7 +88,7 @@ public class GemfireOutboundChannelAdapterParserTests { @Override protected Object doInvoke(ExecutionCallback callback, Object target, Message message) throws Exception { - adviceCalled++; + adviceCalled.countDown(); return null; } diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.3.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.3.xsd index 176b5004bd..fec0ae2e35 100644 --- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.3.xsd +++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.3.xsd @@ -68,6 +68,7 @@ + @@ -203,6 +204,7 @@ + @@ -343,6 +345,7 @@ + diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml index b18a079239..a03d72240b 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml @@ -143,9 +143,12 @@ order="12" /> - + + + + @@ -173,12 +176,15 @@ - + + + + @@ -229,13 +235,16 @@ phase="127" /> - + + + + diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java index 814e163277..8f0801dd9a 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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,8 @@ import static org.mockito.Mockito.mock; import java.util.Iterator; import java.util.Set; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import org.junit.Test; import org.junit.runner.RunWith; @@ -76,16 +78,19 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.TaskScheduler; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author Gary Russell * @author Oleg Zhurakousky + * @author Artem Bilan * @since 2.0 */ @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) +@DirtiesContext public class ParserUnitTests { @Autowired @@ -213,19 +218,19 @@ public class ParserUnitTests { private MessageChannel errorChannel; @Autowired - private DirectChannel udpChannel; + private MessageChannel udpChannel; @Autowired - private DirectChannel udpAdviceChannel; + private MessageChannel udpAdviceChannel; @Autowired - private DirectChannel tcpAdviceChannel; + private MessageChannel tcpAdviceChannel; @Autowired - private DirectChannel tcpAdviceGateChannel; + private MessageChannel tcpAdviceGateChannel; @Autowired - private DirectChannel tcpChannel; + private MessageChannel tcpChannel; @Autowired TcpReceivingChannelAdapter tcpInClientMode; @@ -274,7 +279,7 @@ public class ParserUnitTests { @Autowired QueueChannel eventChannel; - private static volatile int adviceCalled; + private static CountDownLatch adviceCalled = new CountDownLatch(1); @Test public void testInUdp() { @@ -409,24 +414,24 @@ public class ParserUnitTests { } @Test - public void udpAdvice() { - adviceCalled = 0; + public void udpAdvice() throws InterruptedException { + adviceCalled = new CountDownLatch(1); this.udpAdviceChannel.send(new GenericMessage("foo")); - assertEquals(1, adviceCalled); + assertTrue(adviceCalled.await(10, TimeUnit.SECONDS)); } @Test - public void tcpAdvice() { - adviceCalled = 0; + public void tcpAdvice() throws InterruptedException { + adviceCalled = new CountDownLatch(1); this.tcpAdviceChannel.send(new GenericMessage("foo")); - assertEquals(1, adviceCalled); + assertTrue(adviceCalled.await(10, TimeUnit.SECONDS)); } @Test - public void tcpGatewayAdvice() { - adviceCalled = 0; + public void tcpGatewayAdvice() throws InterruptedException { + adviceCalled = new CountDownLatch(1); this.tcpAdviceGateChannel.send(new GenericMessage("foo")); - assertEquals(1, adviceCalled); + assertTrue(adviceCalled.await(10, TimeUnit.SECONDS)); } @Test @@ -693,7 +698,7 @@ public class ParserUnitTests { @Override protected Object doInvoke(ExecutionCallback callback, Object target, Message message) throws Exception { - adviceCalled++; + adviceCalled.countDown(); return null; } diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.3.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.3.xsd index 38f8d17ba5..646c49e936 100644 --- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.3.xsd +++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.3.xsd @@ -721,6 +721,7 @@ + diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests-context.xml index 174d3325d3..505a928902 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests-context.xml +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests-context.xml @@ -18,7 +18,13 @@ - + + + + + + + + diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java index 35ff099c5f..1017a0ebba 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2016 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,10 @@ package org.springframework.integration.jdbc; +import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.sql.CallableStatement; @@ -48,8 +50,10 @@ import org.springframework.integration.support.json.JsonOutboundMessageMapper; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.SqlReturnType; import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; @@ -73,10 +77,14 @@ public class StoredProcOutboundGatewayWithSpelIntegrationTests { @Autowired @Qualifier("startChannel") - DirectChannel channel; + MessageChannel channel; @Autowired - DirectChannel getMessageChannel; + @Qualifier("startErrorsChannel") + PollableChannel startErrorsChannel; + + @Autowired + MessageChannel getMessageChannel; @Autowired PollableChannel output2Channel; @@ -95,8 +103,8 @@ public class StoredProcOutboundGatewayWithSpelIntegrationTests { User user2 = new User("Second User", "my second password", "email2"); Message user1Message = MessageBuilder.withPayload(user1) - .setHeader("my_stored_procedure", "CREATE_USER") - .build(); + .setHeader("my_stored_procedure", "CREATE_USER") + .build(); Message user2Message = MessageBuilder.withPayload(user2) .setHeader("my_stored_procedure", "CREATE_USER_RETURN_ALL") .build(); @@ -132,19 +140,18 @@ public class StoredProcOutboundGatewayWithSpelIntegrationTests { Message user1Message = MessageBuilder.withPayload(user1).build(); - try { - channel.send(user1Message); - } catch (MessageHandlingException e) { + this.channel.send(user1Message); - String expectedMessage = "Unable to resolve Stored Procedure/Function name " + - "for the provided Expression 'headers['my_stored_procedure']'."; - String actualMessage = e.getCause().getMessage(); - Assert.assertEquals(expectedMessage, actualMessage); - return; - } + Message receive = this.startErrorsChannel.receive(1000); + assertNotNull(receive); + assertThat(receive, instanceOf(ErrorMessage.class)); - Assert.fail("Expected a MessageHandlingException to be thrown."); + MessageHandlingException exception = (MessageHandlingException) receive.getPayload(); + String expectedMessage = "Unable to resolve Stored Procedure/Function name " + + "for the provided Expression 'headers['my_stored_procedure']'."; + String actualMessage = exception.getCause().getMessage(); + Assert.assertEquals(expectedMessage, actualMessage); } @Test @@ -161,7 +168,8 @@ public class StoredProcOutboundGatewayWithSpelIntegrationTests { assertNotNull(resultMessage); Object resultPayload = resultMessage.getPayload(); assertTrue(resultPayload instanceof String); - Message message = new JsonInboundMessageMapper(String.class, new Jackson2JsonMessageParser()).toMessage((String) resultPayload); + Message message = new JsonInboundMessageMapper(String.class, new Jackson2JsonMessageParser()) + .toMessage((String) resultPayload); assertEquals(testMessage.getPayload(), message.getPayload()); assertEquals(testMessage.getHeaders().get("FOO"), message.getHeaders().get("FOO")); Mockito.verify(clobSqlReturnType).getTypeValue(Mockito.any(CallableStatement.class), @@ -173,11 +181,11 @@ public class StoredProcOutboundGatewayWithSpelIntegrationTests { private final AtomicInteger count = new AtomicInteger(); public Integer next() throws InterruptedException { - if (count.get()>2){ + if (count.get() > 2) { //prevent message overload return null; } - return Integer.valueOf(count.incrementAndGet()); + return count.incrementAndGet(); } } @@ -200,4 +208,5 @@ public class StoredProcOutboundGatewayWithSpelIntegrationTests { } } + } diff --git a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.3.xsd b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.3.xsd index dfea3f0ac5..29de3c459d 100644 --- a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.3.xsd +++ b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.3.xsd @@ -72,6 +72,7 @@ + @@ -100,6 +101,7 @@ + diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests-context.xml index e9e3dd8e8e..af1181c047 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests-context.xml +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests-context.xml @@ -16,7 +16,9 @@ - + + + @@ -28,6 +30,7 @@ reply-channel="withReplyChannelOutput" object-name="org.springframework.integration.jmx.config:type=TestBean,name=testBeanGateway" operation-name="testWithReturn"> + diff --git a/spring-integration-jpa/src/main/resources/META-INF/spring.schemas b/spring-integration-jpa/src/main/resources/META-INF/spring.schemas index 4b926a85e6..7c4dd316ca 100644 --- a/spring-integration-jpa/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-jpa/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.3.xsd=org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.3.xsd -http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa.xsd=org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.3.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa-4.3.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-4.3.xsd +http\://www.springframework.org/schema/integration/jpa/spring-integration-jpa.xsd=org/springframework/integration/jpa/config/spring-integration-jpa-4.3.xsd diff --git a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.3.xsd b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-4.3.xsd similarity index 100% rename from spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.3.xsd rename to spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa-4.3.xsd diff --git a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa.gif b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa.gif similarity index 100% rename from spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa.gif rename to spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/spring-integration-jpa.gif diff --git a/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas b/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas index cdd717d82e..38b237e041 100644 --- a/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-mqtt/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.3.xsd=org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.3.xsd -http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt.xsd=org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.3.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt-4.3.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-4.3.xsd +http\://www.springframework.org/schema/integration/mqtt/spring-integration-mqtt.xsd=org/springframework/integration/mqtt/config/spring-integration-mqtt-4.3.xsd diff --git a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.3.xsd b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-4.3.xsd similarity index 100% rename from spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.3.xsd rename to spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt-4.3.xsd diff --git a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqtt.gif b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt.gif similarity index 100% rename from spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqtt.gif rename to spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/spring-integration-mqtt.gif diff --git a/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas b/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas index 4ac55555aa..dc7a3cebe5 100644 --- a/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-zookeeper/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-4.3.xsd=org/springframework/integration/zookeeper/config/xml/spring-integration-zookeeper-4.3.xsd -http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper.xsd=org/springframework/integration/zookeeper/config/xml/spring-integration-zookeeper-4.3.xsd +http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper-4.3.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-4.3.xsd +http\://www.springframework.org/schema/integration/zookeeper/spring-integration-zookeeper.xsd=org/springframework/integration/zookeeper/config/spring-integration-zookeeper-4.3.xsd diff --git a/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/xml/spring-integration-zookeeper-4.3.xsd b/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-4.3.xsd similarity index 100% rename from spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/xml/spring-integration-zookeeper-4.3.xsd rename to spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper-4.3.xsd diff --git a/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/xml/spring-integration-zookeeper.gif b/spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper.gif similarity index 100% rename from spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/xml/spring-integration-zookeeper.gif rename to spring-integration-zookeeper/src/main/resources/org/springframework/integration/zookeeper/config/spring-integration-zookeeper.gif