checkstyle Misc Rules

checkstyle Nesting

checkstyle GenericWhitespace

checkstyle MethodParamPad

checkstyle NoWhiteSpace

checkstyle ParenPad Script

checkstyle ParenPad
This commit is contained in:
Gary Russell
2016-04-05 14:58:29 -04:00
committed by Artem Bilan
parent 05cc7be644
commit 57f96bb759
87 changed files with 737 additions and 628 deletions

View File

@@ -73,12 +73,13 @@ public class StoredProcJmxManagedBeanTests {
// MessageHandler
final Set<ObjectName> messageHandlerObjectNames = server.queryNames(
ObjectName.getInstance("org.springframework.integration.jdbc.test:name=outboundChannelAdapter.adapter.storedProcExecutor,*"),
ObjectName.getInstance(
"org.springframework.integration.jdbc.test:name=outboundChannelAdapter.adapter.storedProcExecutor,*"),
null);
assertEquals(1, messageHandlerObjectNames.size());
ObjectName messageHandlerObjectName = messageHandlerObjectNames.iterator().next();
Map<String, Object> messageHandlerCacheStatistics =
(Map<String, Object>) server.getAttribute(messageHandlerObjectName, "JdbcCallOperationsCacheStatisticsAsMap");
Map<String, Object> messageHandlerCacheStatistics = (Map<String, Object>) server
.getAttribute(messageHandlerObjectName, "JdbcCallOperationsCacheStatisticsAsMap");
assertEquals(11, messageHandlerCacheStatistics.size());
@@ -89,13 +90,12 @@ public class StoredProcJmxManagedBeanTests {
assertEquals(0L, messageHandlerCacheStatistics.get("missCount"));
// StoredProcOutboundGateway
final Set<ObjectName> storedProcOutboundGatewayObjectNames = server.queryNames(
ObjectName.getInstance("org.springframework.integration.jdbc.test:name=my gateway.storedProcExecutor,*"),
null);
final Set<ObjectName> storedProcOutboundGatewayObjectNames = server.queryNames(ObjectName
.getInstance("org.springframework.integration.jdbc.test:name=my gateway.storedProcExecutor,*"), null);
assertEquals(1, storedProcOutboundGatewayObjectNames.size());
ObjectName storedProcOutboundGatewayObjectName = storedProcOutboundGatewayObjectNames.iterator().next();
Map<String, Object> storedProcOutboundGatewayCacheStatistics =
(Map<String, Object>) server.getAttribute(storedProcOutboundGatewayObjectName, "JdbcCallOperationsCacheStatisticsAsMap");
Map<String, Object> storedProcOutboundGatewayCacheStatistics = (Map<String, Object>) server
.getAttribute(storedProcOutboundGatewayObjectName, "JdbcCallOperationsCacheStatisticsAsMap");
assertEquals(11, messageHandlerCacheStatistics.size());
@@ -107,10 +107,15 @@ public class StoredProcJmxManagedBeanTests {
// StoredProcPollingChannelAdapter
final Set<ObjectName> storedProcPollingChannelAdapterObjectNames = server.queryNames(ObjectName.getInstance("org.springframework.integration.jdbc.test:name=inbound-channel-adapter.storedProcExecutor,*"), null);
final Set<ObjectName> storedProcPollingChannelAdapterObjectNames = server.queryNames(
ObjectName.getInstance(
"org.springframework.integration.jdbc.test:name=inbound-channel-adapter.storedProcExecutor,*"),
null);
assertEquals(1, storedProcPollingChannelAdapterObjectNames.size());
ObjectName storedProcPollingChannelAdapterObjectName = storedProcPollingChannelAdapterObjectNames.iterator().next();
Map<String, Object>storedProcPollingChannelAdapterCacheStatistics = (Map<String, Object>) server.getAttribute(storedProcPollingChannelAdapterObjectName, "JdbcCallOperationsCacheStatisticsAsMap");
ObjectName storedProcPollingChannelAdapterObjectName = storedProcPollingChannelAdapterObjectNames.iterator()
.next();
Map<String, Object> storedProcPollingChannelAdapterCacheStatistics = (Map<String, Object>) server
.getAttribute(storedProcPollingChannelAdapterObjectName, "JdbcCallOperationsCacheStatisticsAsMap");
assertEquals(11, storedProcPollingChannelAdapterCacheStatistics.size());
@@ -188,7 +193,8 @@ public class StoredProcJmxManagedBeanTests {
static class Consumer {
private final BlockingQueue<Message<Collection<User>>> messages = new LinkedBlockingQueue<Message<Collection<User>>>();
private final BlockingQueue<Message<Collection<User>>> messages =
new LinkedBlockingQueue<Message<Collection<User>>>();
@ServiceActivator
public void receive(Message<Collection<User>> message) {

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.
@@ -189,7 +189,7 @@ public class StoredProcMessageHandlerDerbyIntegrationTests {
final List<ProcedureParameter> procedureParameters = new ArrayList<ProcedureParameter>();
procedureParameters.add(new ProcedureParameter("USERNAME", null, "headers[business_id] + '_' + payload.username"));
procedureParameters.add(new ProcedureParameter("password", "static_password", null));
procedureParameters.add(new ProcedureParameter("email", "static_email" , null));
procedureParameters.add(new ProcedureParameter("email", "static_email", null));
storedProcExecutor.setProcedureParameters(procedureParameters);
storedProcExecutor.setBeanFactory(mock(BeanFactory.class));

View File

@@ -39,62 +39,61 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Gunnar Hillert
* @author Gary Russell
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext // close at the end after class
public class StoredProcPollingChannelAdapterWithNamespace2IntegrationTests {
@Autowired
private AbstractApplicationContext context;
@Autowired
private Consumer consumer;
@Autowired
private AbstractApplicationContext context;
@Autowired
private Consumer consumer;
@Test
public void pollH2DatabaseUsingStoredProcedureCall() throws Exception {
List<Message<List<Integer>>> received = new ArrayList<Message<List<Integer>>>();
public void pollH2DatabaseUsingStoredProcedureCall() throws Exception {
List<Message<List<Integer>>> received = new ArrayList<Message<List<Integer>>>();
received.add(consumer.poll(60000));
received.add(consumer.poll(60000));
Message<List<Integer>> message = received.get(0);
context.stop();
assertNotNull(message);
assertNotNull(message.getPayload());
assertTrue(message.getPayload() instanceof List<?>);
Message<List<Integer>> message = received.get(0);
context.stop();
assertNotNull(message);
assertNotNull(message.getPayload());
assertTrue(message.getPayload() instanceof List<?>);
List<Integer> resultList = message.getPayload();
List<Integer> resultList = message.getPayload();
assertTrue(resultList.size() == 1);
assertTrue(resultList.size() == 1);
}
}
static class Counter {
static class Counter {
private final AtomicInteger count = new AtomicInteger();
private final AtomicInteger count = new AtomicInteger();
public Integer next() throws InterruptedException {
if (count.get() > 2) {
//prevent message overload
return null;
}
return Integer.valueOf(count.incrementAndGet());
}
}
public Integer next() throws InterruptedException {
if (count.get() > 2) {
// prevent message overload
return null;
}
return Integer.valueOf(count.incrementAndGet());
}
}
static class Consumer {
static class Consumer {
private final BlockingQueue<Message<List<Integer>>> messages = new LinkedBlockingQueue<Message<List<Integer>>>();
private final BlockingQueue<Message<List<Integer>>> messages = new LinkedBlockingQueue<Message<List<Integer>>>();
@ServiceActivator
public void receive(Message<List<Integer>> message) {
messages.add(message);
}
@ServiceActivator
public void receive(Message<List<Integer>>message) {
messages.add(message);
}
Message<List<Integer>> poll(long timeoutInMillis) throws InterruptedException {
return messages.poll(timeoutInMillis, TimeUnit.MILLISECONDS);
}
}
Message<List<Integer>> poll(long timeoutInMillis) throws InterruptedException {
return messages.poll(timeoutInMillis, TimeUnit.MILLISECONDS);
}
}
}

View File

@@ -48,56 +48,55 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@DirtiesContext // close at the end after class
public class StoredProcPollingChannelAdapterWithNamespaceIntegrationTests {
@Autowired
private AbstractApplicationContext context;
@Autowired
private AbstractApplicationContext context;
@Autowired
private Consumer consumer;
@Autowired
private Consumer consumer;
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked")
@Test
public void pollH2DatabaseUsingStoredProcedureCall() throws Exception {
List<Message<?>> received = new ArrayList<Message<?>>();
public void pollH2DatabaseUsingStoredProcedureCall() throws Exception {
List<Message<?>> received = new ArrayList<Message<?>>();
received.add(consumer.poll(60000));
received.add(consumer.poll(60000));
Message<?> message = received.get(0);
context.stop();
assertNotNull(message);
assertNotNull(message.getPayload());
assertNotNull(message.getPayload() instanceof Collection<?>);
Message<?> message = received.get(0);
context.stop();
assertNotNull(message);
assertNotNull(message.getPayload());
assertNotNull(message.getPayload() instanceof Collection<?>);
List<Integer> primeNumbers = (List<Integer>) message.getPayload();
List<Integer> primeNumbers = (List<Integer>) message.getPayload();
assertThat(primeNumbers, contains(2, 3, 5, 7));
}
}
static class Counter {
static class Counter {
private final AtomicInteger count = new AtomicInteger();
private final AtomicInteger count = new AtomicInteger();
public Integer next() throws InterruptedException {
if (count.get() > 2) {
//prevent message overload
return null;
}
return Integer.valueOf(count.incrementAndGet());
}
}
public Integer next() throws InterruptedException {
if (count.get() > 2) {
// prevent message overload
return null;
}
return Integer.valueOf(count.incrementAndGet());
}
}
static class Consumer {
static class Consumer {
private final BlockingQueue<Message<?>> messages = new LinkedBlockingQueue<Message<?>>();
private final BlockingQueue<Message<?>> messages = new LinkedBlockingQueue<Message<?>>();
@ServiceActivator
public void receive(Message<?> message) {
messages.add(message);
}
@ServiceActivator
public void receive(Message<?>message) {
messages.add(message);
}
Message<?> poll(long timeoutInMillis) throws InterruptedException {
return messages.poll(timeoutInMillis, TimeUnit.MILLISECONDS);
}
}
Message<?> poll(long timeoutInMillis) throws InterruptedException {
return messages.poll(timeoutInMillis, TimeUnit.MILLISECONDS);
}
}
}

View File

@@ -46,55 +46,54 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@DirtiesContext // close at the end after class
public class StoredProcPollingChannelAdapterWithSpringContextIntegrationTests {
@Autowired
private AbstractApplicationContext context;
@Autowired
private AbstractApplicationContext context;
@Autowired
private Consumer consumer;
@Autowired
private Consumer consumer;
@Test
public void test() throws Exception {
List<Message<Collection<Integer>>> received = new ArrayList<Message<Collection<Integer>>>();
public void test() throws Exception {
List<Message<Collection<Integer>>> received = new ArrayList<Message<Collection<Integer>>>();
received.add(consumer.poll(2000));
received.add(consumer.poll(2000));
Message<Collection<Integer>> message = received.get(0);
context.stop();
assertNotNull(message);
assertNotNull(message.getPayload());
assertNotNull(message.getPayload() instanceof Collection<?>);
Message<Collection<Integer>> message = received.get(0);
context.stop();
assertNotNull(message);
assertNotNull(message.getPayload());
assertNotNull(message.getPayload() instanceof Collection<?>);
Collection<Integer> primeNumbers = message.getPayload();
Collection<Integer> primeNumbers = message.getPayload();
assertTrue(primeNumbers.size() == 4);
assertTrue(primeNumbers.size() == 4);
}
}
static class Counter {
static class Counter {
private final AtomicInteger count = new AtomicInteger();
private final AtomicInteger count = new AtomicInteger();
public Integer next() throws InterruptedException {
if (count.get() > 2) {
//prevent message overload
return null;
}
return Integer.valueOf(count.incrementAndGet());
}
}
public Integer next() throws InterruptedException {
if (count.get() > 2) {
// prevent message overload
return null;
}
return Integer.valueOf(count.incrementAndGet());
}
}
static class Consumer {
static class Consumer {
private final BlockingQueue<Message<Collection<Integer>>> messages = new LinkedBlockingQueue<Message<Collection<Integer>>>();
private final BlockingQueue<Message<Collection<Integer>>> messages = new LinkedBlockingQueue<Message<Collection<Integer>>>();
@ServiceActivator
public void receive(Message<Collection<Integer>> message) {
messages.add(message);
}
@ServiceActivator
public void receive(Message<Collection<Integer>>message) {
messages.add(message);
}
Message<Collection<Integer>> poll(long timeoutInMillis) throws InterruptedException {
return messages.poll(timeoutInMillis, TimeUnit.MILLISECONDS);
}
}
Message<Collection<Integer>> poll(long timeoutInMillis) throws InterruptedException {
return messages.poll(timeoutInMillis, TimeUnit.MILLISECONDS);
}
}
}

View File

@@ -133,12 +133,12 @@ public class JdbcPollingChannelAdapterParserTests {
this.jdbcTemplate.update("insert into item values(1,'',42)");
Message<?> message = messagingTemplate.receive();
assertNotNull(message);
assertEquals(42, ((Map<?, ?>) ((List<?> ) message.getPayload()).get(0)).get("STATUS"));
assertEquals(42, ((Map<?, ?>) ((List<?>) message.getPayload()).get(0)).get("STATUS"));
this.jdbcTemplate.update("insert into item values(2,'',84)");
this.appCtx.getBean(Status.class).which = 84;
message = messagingTemplate.receive();
assertNotNull(message);
assertEquals(84, ((Map<?, ?>) ((List<?> ) message.getPayload()).get(0)).get("STATUS"));
assertEquals(84, ((Map<?, ?>) ((List<?>) message.getPayload()).get(0)).get("STATUS"));
}
@Test

View File

@@ -16,30 +16,31 @@
package org.springframework.integration.jdbc.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import java.sql.Types;
import java.util.List;
import org.junit.After;
import org.junit.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.expression.Expression;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice;
import org.springframework.integration.jdbc.storedproc.ProcedureParameter;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.jdbc.core.SqlInOutParameter;
import org.springframework.jdbc.core.SqlOutParameter;
import org.springframework.jdbc.core.SqlParameter;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.support.GenericMessage;
/**
* @author Gunnar Hillert
@@ -86,7 +87,7 @@ public class StoredProcMessageHandlerParserTests {
assertNotNull(procedureParameters);
assertTrue(procedureParameters instanceof List);
List<ProcedureParameter>procedureParametersAsList = (List<ProcedureParameter>) procedureParameters;
List<ProcedureParameter> procedureParametersAsList = (List<ProcedureParameter>) procedureParameters;
assertTrue(procedureParametersAsList.size() == 4);
@@ -129,7 +130,7 @@ public class StoredProcMessageHandlerParserTests {
assertNotNull(sqlParameters);
assertTrue(sqlParameters instanceof List);
List<SqlParameter>sqlParametersAsList = (List<SqlParameter>) sqlParameters;
List<SqlParameter> sqlParametersAsList = (List<SqlParameter>) sqlParameters;
assertTrue(sqlParametersAsList.size() == 4);

View File

@@ -29,15 +29,16 @@ import java.util.Map.Entry;
import org.junit.After;
import org.junit.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.expression.Expression;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice;
import org.springframework.integration.jdbc.storedproc.PrimeMapper;
import org.springframework.integration.jdbc.storedproc.ProcedureParameter;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.SqlInOutParameter;
@@ -45,7 +46,7 @@ import org.springframework.jdbc.core.SqlOutParameter;
import org.springframework.jdbc.core.SqlParameter;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.messaging.support.GenericMessage;
/**
* @author Gunnar Hillert
@@ -182,7 +183,7 @@ public class StoredProcOutboundGatewayParserTests {
assertNotNull(procedureParameters);
assertTrue(procedureParameters instanceof List);
List<ProcedureParameter>procedureParametersAsList = (List<ProcedureParameter>) procedureParameters;
List<ProcedureParameter> procedureParametersAsList = (List<ProcedureParameter>) procedureParameters;
assertTrue(procedureParametersAsList.size() == 4);
@@ -248,7 +249,7 @@ public class StoredProcOutboundGatewayParserTests {
assertNotNull(sqlParameters);
assertTrue(sqlParameters instanceof List);
List<SqlParameter>sqlParametersAsList = (List<SqlParameter>) sqlParameters;
List<SqlParameter> sqlParametersAsList = (List<SqlParameter>) sqlParameters;
assertTrue(sqlParametersAsList.size() == 4);

View File

@@ -148,7 +148,7 @@ public class MySqlJdbcMessageStoreMultipleChannelTests {
super();
}
public void first(Message<?> message ) {
public void first(Message<?> message) {
int sequenceNumber = new IntegrationMessageHeaderAccessor(message).getSequenceNumber();
@@ -161,7 +161,7 @@ public class MySqlJdbcMessageStoreMultipleChannelTests {
countDownLatch1.countDown();
}
public void second(Message<?> message ) {
public void second(Message<?> message) {
int sequenceNumber = new IntegrationMessageHeaderAccessor(message).getSequenceNumber();
LOG.info("Second handling sequence number: " + sequenceNumber + "; Message ID: " + message.getHeaders().getId());

View File

@@ -30,7 +30,7 @@ public final class DerbyFunctions {
super();
}
public static String convertStringToUpperCase( String invalue ) {
public static String convertStringToUpperCase(String invalue) {
return invalue.toUpperCase(Locale.ENGLISH);
}

View File

@@ -89,7 +89,7 @@ public final class DerbyStoredProcedures {
Connection conn = DriverManager.getConnection("jdbc:default:connection");
PreparedStatement stmt = conn.prepareStatement("select MESSAGE_JSON from JSON_MESSAGE where MESSAGE_ID = ?");
stmt.setString( 1, messageId);
stmt.setString(1, messageId);
ResultSet results = stmt.executeQuery();
if (results.next()) {
returnedData[0] = results.getClob(1);