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 2013/07/06 18:59:42 UTC
[1/2] Polished.
Updated Branches:
refs/heads/master bee48ab65 -> ad710f1fc
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/DSAKeyPairIdentity.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/DSAKeyPairIdentity.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/DSAKeyPairIdentity.java
index fa5cf11..849a95c 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/DSAKeyPairIdentity.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/DSAKeyPairIdentity.java
@@ -1,228 +1,228 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.file.remote;
-
-import java.nio.ByteBuffer;
-import java.security.InvalidKeyException;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.security.interfaces.DSAParams;
-import java.security.interfaces.DSAPublicKey;
-
-import com.jcraft.jsch.Identity;
-import com.jcraft.jsch.JSchException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DSAKeyPairIdentity implements Identity {
- private static final String ALGORITHM_TYPE = "ssh-dss";
- private final transient Logger log = LoggerFactory.getLogger(getClass());
- private KeyPair keyPair;
- private String name;
-
- public DSAKeyPairIdentity(String name, KeyPair keyPair) {
- this.name = name;
- this.keyPair = keyPair;
- }
-
- @Override
- public boolean setPassphrase(byte[] passphrase) throws JSchException {
- return true;
- }
-
- @Override
- public byte[] getPublicKeyBlob() {
- DSAPublicKey publicKey = (DSAPublicKey) keyPair.getPublic();
- byte[] sshDss = ALGORITHM_TYPE.getBytes();
-
- DSAParams dsaParams = publicKey.getParams();
- byte[] pArray = dsaParams.getP().toByteArray();
- byte[] qArray = dsaParams.getQ().toByteArray();
- byte[] gArray = dsaParams.getG().toByteArray();
- byte[] yArray = publicKey.getY().toByteArray();
-
- byte[] result = new byte[sshDss.length + 4 + pArray.length + 4 + qArray.length + 4 + gArray.length + 4 + yArray.length + 4];
- int index = 0;
-
- byte[] intAsByteArray = ByteBuffer.allocate(4).putInt(sshDss.length).array();
- System.arraycopy(intAsByteArray, 0, result, index, 4);
- index += 4;
-
- System.arraycopy(sshDss, 0, result, index, sshDss.length);
- index += sshDss.length;
-
- intAsByteArray = ByteBuffer.allocate(4).putInt(pArray.length).array();
- System.arraycopy(intAsByteArray, 0, result, index, 4);
- index += 4;
-
- System.arraycopy(pArray, 0, result, index, pArray.length);
- index += pArray.length;
-
- intAsByteArray = ByteBuffer.allocate(4).putInt(qArray.length).array();
- System.arraycopy(intAsByteArray, 0, result, index, 4);
- index += 4;
-
- System.arraycopy(qArray, 0, result, index, qArray.length);
- index += qArray.length;
-
- intAsByteArray = ByteBuffer.allocate(4).putInt(gArray.length).array();
- System.arraycopy(intAsByteArray, 0, result, index, 4);
- index += 4;
-
- System.arraycopy(gArray, 0, result, index, gArray.length);
- index += gArray.length;
-
- intAsByteArray = ByteBuffer.allocate(4).putInt(yArray.length).array();
- System.arraycopy(intAsByteArray, 0, result, index, 4);
- index += 4;
-
- System.arraycopy(yArray, 0, result, index, yArray.length);
-
- return result;
- }
-
- @Override
- public byte[] getSignature(byte[] data) {
- try {
- PrivateKey prvKey = (PrivateKey) keyPair.getPrivate();
- Signature sig;
- sig = Signature.getInstance("SHA1withDSA");
- sig.initSign(prvKey);
- sig.update(data);
- byte[] sshDss = ALGORITHM_TYPE.getBytes();
- byte[] signature = sig.sign();
-
- signature = convertDERToP1363(signature);
-
- byte[] result = new byte[sshDss.length + 4 + signature.length + 4];
- int index = 0;
-
- byte[] intAsByteArray = ByteBuffer.allocate(4).putInt(sshDss.length).array();
- System.arraycopy(intAsByteArray, 0, result, index, 4);
- index += 4;
-
- System.arraycopy(sshDss, 0, result, index, sshDss.length);
- index += sshDss.length;
-
- intAsByteArray = ByteBuffer.allocate(4).putInt(signature.length).array();
- System.arraycopy(intAsByteArray, 0, result, index, 4);
- index += 4;
-
- System.arraycopy(signature, 0, result, index, signature.length);
-
- return result;
- } catch (NoSuchAlgorithmException e) {
- log.error("Cannot sign", e);
- } catch (InvalidKeyException e) {
- log.error("Cannot sign", e);
- } catch (SignatureException e) {
- log.error("Cannot sign", e);
- }
- return null;
- }
-
- /**
- * "The signature on m is (r, s). Message m and (r, s) should be sent to the
- * verifier. We need to observe that both r and s are 20 bytes, since a
- * modular reduction is being performed (steps 2 and 5) using q, a 160 bit
- * value. This will gain significance later when we begin verifying messages
- * between Crypto++ and C# (which use the IEEE P1363 signature format) and
- * Java (which uses a DER encoding of a signature)." [taken from <a href=
- * "http://www.codeproject.com/Articles/25590/Cryptographic-Interoperability-Digital-Signatures"
- * >Cryptographic Interoperability Digital Signatures</a>]
- *
- * @param sig
- * signature in DER format
- * @return signature in P1363 format; SEQUENCE ::= { r INTEGER, s INTEGER }
- */
- private byte[] convertDERToP1363(byte[] sig) {
- int index = 3;
- int len = sig[index++] & 0xff;
-
- byte[] r = new byte[len];
- System.arraycopy(sig, index, r, 0, r.length);
- index = index + len + 1;
-
- len = sig[index++] & 0xff;
- byte[] s = new byte[len];
- System.arraycopy(sig, index, s, 0, s.length);
-
- byte[] p1363Signature = new byte[40];
- if (r.length > 21 || (r.length == 21 && r[0] != 0)) {
- // Reject - signature verification failed
- } else if (r.length == 21) {
- // r[0] = 0
- // r[1]'s high bit *should* be set
- System.arraycopy(r, 1, p1363Signature, 0, 20);
- } else if (r.length == 20) {
- // r[0]'s high bit *should not* be set
- System.arraycopy(r, 0, p1363Signature, 0, 20);
- } else {
- // fewer than 20 bytes
- len = r.length;
- int off = 20 - len;
- System.arraycopy(r, 0, p1363Signature, off, len);
- }
-
- if (s.length > 21 || (s.length == 21 && s[0] != 0)) {
- // Reject - signature verification failed
- p1363Signature = new byte[0];
- } else if (s.length == 21) {
- // s[0] = 0
- // s[1]'s high bit *should* be set
- System.arraycopy(s, 1, p1363Signature, 20, 20);
- } else if (s.length == 20) {
- // s[0]'s high bit *should not* be set
- System.arraycopy(s, 0, p1363Signature, 20, 20);
- } else {
- // fewer than 20 bytes
- len = s.length;
- int off = 40 - len;
- System.arraycopy(s, 0, p1363Signature, off, len);
- }
-
- return p1363Signature;
- }
-
- @Override
- public boolean decrypt() {
- return true;
- }
-
- @Override
- public String getAlgName() {
- return ALGORITHM_TYPE;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public boolean isEncrypted() {
- return false;
- }
-
- @Override
- public void clear() {
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.file.remote;
+
+import java.nio.ByteBuffer;
+import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Signature;
+import java.security.SignatureException;
+import java.security.interfaces.DSAParams;
+import java.security.interfaces.DSAPublicKey;
+
+import com.jcraft.jsch.Identity;
+import com.jcraft.jsch.JSchException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DSAKeyPairIdentity implements Identity {
+ private static final String ALGORITHM_TYPE = "ssh-dss";
+ private final transient Logger log = LoggerFactory.getLogger(getClass());
+ private KeyPair keyPair;
+ private String name;
+
+ public DSAKeyPairIdentity(String name, KeyPair keyPair) {
+ this.name = name;
+ this.keyPair = keyPair;
+ }
+
+ @Override
+ public boolean setPassphrase(byte[] passphrase) throws JSchException {
+ return true;
+ }
+
+ @Override
+ public byte[] getPublicKeyBlob() {
+ DSAPublicKey publicKey = (DSAPublicKey) keyPair.getPublic();
+ byte[] sshDss = ALGORITHM_TYPE.getBytes();
+
+ DSAParams dsaParams = publicKey.getParams();
+ byte[] pArray = dsaParams.getP().toByteArray();
+ byte[] qArray = dsaParams.getQ().toByteArray();
+ byte[] gArray = dsaParams.getG().toByteArray();
+ byte[] yArray = publicKey.getY().toByteArray();
+
+ byte[] result = new byte[sshDss.length + 4 + pArray.length + 4 + qArray.length + 4 + gArray.length + 4 + yArray.length + 4];
+ int index = 0;
+
+ byte[] intAsByteArray = ByteBuffer.allocate(4).putInt(sshDss.length).array();
+ System.arraycopy(intAsByteArray, 0, result, index, 4);
+ index += 4;
+
+ System.arraycopy(sshDss, 0, result, index, sshDss.length);
+ index += sshDss.length;
+
+ intAsByteArray = ByteBuffer.allocate(4).putInt(pArray.length).array();
+ System.arraycopy(intAsByteArray, 0, result, index, 4);
+ index += 4;
+
+ System.arraycopy(pArray, 0, result, index, pArray.length);
+ index += pArray.length;
+
+ intAsByteArray = ByteBuffer.allocate(4).putInt(qArray.length).array();
+ System.arraycopy(intAsByteArray, 0, result, index, 4);
+ index += 4;
+
+ System.arraycopy(qArray, 0, result, index, qArray.length);
+ index += qArray.length;
+
+ intAsByteArray = ByteBuffer.allocate(4).putInt(gArray.length).array();
+ System.arraycopy(intAsByteArray, 0, result, index, 4);
+ index += 4;
+
+ System.arraycopy(gArray, 0, result, index, gArray.length);
+ index += gArray.length;
+
+ intAsByteArray = ByteBuffer.allocate(4).putInt(yArray.length).array();
+ System.arraycopy(intAsByteArray, 0, result, index, 4);
+ index += 4;
+
+ System.arraycopy(yArray, 0, result, index, yArray.length);
+
+ return result;
+ }
+
+ @Override
+ public byte[] getSignature(byte[] data) {
+ try {
+ PrivateKey prvKey = keyPair.getPrivate();
+ Signature sig;
+ sig = Signature.getInstance("SHA1withDSA");
+ sig.initSign(prvKey);
+ sig.update(data);
+ byte[] sshDss = ALGORITHM_TYPE.getBytes();
+ byte[] signature = sig.sign();
+
+ signature = convertDERToP1363(signature);
+
+ byte[] result = new byte[sshDss.length + 4 + signature.length + 4];
+ int index = 0;
+
+ byte[] intAsByteArray = ByteBuffer.allocate(4).putInt(sshDss.length).array();
+ System.arraycopy(intAsByteArray, 0, result, index, 4);
+ index += 4;
+
+ System.arraycopy(sshDss, 0, result, index, sshDss.length);
+ index += sshDss.length;
+
+ intAsByteArray = ByteBuffer.allocate(4).putInt(signature.length).array();
+ System.arraycopy(intAsByteArray, 0, result, index, 4);
+ index += 4;
+
+ System.arraycopy(signature, 0, result, index, signature.length);
+
+ return result;
+ } catch (NoSuchAlgorithmException e) {
+ log.error("Cannot sign", e);
+ } catch (InvalidKeyException e) {
+ log.error("Cannot sign", e);
+ } catch (SignatureException e) {
+ log.error("Cannot sign", e);
+ }
+ return null;
+ }
+
+ /**
+ * "The signature on m is (r, s). Message m and (r, s) should be sent to the
+ * verifier. We need to observe that both r and s are 20 bytes, since a
+ * modular reduction is being performed (steps 2 and 5) using q, a 160 bit
+ * value. This will gain significance later when we begin verifying messages
+ * between Crypto++ and C# (which use the IEEE P1363 signature format) and
+ * Java (which uses a DER encoding of a signature)." [taken from <a href=
+ * "http://www.codeproject.com/Articles/25590/Cryptographic-Interoperability-Digital-Signatures"
+ * >Cryptographic Interoperability Digital Signatures</a>]
+ *
+ * @param sig
+ * signature in DER format
+ * @return signature in P1363 format; SEQUENCE ::= { r INTEGER, s INTEGER }
+ */
+ private byte[] convertDERToP1363(byte[] sig) {
+ int index = 3;
+ int len = sig[index++] & 0xff;
+
+ byte[] r = new byte[len];
+ System.arraycopy(sig, index, r, 0, r.length);
+ index = index + len + 1;
+
+ len = sig[index++] & 0xff;
+ byte[] s = new byte[len];
+ System.arraycopy(sig, index, s, 0, s.length);
+
+ byte[] p1363Signature = new byte[40];
+ if (r.length > 21 || (r.length == 21 && r[0] != 0)) {
+ // Reject - signature verification failed
+ } else if (r.length == 21) {
+ // r[0] = 0
+ // r[1]'s high bit *should* be set
+ System.arraycopy(r, 1, p1363Signature, 0, 20);
+ } else if (r.length == 20) {
+ // r[0]'s high bit *should not* be set
+ System.arraycopy(r, 0, p1363Signature, 0, 20);
+ } else {
+ // fewer than 20 bytes
+ len = r.length;
+ int off = 20 - len;
+ System.arraycopy(r, 0, p1363Signature, off, len);
+ }
+
+ if (s.length > 21 || (s.length == 21 && s[0] != 0)) {
+ // Reject - signature verification failed
+ p1363Signature = new byte[0];
+ } else if (s.length == 21) {
+ // s[0] = 0
+ // s[1]'s high bit *should* be set
+ System.arraycopy(s, 1, p1363Signature, 20, 20);
+ } else if (s.length == 20) {
+ // s[0]'s high bit *should not* be set
+ System.arraycopy(s, 0, p1363Signature, 20, 20);
+ } else {
+ // fewer than 20 bytes
+ len = s.length;
+ int off = 40 - len;
+ System.arraycopy(s, 0, p1363Signature, off, len);
+ }
+
+ return p1363Signature;
+ }
+
+ @Override
+ public boolean decrypt() {
+ return true;
+ }
+
+ @Override
+ public String getAlgName() {
+ return ALGORITHM_TYPE;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean isEncrypted() {
+ return false;
+ }
+
+ @Override
+ public void clear() {
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index cf3b36d..8b718fc 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -40,6 +40,7 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.TimeUtils;
+import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
@@ -164,7 +165,7 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
if (!login) {
throw new GenericFileOperationFailedException(client.getReplyCode(), client.getReplyString());
}
- client.setFileType(configuration.isBinary() ? FTPClient.BINARY_FILE_TYPE : FTPClient.ASCII_FILE_TYPE);
+ client.setFileType(configuration.isBinary() ? FTP.BINARY_FILE_TYPE : FTP.ASCII_FILE_TYPE);
} catch (IOException e) {
throw new GenericFileOperationFailedException(client.getReplyCode(), client.getReplyString(), e.getMessage(), e);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
index 65eb66a..435a1b4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.file.remote;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-import java.util.GregorianCalendar;
import org.apache.camel.impl.JndiRegistry;
import org.junit.Before;
@@ -105,7 +104,7 @@ public class FtpProducerExpressionTest extends FtpServerTestSupport {
@Test
public void testProducerWithDateHeader() throws Exception {
- Calendar cal = GregorianCalendar.getInstance();
+ Calendar cal = Calendar.getInstance();
cal.set(1974, Calendar.APRIL, 20);
Date date = cal.getTime();
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java
index c292531..ccac51f 100644
--- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java
+++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.gson;
+import java.util.Arrays;
+
import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes;
import org.apache.camel.builder.RouteBuilder;
@@ -106,12 +108,14 @@ public class GsonMarshalExclusionTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
- GsonDataFormat weightExclusionFormat = new GsonDataFormat(TestPojoExclusion.class, new WeightExclusionStrategy());
+ GsonDataFormat weightExclusionFormat = new GsonDataFormat(TestPojoExclusion.class);
+ weightExclusionFormat.setExclusionStrategies(Arrays.<ExclusionStrategy>asList(new WeightExclusionStrategy()));
from("direct:inPojoExcludeWeight").marshal(weightExclusionFormat);
from("direct:backPojoExcludeWeight").unmarshal(weightExclusionFormat).to("mock:reversePojoExcludeWeight");
//START SNIPPET: format
- GsonDataFormat ageExclusionFormat = new GsonDataFormat(TestPojoExclusion.class, new AgeExclusionStrategy());
+ GsonDataFormat ageExclusionFormat = new GsonDataFormat(TestPojoExclusion.class);
+ ageExclusionFormat.setExclusionStrategies(Arrays.<ExclusionStrategy>asList(new AgeExclusionStrategy()));
from("direct:inPojoExcludeAge").marshal(ageExclusionFormat);
//END SNIPPET: format
from("direct:backPojoExcludeAge").unmarshal(ageExclusionFormat).to("mock:reversePojoExcludeAge");
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java b/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
index 386e869..ba81a7f 100644
--- a/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
+++ b/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.guice;
import java.util.Hashtable;
+import javax.naming.Context;
import javax.naming.InitialContext;
import com.google.inject.Injector;
@@ -53,7 +54,7 @@ public class ComponentFoundInRegistryTest extends Assert {
@Test
public void testGuice() throws Exception {
Hashtable<String, Object> env = new Hashtable<String, Object>();
- env.put(InitialContext.PROVIDER_URL, GuiceInitialContextFactory.class.getName());
+ env.put(Context.PROVIDER_URL, GuiceInitialContextFactory.class.getName());
env.put(Injectors.MODULE_CLASS_NAMES, MyModule.class.getName());
InitialContext context = new InitialContext(env);
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-guice/src/test/java/org/apache/camel/guice/FileEndpointReferenceRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-guice/src/test/java/org/apache/camel/guice/FileEndpointReferenceRouteTest.java b/components/camel-guice/src/test/java/org/apache/camel/guice/FileEndpointReferenceRouteTest.java
index edeafce..f6e9d6c 100644
--- a/components/camel-guice/src/test/java/org/apache/camel/guice/FileEndpointReferenceRouteTest.java
+++ b/components/camel-guice/src/test/java/org/apache/camel/guice/FileEndpointReferenceRouteTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.guice;
import java.util.Hashtable;
+import javax.naming.Context;
import javax.naming.InitialContext;
import com.google.inject.Injector;
@@ -83,7 +84,7 @@ public class FileEndpointReferenceRouteTest extends Assert {
@Test
public void runTest() throws Exception {
Hashtable<String, Object> env = new Hashtable<String, Object>();
- env.put(InitialContext.PROVIDER_URL, GuiceInitialContextFactory.class.getName());
+ env.put(Context.PROVIDER_URL, GuiceInitialContextFactory.class.getName());
env.put(Injectors.MODULE_CLASS_NAMES, MyModule.class.getName());
InitialContext context = new InitialContext(env);
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
index b24a9ea..84c7e92 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
@@ -119,14 +119,13 @@ public final class HdfsConsumer extends ScheduledPollConsumer {
fileStatuses = info.getFileSystem().globStatus(pattern, new ExcludePathFilter());
}
- for (int i = 0; i < fileStatuses.length; ++i) {
- FileStatus status = fileStatuses[i];
+ for (FileStatus status : fileStatuses) {
if (normalFileIsDirectoryNoSuccessFile(status, info)) {
continue;
}
try {
this.rwlock.writeLock().lock();
- this.istream = HdfsInputStream.createInputStream(fileStatuses[i].getPath().toString(), this.config);
+ this.istream = HdfsInputStream.createInputStream(status.getPath().toString(), this.config);
} finally {
this.rwlock.writeLock().unlock();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java
index 6776302..4541fb4 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.http4;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http4.handler.BasicValidationHandler;
import org.apache.camel.impl.JndiRegistry;
import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
index b2f29f6..c7e5801 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
@@ -24,7 +24,7 @@ import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
import org.schwering.irc.lib.IRCConnection;
-import org.schwering.irc.lib.IRCEventAdapter;
+import org.schwering.irc.lib.IRCConstants;
import org.schwering.irc.lib.IRCModeParser;
import org.schwering.irc.lib.IRCUser;
import org.slf4j.Logger;
@@ -151,7 +151,7 @@ public class IrcEndpoint extends DefaultEndpoint {
public void handleIrcError(int num, String msg) {
- if (IRCEventAdapter.ERR_NICKNAMEINUSE == num) {
+ if (IRCConstants.ERR_NICKNAMEINUSE == num) {
handleNickInUse();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
index 622aaa4..a807b84 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.schwering.irc.lib.IRCConnection;
-import org.schwering.irc.lib.IRCEventAdapter;
+import org.schwering.irc.lib.IRCConstants;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -77,7 +77,7 @@ public class IrcEndpointTest {
@Test
public void doHandleIrcErrorNickInUse() throws Exception {
when(connection.getNick()).thenReturn("nick");
- endpoint.handleIrcError(IRCEventAdapter.ERR_NICKNAMEINUSE, "foo");
+ endpoint.handleIrcError(IRCConstants.ERR_NICKNAMEINUSE, "foo");
verify(connection).doNick("nick-");
when(connection.getNick()).thenReturn("nick---");
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
index 6babc3b..4575fcc 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.EndpointInject;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.address.Address;
import org.apache.camel.converter.jaxb.person.Person;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultJdbcPrepareStatementStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultJdbcPrepareStatementStrategy.java b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultJdbcPrepareStatementStrategy.java
index 04aad60..cceafae 100644
--- a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultJdbcPrepareStatementStrategy.java
+++ b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultJdbcPrepareStatementStrategy.java
@@ -159,9 +159,5 @@ public class DefaultJdbcPrepareStatementStrategy implements JdbcPrepareStatement
return matcher.group(1);
}
-
- public String replaceAll(String replacement) {
- return matcher.replaceAll(replacement);
- }
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
index 45e82aa..fe4154f 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
@@ -34,6 +34,7 @@ import org.apache.camel.test.junit4.TestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -100,7 +101,7 @@ public class SpringHttpsRouteTest {
mockEndpoint.assertIsSatisfied();
List<Exchange> list = mockEndpoint.getReceivedExchanges();
Exchange exchange = list.get(0);
- TestSupport.assertNotNull("exchange", exchange);
+ Assert.assertNotNull("exchange", exchange);
Message in = exchange.getIn();
assertNotNull("in", in);
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
index 166c62b..1bf5a45 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
@@ -365,7 +365,7 @@ public class MongoDbProducer extends DefaultProducer {
// @see http://docs.mongodb.org/manual/core/aggregation/
if (query instanceof BasicDBList) {
BasicDBList queryList = (BasicDBList)query;
- aggregationResult = dbCol.aggregate((DBObject)queryList.get(0), (BasicDBObject[])queryList
+ aggregationResult = dbCol.aggregate((DBObject)queryList.get(0), queryList
.subList(1, queryList.size()).toArray(new BasicDBObject[queryList.size() - 1]));
} else {
aggregationResult = dbCol.aggregate(query);
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java
index 87fc9ce..3176abe 100644
--- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java
@@ -24,7 +24,6 @@ import com.mongodb.DBObject;
import com.mongodb.WriteResult;
import com.mongodb.util.JSON;
-import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelEndpoint.java b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelEndpoint.java
index 9c5edf7..d8cfe1a 100644
--- a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelEndpoint.java
+++ b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelEndpoint.java
@@ -16,11 +16,8 @@
*/
package org.apache.camel.language.mvel;
-import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
import java.util.Map;
import org.apache.camel.Exchange;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerBootstrapFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerBootstrapFactory.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerBootstrapFactory.java
index cf8ae4e..aab12b1 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerBootstrapFactory.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerBootstrapFactory.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.netty.http;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.netty.NettyConfiguration;
import org.apache.camel.component.netty.NettyConsumer;
import org.apache.camel.component.netty.NettyServerBootstrapConfiguration;
import org.apache.camel.component.netty.SingleTCPNettyServerBootstrapFactory;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java
index 9cf7f75..e74e0ea 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.netty.http;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Ignore;
import org.junit.Test;
public class NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest extends BaseNettyTest {
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
index 53bd02f..14066ce 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
@@ -28,7 +28,6 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.util.EndpointHelper;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.jsse.SSLContextParameters;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.ChannelHandler;
import org.jboss.netty.handler.codec.frame.Delimiters;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
----------------------------------------------------------------------
diff --git a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
index 1e93d70..96b3e52 100644
--- a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
+++ b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
@@ -31,13 +31,11 @@ import org.apache.camel.support.ExpressionSupport;
*/
public class OgnlExpression extends ExpressionSupport {
- private final OgnlLanguage language;
private final String expressionString;
private final Class<?> type;
private Object expression;
public OgnlExpression(OgnlLanguage language, String expressionString, Class<?> type) {
- this.language = language;
this.expressionString = expressionString;
this.type = type;
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
index 4081938..8c91879 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.rss;
import java.util.Calendar;
import java.util.Date;
-import java.util.GregorianCalendar;
import java.util.TimeZone;
import javax.naming.Context;
@@ -49,7 +48,7 @@ public class RssEntryPollingConsumerWithFilterTest extends CamelTestSupport {
// timestamp from the feed to use as base
// Fri, 31 Oct 2008 12:02:21 -0500
- Calendar cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT-5:00"));
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT-5:00"));
cal.set(2008, Calendar.OCTOBER, 31, 12, 02, 21);
answer.bind("myBean", new MyBean(cal.getTime()));
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-rx/src/main/java/org/apache/camel/rx/RuntimeCamelRxException.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/RuntimeCamelRxException.java b/components/camel-rx/src/main/java/org/apache/camel/rx/RuntimeCamelRxException.java
index 70ed3b9..7a1dbee 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/RuntimeCamelRxException.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/RuntimeCamelRxException.java
@@ -22,6 +22,9 @@ import org.apache.camel.RuntimeCamelException;
* A runtime exception caused by using the Camel RX layer
*/
public class RuntimeCamelRxException extends RuntimeCamelException {
+
+ private static final long serialVersionUID = 1L;
+
public RuntimeCamelRxException() {
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
index 638e0a1..7e01074 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java
@@ -18,7 +18,6 @@ package org.apache.camel.rx.support;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.Message;
import org.apache.camel.Producer;
import org.apache.camel.rx.RuntimeCamelRxException;
@@ -28,11 +27,9 @@ import rx.Observer;
* An {@link Observer} which sends events to a given {@link Endpoint}
*/
public class ObserverSender implements Observer {
- private Endpoint endpoint;
private Producer producer;
public ObserverSender(Endpoint endpoint) throws Exception {
- this.endpoint = endpoint;
this.producer = endpoint.createProducer();
this.producer.start();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
index 7484d26..d62ac0d 100644
--- a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
+++ b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
@@ -58,7 +58,7 @@ public class NetWeaverProducer extends DefaultProducer {
if (data != null && getEndpoint().isJsonAsMap()) {
// map json string to json map
ObjectMapper mapper = new ObjectMapper();
- Map map = mapper.readValue(data, Map.class);
+ Map<?, ?> map = mapper.readValue(data, Map.class);
// if we only have one entry in the map, then put that as root (as it tends to return a single instance "d"
if (map.size() == 1 && getEndpoint().isFlatternMap()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
index a03631a..7d6078a 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
import org.apache.camel.component.sjms.jms.ConnectionResource;
import org.apache.camel.component.sjms.jms.KeyFormatStrategy;
import org.apache.camel.component.sjms.taskmanager.TimedTaskManager;
-import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
index 1d9c58d..a5637fc 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
@@ -384,7 +384,7 @@ public final class SjmsExchangeMessageHelper {
} else if (headerName.equalsIgnoreCase("JMSReplyTo") && headerValue != null) {
if (headerValue instanceof String) {
// if the value is a String we must normalize it first
- headerValue = (String)headerValue;
+ headerValue = headerValue;
} else {
// TODO write destination converter
// Destination replyTo =
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/Smpp8BitSplitterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/Smpp8BitSplitterTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/Smpp8BitSplitterTest.java
index c81b387..1ac081b 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/Smpp8BitSplitterTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/Smpp8BitSplitterTest.java
@@ -29,7 +29,7 @@ public class Smpp8BitSplitterTest {
+ "123456789012345678901234567890123456789012345678901234567890";
Smpp8BitSplitter splitter = new Smpp8BitSplitter(message.length());
- Smpp8BitSplitter.resetCurrentReferenceNumber();
+ SmppSplitter.resetCurrentReferenceNumber();
byte[][] result = splitter.split(message.getBytes());
assertEquals(1, result.length);
@@ -47,7 +47,7 @@ public class Smpp8BitSplitterTest {
+ "12345678901234567890123456789012345678901234567890123456789012345678901";
Smpp8BitSplitter splitter = new Smpp8BitSplitter(message.length());
- Smpp8BitSplitter.resetCurrentReferenceNumber();
+ SmppSplitter.resetCurrentReferenceNumber();
byte[][] result = splitter.split(message.getBytes());
assertEquals(2, result.length);
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDefaultSplitterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDefaultSplitterTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDefaultSplitterTest.java
index 4d6a8dc..26c868b 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDefaultSplitterTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDefaultSplitterTest.java
@@ -28,7 +28,7 @@ public class SmppDefaultSplitterTest {
String message = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+ "12345678901234567890123456789012345678901234567890123456789012345678901234567890";
- SmppDefaultSplitter splitter = new SmppDefaultSplitter(message.length());
+ SmppSplitter splitter = new SmppDefaultSplitter(message.length());
SmppDefaultSplitter.resetCurrentReferenceNumber();
byte[][] result = splitter.split(message.getBytes());
@@ -46,7 +46,7 @@ public class SmppDefaultSplitterTest {
String message = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+ "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901";
- SmppDefaultSplitter splitter = new SmppDefaultSplitter(message.length());
+ SmppSplitter splitter = new SmppDefaultSplitter(message.length());
SmppDefaultSplitter.resetCurrentReferenceNumber();
byte[][] result = splitter.split(message.getBytes());
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppUcs2SplitterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppUcs2SplitterTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppUcs2SplitterTest.java
index 0525c1a..fc4c3c3 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppUcs2SplitterTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppUcs2SplitterTest.java
@@ -32,7 +32,7 @@ public class SmppUcs2SplitterTest {
Charset charset = Charset.forName("UTF-16BE");
SmppUcs2Splitter splitter = new SmppUcs2Splitter(message.length());
- SmppUcs2Splitter.resetCurrentReferenceNumber();
+ SmppSplitter.resetCurrentReferenceNumber();
byte[][] result = splitter.split(message.getBytes(charset));
assertEquals(1, result.length);
@@ -49,7 +49,7 @@ public class SmppUcs2SplitterTest {
Charset charset = Charset.forName("UTF-16BE");
SmppUcs2Splitter splitter = new SmppUcs2Splitter(message.length());
- SmppUcs2Splitter.resetCurrentReferenceNumber();
+ SmppSplitter.resetCurrentReferenceNumber();
byte[][] result = splitter.split(message.getBytes(charset));
assertEquals(2, result.length);
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
index efde126..24e2aaa 100644
--- a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
+++ b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
@@ -35,17 +35,12 @@ public class SolrComponent extends DefaultComponent {
private static final transient Logger LOG = LoggerFactory.getLogger(SolrComponent.class);
private final Map<SolrEndpoint, SolrServerReference> servers = new HashMap<SolrEndpoint, SolrServerReference>();
- protected static final class SolrServerReference {
+ protected static final class SolrServerReference {
private final AtomicInteger referenceCounter = new AtomicInteger();
- private final SolrEndpoint endpoint;
private HttpSolrServer solrServer;
private ConcurrentUpdateSolrServer updateSolrServer;
- SolrServerReference(SolrEndpoint endpoint) {
- this.endpoint = endpoint;
- }
-
public HttpSolrServer getSolrServer() {
return solrServer;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
index 3f613fa..564aaa4 100644
--- a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
+++ b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
@@ -86,7 +86,7 @@ public class SolrEndpoint extends DefaultEndpoint {
solrServer.setAllowCompression(allowCompression);
}
- ref = new SolrComponent.SolrServerReference(this);
+ ref = new SolrComponent.SolrServerReference();
ref.setSolrServer(solrServer);
ref.setUpdateSolrServer(solrStreamingServer);
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisClient.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisClient.java b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisClient.java
index aef3ffe..0d7af9b 100755
--- a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisClient.java
+++ b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisClient.java
@@ -24,7 +24,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.springframework.dao.DataAccessException;
-import org.springframework.data.redis.connection.DataType;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java
index bef1662..ae41530 100755
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.redis;
import org.apache.camel.impl.JndiRegistry;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.ArgumentCaptor;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate;
@@ -48,13 +47,6 @@ public class RedisConnectionTest extends RedisTestSupport {
super.setUp();
}
- private void getMocketConnection() {
- ArgumentCaptor<RedisCallback> argument = ArgumentCaptor.forClass(RedisCallback.class);
- verify(redisTemplate).execute(argument.capture());
- RedisCallback redisCallback = argument.getValue();
- redisCallback.doInRedis(redisConnection);
- }
-
@Test
public void shouldExecuteECHO() throws Exception {
when(redisTemplate.execute(any(RedisCallback.class))).thenReturn("value");
@@ -85,7 +77,7 @@ public class RedisConnectionTest extends RedisTestSupport {
@Test
public void shouldExecutePUBLISH() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "PUBLISH",
RedisConstants.CHANNEL, "channel",
RedisConstants.MESSAGE, "a message");
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
index 5ba74c7..64aaa09 100755
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
@@ -32,7 +32,6 @@ import org.springframework.data.redis.listener.ChannelTopic;
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.data.redis.listener.Topic;
-import static org.hamcrest.CoreMatchers.is;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java
index 4ad60f5..aa0a2dd 100755
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java
@@ -58,7 +58,7 @@ public class RedisHashTest extends RedisTestSupport {
@Test
public void shouldExecuteHDEL() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "HDEL",
RedisConstants.KEY, "key",
RedisConstants.FIELD, "field");
@@ -113,7 +113,7 @@ public class RedisHashTest extends RedisTestSupport {
values.put("field1", "value1");
values.put("field2", "value");
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "HMSET",
RedisConstants.KEY, "key",
RedisConstants.VALUES, values);
@@ -152,7 +152,7 @@ public class RedisHashTest extends RedisTestSupport {
@Test
public void shouldSetHashValue() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "HSET",
RedisConstants.KEY, "key",
RedisConstants.FIELD, "field",
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
index f053df5..30949ba 100755
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java
@@ -59,7 +59,7 @@ public class RedisKeyTest extends RedisTestSupport {
Collection<String> keys = new HashSet<String>();
keys.add("key1");
keys.add("key2");
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "DEL",
RedisConstants.KEYS, keys);
@@ -187,7 +187,7 @@ public class RedisKeyTest extends RedisTestSupport {
@Test
public void shouldExecuteRENAME() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "RENAME",
RedisConstants.KEY, "key",
RedisConstants.VALUE, "newkey");
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java
index c6a44ac..9ab6841 100755
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java
@@ -237,7 +237,7 @@ public class RedisListTest extends RedisTestSupport {
@Test
public void shouldExecuteLSET() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "LSET",
RedisConstants.KEY, "key",
RedisConstants.VALUE, "value",
@@ -248,7 +248,7 @@ public class RedisListTest extends RedisTestSupport {
@Test
public void shouldExecuteLTRIM() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "LTRIM",
RedisConstants.KEY, "key",
RedisConstants.START, "1",
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java
index 25ad020..d181c60 100755
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java
@@ -102,7 +102,7 @@ public class RedisSetTest extends RedisTestSupport {
Set<String> keys = new HashSet<String>();
keys.add("key2");
keys.add("key3");
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "SDIFFSTORE",
RedisConstants.KEY, "key",
RedisConstants.KEYS, keys,
@@ -135,7 +135,7 @@ public class RedisSetTest extends RedisTestSupport {
Set<String> keys = new HashSet<String>();
keys.add("key2");
keys.add("key3");
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "SINTERSTORE",
RedisConstants.KEY, "key",
RedisConstants.DESTINATION, "destination",
@@ -175,7 +175,7 @@ public class RedisSetTest extends RedisTestSupport {
@Test
public void shouldExecuteSMOVE() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "SMOVE",
RedisConstants.KEY, "key",
RedisConstants.VALUE, "value",
@@ -250,7 +250,7 @@ public class RedisSetTest extends RedisTestSupport {
keys.add("key2");
keys.add("key4");
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "SUNIONSTORE",
RedisConstants.KEY, "key",
RedisConstants.KEYS, keys,
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java
index d852e3d..43a6d14 100755
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java
@@ -113,7 +113,7 @@ public class RedisSortedSetTest extends RedisTestSupport {
Set<String> keys = new HashSet<String>();
keys.add("key2");
keys.add("key3");
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "ZINTERSTORE",
RedisConstants.KEY, "key",
RedisConstants.DESTINATION, "destination",
@@ -203,7 +203,7 @@ public class RedisSortedSetTest extends RedisTestSupport {
@Test
public void shouldExecuteZREMRANGEBYRANK() {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "ZREMRANGEBYRANK",
RedisConstants.KEY, "key",
RedisConstants.START, 1,
@@ -214,7 +214,7 @@ public class RedisSortedSetTest extends RedisTestSupport {
@Test
public void shouldExecuteZREMRANGEBYSCORE() {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "ZREMRANGEBYSCORE",
RedisConstants.KEY, "key",
RedisConstants.START, 1,
@@ -294,7 +294,7 @@ public class RedisSortedSetTest extends RedisTestSupport {
Set<String> keys = new HashSet<String>();
keys.add("key2");
keys.add("key3");
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "ZUNIONSTORE",
RedisConstants.KEY, "key",
RedisConstants.DESTINATION, "destination",
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java
index 4ff3aeb..43b74b4 100755
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java
@@ -56,7 +56,7 @@ public class RedisStringTest extends RedisTestSupport {
@Test
public void shouldExecuteSET() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "SET",
RedisConstants.KEY, "key",
RedisConstants.VALUE, "value");
@@ -66,7 +66,7 @@ public class RedisStringTest extends RedisTestSupport {
@Test
public void shouldExecuteSETNX() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "SETNX",
RedisConstants.KEY, "key",
RedisConstants.VALUE, "value");
@@ -77,7 +77,7 @@ public class RedisStringTest extends RedisTestSupport {
@Test
public void shouldExecuteSETEX() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "SETEX",
RedisConstants.KEY, "key",
RedisConstants.TIMEOUT, "10",
@@ -89,7 +89,7 @@ public class RedisStringTest extends RedisTestSupport {
@Test
public void shouldExecuteSETRANGE() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "SETRANGE",
RedisConstants.KEY, "key",
RedisConstants.OFFSET, "10",
@@ -116,7 +116,7 @@ public class RedisStringTest extends RedisTestSupport {
@Test
public void shouldExecuteSETBIT() throws Exception {
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "SETBIT",
RedisConstants.KEY, "key",
RedisConstants.OFFSET, "10",
@@ -252,7 +252,7 @@ public class RedisStringTest extends RedisTestSupport {
HashMap<String, String> values = new HashMap<String, String>();
values.put("field1", "valu1");
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "MSET",
RedisConstants.VALUES, values);
@@ -265,7 +265,7 @@ public class RedisStringTest extends RedisTestSupport {
HashMap<String, String> values = new HashMap<String, String>();
values.put("field1", "valu1");
- Object result = sendHeaders(
+ sendHeaders(
RedisConstants.COMMAND, "MSETNX",
RedisConstants.VALUES, values);
@@ -286,34 +286,4 @@ public class RedisStringTest extends RedisTestSupport {
assertEquals("old value", result);
}
-
-
-//
-// @Test
-// public void shouldExecuteMULTI() throws Exception {
-// //when(valueOperations.multi()).thenReturn(any(Transaction.class));
-//
-// Object result = sendHeaders(RedisConstants.COMMAND, "MULTI");
-//
-// verify(jedis).multi();
-// assertEquals("OK", result);
-// }
-//
-// @Test
-// public void shouldExecuteInTransaction() throws Exception {
-// Transaction transaction = mock(Transaction.class);
-// when(jedis.multi()).thenReturn(transaction);
-//
-// sendHeaders(RedisConstants.COMMAND, "MULTI");
-//
-//
-// Object result = sendHeaders(
-// RedisConstants.KEY, "key",
-// RedisConstants.VALUE, "value");
-//
-// verify(transaction).set("key", "value");
-// assertEquals("OK", result);
-//
-//
-// }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
index 27721e8..fba08af 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
@@ -28,7 +28,6 @@ import org.apache.camel.Processor;
import org.apache.camel.processor.RedeliveryErrorHandler;
import org.apache.camel.processor.RedeliveryPolicy;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
-import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.CamelLogger;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSprinPropertyPlaceholderRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSprinPropertyPlaceholderRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSprinPropertyPlaceholderRouteTest.java
index a87cfec..bb2f904 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSprinPropertyPlaceholderRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSprinPropertyPlaceholderRouteTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.spring.placeholder;
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.TestSupport;
import org.apache.camel.spring.SpringRunWithTestSupport;
import org.junit.Before;
import org.junit.Ignore;
@@ -37,8 +37,8 @@ public class SimpleLanguageWithSprinPropertyPlaceholderRouteTest extends SpringR
@Before
public void setUp() throws Exception {
- ContextTestSupport.deleteDirectory("target/outBox");
- ContextTestSupport.deleteDirectory("target/outBoxSimple");
+ TestSupport.deleteDirectory("target/outBox");
+ TestSupport.deleteDirectory("target/outBoxSimple");
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
index f8719a2..2bd8e6c 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
@@ -176,9 +176,5 @@ public class DefaultSqlPrepareStatementStrategy implements SqlPrepareStatementSt
return matcher.group(1);
}
-
- public String replaceAll(String replacement) {
- return matcher.replaceAll(replacement);
- }
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
index 9f71385..87c6b15 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
@@ -41,6 +41,7 @@ import org.springframework.jdbc.support.lob.DefaultLobHandler;
import org.springframework.jdbc.support.lob.LobCreator;
import org.springframework.jdbc.support.lob.LobHandler;
import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
@@ -97,10 +98,10 @@ public class JdbcAggregationRepository extends ServiceSupport implements Recover
this.transactionManager = transactionManager;
transactionTemplate = new TransactionTemplate(transactionManager);
- transactionTemplate.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRED);
+ transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
transactionTemplateReadOnly = new TransactionTemplate(transactionManager);
- transactionTemplateReadOnly.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRED);
+ transactionTemplateReadOnly.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
transactionTemplateReadOnly.setReadOnly(true);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
----------------------------------------------------------------------
diff --git a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
index fb47e5b..cf80fc2 100644
--- a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
+++ b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
@@ -87,7 +87,7 @@ public final class Rfc3164SyslogConverter {
//SDF isn't going to help much here.
- Calendar cal = GregorianCalendar.getInstance();
+ Calendar cal = Calendar.getInstance();
cal.setTime(message.getTimestamp());
String firstLetter = MONTHS.values()[cal.get(Calendar.MONTH)].toString().substring(0, 1); // Get first letter
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index a1c60bf..1637248 100644
--- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -35,7 +35,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Properties;
import java.util.jar.JarInputStream;
import de.kalpatec.pojosr.framework.PojoServiceRegistryFactoryImpl;
@@ -184,7 +183,7 @@ public final class CamelBlueprintHelper {
// must force type cast to have code compile with both java6
// and 7 with the
// (org.apache.felix.utils.properties.Properties)
- String value = (String)cfg.get(key);
+ String value = cfg.get(key);
props.put(key, value);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
index d2ab36a..8062dae 100644
--- a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
+++ b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
@@ -33,9 +33,9 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ResourceHelper;
import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
+import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.log.CommonsLogLogChute;
public class VelocityEndpoint extends ResourceEndpoint {
@@ -76,11 +76,11 @@ public class VelocityEndpoint extends ResourceEndpoint {
// set default properties
Properties properties = new Properties();
- properties.setProperty(Velocity.FILE_RESOURCE_LOADER_CACHE, isLoaderCache() ? "true" : "false");
- properties.setProperty(Velocity.RESOURCE_LOADER, "file, class");
+ properties.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_CACHE, isLoaderCache() ? "true" : "false");
+ properties.setProperty(RuntimeConstants.RESOURCE_LOADER, "file, class");
properties.setProperty("class.resource.loader.description", "Camel Velocity Classpath Resource Loader");
properties.setProperty("class.resource.loader.class", CamelVelocityClasspathResourceLoader.class.getName());
- properties.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, CommonsLogLogChute.class.getName());
+ properties.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, CommonsLogLogChute.class.getName());
properties.setProperty(CommonsLogLogChute.LOGCHUTE_COMMONS_LOG_NAME, VelocityEndpoint.class.getName());
// load the velocity properties from property file which may overrides the default ones
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcWriter.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcWriter.java b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcWriter.java
index db3b10a..add7861 100644
--- a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcWriter.java
+++ b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcWriter.java
@@ -39,7 +39,7 @@ public class XmlRpcWriter extends org.apache.xmlrpc.serializer.XmlRpcWriter {
handler.startDocument();
boolean extensions = config.isEnabledForExtensions();
if (extensions) {
- handler.startPrefixMapping("ex", XmlRpcWriter.EXTENSIONS_URI);
+ handler.startPrefixMapping("ex", org.apache.xmlrpc.serializer.XmlRpcWriter.EXTENSIONS_URI);
}
handler.startElement("", "methodCall", "methodCall", ZERO_ATTRIBUTES);
handler.startElement("", "methodName", "methodName", ZERO_ATTRIBUTES);
[2/2] git commit: Polished.
Posted by bv...@apache.org.
Polished.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ad710f1f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ad710f1f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ad710f1f
Branch: refs/heads/master
Commit: ad710f1fc4343790a8c3fda268de2c7524e0d14a
Parents: bee48ab
Author: Babak Vahdat <bv...@apache.org>
Authored: Sat Jul 6 18:59:31 2013 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sat Jul 6 18:59:31 2013 +0200
----------------------------------------------------------------------
.../bean/ParameterBindingException.java | 1 +
.../DirectConsumerNotAvailableException.java | 2 +
.../DirectVmConsumerNotAvailableException.java | 2 +
.../camel/component/seda/SedaComponent.java | 1 -
.../camel/component/timer/TimerComponent.java | 1 -
.../camel/converter/jaxp/XmlConverter.java | 2 -
.../impl/ComponentConfigurationSupport.java | 10 +-
.../camel/impl/EventDrivenConsumerRoute.java | 1 -
.../mbean/ManagedBacklogDebugger.java | 1 -
.../management/mbean/ManagedCamelContext.java | 3 -
.../org/apache/camel/model/TryDefinition.java | 1 -
.../processor/DefaultExchangeFormatter.java | 5 +-
.../processor/interceptor/BacklogDebugger.java | 1 -
.../processor/interceptor/BacklogTracer.java | 4 +-
.../loadbalancer/QueueLoadBalancer.java | 1 -
.../OptimisticLockingAggregationRepository.java | 4 +-
.../java/org/apache/camel/util/IOHelper.java | 1 -
.../file/FileProducerExpressionTest.java | 3 +-
.../camel/component/log/LogInputStreamTest.java | 2 +-
...edaQueueMultipleConsumersDifferenceTest.java | 1 -
.../apache/camel/language/FileLanguageTest.java | 3 +-
.../simple/SimpleParserExpressionTest.java | 1 -
.../camel/language/simple/SimpleTest.java | 5 +-
.../management/EndpointCompletionTest.java | 24 +-
.../camel/processor/ChoiceWithEndTest.java | 1 -
.../RouteServicesStartupOrderTest.java | 1 -
.../OnExceptionComplexRouteTest.java | 1 -
.../org/apache/camel/util/URISupportTest.java | 2 -
.../component/atom/UpdatedDateFilterTest.java | 3 +-
.../camel/component/aws/s3/S3Producer.java | 1 -
.../bindy/BindyFixedLengthFactory.java | 2 +-
.../camel/dataformat/bindy/FormatFactory.java | 2 +-
.../handler/CamelNamespaceHandler.java | 1 -
.../camel/cdi/internal/CamelExtension.java | 4 +-
.../camel/core/osgi/OsgiTypeConverter.java | 2 +-
.../core/osgi/utils/BundleContextUtils.java | 4 -
.../camel/converter/crypto/PGPDataFormat.java | 4 +-
.../apache/camel/component/cxf/CxfEndpoint.java | 5 +-
.../blueprint/AbstractBeanDefinitionParser.java | 4 +-
.../component/cxf/converter/CxfConverter.java | 2 -
.../component/cxf/jaxrs/SimpleCxfRsBinding.java | 4 +-
.../cxf/CxfCustomizedExceptionTest.java | 3 +-
.../component/cxf/CxfProducerRouterTest.java | 4 +-
.../cxf/CxfProducerSynchronousFalseTest.java | 4 +-
.../cxf/CxfProducerSynchronousTest.java | 4 +-
.../camel/component/cxf/CxfProducerTest.java | 4 +-
.../cxf/CxfSpringCustomizedExceptionTest.java | 3 +-
.../component/cxf/DefaultCxfBindingTest.java | 1 -
.../CxfRsConsumerSimpleBindingTest.java | 2 +-
.../wssecurity/client/UTPasswordCallback.java | 4 +-
.../wssecurity/server/UTPasswordCallback.java | 4 +-
.../disruptor/DisruptorNotStartedException.java | 3 +
.../disruptor/SedaDisruptorCompareTest.java | 15 +-
...sruptorVmComponentReferenceEndpointTest.java | 5 +-
.../camel/component/eventadmin/Activator.java | 2 +-
.../eventadmin/EventAdminConsumer.java | 2 +-
.../eventadmin/EventAdminProducer.java | 4 +-
.../eventadmin/EventAdminServiceFactory.java | 6 +-
.../camel/component/fop/FopEndpointTest.java | 3 +-
.../file/remote/DSAKeyPairIdentity.java | 456 +++++++++----------
.../component/file/remote/FtpOperations.java | 3 +-
.../file/remote/FtpProducerExpressionTest.java | 3 +-
.../gson/GsonMarshalExclusionTest.java | 8 +-
.../guice/ComponentFoundInRegistryTest.java | 3 +-
.../guice/FileEndpointReferenceRouteTest.java | 3 +-
.../camel/component/hdfs/HdfsConsumer.java | 5 +-
.../camel/component/http4/HttpsGetTest.java | 1 -
.../apache/camel/component/irc/IrcEndpoint.java | 4 +-
.../camel/component/irc/IrcEndpointTest.java | 4 +-
...axbDataFormatSchemaValidationSpringTest.java | 1 -
.../DefaultJdbcPrepareStatementStrategy.java | 4 -
.../component/jetty/SpringHttpsRouteTest.java | 3 +-
.../component/mongodb/MongoDbProducer.java | 2 +-
.../mongodb/MongoDbOperationsTest.java | 1 -
.../camel/language/mvel/MvelEndpoint.java | 3 -
.../netty/http/HttpServerBootstrapFactory.java | 1 -
...ntUriEncodingIssueUrlDecodeDisabledTest.java | 1 -
.../component/netty/NettyConfiguration.java | 1 -
.../camel/language/ognl/OgnlExpression.java | 2 -
.../RssEntryPollingConsumerWithFilterTest.java | 3 +-
.../camel/rx/RuntimeCamelRxException.java | 3 +
.../apache/camel/rx/support/ObserverSender.java | 3 -
.../sap/netweaver/NetWeaverProducer.java | 2 +-
.../camel/component/sjms/SjmsComponent.java | 1 -
.../sjms/SjmsExchangeMessageHelper.java | 2 +-
.../component/smpp/Smpp8BitSplitterTest.java | 4 +-
.../component/smpp/SmppDefaultSplitterTest.java | 4 +-
.../component/smpp/SmppUcs2SplitterTest.java | 4 +-
.../camel/component/solr/SolrComponent.java | 7 +-
.../camel/component/solr/SolrEndpoint.java | 2 +-
.../camel/component/redis/RedisClient.java | 1 -
.../component/redis/RedisConnectionTest.java | 10 +-
.../component/redis/RedisConsumerTest.java | 1 -
.../camel/component/redis/RedisHashTest.java | 6 +-
.../camel/component/redis/RedisKeyTest.java | 4 +-
.../camel/component/redis/RedisListTest.java | 4 +-
.../camel/component/redis/RedisSetTest.java | 8 +-
.../component/redis/RedisSortedSetTest.java | 8 +-
.../camel/component/redis/RedisStringTest.java | 44 +-
.../spring/spi/TransactionErrorHandler.java | 1 -
...geWithSprinPropertyPlaceholderRouteTest.java | 6 +-
.../sql/DefaultSqlPrepareStatementStrategy.java | 4 -
.../jdbc/JdbcAggregationRepository.java | 5 +-
.../syslog/Rfc3164SyslogConverter.java | 2 +-
.../test/blueprint/CamelBlueprintHelper.java | 3 +-
.../component/velocity/VelocityEndpoint.java | 8 +-
.../camel/dataformat/xmlrpc/XmlRpcWriter.java | 2 +-
107 files changed, 384 insertions(+), 473 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/component/bean/ParameterBindingException.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ParameterBindingException.java b/camel-core/src/main/java/org/apache/camel/component/bean/ParameterBindingException.java
index 9ca612f..1a8ab80 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/ParameterBindingException.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/ParameterBindingException.java
@@ -23,6 +23,7 @@ import org.apache.camel.util.ObjectHelper;
public class ParameterBindingException extends RuntimeCamelException {
+ private static final long serialVersionUID = 1L;
private final Method method;
private final int index;
private final Class<?> parameterType;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumerNotAvailableException.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumerNotAvailableException.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumerNotAvailableException.java
index 553bd8c..95178c3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumerNotAvailableException.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumerNotAvailableException.java
@@ -26,6 +26,8 @@ import org.apache.camel.Exchange;
*/
public class DirectConsumerNotAvailableException extends CamelExchangeException {
+ private static final long serialVersionUID = 1L;
+
public DirectConsumerNotAvailableException(String message, Exchange exchange) {
super(message, exchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerNotAvailableException.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerNotAvailableException.java b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerNotAvailableException.java
index 6220c49..09fed78 100644
--- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerNotAvailableException.java
+++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerNotAvailableException.java
@@ -26,6 +26,8 @@ import org.apache.camel.Exchange;
*/
public class DirectVmConsumerNotAvailableException extends CamelExchangeException {
+ private static final long serialVersionUID = 1L;
+
public DirectVmConsumerNotAvailableException(String message, Exchange exchange) {
super(message, exchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
index 77a8177..e6d5171 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
@@ -23,7 +23,6 @@ import java.util.concurrent.LinkedBlockingQueue;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.UriEndpointComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java b/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
index 3e3155b..aed97e0 100644
--- a/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Timer;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.UriEndpointComponent;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index 130f7de..f2ec5a2 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -26,7 +26,6 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
-import java.lang.reflect.Constructor;
import java.nio.ByteBuffer;
import java.util.Properties;
@@ -56,7 +55,6 @@ import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
import org.apache.camel.BytesSource;
import org.apache.camel.Converter;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java b/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java
index 61d00ea..4dae1b7 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java
@@ -141,7 +141,7 @@ public abstract class ComponentConfigurationSupport implements ComponentConfigur
public void setUriString(String uri) throws URISyntaxException {
String path = uri;
int idx = path.indexOf('?');
- Map<String, Object> newParameters = Collections.EMPTY_MAP;
+ Map<String, Object> newParameters = Collections.emptyMap();
if (idx >= 0) {
path = path.substring(0, idx);
String query = uri.substring(idx + 1);
@@ -166,19 +166,17 @@ public abstract class ComponentConfigurationSupport implements ComponentConfigur
public String createParameterJsonSchema() {
SortedMap<String, ParameterConfiguration> map = getParameterConfigurationMap();
- Set<Map.Entry<String, ParameterConfiguration>> entries = map.entrySet();
StringBuilder buffer = new StringBuilder("{\n \"properties\": {");
boolean first = true;
- for (Map.Entry<String, ParameterConfiguration> entry : entries) {
- String key = entry.getKey();
+ for (Map.Entry<String, ParameterConfiguration> entry : map.entrySet()) {
if (first) {
first = false;
} else {
buffer.append(",");
}
+ buffer.append(entry.getKey());
buffer.append("\n ");
- ParameterConfiguration value = entry.getValue();
- buffer.append(value.toJson());
+ buffer.append(entry.getValue().toJson());
}
buffer.append("\n }\n}\n");
return buffer.toString();
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
index c9e2709..4276ccc 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
@@ -24,7 +24,6 @@ import org.apache.camel.Navigate;
import org.apache.camel.Processor;
import org.apache.camel.Service;
import org.apache.camel.SuspendableService;
-import org.apache.camel.processor.DelegateAsyncProcessor;
import org.apache.camel.spi.RouteContext;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
index eadedd7..33f1310 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
@@ -19,7 +19,6 @@ package org.apache.camel.management.mbean;
import java.util.Set;
import org.apache.camel.CamelContext;
-import org.apache.camel.api.management.ManagedOperation;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.ManagedBacklogDebuggerMBean;
import org.apache.camel.processor.interceptor.BacklogDebugger;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index eed4cff..76e8996 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.SortedMap;
import java.util.concurrent.TimeUnit;
import javax.management.MBeanServer;
import javax.management.MBeanServerInvocationHandler;
@@ -42,12 +41,10 @@ import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.ManagedCamelContextMBean;
import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
-import org.apache.camel.impl.ParameterConfiguration;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ModelHelper;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
-import org.apache.camel.util.CamelContextHelper;
/**
* @version
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java b/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
index 6f824fe..5ef243e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
@@ -29,7 +29,6 @@ import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.builder.ExpressionBuilder;
-import org.apache.camel.processor.CatchProcessor;
import org.apache.camel.processor.TryProcessor;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ExpressionToPredicateAdapter;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
index 0405fde..7666253 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
@@ -356,9 +356,8 @@ public class DefaultExchangeFormatter implements ExchangeFormatter {
return answer;
}
- @SuppressWarnings("unchecked")
- private static Map sortMap(Map<String, Object> map) {
- TreeMap answer = new TreeMap(String.CASE_INSENSITIVE_ORDER);
+ private static Map<String, Object> sortMap(Map<String, Object> map) {
+ TreeMap<String, Object> answer = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
answer.putAll(map);
return answer;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
index c5f8337..3c2e290 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
@@ -39,7 +39,6 @@ import org.apache.camel.impl.DefaultDebugger;
import org.apache.camel.management.event.ExchangeCompletedEvent;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.ProcessorDefinitionHelper;
-import org.apache.camel.spi.Breakpoint;
import org.apache.camel.spi.Condition;
import org.apache.camel.spi.Debugger;
import org.apache.camel.spi.InterceptStrategy;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
index b739d09..caeb768 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
@@ -285,11 +285,11 @@ public class BacklogTracer extends ServiceSupport implements InterceptStrategy {
List<BacklogTracerEventMessage> events = dumpTracedMessages(nodeId);
StringBuilder sb = new StringBuilder();
- sb.append("<").append(DefaultBacklogTracerEventMessage.ROOT_TAG).append("s>");
+ sb.append("<").append(BacklogTracerEventMessage.ROOT_TAG).append("s>");
for (BacklogTracerEventMessage event : events) {
sb.append("\n").append(event.toXml(2));
}
- sb.append("\n</").append(DefaultBacklogTracerEventMessage.ROOT_TAG).append("s>");
+ sb.append("\n</").append(BacklogTracerEventMessage.ROOT_TAG).append("s>");
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java
index 4bc7b94..e86b751 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java
@@ -22,7 +22,6 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.util.AsyncProcessorHelper;
/**
* A base class for {@link LoadBalancer} implementations which choose a single
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java b/camel-core/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java
index 86634c4..be12a8d 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java
@@ -37,7 +37,9 @@ public interface OptimisticLockingAggregationRepository extends AggregationRepos
* update error has occurred and that the operation should be retried by the caller.
* <p/>
*/
- public static class OptimisticLockingException extends RuntimeException { }
+ class OptimisticLockingException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+ }
/**
* Add the given {@link org.apache.camel.Exchange} under the correlation key.
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/main/java/org/apache/camel/util/IOHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/IOHelper.java b/camel-core/src/main/java/org/apache/camel/util/IOHelper.java
index efaa86c..c381e90 100644
--- a/camel-core/src/main/java/org/apache/camel/util/IOHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/IOHelper.java
@@ -21,7 +21,6 @@ import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.FileOutputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java
index 6848189..01813e0 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.file;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-import java.util.GregorianCalendar;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
@@ -87,7 +86,7 @@ public class FileProducerExpressionTest extends ContextTestSupport {
}
public void testProducerWithDateHeader() throws Exception {
- Calendar cal = GregorianCalendar.getInstance();
+ Calendar cal = Calendar.getInstance();
cal.set(1974, Calendar.APRIL, 20);
Date date = cal.getTime();
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/test/java/org/apache/camel/component/log/LogInputStreamTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/log/LogInputStreamTest.java b/camel-core/src/test/java/org/apache/camel/component/log/LogInputStreamTest.java
index 26b4c61..3089a30 100644
--- a/camel-core/src/test/java/org/apache/camel/component/log/LogInputStreamTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/log/LogInputStreamTest.java
@@ -41,7 +41,7 @@ public class LogInputStreamTest extends ContextTestSupport {
public void testB() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:b");
mock.expectedMessageCount(1);
- mock.message(0).body(InputStream.class).convertToString().isEqualTo("Hello World");
+ mock.message(0).body().convertToString().isEqualTo("Hello World");
InputStream is = new ByteArrayInputStream("Hello World".getBytes());
template.sendBody("direct:b", is);
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/test/java/org/apache/camel/component/seda/SameSedaQueueMultipleConsumersDifferenceTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SameSedaQueueMultipleConsumersDifferenceTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SameSedaQueueMultipleConsumersDifferenceTest.java
index 98856df..9f39d15 100644
--- a/camel-core/src/test/java/org/apache/camel/component/seda/SameSedaQueueMultipleConsumersDifferenceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/seda/SameSedaQueueMultipleConsumersDifferenceTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.seda;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java b/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
index a18bd2d..3208835 100644
--- a/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
@@ -20,7 +20,6 @@ import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-import java.util.GregorianCalendar;
import org.apache.camel.Exchange;
import org.apache.camel.ExpressionIllegalSyntaxException;
@@ -177,7 +176,7 @@ public class FileLanguageTest extends LanguageTestSupport {
Exchange answer = endpoint.createExchange(gf);
endpoint.configureMessage(gf, answer.getIn());
- Calendar cal = GregorianCalendar.getInstance();
+ Calendar cal = Calendar.getInstance();
cal.set(1974, Calendar.APRIL, 20);
answer.getIn().setHeader("birthday", cal.getTime());
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java
index 1844512..c4f09a8 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.camel.ExchangeTestSupport;
import org.apache.camel.Expression;
-import org.apache.camel.Predicate;
/**
*
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 0dcba7f8..e66de80 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.language.simple;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
-import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -309,7 +308,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testDateExpressions() throws Exception {
- Calendar cal = GregorianCalendar.getInstance();
+ Calendar cal = Calendar.getInstance();
cal.set(1974, Calendar.APRIL, 20);
exchange.getIn().setHeader("birthday", cal.getTime());
@@ -324,7 +323,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testDateAndTimeExpressions() throws Exception {
- Calendar cal = GregorianCalendar.getInstance();
+ Calendar cal = Calendar.getInstance();
cal.set(1974, Calendar.APRIL, 20, 8, 55, 47);
cal.set(Calendar.MILLISECOND, 123);
exchange.getIn().setHeader("birthday", cal.getTime());
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java b/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
index 4cf9b1a..b081380 100644
--- a/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.management;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -28,7 +30,6 @@ import org.slf4j.LoggerFactory;
public class EndpointCompletionTest extends ManagementTestSupport {
private static final transient Logger LOG = LoggerFactory.getLogger(EndpointCompletionTest.class);
- @SuppressWarnings("unchecked")
public void testEndpointCompletion() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance(
@@ -37,13 +38,13 @@ public class EndpointCompletionTest extends ManagementTestSupport {
mbeanServer.isRegistered(on);
String componentName = "file";
- HashMap<String, Object> properties = new HashMap<String, Object>();
- List<String> completions = assertCompletion(mbeanServer, on, componentName, properties, "");
- completions = assertCompletion(mbeanServer, on, componentName, properties, "po");
- completions = assertCompletion(mbeanServer, on, componentName, properties, "/");
- completions = assertCompletion(mbeanServer, on, componentName, properties, "/usr/local");
- completions = assertCompletion(mbeanServer, on, componentName, properties, "/usr/local/");
- completions = assertCompletion(mbeanServer, on, componentName, properties, "/usr/local/b");
+ Map<String, Object> properties = new HashMap<String, Object>();
+ assertCompletion(mbeanServer, on, componentName, properties, "");
+ assertCompletion(mbeanServer, on, componentName, properties, "po");
+ assertCompletion(mbeanServer, on, componentName, properties, "/");
+ assertCompletion(mbeanServer, on, componentName, properties, "/usr/local");
+ assertCompletion(mbeanServer, on, componentName, properties, "/usr/local/");
+ assertCompletion(mbeanServer, on, componentName, properties, "/usr/local/b");
}
public void testEndpointConfigurationJson() throws Exception {
@@ -57,16 +58,17 @@ public class EndpointCompletionTest extends ManagementTestSupport {
assertParameterJsonSchema(mbeanServer, on, "timer");
}
+ @SuppressWarnings("unchecked")
private List<String> assertCompletion(MBeanServer mbeanServer, ObjectName on, String componentName,
- HashMap<String, Object> properties, String completionText) throws Exception {
+ Map<String, Object> properties, String completionText) throws Exception {
Object[] params = {componentName, properties, completionText};
String[] signature = {"java.lang.String", "java.util.Map", "java.lang.String"};
- List completions = assertIsInstanceOf(List.class,
+ List<?> completions = assertIsInstanceOf(List.class,
mbeanServer.invoke(on, "completeEndpointPath", params, signature));
LOG.info("Component " + componentName + " with '" + completionText + "' Returned: " + completions);
- return completions;
+ return (List<String>) completions;
}
private String assertParameterJsonSchema(MBeanServer mbeanServer, ObjectName on, String componentName) throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java b/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
index ae7ace9..61306de 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
@@ -29,7 +29,6 @@ import org.apache.camel.builder.RouteBuilder;
*/
public class ChoiceWithEndTest extends ContextTestSupport {
- @SuppressWarnings("unchecked")
public void testRouteIsCorrectAtRuntime() throws Exception {
// use navigate to find that the end works as expected
Navigate<Processor> nav = getRoute("direct://start").navigate();
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/test/java/org/apache/camel/processor/RouteServicesStartupOrderTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/RouteServicesStartupOrderTest.java b/camel-core/src/test/java/org/apache/camel/processor/RouteServicesStartupOrderTest.java
index 6177d86..e2a835f 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/RouteServicesStartupOrderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/RouteServicesStartupOrderTest.java
@@ -21,7 +21,6 @@ import java.util.List;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.Service;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexRouteTest.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexRouteTest.java
index 9500115..28ab5d0 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionComplexRouteTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.processor.onexception;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java b/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
index c9e94ab..d983c90 100644
--- a/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
@@ -20,8 +20,6 @@ import java.net.URI;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import org.apache.camel.ContextTestSupport;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java
index 6eaf3e3..e0096ea 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.atom;
import java.util.Calendar;
-import java.util.GregorianCalendar;
import java.util.List;
import java.util.TimeZone;
@@ -40,7 +39,7 @@ public class UpdatedDateFilterTest extends Assert {
// timestamp from the feed to use as base
// 2007-11-13T13:35:25.014Z
- Calendar cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT+1:00"));
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT+1:00"));
cal.set(2007, Calendar.NOVEMBER, 13, 14, 35, 0);
EntryFilter filter = new UpdatedDateFilter(cal.getTime());
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
index cda1d98..825af36 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
@@ -29,7 +29,6 @@ import com.amazonaws.services.s3.model.PutObjectResult;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.InvalidPayloadException;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.util.FileUtil;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
index da522e9..0f9f62a 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
@@ -193,7 +193,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
Field lengthField = annotatedFields.get(dataField.lengthPos());
lengthField.setAccessible(true);
Object modelObj = model.get(lengthField.getDeclaringClass().getName());
- Object lengthObj = (Integer) lengthField.get(modelObj);
+ Object lengthObj = lengthField.get(modelObj);
length = ((Integer)lengthObj).intValue();
}
if (length < 1 && delimiter == null && dataField.lengthPos() == 0) {
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
index 6e18f62..f981b6a 100755
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
@@ -64,7 +64,7 @@ public final class FormatFactory {
* @return Format the formatter
* @throws IllegalArgumentException if not suitable formatter is found
*/
- @SuppressWarnings("unchcecked")
+ @SuppressWarnings("unchecked")
private static Format<?> doGetFormat(Class<?> clazz, String pattern, String locale, int precision, boolean impliedDecimalSeparator) throws Exception {
if (clazz == byte.class || clazz == Byte.class) {
return ObjectHelper.isNotEmpty(pattern)
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index c78717e..0430d3f 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -102,7 +102,6 @@ public class CamelNamespaceHandler implements NamespaceHandler {
private static final String SSL_CONTEXT_PARAMETERS = "sslContextParameters";
private static final String BLUEPRINT_NS = "http://camel.apache.org/schema/blueprint";
- private static final String PLACEHOLDER_NS = "http://camel.apache.org/schema/placeholder";
private static final String SPRING_NS = "http://camel.apache.org/schema/spring";
private static final transient Logger LOG = LoggerFactory.getLogger(CamelNamespaceHandler.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
index fda29da..a05f9c2 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
@@ -63,7 +63,9 @@ import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
* Set of camel specific hooks for CDI.
*/
public class CamelExtension implements Extension {
- private static class InjectLiteral extends AnnotationLiteral<Inject> implements Inject { }
+ private static class InjectLiteral extends AnnotationLiteral<Inject> implements Inject {
+ private static final long serialVersionUID = 1L;
+ }
CamelContextMap camelContextMap;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index ca884c7..48d06af 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -58,7 +58,7 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
public Object addingService(ServiceReference<TypeConverterLoader> serviceReference) {
LOG.trace("AddingService: {}", serviceReference);
- TypeConverterLoader loader = (TypeConverterLoader) bundleContext.getService(serviceReference);
+ TypeConverterLoader loader = bundleContext.getService(serviceReference);
if (loader != null) {
try {
loader.load(getDelegate());
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
index bc0652e..f4750f7 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Method;
import java.net.URL;
-import java.util.Arrays;
import java.util.Enumeration;
import java.util.Map;
import java.util.Properties;
@@ -28,14 +27,11 @@ import java.util.SortedMap;
import java.util.TreeMap;
import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.LoadPropertiesException;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
/**
* Helper class
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/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 6ef7d8a..df13927 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
@@ -37,10 +37,10 @@ import org.apache.commons.io.IOUtils;
import org.bouncycastle.bcpg.ArmoredOutputStream;
import org.bouncycastle.bcpg.CompressionAlgorithmTags;
import org.bouncycastle.bcpg.HashAlgorithmTags;
+import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.openpgp.PGPCompressedData;
import org.bouncycastle.openpgp.PGPCompressedDataGenerator;
-import org.bouncycastle.openpgp.PGPEncryptedData;
import org.bouncycastle.openpgp.PGPEncryptedDataGenerator;
import org.bouncycastle.openpgp.PGPEncryptedDataList;
import org.bouncycastle.openpgp.PGPException;
@@ -136,7 +136,7 @@ public class PGPDataFormat implements DataFormat {
outputStream = new ArmoredOutputStream(outputStream);
}
- PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).
+ PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5).
setWithIntegrityPacket(integrity).
setSecureRandom(new SecureRandom()).
setProvider("BC"));
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 26d0af0..0eadfb8 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.Source;
@@ -965,10 +966,10 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
}
if (r != null) {
try {
- if (r.getEventType() == XMLStreamReader.START_DOCUMENT) {
+ if (r.getEventType() == XMLStreamConstants.START_DOCUMENT) {
r.next();
}
- if (r.getEventType() != XMLStreamReader.START_ELEMENT) {
+ if (r.getEventType() != XMLStreamConstants.START_ELEMENT) {
r.nextTag();
}
} catch (XMLStreamException e) {
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/AbstractBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/AbstractBeanDefinitionParser.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/AbstractBeanDefinitionParser.java
index 3224e12..541d27a 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/AbstractBeanDefinitionParser.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/AbstractBeanDefinitionParser.java
@@ -19,6 +19,8 @@ package org.apache.camel.component.cxf.blueprint;
import java.util.StringTokenizer;
+import org.osgi.service.blueprint.reflect.BeanMetadata;
+
import org.w3c.dom.Element;
import org.apache.aries.blueprint.ParserContext;
@@ -48,7 +50,7 @@ public class AbstractBeanDefinitionParser extends AbstractBPBeanDefinitionParser
answer.addProperty("blueprintContainer", createRef(context, "blueprintContainer"));
answer.addProperty("bundleContext", createRef(context, "blueprintBundleContext"));
// set the Bean scope to be prototype, so we can get a new instance per looking up
- answer.setScope(MutableBeanMetadata.SCOPE_PROTOTYPE);
+ answer.setScope(BeanMetadata.SCOPE_PROTOTYPE);
if (!StringUtils.isEmpty(getIdOrName(element))) {
answer.setId(getIdOrName(element));
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
index 37b86bd..512223e 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.cxf.converter;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -24,7 +23,6 @@ import java.util.Collection;
import javax.ws.rs.core.Response;
import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
index 70088e9..9aa8e11 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
@@ -121,8 +121,8 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding {
InputStream.class,
})));
- private static final Class<?>[] NO_PARAMETER_TYPES = (Class<?>[]) null;
- private static final Object[] NO_PARAMETERS = (Object[]) null;
+ private static final Class<?>[] NO_PARAMETER_TYPES = null;
+ private static final Object[] NO_PARAMETERS = null;
/** Caches the Method to Parameters associations to avoid reflection with every request */
private Map<Method, MethodSpec> methodSpecCache = new ConcurrentHashMap<Method, MethodSpec>();
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
index 62f826b..1197bb6 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
@@ -40,6 +40,7 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.frontend.ClientFactoryBean;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
+import org.apache.cxf.interceptor.Fault;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -53,7 +54,7 @@ public class CxfCustomizedExceptionTest extends CamelTestSupport {
static {
// START SNIPPET: FaultDefine
- SOAP_FAULT = new SoapFault(EXCEPTION_MESSAGE, SoapFault.FAULT_CODE_CLIENT);
+ SOAP_FAULT = new SoapFault(EXCEPTION_MESSAGE, Fault.FAULT_CODE_CLIENT);
Element detail = SOAP_FAULT.getOrCreateDetail();
Document doc = detail.getOwnerDocument();
Text tn = doc.createTextNode(DETAIL_TEXT);
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
index e2915c6..7b10dec 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.URISupport;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.helpers.CastUtils;
@@ -63,7 +63,7 @@ public class CxfProducerRouterTest extends CamelTestSupport {
svrBean.setAddress(SIMPLE_SERVER_ADDRESS);
svrBean.setServiceClass(HelloService.class);
svrBean.setServiceBean(new HelloServiceImpl());
- svrBean.setBus(CXFBusFactory.getDefaultBus());
+ svrBean.setBus(BusFactory.getDefaultBus());
svrBean.create();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousFalseTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousFalseTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousFalseTest.java
index 28633d9..6ccaebd 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousFalseTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousFalseTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -52,7 +52,7 @@ public class CxfProducerSynchronousFalseTest extends CamelTestSupport {
svrBean.setAddress(SIMPLE_SERVER_ADDRESS);
svrBean.setServiceClass(HelloService.class);
svrBean.setServiceBean(new HelloServiceImpl());
- svrBean.setBus(CXFBusFactory.getDefaultBus());
+ svrBean.setBus(BusFactory.getDefaultBus());
svrBean.create();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousTest.java
index 6f9760d..173361c 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSynchronousTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -51,7 +51,7 @@ public class CxfProducerSynchronousTest extends CamelTestSupport {
svrBean.setAddress(SIMPLE_SERVER_ADDRESS);
svrBean.setServiceClass(HelloService.class);
svrBean.setServiceBean(new HelloServiceImpl());
- svrBean.setBus(CXFBusFactory.getDefaultBus());
+ svrBean.setBus(BusFactory.getDefaultBus());
svrBean.create();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
index 9fbb446..c7be79c 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
@@ -34,7 +34,7 @@ import org.apache.camel.component.cxf.converter.CxfPayloadConverter;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ServerFactoryBean;
@@ -80,7 +80,7 @@ public class CxfProducerTest extends Assert {
svrBean.setAddress(getSimpleServerAddress());
svrBean.setServiceClass(HelloService.class);
svrBean.setServiceBean(new HelloServiceImpl());
- svrBean.setBus(CXFBusFactory.getDefaultBus());
+ svrBean.setBus(BusFactory.getDefaultBus());
server = svrBean.create();
GreeterImpl greeterImpl = new GreeterImpl();
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
index 71e155e..b294ffc 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.cxf.binding.soap.SoapFault;
+import org.apache.cxf.interceptor.Fault;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -41,7 +42,7 @@ public class CxfSpringCustomizedExceptionTest extends CamelTestSupport {
static {
// START SNIPPET: FaultDefine
- SOAP_FAULT = new SoapFault(EXCEPTION_MESSAGE, SoapFault.FAULT_CODE_CLIENT);
+ SOAP_FAULT = new SoapFault(EXCEPTION_MESSAGE, Fault.FAULT_CODE_CLIENT);
Element detail = SOAP_FAULT.getOrCreateDetail();
Document doc = detail.getOwnerDocument();
Text tn = doc.createTextNode(DETAIL_TEXT);
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
index 92729bf..5b7a038 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
@@ -31,7 +31,6 @@ import javax.activation.FileDataSource;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.component.cxf.common.message.CxfConstants;
-import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.DefaultHeaderFilterStrategy;
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
index a4f49e8..951f6dc 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
@@ -246,7 +246,7 @@ public class CxfRsConsumerSimpleBindingTest extends CamelTestSupport {
HttpResponse response = httpclient.execute(get);
assertEquals(200, response.getStatusLine().getStatusCode());
CustomerList cl = (CustomerList) jaxb.createUnmarshaller().unmarshal(new StringReader(EntityUtils.toString(response.getEntity())));
- List<Customer> vips = (List<Customer>) cl.getCustomers();
+ List<Customer> vips = cl.getCustomers();
assertEquals(2, vips.size());
assertEquals(123, vips.get(0).getId());
assertEquals(456, vips.get(1).getId());
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
index b8fe2e9..ab45026 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
@@ -46,8 +46,8 @@ public class UTPasswordCallback implements CallbackHandler {
* alias/passwords map.
*/
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+ for (Callback callback : callbacks) {
+ WSPasswordCallback pc = (WSPasswordCallback)callback;
String pass = passwords.get(pc.getIdentifier());
if (pass != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
index 8100b78..9fe1a6b 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
@@ -46,8 +46,8 @@ public class UTPasswordCallback implements CallbackHandler {
* alias/passwords map.
*/
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+ for (Callback callback : callbacks) {
+ WSPasswordCallback pc = (WSPasswordCallback)callback;
String pass = passwords.get(pc.getIdentifier());
if (pass != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/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 913822b..caabae9 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
@@ -22,6 +22,9 @@ package org.apache.camel.component.disruptor;
* already shut down
*/
public class DisruptorNotStartedException extends Exception {
+
+ private static final long serialVersionUID = 1L;
+
public DisruptorNotStartedException() {
super();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
----------------------------------------------------------------------
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
index 6be9eb1..cd94143 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
@@ -282,8 +282,8 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
}
final long start = System.currentTimeMillis();
- for (int i = 0; i < producerThread.length; ++i) {
- producerThread[i].start();
+ for (ProducerThread element : producerThread) {
+ element.start();
}
awaitExchangeAwaiters();
@@ -421,16 +421,5 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
producerTemplate.sendBody(endpoint, ExchangePattern.InOnly, System.nanoTime());
}
}
-
- public String getStatus() {
- final StringBuilder sb = new StringBuilder(100);
- sb.append("produced ");
- sb.append(producedMessageCount - 1);
- sb.append('/');
- sb.append(totalMessageCount);
- sb.append(" messages");
-
- return sb.toString();
- }
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java
index cd2c7fd..a4e8125 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java
@@ -20,6 +20,7 @@ import java.util.Iterator;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.disruptor.DisruptorComponent;
import org.apache.camel.component.disruptor.DisruptorReference;
/**
@@ -30,7 +31,7 @@ public class DisruptorVmComponentReferenceEndpointTest extends ContextTestSuppor
public void testDisruptorVmComponentReference() throws Exception {
DisruptorVmComponent vm = context.getComponent("disruptor-vm", DisruptorVmComponent.class);
- String key = DisruptorVmComponent.getDisruptorKey("disruptor-vm://foo");
+ String key = DisruptorComponent.getDisruptorKey("disruptor-vm://foo");
assertEquals(1, vm.getDisruptors().get(key).getEndpointCount());
assertEquals(2, numberOfReferences(vm));
@@ -61,7 +62,7 @@ public class DisruptorVmComponentReferenceEndpointTest extends ContextTestSuppor
// there should still be a bar
assertEquals(1, numberOfReferences(vm));
- key = DisruptorVmComponent.getDisruptorKey("disruptor-vm://bar");
+ key = DisruptorComponent.getDisruptorKey("disruptor-vm://bar");
assertEquals(1, vm.getDisruptors().get(key).getEndpointCount());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/Activator.java
----------------------------------------------------------------------
diff --git a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/Activator.java b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/Activator.java
index 4bc40e4..2c29e13 100644
--- a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/Activator.java
+++ b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/Activator.java
@@ -30,7 +30,7 @@ import org.osgi.framework.ServiceRegistration;
*/
public class Activator implements BundleActivator {
- private ServiceRegistration registration;
+ private ServiceRegistration<?> registration;
public void start(BundleContext bundleContext) throws Exception {
Dictionary<String, String> props = new Hashtable<String, String>();
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
index 1712aec..e1d2e4c 100644
--- a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
+++ b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
@@ -32,7 +32,7 @@ public class EventAdminConsumer extends DefaultConsumer implements EventHandler
private static final transient Logger LOG = LoggerFactory.getLogger(EventAdminConsumer.class);
private final EventAdminEndpoint endpoint;
- private ServiceRegistration registration;
+ private ServiceRegistration<?> registration;
public EventAdminConsumer(EventAdminEndpoint endpoint, Processor processor) {
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java
index 928346c..fc5f053 100644
--- a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java
+++ b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java
@@ -37,12 +37,12 @@ import org.osgi.util.tracker.ServiceTracker;
public class EventAdminProducer extends DefaultProducer {
private final EventAdminEndpoint endpoint;
- private ServiceTracker tracker;
+ private ServiceTracker<Object, Object> tracker;
public EventAdminProducer(EventAdminEndpoint endpoint) {
super(endpoint);
this.endpoint = endpoint;
- this.tracker = new ServiceTracker(endpoint.getComponent().getBundleContext(), EventAdmin.class.getName(), null);
+ this.tracker = new ServiceTracker<Object, Object>(endpoint.getComponent().getBundleContext(), EventAdmin.class.getName(), null);
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminServiceFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminServiceFactory.java b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminServiceFactory.java
index 3682e67..afb1e53 100644
--- a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminServiceFactory.java
+++ b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminServiceFactory.java
@@ -23,13 +23,13 @@ import org.osgi.framework.ServiceRegistration;
/**
* EventAdmin service factory
*/
-public class EventAdminServiceFactory implements ServiceFactory {
+public class EventAdminServiceFactory implements ServiceFactory<Object> {
- public Object getService(Bundle bundle, ServiceRegistration serviceRegistration) {
+ public Object getService(Bundle bundle, ServiceRegistration<Object> serviceRegistration) {
return new EventAdminComponentResolver(bundle.getBundleContext());
}
- public void ungetService(Bundle bundle, ServiceRegistration serviceRegistration, Object o) {
+ public void ungetService(Bundle bundle, ServiceRegistration<Object> serviceRegistration, Object o) {
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad710f1f/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java
index ca8a0f2..3acfc6a 100644
--- a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java
+++ b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.fop.apps.MimeConstants;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.junit.Test;
@@ -86,7 +85,7 @@ public class FopEndpointTest extends CamelTestSupport {
Endpoint endpoint = context().getEndpoint("fop:" + defaultOutputFormat);
Producer producer = endpoint.createProducer();
Exchange exchange = new DefaultExchange(context);
- exchange.getIn().setHeader(FopConstants.CAMEL_FOP_OUTPUT_FORMAT, MimeConstants.MIME_PLAIN_TEXT);
+ exchange.getIn().setHeader(FopConstants.CAMEL_FOP_OUTPUT_FORMAT, org.apache.xmlgraphics.util.MimeConstants.MIME_PLAIN_TEXT);
exchange.getIn().setBody(FopHelper.decorateTextWithXSLFO("Test Content"));
producer.process(exchange);