You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2014/06/22 10:40:56 UTC
[2/2] git commit: Polished.
Polished.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/12a2c0d2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/12a2c0d2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/12a2c0d2
Branch: refs/heads/master
Commit: 12a2c0d29bf1b9c828fdb75c0025d6173503a3f3
Parents: a4703f4
Author: Babak Vahdat <bv...@apache.org>
Authored: Sun Jun 22 10:40:47 2014 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sun Jun 22 10:40:47 2014 +0200
----------------------------------------------------------------------
.../camel/component/file/FileComponent.java | 1 -
.../camel/impl/DefaultHeaderFilterStrategy.java | 2 +-
.../support/XMLTokenExpressionIterator.java | 15 ++++----
.../camel/util/concurrent/AtomicException.java | 3 +-
.../camel/util/concurrent/AtomicExchange.java | 3 +-
.../camel/converter/jaxp/StaxSourceTest.java | 2 +-
...BeanAdapterWithHeadersAndPropertiesTest.java | 4 +-
...ationStrategyBeanAdapterWithHeadersTest.java | 2 +-
.../camel/component/ahc/ws/WsProducer.java | 6 +--
.../component/wsservlet/WebsocketRouteTest.java | 4 +-
.../component/avro/AvroComponentException.java | 1 -
.../camel/dataformat/beanio/csv/CsvTest.java | 2 +-
.../dataformat/bindy/model/csv/MyCsvRecord.java | 4 +-
.../camel/converter/crypto/PGPDataFormat.java | 1 -
.../crypto/PGPKeyAccessDataFormat.java | 4 --
.../crypto/PGPDataFormatDynamicTest.java | 14 +++----
.../converter/crypto/PGPDataFormatTest.java | 40 ++++++++++----------
.../cxf/transport/CamelDestination.java | 1 -
.../wssecurity/camel/WSSecurityRouteTest.java | 17 +++++----
.../cxf/wssecurity/server/CxfServer.java | 5 ++-
.../cxf/wssecurity/server/GreeterImpl.java | 1 -
.../disruptor/DisruptorNotStartedException.java | 1 -
.../dropbox/util/DropboxException.java | 3 ++
.../dropbox/util/DropboxPropertyManager.java | 2 +-
.../component/file/remote/FtpComponent.java | 1 -
.../component/file/remote/FtpsComponent.java | 1 -
.../component/file/remote/SftpComponent.java | 1 -
.../component/gae/auth/GAuthException.java | 3 +-
.../gae/context/GaeDefaultCamelContext.java | 1 -
.../camel/component/gora/GoraAttribute.java | 2 -
.../camel/component/gora/GoraConstants.java | 2 -
.../camel/component/gora/GoraEndpoint.java | 2 -
.../camel/component/gora/GoraOperation.java | 2 -
.../extend/ClosureAggregationStrategy.java | 1 -
.../camel/groovy/extend/ClosureExpression.java | 1 -
.../language/groovy/GroovyRouteBuilder.java | 1 -
.../component/hdfs/HdfsProducerSplitTest.java | 4 +-
.../camel/component/hdfs2/HdfsFileType.java | 8 ++--
.../component/hdfs2/HdfsProducerSplitTest.java | 4 +-
.../component/hl7/MessageValidatorTest.java | 3 +-
.../apache/camel/jaxb/TestXmlStreamWriter.java | 3 --
.../component/jgroups/JGroupsException.java | 2 +
.../jmx/JMXNotificationFilterTest.java | 4 +-
.../apache/camel/component/jpa/JpaProducer.java | 4 +-
.../camel/component/kafka/KafkaConsumer.java | 2 +-
.../http/NettyHttpHeaderFilterStrategyTest.java | 3 --
.../protobuf/generated/AddressBookProtos.java | 36 +++++++++++++-----
.../component/salesforce/api/dto/RestError.java | 1 -
.../xquery/XQueryWithExtensionTest.java | 3 ++
...lementPreferringElementNameStrategyTest.java | 3 ++
.../component/splunk/event/SplunkEvent.java | 2 +-
.../apache/camel/spring/ShutdownOrderBean.java | 8 ++--
.../component/ssh/FileKeyPairProvider.java | 6 +--
.../WebscoketEndpointConfigurationTest.java | 2 +-
.../component/xmlrpc/XmlRpcComponentTest.java | 4 +-
.../processor/XmlSignerConfiguration.java | 1 -
.../processor/XmlSignerProcessor.java | 1 -
.../processor/XmlVerifierConfiguration.java | 1 -
.../processor/XmlVerifierProcessor.java | 1 -
.../yammer/YammerComponentTestSupport.java | 1 -
.../protobuf/generated/AddressBookProtos.java | 36 +++++++++++++-----
.../OSGiIntegrationManagedCamelContextTest.java | 5 +--
.../camel/maven/AbstractGeneratorMojoTest.java | 3 ++
63 files changed, 165 insertions(+), 142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java b/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
index 8d0a3a5..e68b49b 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
@@ -43,7 +43,6 @@ public class FileComponent extends GenericFileComponent<File> implements Endpoin
public static final String DEFAULT_LOCK_FILE_POSTFIX = ".camelLock";
public FileComponent() {
- super();
setEndpointClass(FileEndpoint.class);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
index 86431cb..c331843 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
@@ -247,7 +247,7 @@ public class DefaultHeaderFilterStrategy implements HeaderFilterStrategy {
if (isCaseInsensitive()) {
Iterator<String> it = filter.iterator();
while (it.hasNext()) {
- String filterString = (String) it.next();
+ String filterString = it.next();
if (filterString.equalsIgnoreCase(headerName)) {
return true;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java b/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java
index 498fde3..35c579a 100644
--- a/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java
+++ b/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java
@@ -31,6 +31,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -278,9 +279,9 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
int d = depth;
while (d <= depth) {
int code = reader.next();
- if (code == XMLStreamReader.START_ELEMENT) {
+ if (code == XMLStreamConstants.START_ELEMENT) {
depth++;
- } else if (code == XMLStreamReader.END_ELEMENT) {
+ } else if (code == XMLStreamConstants.END_ELEMENT) {
depth--;
}
}
@@ -289,7 +290,7 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
code = reader.next();
} else {
code = reader.getEventType();
- if (code == XMLStreamReader.END_ELEMENT) {
+ if (code == XMLStreamConstants.END_ELEMENT) {
// revert the depth count to avoid double counting the up event
depth++;
}
@@ -360,11 +361,11 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
private String getNextToken() throws XMLStreamException {
int code = 0;
- while (code != XMLStreamReader.END_DOCUMENT) {
+ while (code != XMLStreamConstants.END_DOCUMENT) {
code = readNext();
switch (code) {
- case XMLStreamReader.START_ELEMENT:
+ case XMLStreamConstants.START_ELEMENT:
depth++;
QName name = reader.getName();
if (LOG.isTraceEnabled()) {
@@ -400,7 +401,7 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
readCurrent(false);
}
break;
- case XMLStreamReader.END_ELEMENT:
+ case XMLStreamConstants.END_ELEMENT:
depth--;
QName endname = reader.getName();
LOG.trace("ee={}", endname);
@@ -436,7 +437,7 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
}
}
break;
- case XMLStreamReader.END_DOCUMENT:
+ case XMLStreamConstants.END_DOCUMENT:
LOG.trace("depth={}", depth);
break;
default:
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/camel-core/src/main/java/org/apache/camel/util/concurrent/AtomicException.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/concurrent/AtomicException.java b/camel-core/src/main/java/org/apache/camel/util/concurrent/AtomicException.java
index 07cfe28..992c60e 100644
--- a/camel-core/src/main/java/org/apache/camel/util/concurrent/AtomicException.java
+++ b/camel-core/src/main/java/org/apache/camel/util/concurrent/AtomicException.java
@@ -21,7 +21,8 @@ import java.util.concurrent.atomic.AtomicReference;
/**
* Convenience class for holding an {@link Exception} in a thread-safe way
*/
-@SuppressWarnings("serial")
public class AtomicException extends AtomicReference<Exception> {
+ private static final long serialVersionUID = 1L;
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/camel-core/src/main/java/org/apache/camel/util/concurrent/AtomicExchange.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/concurrent/AtomicExchange.java b/camel-core/src/main/java/org/apache/camel/util/concurrent/AtomicExchange.java
index fed12ce..8af9b45 100644
--- a/camel-core/src/main/java/org/apache/camel/util/concurrent/AtomicExchange.java
+++ b/camel-core/src/main/java/org/apache/camel/util/concurrent/AtomicExchange.java
@@ -23,7 +23,8 @@ import org.apache.camel.Exchange;
/**
* Convenience class for holding an {@link Exchange} in a thread-safe way
*/
-@SuppressWarnings("serial")
public class AtomicExchange extends AtomicReference<Exchange> {
+ private static final long serialVersionUID = 1L;
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxSourceTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxSourceTest.java b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxSourceTest.java
index 3d83d77..3a9d46c 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxSourceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxSourceTest.java
@@ -52,7 +52,7 @@ public class StaxSourceTest extends ContextTestSupport {
StaxSource staxSource = new StaxSource(reader);
StreamSource templateSource = new StreamSource(getClass().getResourceAsStream("/xslt/common/copy.xsl"));
Transformer transformer = trf.newTransformer(templateSource);
- //System.out.println("Used transformer: " + transformer.getClass().getName());
+ log.info("Used transformer: {}", transformer.getClass().getName());
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
transformer.transform(staxSource, new StreamResult(baos));
writer.flush();
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest.java
index e9385ef..50f4ead 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest.java
@@ -57,9 +57,9 @@ public class AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest extends
public String appendWithHeadersAndProperties(String existing, Map<String, String> oldHeaders, Map<String, Integer> oldProperties,
String next, Map<String, String> newHeaders, Map<String, Integer> newProperties) {
if (next != null) {
- Integer count = (Integer) oldProperties.get("count") + (Integer) newProperties.get("count");
+ Integer count = oldProperties.get("count") + newProperties.get("count");
oldProperties.put("count", count);
- String foo = oldHeaders.get("foo") + (String) newHeaders.get("foo");
+ String foo = oldHeaders.get("foo") + newHeaders.get("foo");
oldHeaders.put("foo", foo);
return existing + next;
} else {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersTest.java
index fd54b36..3155ab0 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersTest.java
@@ -54,7 +54,7 @@ public class AggregationStrategyBeanAdapterWithHeadersTest extends ContextTestSu
public String appendWithHeaders(String existing, Map<String, Integer> oldHeaders, String next, Map<String, Integer> newHeaders) {
if (next != null) {
- Integer count = (Integer) oldHeaders.get("count") + (Integer) newHeaders.get("count");
+ Integer count = oldHeaders.get("count") + newHeaders.get("count");
oldHeaders.put("count", count);
return existing + next;
} else {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java
index 43f3259..fe00b93 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java
@@ -49,9 +49,9 @@ public class WsProducer extends DefaultProducer {
log.debug("Sending out {}", message);
if (message != null) {
if (message instanceof String) {
- sendMessage(getWebSocket(), (String)message, ((WsEndpoint)getEndpoint()).isUseStreaming());
+ sendMessage(getWebSocket(), (String)message, getEndpoint().isUseStreaming());
} else if (message instanceof byte[]) {
- sendMessage(getWebSocket(), (byte[])message, ((WsEndpoint)getEndpoint()).isUseStreaming());
+ sendMessage(getWebSocket(), (byte[])message, getEndpoint().isUseStreaming());
} else if (message instanceof InputStream) {
sendStreamMessage(getWebSocket(), (InputStream)message);
} else {
@@ -133,6 +133,6 @@ public class WsProducer extends DefaultProducer {
}
private WebSocket getWebSocket() {
- return ((WsEndpoint)getEndpoint()).getWebSocket();
+ return getEndpoint().getWebSocket();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/wsservlet/WebsocketRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/wsservlet/WebsocketRouteTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/wsservlet/WebsocketRouteTest.java
index fe1a796..68f2dbc 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/wsservlet/WebsocketRouteTest.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/wsservlet/WebsocketRouteTest.java
@@ -165,9 +165,9 @@ public class WebsocketRouteTest extends WebsocketCamelRouterTestSupport {
}
private static byte[] createByteResponse(byte[] req) {
- byte[] resp = new byte[((byte[])req).length + RESPONSE_GREETING_BYTES.length];
+ byte[] resp = new byte[req.length + RESPONSE_GREETING_BYTES.length];
System.arraycopy(RESPONSE_GREETING_BYTES, 0, resp, 0, RESPONSE_GREETING_BYTES.length);
- System.arraycopy(req, 0, resp, RESPONSE_GREETING_BYTES.length, ((byte[])req).length);
+ System.arraycopy(req, 0, resp, RESPONSE_GREETING_BYTES.length, req.length);
return resp;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponentException.java
----------------------------------------------------------------------
diff --git a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponentException.java b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponentException.java
index 4f42a95..ce8df16 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponentException.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponentException.java
@@ -21,7 +21,6 @@ public class AvroComponentException extends Exception {
private static final long serialVersionUID = 8915917806189741165L;
public AvroComponentException() {
- super();
}
public AvroComponentException(String message, Throwable cause) {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java
----------------------------------------------------------------------
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java
index db2db71..6b1c8e1 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java
@@ -63,7 +63,7 @@ public class CsvTest extends CamelTestSupport {
if (verbose) {
for (Exchange exchange : exchanges) {
Object body = exchange.getIn().getBody();
- System.out.println("received message " + body + " of class " + body.getClass().getName());
+ log.info("received message {} of class {}", body, body.getClass().getName());
}
}
List<Map> results = new ArrayList<Map>();
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/csv/MyCsvRecord.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/csv/MyCsvRecord.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/csv/MyCsvRecord.java
index 7308823..423f639 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/csv/MyCsvRecord.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/csv/MyCsvRecord.java
@@ -21,10 +21,11 @@ import java.io.Serializable;
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
-@SuppressWarnings("serial")
@CsvRecord(separator = "," , skipFirstLine = false)
public class MyCsvRecord implements Serializable {
+ private static final long serialVersionUID = 1L;
+
@DataField(pos = 1)
private String attention;
@DataField(pos = 2)
@@ -45,7 +46,6 @@ public class MyCsvRecord implements Serializable {
private String dummy2;
public MyCsvRecord() {
- super();
}
public String getAttention() {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
index a147a10..5b7521b 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
@@ -61,7 +61,6 @@ public class PGPDataFormat extends PGPKeyAccessDataFormat implements PGPPublicKe
private PGPPassphraseAccessor passphraseAccessor; // for signing and decryption with multiple keys
public PGPDataFormat() {
- super();
publicKeyAccessor = this;
secretKeyAccessor = this;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
index 1ca517a..19fa450 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
@@ -78,10 +78,6 @@ import org.slf4j.LoggerFactory;
* array or file, then you should use the class {@link PGPDataFormat}.
*
*/
-/**
- * @author D023101
- *
- */
public class PGPKeyAccessDataFormat extends ServiceSupport implements DataFormat {
public static final String KEY_USERID = "CamelPGPDataFormatKeyUserid";
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
index 6250695..0489086 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
@@ -78,15 +78,15 @@ public class PGPDataFormatDynamicTest extends PGPDataFormatTest {
// override wrong userid and password with correct userid and password in the headers
protected Map<String, Object> getHeaders() {
Map<String, Object> headers = new HashMap<String, Object>();
- headers.put(PGPDataFormat.KEY_USERID, "sdude@nowhere.net");
- headers.put(PGPDataFormat.KEY_USERIDS, Collections.singletonList("second"));
- headers.put(PGPDataFormat.SIGNATURE_KEY_USERID, "sdude@nowhere.net");
+ headers.put(PGPKeyAccessDataFormat.KEY_USERID, "sdude@nowhere.net");
+ headers.put(PGPKeyAccessDataFormat.KEY_USERIDS, Collections.singletonList("second"));
+ headers.put(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID, "sdude@nowhere.net");
headers.put(PGPDataFormat.KEY_PASSWORD, "sdude");
headers.put(PGPDataFormat.SIGNATURE_KEY_PASSWORD, "sdude");
- headers.put(PGPDataFormat.ENCRYPTION_ALGORITHM, SymmetricKeyAlgorithmTags.AES_128);
- headers.put(PGPDataFormat.SIGNATURE_HASH_ALGORITHM, HashAlgorithmTags.SHA512);
- headers.put(PGPDataFormat.COMPRESSION_ALGORITHM, CompressionAlgorithmTags.ZLIB);
- headers.put(PGPDataFormat.SIGNATURE_KEY_USERIDS, Collections.singletonList("second"));
+ headers.put(PGPKeyAccessDataFormat.ENCRYPTION_ALGORITHM, SymmetricKeyAlgorithmTags.AES_128);
+ headers.put(PGPKeyAccessDataFormat.SIGNATURE_HASH_ALGORITHM, HashAlgorithmTags.SHA512);
+ headers.put(PGPKeyAccessDataFormat.COMPRESSION_ALGORITHM, CompressionAlgorithmTags.ZLIB);
+ headers.put(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERIDS, Collections.singletonList("second"));
return headers;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
index 713e7b8..77783c3 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
@@ -206,9 +206,9 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
String payload = "Hi Alice, Be careful Eve is listening, signed Bob";
Map<String, Object> headers = new HashMap<String, Object>();
// add signature user id which does not have a passphrase
- headers.put(PGPDataFormat.SIGNATURE_KEY_USERID, "userIDWithNoPassphrase");
+ headers.put(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID, "userIDWithNoPassphrase");
// the following entry is necessary for the dynamic test
- headers.put(PGPDataFormat.KEY_USERID, "second");
+ headers.put(PGPKeyAccessDataFormat.KEY_USERID, "second");
template.sendBodyAndHeaders("direct:several-signer-keys", payload, headers);
assertMockEndpointsSatisfied();
@@ -237,8 +237,8 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
Message inMess = exchange.getIn();
assertNotNull(inMess);
// must contain exactly one encryption key and one signature
- assertEquals(1, inMess.getHeader(PGPDataFormat.NUMBER_OF_ENCRYPTION_KEYS));
- assertEquals(1, inMess.getHeader(PGPDataFormat.NUMBER_OF_SIGNING_KEYS));
+ assertEquals(1, inMess.getHeader(PGPKeyAccessDataFormat.NUMBER_OF_ENCRYPTION_KEYS));
+ assertEquals(1, inMess.getHeader(PGPKeyAccessDataFormat.NUMBER_OF_SIGNING_KEYS));
}
/**
@@ -347,7 +347,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider(getProvider()).build(
"sdude".toCharArray()));
PGPSignatureGenerator sGen = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(pgpSec.getPublicKey().getAlgorithm(),
- PGPUtil.SHA1).setProvider(getProvider()));
+ HashAlgorithmTags.SHA1).setProvider(getProvider()));
sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey);
@@ -444,7 +444,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
@Test
public void testExceptionForSignatureVerificationOptionNoSignatureAllowed() throws Exception {
- decryptor.setSignatureVerificationOption(PGPDataFormat.SIGNATURE_VERIFICATION_OPTION_NO_SIGNATURE_ALLOWED);
+ decryptor.setSignatureVerificationOption(PGPKeyAccessDataFormat.SIGNATURE_VERIFICATION_OPTION_NO_SIGNATURE_ALLOWED);
MockEndpoint mock = getMockEndpoint("mock:exception");
mock.expectedMessageCount(1);
@@ -458,7 +458,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
public void testExceptionForSignatureVerificationOptionRequired() throws Exception {
encryptor.setSignatureKeyUserid(null); // no signature
- decryptor.setSignatureVerificationOption(PGPDataFormat.SIGNATURE_VERIFICATION_OPTION_REQUIRED);
+ decryptor.setSignatureVerificationOption(PGPKeyAccessDataFormat.SIGNATURE_VERIFICATION_OPTION_REQUIRED);
MockEndpoint mock = getMockEndpoint("mock:exception");
mock.expectedMessageCount(1);
@@ -472,7 +472,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
public void testSignatureVerificationOptionIgnore() throws Exception {
// encryptor is sending a PGP message with signature! Decryptor is ignoreing the signature
- decryptor.setSignatureVerificationOption(PGPDataFormat.SIGNATURE_VERIFICATION_OPTION_IGNORE);
+ decryptor.setSignatureVerificationOption(PGPKeyAccessDataFormat.SIGNATURE_VERIFICATION_OPTION_IGNORE);
decryptor.setSignatureKeyUserids(null);
decryptor.setSignatureKeyFileName(null); // no public keyring! --> no signature validation possible
@@ -516,7 +516,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
pgpDecrypt.setKeyFileName(keyFileNameSec);
pgpDecrypt.setPassword(keyPassword);
pgpDecrypt.setProvider(getProvider());
- pgpDecrypt.setSignatureVerificationOption(PGPDataFormat.SIGNATURE_VERIFICATION_OPTION_NO_SIGNATURE_ALLOWED);
+ pgpDecrypt.setSignatureVerificationOption(PGPKeyAccessDataFormat.SIGNATURE_VERIFICATION_OPTION_NO_SIGNATURE_ALLOWED);
from("direct:inline2").marshal(pgpEncrypt).to("mock:encrypted").unmarshal(pgpDecrypt).to("mock:unencrypted");
@@ -550,8 +550,8 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
// test verifying exception, no public key found corresponding to signature key userIds
from("direct:verify_exception_sig_userids").marshal(pgpSignAndEncrypt).to("mock:encrypted")
- .setHeader(PGPDataFormat.SIGNATURE_KEY_USERIDS).constant(Arrays.asList(new String[] {"wrong1", "wrong2" }))
- .setHeader(PGPDataFormat.SIGNATURE_KEY_USERID).constant("wrongUserID").unmarshal(pgpVerifyAndDecrypt)
+ .setHeader(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERIDS).constant(Arrays.asList(new String[] {"wrong1", "wrong2" }))
+ .setHeader(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID).constant("wrongUserID").unmarshal(pgpVerifyAndDecrypt)
.to("mock:unencrypted");
/* ---- key ring as byte array -- */
@@ -589,7 +589,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
pgpVerifyAndDecryptByteArray.setProvider(getProvider());
// restrict verification to public keys with certain User ID
pgpVerifyAndDecryptByteArray.setSignatureKeyUserids(getSignatureKeyUserIds());
- pgpVerifyAndDecryptByteArray.setSignatureVerificationOption(PGPDataFormat.SIGNATURE_VERIFICATION_OPTION_REQUIRED);
+ pgpVerifyAndDecryptByteArray.setSignatureVerificationOption(PGPKeyAccessDataFormat.SIGNATURE_VERIFICATION_OPTION_REQUIRED);
from("direct:sign-key-ring-byte-array").streamCaching()
// encryption key ring can also be set as header
@@ -647,27 +647,27 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
pgpVerifyAndDecryptOneUserIdWithServeralKeys.setSignatureKeyUserids(expectedSigUserIds);
from("direct:one-userid-several-keys")
// there are two keys which have a User ID which contains the string "econd"
- .setHeader(PGPDataFormat.KEY_USERID)
+ .setHeader(PGPKeyAccessDataFormat.KEY_USERID)
.constant("econd")
- .setHeader(PGPDataFormat.SIGNATURE_KEY_USERID)
+ .setHeader(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID)
.constant("econd")
.marshal(pgpSignAndEncryptOneUserIdWithServeralKeys)
// it is recommended to remove the header immediately when it is no longer needed
- .removeHeader(PGPDataFormat.KEY_USERID)
- .removeHeader(PGPDataFormat.SIGNATURE_KEY_USERID)
+ .removeHeader(PGPKeyAccessDataFormat.KEY_USERID)
+ .removeHeader(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID)
.to("mock:encrypted")
// only specify one expected signature key, to check the first signature
- .setHeader(PGPDataFormat.SIGNATURE_KEY_USERID)
+ .setHeader(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID)
.constant("Second <em...@second.com>")
.unmarshal(pgpVerifyAndDecryptOneUserIdWithServeralKeys)
// do it again but now check the second signature key
// there are two keys which have a User ID which contains the string "econd"
- .setHeader(PGPDataFormat.KEY_USERID).constant("econd").setHeader(PGPDataFormat.SIGNATURE_KEY_USERID)
+ .setHeader(PGPKeyAccessDataFormat.KEY_USERID).constant("econd").setHeader(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID)
.constant("econd").marshal(pgpSignAndEncryptOneUserIdWithServeralKeys)
// it is recommended to remove the header immediately when it is no longer needed
- .removeHeader(PGPDataFormat.KEY_USERID).removeHeader(PGPDataFormat.SIGNATURE_KEY_USERID)
+ .removeHeader(PGPKeyAccessDataFormat.KEY_USERID).removeHeader(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID)
// only specify one expected signature key, to check the second signature
- .setHeader(PGPDataFormat.SIGNATURE_KEY_USERID).constant("Third (comment third) <em...@third.com>")
+ .setHeader(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID).constant("Third (comment third) <em...@third.com>")
.unmarshal(pgpVerifyAndDecryptOneUserIdWithServeralKeys).to("mock:unencrypted");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
index dee3c52..ad02956 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
@@ -199,7 +199,6 @@ public class CamelDestination extends AbstractDestination implements Configurabl
org.apache.cxf.message.Exchange cxfExchange;
BackChannelConduit(Message message) {
- super();
inMessage = message;
cxfExchange = inMessage.getExchange();
camelExchange = cxfExchange.get(Exchange.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java
index af28c19..617a29a 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java
@@ -28,6 +28,7 @@ import org.apache.camel.hello_world_soap_http.GreeterService;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -69,8 +70,8 @@ public class WSSecurityRouteTest extends CamelTestSupport {
URL busFile = WSSecurityRouteTest.class.getResource("../client/wssec.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
GreeterService gs = new GreeterService();
Greeter greeter = gs.getGreeterSignaturePort();
@@ -90,8 +91,8 @@ public class WSSecurityRouteTest extends CamelTestSupport {
URL busFile = WSSecurityRouteTest.class.getResource("../client/wssec.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
GreeterService gs = new GreeterService();
Greeter greeter = gs.getGreeterUsernameTokenPort();
@@ -111,8 +112,8 @@ public class WSSecurityRouteTest extends CamelTestSupport {
URL busFile = WSSecurityRouteTest.class.getResource("../client/wssec.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
GreeterService gs = new GreeterService();
Greeter greeter = gs.getGreeterEncryptionPort();
@@ -132,8 +133,8 @@ public class WSSecurityRouteTest extends CamelTestSupport {
URL busFile = WSSecurityRouteTest.class.getResource("../client/wssec.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
GreeterService gs = new GreeterService();
Greeter greeter = gs.getGreeterSecurityPolicyPort();
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/CxfServer.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/CxfServer.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/CxfServer.java
index 92d6ba5..297ad50 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/CxfServer.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/CxfServer.java
@@ -20,6 +20,7 @@ import java.net.URL;
import org.apache.camel.component.cxf.wssecurity.camel.WSSecurityRouteTest;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
public class CxfServer {
@@ -29,8 +30,8 @@ public class CxfServer {
URL busFile = WSSecurityRouteTest.class.getResource("../server/wssec.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
index 204ce91..ca5a94d 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
@@ -51,7 +51,6 @@ public class GreeterImpl implements Greeter {
*/
public String sayHi() {
LOG.info("Executing operation sayHi");
- System.out.println("Executing operation sayHi\n");
return "Bonjour";
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorNotStartedException.java
----------------------------------------------------------------------
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorNotStartedException.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorNotStartedException.java
index caabae9..1cb2f5e 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorNotStartedException.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorNotStartedException.java
@@ -26,7 +26,6 @@ public class DisruptorNotStartedException extends Exception {
private static final long serialVersionUID = 1L;
public DisruptorNotStartedException() {
- super();
}
public DisruptorNotStartedException(String message) {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxException.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxException.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxException.java
index 387d239..3ba9467 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxException.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxException.java
@@ -17,6 +17,9 @@
package org.apache.camel.component.dropbox.util;
public class DropboxException extends Exception {
+
+ private static final long serialVersionUID = 1L;
+
public DropboxException(String message) {
super(message);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxPropertyManager.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxPropertyManager.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxPropertyManager.java
index f9778fe..8810afb 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxPropertyManager.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/util/DropboxPropertyManager.java
@@ -37,7 +37,7 @@ public final class DropboxPropertyManager {
}
public String getProperty(String key) {
- return (String)properties.getProperty(key);
+ return properties.getProperty(key);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
index 8e3998f..9aeee72 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
@@ -30,7 +30,6 @@ import org.apache.commons.net.ftp.FTPFile;
public class FtpComponent extends RemoteFileComponent<FTPFile> {
public FtpComponent() {
- super();
setEndpointClass(FtpEndpoint.class);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsComponent.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsComponent.java
index d43ecf2..428ba7d 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsComponent.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsComponent.java
@@ -34,7 +34,6 @@ import org.apache.commons.net.ftp.FTPFile;
public class FtpsComponent extends FtpComponent {
public FtpsComponent() {
- super();
setEndpointClass(FtpsEndpoint.class);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpComponent.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpComponent.java
index 4faa66c..82c1247 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpComponent.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpComponent.java
@@ -29,7 +29,6 @@ import org.apache.camel.component.file.GenericFileEndpoint;
public class SftpComponent extends RemoteFileComponent<ChannelSftp.LsEntry> {
public SftpComponent() {
- super();
setEndpointClass(SftpEndpoint.class);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthException.java
----------------------------------------------------------------------
diff --git a/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthException.java b/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthException.java
index 7ab3995..0b5820a 100644
--- a/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthException.java
+++ b/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthException.java
@@ -16,9 +16,10 @@
*/
package org.apache.camel.component.gae.auth;
-@SuppressWarnings("serial")
public class GAuthException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
public GAuthException() {
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java b/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
index 72c0213..3bc1f23 100644
--- a/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
+++ b/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
@@ -22,7 +22,6 @@ import org.apache.camel.impl.SimpleRegistry;
public class GaeDefaultCamelContext extends DefaultCamelContext {
public GaeDefaultCamelContext() {
- super();
// disable JMX and use the simple registry as JNDI is not allowed
disableJMX();
setRegistry(new SimpleRegistry());
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraAttribute.java
----------------------------------------------------------------------
diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraAttribute.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraAttribute.java
index aeab95f..069a42d 100644
--- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraAttribute.java
+++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraAttribute.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.gora;
/**
* Camel-Gora attributes
- *
- * @author ipolyzos
*/
public enum GoraAttribute {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConstants.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConstants.java
index de08fb7..999056e 100644
--- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConstants.java
+++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConstants.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.gora;
/**
* Camel Gora component constants
- *
- * @author ipolyzos
*/
public final class GoraConstants {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java
index df5c628..aedbd45 100644
--- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java
+++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java
@@ -28,8 +28,6 @@ import org.slf4j.LoggerFactory;
/**
* Gora endpoint
- *
- * @author ipolyzos
*/
public class GoraEndpoint extends DefaultEndpoint {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraOperation.java
----------------------------------------------------------------------
diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraOperation.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraOperation.java
index 3fd4284..29dbe6c 100644
--- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraOperation.java
+++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraOperation.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.gora;
/**
* Camel-Gora Operations.
- *
- * @author ipolyzos
*/
public enum GoraOperation {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureAggregationStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureAggregationStrategy.java b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureAggregationStrategy.java
index c209976..51fc467 100644
--- a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureAggregationStrategy.java
+++ b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureAggregationStrategy.java
@@ -26,7 +26,6 @@ class ClosureAggregationStrategy implements AggregationStrategy {
private Closure<Exchange> closure;
ClosureAggregationStrategy(Closure<Exchange> closure) {
- super();
this.closure = closure;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureExpression.java
----------------------------------------------------------------------
diff --git a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureExpression.java b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureExpression.java
index 1cdfc4b..af634a9 100644
--- a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureExpression.java
+++ b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureExpression.java
@@ -29,7 +29,6 @@ class ClosureExpression extends ExpressionSupport {
private Closure<?> closure;
ClosureExpression(Closure<?> closure) {
- super();
this.closure = closure;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java
----------------------------------------------------------------------
diff --git a/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java b/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java
index 2710fa4..a6f018c 100644
--- a/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java
+++ b/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java
@@ -26,7 +26,6 @@ import org.apache.camel.builder.RouteBuilder;
@Deprecated
public abstract class GroovyRouteBuilder extends RouteBuilder {
public GroovyRouteBuilder() {
- super();
}
public GroovyRouteBuilder(CamelContext context) {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
index 7496a11..2ecc4ff 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
@@ -97,8 +97,8 @@ public class HdfsProducerSplitTest extends HdfsTestSupport {
FileSystem fs = FileSystem.get(new Configuration());
FileStatus[] status = fs.listStatus(new Path("file:///" + BASE_FILE.toUri() + routeNr));
assertEquals(10, status.length);
- for (int i = 0; i < status.length; i++) {
- BufferedReader br = new BufferedReader(new InputStreamReader(fs.open(status[i].getPath())));
+ for (FileStatus fileStatus : status) {
+ BufferedReader br = new BufferedReader(new InputStreamReader(fs.open(fileStatus.getPath())));
assertTrue(br.readLine().startsWith("CIAO"));
assertNull(br.readLine());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
index bb08440..2df0bba 100644
--- a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
+++ b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
@@ -348,10 +348,10 @@ public enum HdfsFileType {
HdfsInfo hdfsInfo = HdfsInfoFactory.newHdfsInfo(hdfsPath);
Class<? extends WritableComparable> keyWritableClass = configuration.getKeyType().getWritableClass();
Class<? extends WritableComparable> valueWritableClass = configuration.getValueType().getWritableClass();
- rout = new BloomMapFile.Writer(hdfsInfo.getConf(), new Path(hdfsPath), BloomMapFile.Writer.keyClass(keyWritableClass),
- BloomMapFile.Writer.valueClass(valueWritableClass),
- BloomMapFile.Writer.compression(configuration.getCompressionType(), configuration.getCompressionCodec().getCodec()),
- BloomMapFile.Writer.progressable(new Progressable() {
+ rout = new BloomMapFile.Writer(hdfsInfo.getConf(), new Path(hdfsPath), org.apache.hadoop.io.MapFile.Writer.keyClass(keyWritableClass),
+ org.apache.hadoop.io.MapFile.Writer.valueClass(valueWritableClass),
+ org.apache.hadoop.io.MapFile.Writer.compression(configuration.getCompressionType(), configuration.getCompressionCodec().getCodec()),
+ org.apache.hadoop.io.MapFile.Writer.progressable(new Progressable() {
@Override
public void progress() {
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerSplitTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerSplitTest.java b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerSplitTest.java
index 22d5ac2..9c26633 100644
--- a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerSplitTest.java
+++ b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsProducerSplitTest.java
@@ -97,8 +97,8 @@ public class HdfsProducerSplitTest extends HdfsTestSupport {
FileSystem fs = FileSystem.get(new Configuration());
FileStatus[] status = fs.listStatus(new Path("file:///" + BASE_FILE.toUri() + routeNr));
assertEquals(10, status.length);
- for (int i = 0; i < status.length; i++) {
- BufferedReader br = new BufferedReader(new InputStreamReader(fs.open(status[i].getPath())));
+ for (FileStatus fileStatus : status) {
+ BufferedReader br = new BufferedReader(new InputStreamReader(fs.open(fileStatus.getPath())));
assertTrue(br.readLine().startsWith("CIAO"));
assertNull(br.readLine());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
index 0287d2c..0ae73e9 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
@@ -44,9 +44,10 @@ public class MessageValidatorTest extends CamelTestSupport {
protected void doPreSetup() throws Exception {
defaultContext = new DefaultValidation();
customContext = new DefaultValidation();
- @SuppressWarnings("serial")
MessageRule rule = new MessageRule() {
+ private static final long serialVersionUID = 1L;
+
@Override
public String getDescription() {
return null;
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
----------------------------------------------------------------------
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
index d30e8f7..6f0634d 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TestXmlStreamWriter.java
@@ -22,9 +22,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.camel.converter.jaxb.JaxbXmlStreamWriterWrapper;
-/**
- * @author <a href="http://christianposta.com/blog">Christian Posta</a>
- */
public class TestXmlStreamWriter implements JaxbXmlStreamWriterWrapper {
@Override
public XMLStreamWriter wrapWriter(final XMLStreamWriter writer) {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsException.java
----------------------------------------------------------------------
diff --git a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsException.java b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsException.java
index b58bf89..9703f00 100644
--- a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsException.java
+++ b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsException.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.jgroups;
public class JGroupsException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
public JGroupsException(String message, Throwable cause) {
super(message, cause);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXNotificationFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXNotificationFilterTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXNotificationFilterTest.java
index 9191a10..c09d86d 100644
--- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXNotificationFilterTest.java
+++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXNotificationFilterTest.java
@@ -69,13 +69,15 @@ public class JMXNotificationFilterTest extends SimpleBeanFixture {
return super.buildFromURI().withNotificationFilter("#myFilter").withFormat("raw");
}
- @SuppressWarnings("serial")
@Override
protected void initRegistry() {
super.initRegistry();
// initialize the registry with our filter
getRegistry().put("myFilter", new NotificationFilter() {
+
+ private static final long serialVersionUID = 1L;
+
public boolean isNotificationEnabled(Notification aNotification) {
// only accept even notifications
boolean enabled = aNotification.getSequenceNumber() % 2 == 0;
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
index a633e89..bd43978 100644
--- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
+++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
@@ -63,8 +63,8 @@ public class JpaProducer extends DefaultProducer {
}
if (values.getClass().isArray()) {
Object[] array = (Object[])values;
- for (int index = 0; index < array.length; index++) {
- save(array[index]);
+ for (Object element : array) {
+ save(element);
}
} else if (values instanceof Collection) {
Collection<?> collection = (Collection<?>)values;
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index 3087a14..bfc73b2 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -110,7 +110,7 @@ public class KafkaConsumer extends DefaultConsumer {
public void run() {
ConsumerIterator<byte[], byte[]> it = stream.iterator();
- while ((Boolean) it.hasNext()) {
+ while (it.hasNext()) {
MessageAndMetadata<byte[], byte[]> mm = it.next();
Exchange exchange = endpoint.createKafkaExchange(mm);
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderFilterStrategyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderFilterStrategyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderFilterStrategyTest.java
index 61d32b9..15de68e 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderFilterStrategyTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderFilterStrategyTest.java
@@ -25,9 +25,6 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-/**
- * @author <a href="http://www.christianposta.com/blog">Christian Posta</a>
- */
public class NettyHttpHeaderFilterStrategyTest {
private NettyHttpHeaderFilterStrategy filter;
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java
----------------------------------------------------------------------
diff --git a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java
index f88a9c0..18e1c0f 100644
--- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java
+++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java
@@ -501,7 +501,9 @@ public final class AddressBookProtos {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized != -1) {
+ return isInitialized == 1;
+ }
if (!hasNumber()) {
memoizedIsInitialized = 0;
@@ -526,7 +528,9 @@ public final class AddressBookProtos {
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
- if (size != -1) return size;
+ if (size != -1) {
+ return size;
+ }
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -708,7 +712,9 @@ public final class AddressBookProtos {
}
public Builder mergeFrom(org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person.PhoneNumber other) {
- if (other == org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person.PhoneNumber.getDefaultInstance()) return this;
+ if (other == org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person.PhoneNumber.getDefaultInstance()) {
+ return this;
+ }
if (other.hasNumber()) {
bitField0_ |= 0x00000001;
number_ = other.number_;
@@ -1017,7 +1023,9 @@ public final class AddressBookProtos {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized != -1) {
+ return isInitialized == 1;
+ }
if (!hasName()) {
memoizedIsInitialized = 0;
@@ -1058,7 +1066,9 @@ public final class AddressBookProtos {
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
- if (size != -1) return size;
+ if (size != -1) {
+ return size;
+ }
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1270,7 +1280,9 @@ public final class AddressBookProtos {
}
public Builder mergeFrom(org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person other) {
- if (other == org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person.getDefaultInstance()) return this;
+ if (other == org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person.getDefaultInstance()) {
+ return this;
+ }
if (other.hasName()) {
bitField0_ |= 0x00000001;
name_ = other.name_;
@@ -1954,7 +1966,9 @@ public final class AddressBookProtos {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized != -1) {
+ return isInitialized == 1;
+ }
for (int i = 0; i < getPersonCount(); i++) {
if (!getPerson(i).isInitialized()) {
@@ -1978,7 +1992,9 @@ public final class AddressBookProtos {
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
- if (size != -1) return size;
+ if (size != -1) {
+ return size;
+ }
size = 0;
for (int i = 0; i < person_.size(); i++) {
@@ -2158,7 +2174,9 @@ public final class AddressBookProtos {
}
public Builder mergeFrom(org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.AddressBook other) {
- if (other == org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.AddressBook.getDefaultInstance()) return this;
+ if (other == org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.AddressBook.getDefaultInstance()) {
+ return this;
+ }
if (personBuilder_ == null) {
if (!other.person_.isEmpty()) {
if (person_.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
index 980108e..c67cf07 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
@@ -29,7 +29,6 @@ public class RestError extends AbstractDTOBase {
// default ctor for unmarshalling
public RestError() {
- super();
}
public RestError(String errorCode, String message, List<String> fields) {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java
index 26401da..ad29aa9 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java
@@ -101,6 +101,9 @@ public class XQueryWithExtensionTest extends CamelTestSupport {
@Override
public ExtensionFunctionCall makeCallExpression() {
return new ExtensionFunctionCall() {
+
+ private static final long serialVersionUID = 1L;
+
@Override
public Sequence call(XPathContext xPathContext, Sequence[] sequences) throws XPathException {
// get value of first arg passed to the function
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java
index 2a9c325..7b42d61 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java
@@ -60,6 +60,9 @@ public class XmlRootElementPreferringElementNameStrategyTest {
@XmlType(name = "", propOrder = {LOCAL_NAME})
@XmlRootElement(name = LOCAL_NAME, namespace = CUSTOM_NS)
public class Request implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/event/SplunkEvent.java
----------------------------------------------------------------------
diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/event/SplunkEvent.java b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/event/SplunkEvent.java
index 63c5cd1..cab646f 100644
--- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/event/SplunkEvent.java
+++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/event/SplunkEvent.java
@@ -24,13 +24,13 @@ import java.util.Map;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
-@SuppressWarnings("serial")
public class SplunkEvent implements Serializable {
// ----------------------------------
// Common event fields
// ----------------------------------
+ private static final long serialVersionUID = 1L;
/**
* A device-specific classification provided as part of the event.
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-spring/src/test/java/org/apache/camel/spring/ShutdownOrderBean.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/ShutdownOrderBean.java b/components/camel-spring/src/test/java/org/apache/camel/spring/ShutdownOrderBean.java
index 5fa708c..e106e72 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/ShutdownOrderBean.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/ShutdownOrderBean.java
@@ -21,8 +21,8 @@ import java.util.List;
public class ShutdownOrderBean {
- private List start = new ArrayList();
- private List shutdown = new ArrayList();
+ private List<String> start = new ArrayList<String>();
+ private List<String> shutdown = new ArrayList<String>();
public void start(String name) {
start.add(name);
@@ -32,11 +32,11 @@ public class ShutdownOrderBean {
shutdown.add(name);
}
- public List getStart() {
+ public List<String> getStart() {
return start;
}
- public List getShutdown() {
+ public List<String> getShutdown() {
return shutdown;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java
----------------------------------------------------------------------
diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java
index 6ed9b9b..30df778 100644
--- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java
+++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/FileKeyPairProvider.java
@@ -79,9 +79,9 @@ public class FileKeyPairProvider extends AbstractKeyPairProvider {
throw new IllegalStateException("BouncyCastle must be registered as a JCE provider");
}
List<KeyPair> keys = new ArrayList<KeyPair>();
- for (int i = 0; i < files.length; i++) {
+ for (String file : files) {
try {
- PEMParser r = new PEMParser(new InputStreamReader(new FileInputStream(files[i])));
+ PEMParser r = new PEMParser(new InputStreamReader(new FileInputStream(file)));
try {
Object o = r.readObject();
@@ -104,7 +104,7 @@ public class FileKeyPairProvider extends AbstractKeyPairProvider {
r.close();
}
} catch (Exception e) {
- log.warn("Unable to read key {}: {}", files[i], e);
+ log.warn("Unable to read key {}: {}", file, e);
}
}
return keys;
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebscoketEndpointConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebscoketEndpointConfigurationTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebscoketEndpointConfigurationTest.java
index b74848f..91c1263 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebscoketEndpointConfigurationTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebscoketEndpointConfigurationTest.java
@@ -50,7 +50,7 @@ public class WebscoketEndpointConfigurationTest extends CamelTestSupport {
assertEquals(WebsocketConsumer.class, consumer.getClass());
// just check the servlet initial parameters
- ConnectorRef conector = component.getConnectors().values().iterator().next();
+ ConnectorRef conector = WebsocketComponent.getConnectors().values().iterator().next();
ServletContextHandler context = (ServletContextHandler)conector.server.getHandler();
String buffersize = context.getInitParameter("bufferSize");
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcComponentTest.java b/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcComponentTest.java
index 860e460..ac4d6c7 100644
--- a/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcComponentTest.java
+++ b/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcComponentTest.java
@@ -69,7 +69,6 @@ public class XmlRpcComponentTest extends CamelTestSupport {
verifyHeadersPreserved("direct:async");
}
- @SuppressWarnings("serial")
private void verifyHeadersPreserved(String uri) throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.reset();
@@ -77,6 +76,9 @@ public class XmlRpcComponentTest extends CamelTestSupport {
mock.expectedHeaderReceived("UserHeader", "test-header-value");
template.requestBodyAndHeaders(uri, new Object[] {"me"},
new HashMap<String, Object>() {
+
+ private static final long serialVersionUID = 1L;
+
{
put(XmlRpcConstants.METHOD_NAME, "hello");
put("UserHeader", "test-header-value");
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
index 15f1158..3193877 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
@@ -109,7 +109,6 @@ public class XmlSignerConfiguration extends XmlSignatureConfiguration {
private String propertiesName;
public XmlSignerConfiguration() {
- super();
}
public XmlSignerConfiguration copy() {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java
index c9dc980..31bd0be 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java
@@ -174,7 +174,6 @@ public class XmlSignerProcessor extends XmlSignatureProcessor {
private final XmlSignerConfiguration config;
public XmlSignerProcessor(XmlSignerConfiguration config) {
- super();
this.config = config;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
index 9e46143..c7da6cb 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
@@ -53,7 +53,6 @@ public class XmlVerifierConfiguration extends XmlSignatureConfiguration {
private Boolean secureValidation = Boolean.TRUE;
public XmlVerifierConfiguration() {
- super();
}
public XmlVerifierConfiguration copy() {
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java
index a7106bb..88863c0 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java
@@ -66,7 +66,6 @@ public class XmlVerifierProcessor extends XmlSignatureProcessor {
private final XmlVerifierConfiguration config;
public XmlVerifierProcessor(XmlVerifierConfiguration config) {
- super();
this.config = config;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/12a2c0d2/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
index f55d5fa..cfc96de 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
@@ -30,7 +30,6 @@ public abstract class YammerComponentTestSupport extends CamelTestSupport {
private String messages;
public YammerComponentTestSupport() {
- super();
}
@Override