You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/06/14 14:22:07 UTC
[camel] branch main updated: (chores) camel-cassandra: remove unecessary calls to String.format
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new f8873dcab29 (chores) camel-cassandra: remove unecessary calls to String.format
f8873dcab29 is described below
commit f8873dcab291b71b59c753fecda5223fb45b3a2c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Jun 14 15:17:35 2022 +0200
(chores) camel-cassandra: remove unecessary calls to String.format
---
.../integration/CassandraComponentConsumerIT.java | 6 ++---
.../integration/CassandraComponentProducerIT.java | 26 +++++++++++-----------
.../CassandraComponentProducerUnpreparedIT.java | 12 +++++-----
.../CassandraAggregationRepositoryIT.java | 2 +-
.../NamedCassandraAggregationRepositoryIT.java | 4 +---
.../cassandra/CassandraIdempotentRepositoryIT.java | 2 +-
.../NamedCassandraIdempotentRepositoryIT.java | 4 +---
7 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java
index 28cad34ea8a..720089d8d0d 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java
@@ -82,10 +82,10 @@ public class CassandraComponentConsumerIT extends BaseCassandra {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(String.format("cql://%s/%s?cql=%s", getUrl(), KEYSPACE_NAME, CQL)).to("mock:resultAll");
- from(String.format("cql://%s/%s?cql=%s&prepareStatements=false", getUrl(), KEYSPACE_NAME, CQL))
+ fromF("cql://%s/%s?cql=%s", getUrl(), KEYSPACE_NAME, CQL).to("mock:resultAll");
+ fromF("cql://%s/%s?cql=%s&prepareStatements=false", getUrl(), KEYSPACE_NAME, CQL)
.to("mock:resultUnprepared");
- from(String.format("cql://%s/%s?cql=%s&resultSetConversionStrategy=ONE", getUrl(), KEYSPACE_NAME, CQL))
+ fromF("cql://%s/%s?cql=%s&resultSetConversionStrategy=ONE", getUrl(), KEYSPACE_NAME, CQL)
.to("mock:resultOne");
}
};
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java
index 9e1a3573290..8bccd5bccf0 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java
@@ -64,15 +64,15 @@ public class CassandraComponentProducerIT extends BaseCassandra {
return new RouteBuilder() {
public void configure() {
- from("direct:input").to(String.format("cql://%s/%s?cql=%s", getUrl(), KEYSPACE_NAME, CQL));
+ from("direct:input").toF("cql://%s/%s?cql=%s", getUrl(), KEYSPACE_NAME, CQL);
from("direct:inputNoParameter")
- .to(String.format("cql://%s/%s?cql=%s", getUrl(), KEYSPACE_NAME, NO_PARAMETER_CQL));
- from("direct:loadBalancingPolicy").to(String.format(
- "cql://%s/%s?cql=%s&loadBalancingPolicyClass=org.apache.camel.component.cassandra.MockLoadBalancingPolicy",
- getUrl(), KEYSPACE_NAME, NO_PARAMETER_CQL));
+ .toF("cql://%s/%s?cql=%s", getUrl(), KEYSPACE_NAME, NO_PARAMETER_CQL);
+ from("direct:loadBalancingPolicy")
+ .toF("cql://%s/%s?cql=%s&loadBalancingPolicyClass=org.apache.camel.component.cassandra.MockLoadBalancingPolicy",
+ getUrl(), KEYSPACE_NAME, NO_PARAMETER_CQL);
from("direct:inputNotConsistent")
- .to(String.format("cql://%s/%s?cql=%s&consistencyLevel=ANY", getUrl(), KEYSPACE_NAME, CQL));
- from("direct:inputNoEndpointCql").to(String.format("cql://%s/%s", getUrl(), KEYSPACE_NAME));
+ .toF("cql://%s/%s?cql=%s&consistencyLevel=ANY", getUrl(), KEYSPACE_NAME, CQL);
+ from("direct:inputNoEndpointCql").toF("cql://%s/%s", getUrl(), KEYSPACE_NAME);
}
};
}
@@ -82,7 +82,7 @@ public class CassandraComponentProducerIT extends BaseCassandra {
producerTemplate.requestBody(Arrays.asList("w_jiang", "Willem", "Jiang"));
ResultSet resultSet = getSession()
- .execute(String.format("select login, first_name, last_name from camel_user where login = '%s'", "w_jiang"));
+ .execute("select login, first_name, last_name from camel_user where login = ?", "w_jiang");
Row row = resultSet.one();
assertNotNull(row);
assertEquals("Willem", row.getString("first_name"));
@@ -111,7 +111,7 @@ public class CassandraComponentProducerIT extends BaseCassandra {
"update camel_user set first_name=?, last_name=? where login=?");
ResultSet resultSet = getSession()
- .execute(String.format("select login, first_name, last_name from camel_user where login = '%s'", "c_ibsen"));
+ .execute("select login, first_name, last_name from camel_user where login = ?", "c_ibsen");
Row row = resultSet.one();
assertNotNull(row);
assertEquals("Claus 2", row.getString("first_name"));
@@ -125,7 +125,7 @@ public class CassandraComponentProducerIT extends BaseCassandra {
"update camel_user set first_name=?, last_name=? where login=?");
ResultSet resultSet = getSession()
- .execute(String.format("select login, first_name, last_name from camel_user where login = '%s'", "c_ibsen"));
+ .execute("select login, first_name, last_name from camel_user where login = ?", "c_ibsen");
Row row = resultSet.one();
assertNotNull(row);
assertEquals("Claus 2", row.getString("first_name"));
@@ -148,7 +148,7 @@ public class CassandraComponentProducerIT extends BaseCassandra {
update.build());
ResultSet resultSet = getSession()
- .execute(String.format("select login, first_name, last_name from camel_user where login = '%s'", "c_ibsen"));
+ .execute("select login, first_name, last_name from camel_user where login = ?", "c_ibsen");
Row row = resultSet.one();
assertNotNull(row);
assertEquals("Claus 2", row.getString("first_name"));
@@ -168,7 +168,7 @@ public class CassandraComponentProducerIT extends BaseCassandra {
update.build());
ResultSet resultSet1 = getSession()
- .execute(String.format("select login, first_name, last_name from camel_user where login = '%s'", "c_ibsen"));
+ .execute("select login, first_name, last_name from camel_user where login = ?", "c_ibsen");
Row row1 = resultSet1.one();
assertNotNull(row1);
assertEquals("Claus 2", row1.getString("first_name"));
@@ -181,7 +181,7 @@ public class CassandraComponentProducerIT extends BaseCassandra {
update.build());
ResultSet resultSet2 = getSession()
- .execute(String.format("select login, first_name, last_name from camel_user where login = '%s'", "c_ibsen"));
+ .execute("select login, first_name, last_name from camel_user where login = ?", "c_ibsen");
Row row2 = resultSet2.one();
assertNotNull(row2);
assertEquals("Claus 2", row2.getString("first_name"));
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java
index 16ce29ec60b..ba426bd007b 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerUnpreparedIT.java
@@ -51,9 +51,9 @@ public class CassandraComponentProducerUnpreparedIT extends BaseCassandra {
public void configure() {
from("direct:input")
- .to(String.format("cql://%s/%s?cql=%s&prepareStatements=false", getUrl(), KEYSPACE_NAME, CQL));
- from("direct:inputNoParameter").to(
- String.format("cql://%s/%s?cql=%s&prepareStatements=false", getUrl(), KEYSPACE_NAME, NO_PARAMETER_CQL));
+ .toF("cql://%s/%s?cql=%s&prepareStatements=false", getUrl(), KEYSPACE_NAME, CQL);
+ from("direct:inputNoParameter")
+ .toF("cql://%s/%s?cql=%s&prepareStatements=false", getUrl(), KEYSPACE_NAME, NO_PARAMETER_CQL);
}
};
}
@@ -63,7 +63,7 @@ public class CassandraComponentProducerUnpreparedIT extends BaseCassandra {
producerTemplate.requestBody(Arrays.asList("w_jiang", "Willem", "Jiang"));
ResultSet resultSet = getSession()
- .execute(String.format("select login, first_name, last_name from camel_user where login = '%s'", "w_jiang"));
+ .execute("select login, first_name, last_name from camel_user where login = ?", "w_jiang");
Row row = resultSet.one();
assertNotNull(row);
assertEquals("Willem", row.getString("first_name"));
@@ -92,7 +92,7 @@ public class CassandraComponentProducerUnpreparedIT extends BaseCassandra {
"update camel_user set first_name=?, last_name=? where login=?");
ResultSet resultSet = getSession()
- .execute(String.format("select login, first_name, last_name from camel_user where login = '%s'", "c_ibsen"));
+ .execute("select login, first_name, last_name from camel_user where login = ?", "c_ibsen");
Row row = resultSet.one();
assertNotNull(row);
assertEquals("Claus 2", row.getString("first_name"));
@@ -111,7 +111,7 @@ public class CassandraComponentProducerUnpreparedIT extends BaseCassandra {
producerTemplate.requestBodyAndHeader(null, CassandraConstants.CQL_QUERY, update.build());
ResultSet resultSet = getSession()
- .execute(String.format("select login, first_name, last_name from camel_user where login = '%s'", "c_ibsen"));
+ .execute("select login, first_name, last_name from camel_user where login = ?", "c_ibsen");
Row row = resultSet.one();
assertNotNull(row);
assertEquals("Claus 2", row.getString("first_name"));
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryIT.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryIT.java
index 3e180a50fa7..09a2fab4f83 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryIT.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryIT.java
@@ -54,7 +54,7 @@ public class CassandraAggregationRepositoryIT extends BaseCassandra {
}
private boolean exists(String key) {
- return getSession().execute(String.format("select KEY from CAMEL_AGGREGATION where KEY='%s'", key)).one() != null;
+ return getSession().execute("select KEY from CAMEL_AGGREGATION where KEY=?", key).one() != null;
}
@Test
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryIT.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryIT.java
index a7d8afa56c3..a09b7696ae0 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryIT.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryIT.java
@@ -56,9 +56,7 @@ public class NamedCassandraAggregationRepositoryIT extends BaseCassandra {
}
private boolean exists(String key) {
- return getSession().execute(String.format("select KEY from NAMED_CAMEL_AGGREGATION where NAME='ID' and KEY='%s'", key))
- .one()
- != null;
+ return getSession().execute("select KEY from NAMED_CAMEL_AGGREGATION where NAME='ID' and KEY=?", key).one() != null;
}
@Test
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryIT.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryIT.java
index ce78fcbe4d4..b7525dedb28 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryIT.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryIT.java
@@ -54,7 +54,7 @@ public class CassandraIdempotentRepositoryIT extends BaseCassandra {
}
private boolean exists(String key) {
- return getSession().execute(String.format("select KEY from CAMEL_IDEMPOTENT where KEY='%s'", key)).one() != null;
+ return getSession().execute("select KEY from CAMEL_IDEMPOTENT where KEY=?", key).one() != null;
}
@Test
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryIT.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryIT.java
index d434eefe213..c43db0c0c23 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryIT.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryIT.java
@@ -55,9 +55,7 @@ public class NamedCassandraIdempotentRepositoryIT extends BaseCassandra {
}
private boolean exists(String key) {
- return getSession().execute(String.format("select KEY from NAMED_CAMEL_IDEMPOTENT where NAME='ID' and KEY='%s'", key))
- .one()
- != null;
+ return getSession().execute("select KEY from NAMED_CAMEL_IDEMPOTENT where NAME='ID' and KEY=?", key).one() != null;
}
@Test