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

checkstyle MutableException

Browse Source 
checkstyle EmptyBlock

checkstyle fixRightCurly Script

checkstyle EmptyStatement

checkstyle RightCurly

checkstyle TailingWhite

checkstyle NeedBraces

Fix the line separator in the `fixRightCurly.gradle`
This commit is contained in:
Gary Russell
2016-04-05 09:44:19 -04:00
committed by Artem Bilan
parent c0b19e61b5
commit 842aded9a4
271 changed files with 1094 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsNamespaceHandler.java
View File

@@ -21,7 +21,7 @@ import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHa
/**
* Namespace handler for Spring Integration's <em>jms</em> namespace.
*
*
* @author Mark Fisher
*/
public class JmsNamespaceHandler extends AbstractIntegrationNamespaceHandler {

4
spring-integration-jms/src/test/java/org/springframework/integration/jms/StubTextMessage.java
View File

@@ -25,7 +25,7 @@ import javax.jms.TextMessage;
/**
* Stub JMS Message implementation intended for testing purposes only.
*
*
* @author Mark Fisher
*/
public class StubTextMessage implements TextMessage {
@@ -35,7 +35,7 @@ public class StubTextMessage implements TextMessage {
private String text;
private int deliveryMode = DEFAULT_DELIVERY_MODE;
private Destination destination;
private String correlationId;

3
spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java
View File

@@ -401,7 +401,8 @@ public class SubscribableJmsChannelTests {
}
try {
Thread.sleep(100);
} catch (InterruptedException e) { }
}
catch (InterruptedException e) { }
timeout -= 100;
}
return false;

14
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java
View File

@@ -38,7 +38,7 @@ import org.springframework.jms.core.MessageCreator;
* @author Oleg Zhurakousky
*/
public class ExceptionHandlingSiConsumerTests {
@Test
public void nonSiProducer_siConsumer_sync_withReturn() throws Exception {
ActiveMqTestUtils.prepare();
@@ -47,7 +47,7 @@ public class ExceptionHandlingSiConsumerTests {
Destination request = applicationContext.getBean("requestQueueA", Destination.class);
final Destination reply = applicationContext.getBean("replyQueueA", Destination.class);
jmsTemplate.send(request, new MessageCreator() {
public Message createMessage(Session session) throws JMSException {
TextMessage message = session.createTextMessage();
message.setText("echoChannel");
@@ -57,10 +57,10 @@ public class ExceptionHandlingSiConsumerTests {
});
Message message = jmsTemplate.receive(reply);
assertNotNull(message);
applicationContext.close();
applicationContext.close();
}
@Test
@Test
public void nonSiProducer_siConsumer_sync_withReturnNoException() throws Exception {
ActiveMqTestUtils.prepare();
ConfigurableApplicationContext applicationContext = new ClassPathXmlApplicationContext("Exception-nonSiProducer-siConsumer.xml", ExceptionHandlingSiConsumerTests.class);
@@ -68,7 +68,7 @@ public class ExceptionHandlingSiConsumerTests {
Destination request = applicationContext.getBean("requestQueueB", Destination.class);
final Destination reply = applicationContext.getBean("replyQueueB", Destination.class);
jmsTemplate.send(request, new MessageCreator() {
public Message createMessage(Session session) throws JMSException {
TextMessage message = session.createTextMessage();
message.setText("echoWithExceptionChannel");
@@ -79,10 +79,10 @@ public class ExceptionHandlingSiConsumerTests {
Message message = jmsTemplate.receive(reply);
assertNotNull(message);
assertEquals("echoWithException", ((TextMessage) message).getText());
applicationContext.close();
applicationContext.close();
}
@Test
@Test
public void nonSiProducer_siConsumer_sync_withOutboundGateway() throws Exception{
ActiveMqTestUtils.prepare();
final ConfigurableApplicationContext applicationContext = new ClassPathXmlApplicationContext("Exception-nonSiProducer-siConsumer.xml", ExceptionHandlingSiConsumerTests.class);

9
spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java
View File

@@ -166,11 +166,14 @@ public class PipelineJmsTests extends ActiveMQMultiContextTests {
try {
assertEquals(y, gateway.exchange(new GenericMessage<Integer>(y)).getPayload());
successCounter.incrementAndGet();
} catch (MessageTimeoutException e) {
}
catch (MessageTimeoutException e) {
timeoutCounter.incrementAndGet();
} catch (Throwable t) {
}
catch (Throwable t) {
failureCounter.incrementAndGet();
} finally {
}
finally {
latch.countDown();
}
}

9
spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java
View File

@@ -216,7 +216,8 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
for (int i = 0; i < 3; i++) {
try {
gateway.exchange(gateway.exchange(new GenericMessage<String>("foo")));
} catch (Exception e) {/*ignore*/}
}
catch (Exception e) {/*ignore*/}
}
@@ -237,7 +238,8 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
replyMessage.setJMSCorrelationID(message.getJMSCorrelationID());
MessageProducer producer = session.createProducer(replyDestination);
producer.send(replyMessage);
} catch (Exception e) {
}
catch (Exception e) {
// ignore. the test will fail
}
}
@@ -264,7 +266,8 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
private Object extractPayload(Message jmsMessage) {
try {
return converter.fromMessage(jmsMessage);
} catch (Exception e) {
}
catch (Exception e) {
e.printStackTrace();
fail();
}

5
spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCorrelationKeyProvidedTests.java
View File

@@ -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.
@@ -91,7 +91,8 @@ public class RequestReplyScenariosWithCorrelationKeyProvidedTests extends Active
for (int i = 0; i < 3; i++) {
try {
gateway.exchange(MessageBuilder.withPayload("hello").build());
} catch (Exception e) {
}
catch (Exception e) {
// ignore
}
}

30
spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java
View File

@@ -83,7 +83,8 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
Destination replyTo = null;
try {
replyTo = requestMessage.getJMSReplyTo();
} catch (Exception e) {
}
catch (Exception e) {
fail();
}
jmsTemplate.send(replyTo, new MessageCreator() {
@@ -94,7 +95,8 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
message.setText("bar");
message.setJMSCorrelationID(requestMessage.getJMSMessageID());
return message;
} catch (Exception e) {
}
catch (Exception e) {
// ignore
}
return null;
@@ -125,14 +127,16 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
Destination replyTo = null;
try {
replyTo = message.getJMSReplyTo();
} catch (Exception e) {
}
catch (Exception e) {
fail();
}
String requestPayload = (String) extractPayload(message);
if (requestPayload.equals("foo")){
try {
Thread.sleep(6000);
} catch (Exception e) {/*ignore*/}
}
catch (Exception e) {/*ignore*/}
}
try {
TextMessage replyMessage = session.createTextMessage();
@@ -140,7 +144,8 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
replyMessage.setJMSCorrelationID(message.getJMSMessageID());
MessageProducer producer = session.createProducer(replyTo);
producer.send(replyMessage);
} catch (Exception e) {
}
catch (Exception e) {
// ignore. the test will fail
}
}
@@ -150,13 +155,15 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
try {
gateway.exchange(new GenericMessage<String>("foo"));
} catch (Exception e) {
}
catch (Exception e) {
// ignore
}
Thread.sleep(1000);
try {
assertEquals("bar", gateway.exchange(new GenericMessage<String>("bar")).getPayload());
} catch (Exception e) {
}
catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -188,7 +195,8 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
try {
assertEquals(i+"", gateway.exchange(new GenericMessage<String>(String.valueOf(i))).getPayload());
replyCounter++;
} catch (Exception e) {
}
catch (Exception e) {
timeoutCounter++;
}
if (i == 0 || i == 20 || i == 40){
@@ -223,7 +231,8 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
if (!String.valueOf(y).equals(reply)){
missmatches.incrementAndGet();
}
} catch (Exception e) {
}
catch (Exception e) {
if (e instanceof MessageDeliveryException) {
timeouts.incrementAndGet();
}
@@ -274,7 +283,8 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti
private Object extractPayload(Message jmsMessage) {
try {
return converter.fromMessage(jmsMessage);
} catch (Exception e) {
}
catch (Exception e) {
e.printStackTrace();
fail();
}