CAMEL-2939: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/db5e6be5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/db5e6be5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/db5e6be5 Branch: refs/heads/master Commit: db5e6be5a50b0922a3b505340853f5d99ee52a8e Parents: d78164b Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Feb 18 10:09:25 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Feb 18 10:09:25 2015 +0100 ---------------------------------------------------------------------- .../component/cassandra/CassandraEndpoint.java | 14 ++++------ .../component/cassandra/CassandraProducer.java | 9 ++++-- .../CassandraAggregationRepository.java | 15 +++++----- .../CassandraIdempotentRepository.java | 2 +- .../camel/utils/cassandra/CassandraUtils.java | 27 ++++++++++++------ .../CassandraComponentConsumerTest.java | 2 -- .../CassandraComponentProducerTest.java | 22 ++++++++++----- ...assandraComponentProducerUnpreparedTest.java | 29 ++++++++++---------- .../CassandraAggregationRepositoryTest.java | 15 +++++----- ...NamedCassandraAggregationRepositoryTest.java | 15 +++++----- 10 files changed, 85 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/db5e6be5/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java index 8d70b9f..f5709a5 100644 --- a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java +++ b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java @@ -51,11 +51,8 @@ public class CassandraEndpoint extends DefaultEndpoint { private String keyspace; @UriParam private String cql; - /** - * Use PreparedStatements or normal Statements - */ - @UriParam - private boolean prepareStatements=true; + @UriParam(defaultValue = "true") + private boolean prepareStatements = true; @UriParam private String clusterName; @UriParam @@ -66,10 +63,6 @@ public class CassandraEndpoint extends DefaultEndpoint { private Cluster cluster; @UriParam private Session session; - - /** - * Consistency level: ONE, TWO, QUORUM, LOCAL_QUORUM, ALL... - */ @UriParam private ConsistencyLevel consistencyLevel; @@ -292,6 +285,9 @@ public class CassandraEndpoint extends DefaultEndpoint { return prepareStatements; } + /** + * Whether to use PreparedStatements or regular Statements + */ public void setPrepareStatements(boolean prepareStatements) { this.prepareStatements = prepareStatements; } http://git-wip-us.apache.org/repos/asf/camel/blob/db5e6be5/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraProducer.java b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraProducer.java index 394283c..9ec9a25 100644 --- a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraProducer.java +++ b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraProducer.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.cassandra; +import java.util.Collection; + import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.RegularStatement; import com.datastax.driver.core.ResultSet; @@ -26,7 +28,6 @@ import org.apache.camel.impl.DefaultProducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collection; import static org.apache.camel.utils.cassandra.CassandraUtils.isEmpty; /** @@ -65,9 +66,11 @@ public class CassandraProducer extends DefaultProducer { public CassandraEndpoint getEndpoint() { return (CassandraEndpoint) super.getEndpoint(); } + public boolean isPrepareStatements() { return getEndpoint().isPrepareStatements(); } + private Object[] getCqlParams(Message message) { Object cqlParamsObj = message.getBody(); Object[] cqlParams; @@ -122,7 +125,7 @@ public class CassandraProducer extends DefaultProducer { // Message Statement lPreparedStatement = getEndpoint().getSession().prepare((RegularStatement) messageCql); } else { - throw new IllegalArgumentException("Invalid "+CassandraConstants.CQL_QUERY+" header"); + throw new IllegalArgumentException("Invalid " + CassandraConstants.CQL_QUERY + " header"); } if (isEmpty(cqlParams)) { resultSet = session.execute(lPreparedStatement.bind()); @@ -149,7 +152,7 @@ public class CassandraProducer extends DefaultProducer { // Message Statement statement = (RegularStatement) messageCql; } else { - throw new IllegalArgumentException("Invalid "+CassandraConstants.CQL_QUERY+" header"); + throw new IllegalArgumentException("Invalid " + CassandraConstants.CQL_QUERY + " header"); } if (statement != null) { resultSet = session.execute(statement); http://git-wip-us.apache.org/repos/asf/camel/blob/db5e6be5/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java index 27b969a..9cf8333 100644 --- a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java +++ b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java @@ -21,6 +21,7 @@ import java.nio.ByteBuffer; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.concurrent.TimeUnit; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.ConsistencyLevel; @@ -29,9 +30,7 @@ import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.datastax.driver.core.querybuilder.Delete; import com.datastax.driver.core.querybuilder.Insert; -import static com.datastax.driver.core.querybuilder.QueryBuilder.*; import com.datastax.driver.core.querybuilder.Select; -import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.spi.AggregationRepository; @@ -41,6 +40,8 @@ import org.apache.camel.utils.cassandra.CassandraSessionHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker; +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; import static org.apache.camel.utils.cassandra.CassandraUtils.append; import static org.apache.camel.utils.cassandra.CassandraUtils.applyConsistencyLevel; import static org.apache.camel.utils.cassandra.CassandraUtils.concat; @@ -112,7 +113,7 @@ public class CassandraAggregationRepository extends ServiceSupport implements Re * Prepared statement used to delete with key and exchange id */ private PreparedStatement deleteIfIdStatement; - + private long recoveryIntervalInMillis = 5000; private boolean useRecovery = true; @@ -309,6 +310,7 @@ public class CassandraAggregationRepository extends ServiceSupport implements Re /** * Get exchange IDs to be recovered + * * @return Exchange IDs */ @Override @@ -335,12 +337,11 @@ public class CassandraAggregationRepository extends ServiceSupport implements Re if (lExchangeId.equals(exchangeId)) { lKey = row.getString(keyColumnName); break; - } + } } return lKey == null ? null : get(camelContext, lKey); } - - + // ------------------------------------------------------------------------- // Getters and Setters @@ -365,7 +366,7 @@ public class CassandraAggregationRepository extends ServiceSupport implements Re return prefixPKValues; } - public void setPrefixPKValues(Object ... prefixPKValues) { + public void setPrefixPKValues(Object... prefixPKValues) { this.prefixPKValues = prefixPKValues; } http://git-wip-us.apache.org/repos/asf/camel/blob/db5e6be5/components/camel-cassandraql/src/main/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepository.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepository.java b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepository.java index 23af20a..7546f17 100644 --- a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepository.java +++ b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepository.java @@ -107,7 +107,7 @@ public class CassandraIdempotentRepository<K> extends ServiceSupport implements protected final boolean isApplied(ResultSet resultSet) { Row row = resultSet.one(); - return row==null || row.getBool("[applied]"); + return row == null || row.getBool("[applied]"); } protected Object[] getPKValues(K key) { http://git-wip-us.apache.org/repos/asf/camel/blob/db5e6be5/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java index 4300d14..32b41b3 100644 --- a/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java +++ b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java @@ -20,19 +20,27 @@ import com.datastax.driver.core.ConsistencyLevel; import com.datastax.driver.core.RegularStatement; import com.datastax.driver.core.querybuilder.Delete; import com.datastax.driver.core.querybuilder.Insert; -import static com.datastax.driver.core.querybuilder.QueryBuilder.*; import com.datastax.driver.core.querybuilder.Select; -/** - * - */ -public class CassandraUtils { +import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker; +import static com.datastax.driver.core.querybuilder.QueryBuilder.delete; +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; +import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto; +import static com.datastax.driver.core.querybuilder.QueryBuilder.select; +import static com.datastax.driver.core.querybuilder.QueryBuilder.ttl; + +public final class CassandraUtils { + + private CassandraUtils() { + } + /** * Test if the array is null or empty. */ public static boolean isEmpty(Object[] array) { return array == null || array.length == 0; } + /** * Concatenate 2 arrays. */ @@ -56,6 +64,7 @@ public class CassandraUtils { private static boolean isEmpty(String[] array) { return size(array) == 0; } + /** * Concatenate 2 arrays. */ @@ -91,7 +100,7 @@ public class CassandraUtils { */ public static Insert generateInsert(String table, String[] columns, boolean ifNotExists, Integer ttl) { Insert insert = insertInto(table); - for(String column: columns) { + for (String column : columns) { insert = insert.value(column, bindMarker()); } if (ifNotExists) { @@ -102,6 +111,7 @@ public class CassandraUtils { } return insert; } + /** * Generate select where columns = ? CQL. */ @@ -116,7 +126,7 @@ public class CassandraUtils { Select select = select(selectColumns).from(table); if (isWhereClause(whereColumns, whereColumnsMaxIndex)) { Select.Where where = select.where(); - for(int i = 0; i < whereColumns.length && i < whereColumnsMaxIndex; i++) { + for (int i = 0; i < whereColumns.length && i < whereColumnsMaxIndex; i++) { where.and(eq(whereColumns[i], bindMarker())); } } @@ -137,7 +147,7 @@ public class CassandraUtils { Delete delete = delete().from(table); if (isWhereClause(whereColumns, whereColumnsMaxIndex)) { Delete.Where where = delete.where(); - for(int i = 0; i < whereColumns.length && i < whereColumnsMaxIndex; i++) { + for (int i = 0; i < whereColumns.length && i < whereColumnsMaxIndex; i++) { where.and(eq(whereColumns[i], bindMarker())); } } @@ -150,6 +160,7 @@ public class CassandraUtils { private static boolean isWhereClause(String[] whereColumns, int whereColumnsMaxIndex) { return !isEmpty(whereColumns) && whereColumnsMaxIndex > 0; } + /** * Apply consistency level if provided, else leave default. */ http://git-wip-us.apache.org/repos/asf/camel/blob/db5e6be5/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java index 788844e..4b70f1a 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java @@ -30,8 +30,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class CassandraComponentConsumerTest extends CamelTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/db5e6be5/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java ---------------------------------------------------------------------- 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 4196842..f5825ab 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 @@ -16,8 +16,15 @@ */ package org.apache.camel.component.cassandra; -import com.datastax.driver.core.*; -import static com.datastax.driver.core.querybuilder.QueryBuilder.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.ConsistencyLevel; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; +import com.datastax.driver.core.Session; import com.datastax.driver.core.querybuilder.Update; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; @@ -29,9 +36,10 @@ import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker; +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; +import static com.datastax.driver.core.querybuilder.QueryBuilder.set; +import static com.datastax.driver.core.querybuilder.QueryBuilder.update; public class CassandraComponentProducerTest extends CamelTestSupport { @@ -92,7 +100,7 @@ public class CassandraComponentProducerTest extends CamelTestSupport { } @Test - public void testRequestNoParameter_Null() throws Exception { + public void testRequestNoParameterNull() throws Exception { Object response = noParameterProducerTemplate.requestBody(null); assertNotNull(response); @@ -101,7 +109,7 @@ public class CassandraComponentProducerTest extends CamelTestSupport { } @Test - public void testRequestNoParameter_Empty() throws Exception { + public void testRequestNoParameterEmpty() throws Exception { Object response = noParameterProducerTemplate.requestBody(Collections.emptyList()); assertNotNull(response); http://git-wip-us.apache.org/repos/asf/camel/blob/db5e6be5/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java index 8c07635..b1c738d 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java @@ -16,11 +16,13 @@ */ package org.apache.camel.component.cassandra; -import com.datastax.driver.core.*; -import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker; -import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static com.datastax.driver.core.querybuilder.QueryBuilder.set; -import static com.datastax.driver.core.querybuilder.QueryBuilder.update; +import java.util.Arrays; +import java.util.List; + +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; +import com.datastax.driver.core.Session; import com.datastax.driver.core.querybuilder.Update; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; @@ -32,10 +34,9 @@ import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; -import java.util.Arrays; -import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; +import static com.datastax.driver.core.querybuilder.QueryBuilder.set; +import static com.datastax.driver.core.querybuilder.QueryBuilder.update; public class CassandraComponentProducerUnpreparedTest extends CamelTestSupport { @@ -67,9 +68,9 @@ public class CassandraComponentProducerUnpreparedTest extends CamelTestSupport { public void configure() { from("direct:input") - .to("cql://localhost/camel_ks?cql=" + CQL+"&prepareStatements=false"); + .to("cql://localhost/camel_ks?cql=" + CQL + "&prepareStatements=false"); from("direct:inputNoParameter") - .to("cql://localhost/camel_ks?cql=" + NO_PARAMETER_CQL+"&prepareStatements=false"); + .to("cql://localhost/camel_ks?cql=" + NO_PARAMETER_CQL + "&prepareStatements=false"); } }; } @@ -90,7 +91,7 @@ public class CassandraComponentProducerUnpreparedTest extends CamelTestSupport { } @Test - public void testRequestNoParameter_Null() throws Exception { + public void testRequestNoParameterNull() throws Exception { Object response = noParameterProducerTemplate.requestBody(null); assertNotNull(response); @@ -99,7 +100,7 @@ public class CassandraComponentProducerUnpreparedTest extends CamelTestSupport { } @Test - public void testRequestNoParameter_Empty() throws Exception { + public void testRequestNoParameterEmpty() throws Exception { Object response = noParameterProducerTemplate.requestBody(null); assertNotNull(response); @@ -122,7 +123,7 @@ public class CassandraComponentProducerUnpreparedTest extends CamelTestSupport { session.close(); cluster.close(); } - + /** * Test with incoming message containing a header with RegularStatement. */ http://git-wip-us.apache.org/repos/asf/camel/blob/db5e6be5/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java index b0c7195..217e7a6 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java @@ -179,25 +179,26 @@ public class CassandraAggregationRepositoryTest { @Test public void testConfirmNotExist() { // Given - String[] keys=new String[3]; + String[] keys = new String[3]; for (int i = 1; i < 4; i++) { - keys[i-1] = "Confirm" + i; + keys[i - 1] = "Confirm" + i; } addExchanges(keys); - for(String key:keys) { + for (String key : keys) { assertTrue(exists(key)); } // When aggregationRepository.confirm(camelContext, "Exchange-Confirm5"); // Then - for (String key: keys) { + for (String key : keys) { assertTrue(exists(key)); } } - private void addExchanges(String ... keys) { + + private void addExchanges(String... keys) { for (String key : keys) { Exchange exchange = new DefaultExchange(camelContext); - exchange.setExchangeId("Exchange-"+key); + exchange.setExchangeId("Exchange-" + key); aggregationRepository.add(camelContext, key, exchange); } } @@ -211,7 +212,7 @@ public class CassandraAggregationRepositoryTest { Set<String> exchangeIdSet = aggregationRepository.scan(camelContext); // Then for (String key : keys) { - assertTrue(exchangeIdSet.contains("Exchange-"+key)); + assertTrue(exchangeIdSet.contains("Exchange-" + key)); } } http://git-wip-us.apache.org/repos/asf/camel/blob/db5e6be5/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java index a4c9a76..f46b68c 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java @@ -180,25 +180,26 @@ public class NamedCassandraAggregationRepositoryTest { @Test public void testConfirmNotExist() { // Given - String[] keys=new String[3]; + String[] keys = new String[3]; for (int i = 1; i < 4; i++) { - keys[i-1] = "Confirm" + i; + keys[i - 1] = "Confirm" + i; } addExchanges(keys); - for(String key:keys) { + for (String key : keys) { assertTrue(exists(key)); } // When aggregationRepository.confirm(camelContext, "Exchange-Confirm5"); // Then - for (String key: keys) { + for (String key : keys) { assertTrue(exists(key)); } } - private void addExchanges(String ... keys) { + + private void addExchanges(String... keys) { for (String key : keys) { Exchange exchange = new DefaultExchange(camelContext); - exchange.setExchangeId("Exchange-"+key); + exchange.setExchangeId("Exchange-" + key); aggregationRepository.add(camelContext, key, exchange); } } @@ -212,7 +213,7 @@ public class NamedCassandraAggregationRepositoryTest { Set<String> exchangeIdSet = aggregationRepository.scan(camelContext); // Then for (String key : keys) { - assertTrue(exchangeIdSet.contains("Exchange-"+key)); + assertTrue(exchangeIdSet.contains("Exchange-" + key)); } }