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 2018/04/19 20:04:33 UTC
[camel] branch master updated: polish (the last commit by this
round)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new fddd28e polish (the last commit by this round)
fddd28e is described below
commit fddd28e48a8a3254893164d5b3ff22ef957d9ee5
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Thu Apr 19 22:04:19 2018 +0200
polish (the last commit by this round)
---
.../component/cassandra/CassandraComponentProducerTest.java | 6 ++----
.../camel/component/git/producer/GitRemoteProducerTest.java | 1 -
.../java/org/apache/camel/component/hl7/HL721Converter.java | 1 -
.../java/org/apache/camel/component/hl7/HL722Converter.java | 1 -
.../java/org/apache/camel/component/hl7/HL7231Converter.java | 1 -
.../java/org/apache/camel/component/hl7/HL723Converter.java | 1 -
.../java/org/apache/camel/component/hl7/HL724Converter.java | 1 -
.../java/org/apache/camel/component/hl7/HL7251Converter.java | 1 -
.../java/org/apache/camel/component/hl7/HL725Converter.java | 1 -
.../java/org/apache/camel/component/hl7/HL726Converter.java | 1 -
.../java/org/apache/camel/component/hl7/HL7Converter.java | 1 -
.../camel/component/hl7/HL7GenericMessageConverter.java | 1 -
.../camel/component/mail/MailMimeDecodeHeadersTest.java | 1 -
.../idempotent/MongoDbIdempotentRepositoryTest.java | 2 --
.../apache/camel/spring/CircularComponentCreationTest.java | 1 -
.../sql/stored/template/generated/ParseException.java | 12 ++++++------
.../component/sql/stored/template/generated/SSPTParser.java | 3 +--
.../src/main/java/org/apache/camel/test/blueprint/Main.java | 3 ---
.../camel/component/thrift/ThriftProducerSecurityTest.java | 1 -
.../component/thrift/ThriftProducerZlibCompressionTest.java | 2 --
.../component/thrift/local/ThriftThreadPoolServerTest.java | 1 -
21 files changed, 9 insertions(+), 34 deletions(-)
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
index 9afee87..d2a5015 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
@@ -202,8 +202,7 @@ public class CassandraComponentProducerTest extends BaseCassandraTest {
Update.Where updateFirstName = update("camel_user")
.with(set("first_name", bindMarker()))
.where(eq("login", bindMarker()));
- @SuppressWarnings("unused")
- Object response1 = producerTemplateNoEndpointCql.requestBodyAndHeader(new Object[]{"Claus 2", "c_ibsen"},
+ producerTemplateNoEndpointCql.sendBodyAndHeader(new Object[]{"Claus 2", "c_ibsen"},
CassandraConstants.CQL_QUERY, updateFirstName);
Cluster cluster = CassandraUnitUtils.cassandraCluster();
@@ -217,8 +216,7 @@ public class CassandraComponentProducerTest extends BaseCassandraTest {
Update.Where updateLastName = update("camel_user")
.with(set("last_name", bindMarker()))
.where(eq("login", bindMarker()));
- @SuppressWarnings("unused")
- Object response2 = producerTemplateNoEndpointCql.requestBodyAndHeader(new Object[]{"Ibsen 2", "c_ibsen"},
+ producerTemplateNoEndpointCql.sendBodyAndHeader(new Object[]{"Ibsen 2", "c_ibsen"},
CassandraConstants.CQL_QUERY, updateLastName);
ResultSet resultSet2 = session.execute("select login, first_name, last_name from camel_user where login = ?", "c_ibsen");
diff --git a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java
index b1fced3..9806307 100644
--- a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java
+++ b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.git.GitTestSupport;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.Status;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.transport.PushResult;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL721Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL721Converter.java
index 1110399..27578a6 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL721Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL721Converter.java
@@ -67,7 +67,6 @@ import ca.uhn.hl7v2.model.v21.message.UDM_Q05;
import ca.uhn.hl7v2.parser.DefaultModelClassFactory;
import ca.uhn.hl7v2.parser.ParserConfiguration;
import ca.uhn.hl7v2.parser.UnexpectedSegmentBehaviourEnum;
-import ca.uhn.hl7v2.validation.ValidationContext;
import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL722Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL722Converter.java
index 8a7b085..336d8ad 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL722Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL722Converter.java
@@ -100,7 +100,6 @@ import ca.uhn.hl7v2.model.v22.message.UDM_Q05;
import ca.uhn.hl7v2.parser.DefaultModelClassFactory;
import ca.uhn.hl7v2.parser.ParserConfiguration;
import ca.uhn.hl7v2.parser.UnexpectedSegmentBehaviourEnum;
-import ca.uhn.hl7v2.validation.ValidationContext;
import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
import org.apache.camel.Converter;
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7231Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7231Converter.java
index f91152e..f4a776c 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7231Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7231Converter.java
@@ -201,7 +201,6 @@ import ca.uhn.hl7v2.model.v231.message.VXX_V02;
import ca.uhn.hl7v2.parser.DefaultModelClassFactory;
import ca.uhn.hl7v2.parser.ParserConfiguration;
import ca.uhn.hl7v2.parser.UnexpectedSegmentBehaviourEnum;
-import ca.uhn.hl7v2.validation.ValidationContext;
import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
import org.apache.camel.Converter;
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL723Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL723Converter.java
index 1b1060d..4deff43 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL723Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL723Converter.java
@@ -264,7 +264,6 @@ import ca.uhn.hl7v2.model.v23.message.VXX_V02;
import ca.uhn.hl7v2.parser.DefaultModelClassFactory;
import ca.uhn.hl7v2.parser.ParserConfiguration;
import ca.uhn.hl7v2.parser.UnexpectedSegmentBehaviourEnum;
-import ca.uhn.hl7v2.validation.ValidationContext;
import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
import org.apache.camel.Converter;
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL724Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL724Converter.java
index 10fbf63..bb174e9 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL724Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL724Converter.java
@@ -206,7 +206,6 @@ import ca.uhn.hl7v2.model.v24.message.VXX_V02;
import ca.uhn.hl7v2.parser.DefaultModelClassFactory;
import ca.uhn.hl7v2.parser.ParserConfiguration;
import ca.uhn.hl7v2.parser.UnexpectedSegmentBehaviourEnum;
-import ca.uhn.hl7v2.validation.ValidationContext;
import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
import org.apache.camel.Converter;
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7251Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7251Converter.java
index f9c7b08..ac7b08f 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7251Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7251Converter.java
@@ -228,7 +228,6 @@ import ca.uhn.hl7v2.model.v251.message.VXX_V02;
import ca.uhn.hl7v2.parser.DefaultModelClassFactory;
import ca.uhn.hl7v2.parser.ParserConfiguration;
import ca.uhn.hl7v2.parser.UnexpectedSegmentBehaviourEnum;
-import ca.uhn.hl7v2.validation.ValidationContext;
import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
import org.apache.camel.Converter;
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL725Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL725Converter.java
index d6e280e..ce93b77 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL725Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL725Converter.java
@@ -228,7 +228,6 @@ import ca.uhn.hl7v2.model.v25.message.VXX_V02;
import ca.uhn.hl7v2.parser.DefaultModelClassFactory;
import ca.uhn.hl7v2.parser.ParserConfiguration;
import ca.uhn.hl7v2.parser.UnexpectedSegmentBehaviourEnum;
-import ca.uhn.hl7v2.validation.ValidationContext;
import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
import org.apache.camel.Converter;
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL726Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL726Converter.java
index dcf3110..19419d5 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL726Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL726Converter.java
@@ -243,7 +243,6 @@ import ca.uhn.hl7v2.model.v26.message.VXX_V02;
import ca.uhn.hl7v2.parser.DefaultModelClassFactory;
import ca.uhn.hl7v2.parser.ParserConfiguration;
import ca.uhn.hl7v2.parser.UnexpectedSegmentBehaviourEnum;
-import ca.uhn.hl7v2.validation.ValidationContext;
import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
import org.apache.camel.Converter;
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
index 843354b..b61018a 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
@@ -25,7 +25,6 @@ import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.parser.DefaultModelClassFactory;
import ca.uhn.hl7v2.parser.ParserConfiguration;
import ca.uhn.hl7v2.parser.UnexpectedSegmentBehaviourEnum;
-import ca.uhn.hl7v2.validation.ValidationContext;
import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
import org.apache.camel.Converter;
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7GenericMessageConverter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7GenericMessageConverter.java
index b7b3336..5b0ad92 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7GenericMessageConverter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7GenericMessageConverter.java
@@ -27,7 +27,6 @@ import ca.uhn.hl7v2.parser.GenericModelClassFactory;
import ca.uhn.hl7v2.parser.Parser;
import ca.uhn.hl7v2.parser.ParserConfiguration;
import ca.uhn.hl7v2.parser.UnexpectedSegmentBehaviourEnum;
-import ca.uhn.hl7v2.validation.ValidationContext;
import ca.uhn.hl7v2.validation.impl.ValidationContextFactory;
import org.apache.camel.Converter;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
index 4c4fb04..7264439 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
@@ -36,7 +36,6 @@ public class MailMimeDecodeHeadersTest extends CamelTestSupport {
StringBuilder sb = new StringBuilder("Camel rocks!");
int mimeFoldingLimit = 76;
- int headerLength = "subject: ".length();
while (sb.length() <= mimeFoldingLimit) {
sb.insert(7, "o");
}
diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java
index 4a9d427..a0e54e0 100644
--- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java
+++ b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.mongodb3.processor.idempotent;
import java.util.UUID;
-import com.mongodb.MongoClient;
-
import org.apache.camel.component.mongodb3.AbstractMongoDbTest;
import org.bson.Document;
import org.junit.After;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java
index 3d743bc..1aa5bb5 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.spring;
-import org.apache.camel.CamelContext;
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.util.IOHelper;
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java
index 30e4737..d2444b8 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java
@@ -91,14 +91,14 @@ public class ParseException extends Exception {
String eol = System.getProperty("line.separator", "\n");
StringBuffer expected = new StringBuffer();
int maxSize = 0;
- for (int i = 0; i < expectedTokenSequences.length; i++) {
- if (maxSize < expectedTokenSequences[i].length) {
- maxSize = expectedTokenSequences[i].length;
+ for (int[] expectedTokenSequence : expectedTokenSequences) {
+ if (maxSize < expectedTokenSequence.length) {
+ maxSize = expectedTokenSequence.length;
}
- for (int j = 0; j < expectedTokenSequences[i].length; j++) {
- expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
+ for (int j = 0; j < expectedTokenSequence.length; j++) {
+ expected.append(tokenImage[expectedTokenSequence[j]]).append(' ');
}
- if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+ if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) {
expected.append("...");
}
expected.append(eol).append(" ");
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
index 30f0258..be4ea91 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
@@ -211,7 +211,6 @@ public class SSPTParser implements SSPTParserConstants {
final public Token ParameterSqlType() throws ParseException {
Token t;
- Token scaleToken;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NUMBER:
t = jj_consume_token(NUMBER);
@@ -379,7 +378,7 @@ public class SSPTParser implements SSPTParserConstants {
return (jj_ntk = jj_nt.kind);
}
- private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
+ private java.util.List<int[]> jj_expentries = new java.util.ArrayList<>();
private int[] jj_expentry;
private int jj_kind = -1;
diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
index 870507b..7a190ea 100644
--- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
+++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
@@ -17,11 +17,8 @@
package org.apache.camel.test.blueprint;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedList;
import java.util.Map;
-import java.util.Set;
-
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.main.MainSupport;
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
index 6f0a78b..9038065 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
@@ -37,7 +37,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jsse.KeyStoreParameters;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.apache.camel.util.jsse.TrustManagersParameters;
-import org.apache.thrift.TProcessor;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TSSLTransportFactory;
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java
index 2e3da45..e12a06f 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java
@@ -29,12 +29,10 @@ import org.apache.camel.component.thrift.generated.Work;
import org.apache.camel.component.thrift.impl.CalculatorSyncServerImpl;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.thrift.TProcessor;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TServerSocket;
-import org.apache.thrift.transport.TTransportFactory;
import org.apache.thrift.transport.TZlibTransport;
import org.junit.AfterClass;
import org.junit.BeforeClass;
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java
index b4afff2..ef0d5a3 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.thrift.server.ThriftThreadPoolServer;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.thrift.TException;
-import org.apache.thrift.TProcessor;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.server.TServer;
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.