From 80af14a2e6c7160eda8d3bd31c4074647b593f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scheibe?= Date: Wed, 8 Jun 2022 16:13:03 +0200 Subject: [PATCH] Make fields immutable (final) where possible --- .../integration/samples/cafe/Delivery.java | 7 ++----- .../integration/samples/cafe/Drink.java | 10 ++++------ .../integration/samples/cafe/Order.java | 6 +++--- .../integration/samples/cafe/Waiter.java | 2 +- .../samples/cafe/demo/ControlBusMain.java | 2 +- .../integration/samples/cafe/annotation/Barista.java | 2 +- .../integration/samples/cafe/xml/Barista.java | 2 +- .../samples/loanbroker/demo/LoanBrokerDemo.java | 2 +- .../loanbroker/demo/LoanBrokerSharkDetectorDemo.java | 2 +- .../samples/loanbroker/stubs/CreditBureauStub.java | 2 +- .../samples/ftp/support/TestUserManager.java | 4 ++-- .../samples/helloworld/HelloWorldApp.java | 2 +- .../integration/samples/http/HttpClientDemo.java | 2 +- .../integration/samples/jdbc/domain/Gender.java | 12 ++++++------ .../integration/samples/jdbc/domain/User.java | 6 +++--- .../imapidle/GmailInboundImapIdleAdapterTestApp.java | 2 +- .../imapidle/GmailInboundPop3AdapterTestApp.java | 2 +- .../integration/samples/mqtt/BrokerRunning.java | 4 ++-- .../integration/samples/oddeven/EvenLogger.java | 2 +- .../integration/samples/oddeven/OddLogger.java | 2 +- .../integration/samples/quote/Quote.java | 4 ++-- .../samples/tcpclientserver/CustomOrder.java | 4 ++-- .../samples/testing/externalgateway/Traffic.java | 8 ++++---- .../externalgateway/TrafficHttpConverter.java | 4 ++-- .../testing/externalgateway/WeatherMarshaller.java | 12 ++++++------ .../integration/samples/ws/InContainerTests.java | 2 +- .../integration/samples/xml/ExternalResupply.java | 2 +- .../integration/samples/xml/WarehouseDispatch.java | 2 +- .../samples/dsl/cafe/lambda/Application.java | 4 ++-- .../samples/async/gateway/ListenableFutureTest.java | 2 +- .../samples/async/gateway/MonoGatewayTests.java | 2 +- .../mailattachments/support/EmailFragment.java | 6 +++--- .../service/impl/DefaultTwitterService.java | 2 +- .../samples/multipart/MultipartReceiver.java | 2 +- .../MultipartClientForHttpOutboundClient.java | 6 +++--- .../samples/multipart/MultipartRestClient.java | 12 ++++++------ .../samples/rest/service/EmployeeSearchService.java | 3 ++- .../integration/samples/rest/RestHttpClientTest.java | 2 +- .../samples/splitteraggregator/CompositeResult.java | 2 +- .../integration/samples/travel/City.java | 8 ++++---- 40 files changed, 80 insertions(+), 84 deletions(-) diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Delivery.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Delivery.java index 7e9f9942..436e3476 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Delivery.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Delivery.java @@ -25,11 +25,9 @@ public class Delivery { private static final String SEPARATOR = "-----------------------"; + private final List deliveredDrinks; - private List deliveredDrinks; - - private int orderNumber; - + private final int orderNumber; public Delivery(List deliveredDrinks) { assert(deliveredDrinks.size() > 0); @@ -37,7 +35,6 @@ public class Delivery { this.orderNumber = deliveredDrinks.get(0).getOrderNumber(); } - public int getOrderNumber() { return orderNumber; } diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Drink.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Drink.java index bb4b0ab0..5abadb04 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Drink.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Drink.java @@ -21,15 +21,14 @@ package org.springframework.integration.samples.cafe; */ public class Drink { - private boolean iced; + private final boolean iced; - private int shots; + private final int shots; - private DrinkType drinkType; + private final DrinkType drinkType; - private int orderNumber; + private final int orderNumber; - public Drink(int orderNumber, DrinkType drinkType, boolean hot, int shots) { this.orderNumber = orderNumber; this.drinkType = drinkType; @@ -37,7 +36,6 @@ public class Drink { this.shots = shots; } - public int getOrderNumber() { return orderNumber; } diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Order.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Order.java index 4a279b74..e02c0453 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Order.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Order.java @@ -25,9 +25,9 @@ import java.util.List; */ public class Order { - private List orderItems = new ArrayList(); + private final List orderItems = new ArrayList(); - private int number; + private final int number; public Order(int number) { this.number = number; @@ -44,7 +44,7 @@ public class Order { public List getItems() { return this.orderItems; } - + public String toString() { return "Order number " + number; } diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java index 5e26cc6a..ae3483e7 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java @@ -31,7 +31,7 @@ import org.springframework.jmx.export.annotation.ManagedResource; @ManagedResource public class Waiter { - private AtomicInteger totalDeliveries = new AtomicInteger(); + private final AtomicInteger totalDeliveries = new AtomicInteger(); public Delivery prepareDelivery(List drinks) { totalDeliveries.getAndIncrement(); diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java index 2b99f291..00b83d20 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java @@ -30,7 +30,7 @@ import org.springframework.integration.samples.cafe.WaiterMonitor; * */ public class ControlBusMain { - private static Log logger = LogFactory.getLog(ControlBusMain.class); + private static final Log logger = LogFactory.getLog(ControlBusMain.class); public static void main(String[] args) { diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java index ad5d08c7..850d7ecf 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java @@ -36,7 +36,7 @@ import org.springframework.stereotype.Component; @Component public class Barista { - private static Log logger = LogFactory.getLog(Barista.class); + private static final Log logger = LogFactory.getLog(Barista.class); private long hotDrinkDelay = 5000; diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java index 57249abe..e49e91b7 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java @@ -33,7 +33,7 @@ import org.springframework.integration.samples.cafe.OrderItem; public class Barista { - private static Log logger = LogFactory.getLog(Barista.class); + private static final Log logger = LogFactory.getLog(Barista.class); private long hotDrinkDelay = 5000; diff --git a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java index fe424c51..88c72e35 100644 --- a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java +++ b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java @@ -33,7 +33,7 @@ import org.springframework.integration.samples.loanbroker.domain.LoanRequest; */ public class LoanBrokerDemo { - private static Log logger = LogFactory.getLog(LoanBrokerDemo.class); + private static final Log logger = LogFactory.getLog(LoanBrokerDemo.class); public static void main(String[] args) { new LoanBrokerDemo().runDemo(); diff --git a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java index 34aadaf0..ce821bb7 100644 --- a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java +++ b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java @@ -33,7 +33,7 @@ import org.springframework.integration.samples.loanbroker.domain.LoanRequest; */ public class LoanBrokerSharkDetectorDemo { - private static Log logger = LogFactory.getLog(LoanBrokerSharkDetectorDemo.class); + private static final Log logger = LogFactory.getLog(LoanBrokerSharkDetectorDemo.class); public static void main(String[] args) { ConfigurableApplicationContext context = diff --git a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java index ab9852e2..eb0c1586 100644 --- a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java +++ b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java @@ -30,7 +30,7 @@ import org.springframework.integration.samples.loanbroker.domain.LoanRequest; */ public class CreditBureauStub { - private static Log logger = LogFactory.getLog(CreditBureauStub.class); + private static final Log logger = LogFactory.getLog(CreditBureauStub.class); /** * @param loanRequest the loan request diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/support/TestUserManager.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/support/TestUserManager.java index ebcdde89..8e94aafe 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/support/TestUserManager.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/support/TestUserManager.java @@ -36,8 +36,8 @@ import org.apache.ftpserver.usermanager.impl.WritePermission; * */ public class TestUserManager extends AbstractUserManager { - private BaseUser testUser; - private BaseUser anonUser; + private final BaseUser testUser; + private final BaseUser anonUser; private static final String TEST_USERNAME = "demo"; private static final String TEST_PASSWORD = "demo"; diff --git a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java index 42d4db18..5c4dd289 100644 --- a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java +++ b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java @@ -42,7 +42,7 @@ import org.springframework.messaging.support.GenericMessage; */ public class HelloWorldApp { - private static Log logger = LogFactory.getLog(HelloWorldApp.class); + private static final Log logger = LogFactory.getLog(HelloWorldApp.class); public static void main(String[] args) { AbstractApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/helloWorldDemo.xml", HelloWorldApp.class); diff --git a/basic/http/src/main/java/org/springframework/integration/samples/http/HttpClientDemo.java b/basic/http/src/main/java/org/springframework/integration/samples/http/HttpClientDemo.java index 9c5b2b84..ab4cb0c7 100644 --- a/basic/http/src/main/java/org/springframework/integration/samples/http/HttpClientDemo.java +++ b/basic/http/src/main/java/org/springframework/integration/samples/http/HttpClientDemo.java @@ -27,7 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; */ public class HttpClientDemo { - private static Log logger = LogFactory.getLog(HttpClientDemo.class); + private static final Log logger = LogFactory.getLog(HttpClientDemo.class); public static void main(String[] args) { ConfigurableApplicationContext context = new ClassPathXmlApplicationContext( diff --git a/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/Gender.java b/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/Gender.java index afe05f22..87fb1a63 100644 --- a/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/Gender.java +++ b/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/Gender.java @@ -27,9 +27,9 @@ import java.util.Map; public enum Gender { MALE("M"),FEMALE("F"); - private static Map map; - - private String identifier; + private static final Map map; + + private final String identifier; private Gender(String identifier) { this.identifier = identifier; @@ -37,12 +37,12 @@ public enum Gender { public String getIdentifier() { return identifier; - } - + } + public static Gender getGenderByIdentifier(String identifier) { return map.get(identifier); } - + static { map = new HashMap(); for(Gender gender:EnumSet.allOf(Gender.class)) { diff --git a/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/User.java b/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/User.java index e324563d..5cf5546e 100644 --- a/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/User.java +++ b/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/User.java @@ -13,9 +13,9 @@ package org.springframework.integration.samples.jdbc.domain; public class User { - private String username; - private String password; - private String email; + private final String username; + private final String password; + private final String email; public User(String username, String password, String email) { super(); diff --git a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java index 2da95d7c..017b5063 100644 --- a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java +++ b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java @@ -30,7 +30,7 @@ import org.springframework.messaging.MessagingException; * */ public class GmailInboundImapIdleAdapterTestApp { - private static Log logger = LogFactory.getLog(GmailInboundImapIdleAdapterTestApp.class); + private static final Log logger = LogFactory.getLog(GmailInboundImapIdleAdapterTestApp.class); public static void main (String[] args) throws Exception { diff --git a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java index baa5366d..810ded52 100644 --- a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java +++ b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java @@ -32,7 +32,7 @@ import org.springframework.messaging.MessagingException; */ public class GmailInboundPop3AdapterTestApp { - private static Log logger = LogFactory.getLog(GmailInboundPop3AdapterTestApp.class); + private static final Log logger = LogFactory.getLog(GmailInboundPop3AdapterTestApp.class); public static void main (String[] args) throws Exception { @SuppressWarnings("resource") diff --git a/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java b/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java index 05a9d498..9880ff2c 100644 --- a/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java +++ b/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java @@ -40,10 +40,10 @@ import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory; */ public class BrokerRunning extends TestWatcher { - private static Log logger = LogFactory.getLog(BrokerRunning.class); + private static final Log logger = LogFactory.getLog(BrokerRunning.class); // Static so that we only test once on failure: speeds up test suite - private static Map brokerOnline = new HashMap<>(); + private static final Map brokerOnline = new HashMap<>(); private final int port; diff --git a/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java b/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java index 4ac5e706..ac1b7c46 100644 --- a/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java +++ b/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java @@ -34,7 +34,7 @@ import org.springframework.integration.annotation.ServiceActivator; */ @MessageEndpoint public class EvenLogger { - private static Log logger = LogFactory.getLog(EvenLogger.class); + private static final Log logger = LogFactory.getLog(EvenLogger.class); @ServiceActivator public void log(int i) { diff --git a/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java b/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java index 4d4b0957..dbb07b98 100644 --- a/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java +++ b/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java @@ -34,7 +34,7 @@ import org.springframework.integration.annotation.ServiceActivator; */ @MessageEndpoint public class OddLogger { - private static Log logger = LogFactory.getLog(OddLogger.class); + private static final Log logger = LogFactory.getLog(OddLogger.class); @ServiceActivator public void log(int i) { diff --git a/basic/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java b/basic/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java index 7d3ee16c..52bf2062 100644 --- a/basic/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java +++ b/basic/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java @@ -23,9 +23,9 @@ import java.math.BigDecimal; */ public class Quote { - private String ticker; + private final String ticker; - private BigDecimal price; + private final BigDecimal price; public Quote(String ticker, BigDecimal price) { this.ticker = ticker; diff --git a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java index b2ad3747..f88a6324 100644 --- a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java +++ b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java @@ -25,9 +25,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; */ public class CustomOrder { - private int number; + private final int number; - private String sender; + private final String sender; private String message; diff --git a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/Traffic.java b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/Traffic.java index 03c301df..9e183318 100644 --- a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/Traffic.java +++ b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/Traffic.java @@ -25,16 +25,16 @@ import java.util.Map; */ public class Traffic { - private Map incidents = new HashMap(); - + private final Map incidents = new HashMap(); + public void addIncident(String title, String description){ incidents.put(title, description); } - + public Map getIncidents(){ return incidents; } - + public String toString(){ return "Traffic: {" + incidents.keySet().toString() + "}"; } diff --git a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java index c2242963..74777aa5 100644 --- a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java +++ b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java @@ -40,8 +40,8 @@ import org.w3c.dom.Node; * @since SpringOne2GX - 2010, Chicago */ public class TrafficHttpConverter implements HttpMessageConverter { - private List supportedMediaTypes = Collections.emptyList(); - + private final List supportedMediaTypes = Collections.emptyList(); + public boolean canRead(Class clazz, MediaType mediaType) { return Traffic.class.equals(clazz); } diff --git a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java index ed39f32f..23f190f7 100644 --- a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java +++ b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java @@ -47,9 +47,9 @@ public class WeatherMarshaller implements Marshaller, Unmarshaller, Initializing private static final TransformerFactory transformerFactory = TransformerFactory.newInstance(); - private Map namespacePrefixes = new HashMap(); + private final Map namespacePrefixes = new HashMap(); - private String xpathPrefix = "/p:GetCityWeatherByZIPResponse/p:GetCityWeatherByZIPResult/"; + private static final String XPATH_PREFIX = "/p:GetCityWeatherByZIPResponse/p:GetCityWeatherByZIPResult/"; public Object unmarshal(Source source) throws IOException, XmlMappingException { @@ -63,16 +63,16 @@ public class WeatherMarshaller implements Marshaller, Unmarshaller, Initializing throw new MarshallingFailureException("Failed to unmarshal SOAP Response", e); } Weather weather = new Weather(); - String expression = xpathPrefix + "p:City"; + String expression = XPATH_PREFIX + "p:City"; String city = XPathExpressionFactory.createXPathExpression(expression, namespacePrefixes).evaluateAsString(result.getNode()); weather.setCity(city); - expression = xpathPrefix + "p:State"; + expression = XPATH_PREFIX + "p:State"; String state = XPathExpressionFactory.createXPathExpression(expression, namespacePrefixes).evaluateAsString(result.getNode()); weather.setState(state); - expression = xpathPrefix + "p:Temperature"; + expression = XPATH_PREFIX + "p:Temperature"; String temperature = XPathExpressionFactory.createXPathExpression(expression, namespacePrefixes).evaluateAsString(result.getNode()); weather.setTemperature(temperature); - expression = xpathPrefix + "p:Description"; + expression = XPATH_PREFIX + "p:Description"; String description = XPathExpressionFactory.createXPathExpression(expression, namespacePrefixes).evaluateAsString(result.getNode()); weather.setDescription(description); return weather; diff --git a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java index 7590b1e5..bd5b0ed2 100644 --- a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java +++ b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java @@ -41,7 +41,7 @@ import org.springframework.xml.transform.StringSource; */ public class InContainerTests { - private static Log logger = LogFactory.getLog(InContainerTests.class); + private static final Log logger = LogFactory.getLog(InContainerTests.class); private static final String WS_URI = "http://localhost:8080/ws-inbound-gateway/echoservice"; private final WebServiceTemplate template = new WebServiceTemplate(); diff --git a/basic/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java b/basic/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java index 3c9b8715..eaa1a95c 100644 --- a/basic/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java +++ b/basic/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; * @author Gary Russell */ public class ExternalResupply { - private static Log logger = LogFactory.getLog(ExternalResupply.class); + private static final Log logger = LogFactory.getLog(ExternalResupply.class); public void orderResupply(Document resupplyOrder) { logger.info("Placing resupply order: \n" + XmlUtil.docAsString(resupplyOrder)); diff --git a/basic/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java b/basic/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java index c2f2aadd..83f8932c 100644 --- a/basic/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java +++ b/basic/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; * @author Gary Russell */ public class WarehouseDispatch { - private static Log logger = LogFactory.getLog(WarehouseDispatch.class); + private static final Log logger = LogFactory.getLog(WarehouseDispatch.class); public void dispatch(Document orderItem){ logger.info("Warehouse dispatching orderItem: \n" + XmlUtil.docAsString(orderItem)); diff --git a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java index 1843b8f2..302e38e4 100644 --- a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java +++ b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java @@ -68,9 +68,9 @@ public class Application { } - private AtomicInteger hotDrinkCounter = new AtomicInteger(); + private final AtomicInteger hotDrinkCounter = new AtomicInteger(); - private AtomicInteger coldDrinkCounter = new AtomicInteger(); + private final AtomicInteger coldDrinkCounter = new AtomicInteger(); @Bean(name = PollerMetadata.DEFAULT_POLLER) public PollerMetadata poller() { diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java index ec8f1d25..ca00e1df 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java @@ -59,7 +59,7 @@ import org.springframework.util.concurrent.ListenableFutureCallback; @DirtiesContext public class ListenableFutureTest { - private static Log logger = LogFactory.getLog(ListenableFutureTest.class); + private static final Log logger = LogFactory.getLog(ListenableFutureTest.class); @Autowired private MathGateway gateway; diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java index e6d5b989..ef86913b 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java @@ -58,7 +58,7 @@ import reactor.core.scheduler.Schedulers; @DirtiesContext public class MonoGatewayTests { - private static Log logger = LogFactory.getLog(MonoGatewayTests.class); + private static final Log logger = LogFactory.getLog(MonoGatewayTests.class); @Autowired private MathGateway gateway; diff --git a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java index d6750a4b..d2e0e902 100644 --- a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java +++ b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java @@ -32,11 +32,11 @@ import org.springframework.util.Assert; */ public class EmailFragment { - private Object data; + private final Object data; - private String filename; + private final String filename; - private File directory; + private final File directory; /** * Constructor. diff --git a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java index bf444389..2342944c 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java @@ -44,7 +44,7 @@ import org.springframework.stereotype.Service; public class DefaultTwitterService implements TwitterService { /** Holds a collection of polled Twitter messages */ - private Map twitterMessages; + private final Map twitterMessages; @Autowired private MessageChannel controlBusChannel; diff --git a/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiver.java b/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiver.java index 6481d1c3..7043ece4 100644 --- a/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiver.java +++ b/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiver.java @@ -28,7 +28,7 @@ import org.springframework.util.LinkedMultiValueMap; * */ public class MultipartReceiver { - private static Log logger = LogFactory.getLog(MultipartReceiver.class); + private static final Log logger = LogFactory.getLog(MultipartReceiver.class); @SuppressWarnings("rawtypes") public void receive(LinkedMultiValueMap multipartRequest){ diff --git a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java index c9557167..600a1b61 100644 --- a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java +++ b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java @@ -32,13 +32,13 @@ import org.springframework.http.HttpStatus; */ public class MultipartClientForHttpOutboundClient { - private static Log logger = LogFactory.getLog(MultipartClientForHttpOutboundClient.class); - private static String resourcePath = "org/springframework/integration/samples/multipart/spring09_logo.png"; + private static final Log logger = LogFactory.getLog(MultipartClientForHttpOutboundClient.class); + private static final String RESOURCE_PATH = "org/springframework/integration/samples/multipart/spring09_logo.png"; public static void main(String[] args) throws Exception{ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "/META-INF/spring/integration/http-outbound-config.xml"); - Resource s2logo = new ClassPathResource(resourcePath); + Resource s2logo = new ClassPathResource(RESOURCE_PATH); Map multipartMap = new HashMap(); multipartMap.put("company", new String[]{"SpringSource", "VMWare"}); multipartMap.put("company-logo", s2logo); diff --git a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java index 6491362e..2a3df825 100644 --- a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java +++ b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java @@ -36,15 +36,15 @@ import org.springframework.web.client.RestTemplate; */ public class MultipartRestClient { - private static Log logger = LogFactory.getLog(MultipartRestClient.class); + private static final Log logger = LogFactory.getLog(MultipartRestClient.class); - private static String uri = "http://localhost:8080/multipart-http/inboundAdapter.htm"; + private static final String URI = "http://localhost:8080/multipart-http/inboundAdapter.htm"; - private static String resourcePath = "org/springframework/integration/samples/multipart/spring09_logo.png"; + private static final String RESOURCE_PATH = "org/springframework/integration/samples/multipart/spring09_logo.png"; public static void main(String[] args) throws Exception{ RestTemplate template = new RestTemplate(); - Resource s2logo = new ClassPathResource(resourcePath); + Resource s2logo = new ClassPathResource(RESOURCE_PATH); MultiValueMap multipartMap = new LinkedMultiValueMap(); multipartMap.add("company", "SpringSource"); multipartMap.add("company-logo", s2logo); @@ -52,8 +52,8 @@ public class MultipartRestClient { HttpHeaders headers = new HttpHeaders(); headers.setContentType(new MediaType("multipart", "form-data")); HttpEntity request = new HttpEntity(multipartMap, headers); - logger.info("Posting request to: " + uri); - ResponseEntity httpResponse = template.exchange(uri, HttpMethod.POST, request, Object.class); + logger.info("Posting request to: " + URI); + ResponseEntity httpResponse = template.exchange(URI, HttpMethod.POST, request, Object.class); if (!httpResponse.getStatusCode().equals(HttpStatus.OK)){ logger.error("Problems with the request. Http status: " + httpResponse.getStatusCode()); } diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java index c875a4b0..4cb429e1 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java @@ -37,7 +37,8 @@ import org.springframework.stereotype.Service; @Service("employeeSearchService") public class EmployeeSearchService { - private static Log logger = LogFactory.getLog(EmployeeSearchService.class); + private static final Log logger = LogFactory.getLog(EmployeeSearchService.class); + /** * The API getEmployee() looks up the mapped in coming message header's id param * and fills the return object with the appropriate employee details. The return diff --git a/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java b/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java index 21437349..fb34e2d7 100644 --- a/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java +++ b/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java @@ -68,7 +68,7 @@ public class RestHttpClientTest { private HttpMessageConverterExtractor responseExtractor; - private static Log logger = LogFactory.getLog(RestHttpClientTest.class); + private static final Log logger = LogFactory.getLog(RestHttpClientTest.class); @Autowired private Jaxb2Marshaller marshaller; diff --git a/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/CompositeResult.java b/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/CompositeResult.java index 9b2f200c..5969bc1d 100644 --- a/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/CompositeResult.java +++ b/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/CompositeResult.java @@ -25,7 +25,7 @@ import java.util.Collection; * */ public class CompositeResult extends Result { - private Collection results = new ArrayList(); + private final Collection results = new ArrayList(); public Collection getResults() { return results; diff --git a/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/City.java b/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/City.java index a8a10ce9..16d1a142 100644 --- a/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/City.java +++ b/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/City.java @@ -31,10 +31,10 @@ public enum City { BOSTON(2, "Boston", "02201", "42.636182,-71.651862,42.080413,-70.467446"), SAN_FRANCISCO(3, "San Francisco", "94102", "38.052886,-123.009856,37.497117,-121.82544"); - private Integer id; - private String name; - private String boundingBox; - private String postalCode; + private final Integer id; + private final String name; + private final String boundingBox; + private final String postalCode; private City(Integer id, String name, String postalCode, String boundingBox) { this.id = id;