From f6aef61d51de3534c5b018bf54b14b269c4525ee Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 3 Jun 2016 14:41:06 -0700 Subject: [PATCH] DATACASS-287 - Polish. Original pull request: #63. --- .../cassandra/test/integration/core/BookListener.java | 7 ++++--- .../test/integration/support/ListListener.java | 1 - .../test/integration/support/ListOfMapListener.java | 1 - .../test/integration/support/MapListener.java | 5 ++--- .../test/integration/support/ObjectListener.java | 3 +-- .../test/integration/support/QueryListener.java | 7 +++---- .../AsynchronousCassandraTemplateIntegrationTests.java | 10 ++++------ 7 files changed, 14 insertions(+), 20 deletions(-) diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/BookListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/BookListener.java index fccf92336..e3a8bf9dc 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/BookListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/BookListener.java @@ -34,14 +34,16 @@ public class BookListener extends CallbackSynchronizationSupport implements Asyn private boolean done; @Override - public void onQueryComplete(ResultSetFuture rsf) { + public void onQueryComplete(ResultSetFuture resultSetFuture) { Row row; + try { - row = rsf.get().one(); + row = resultSetFuture.get().one(); } catch (Exception e) { throw new RuntimeException("Failed to get ResultSet from ResultSetFuture", e); } + book = new Book(); book.setIsbn(row.getString("isbn")); book.setTitle(row.getString("title")); @@ -66,5 +68,4 @@ public class BookListener extends CallbackSynchronizationSupport implements Asyn public Book getBook() { return book; } - } diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListListener.java index aabf7f56e..476eeb9b5 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListListener.java @@ -34,7 +34,6 @@ public class ListListener extends CallbackSynchronizationSupport implements Q * Allow instances only using {@link #create()} */ private ListListener() { - super(); } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListOfMapListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListOfMapListener.java index 6d81f1377..1f281c448 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListOfMapListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ListOfMapListener.java @@ -37,7 +37,6 @@ public class ListOfMapListener extends CallbackSynchronizationSupport implements * Allow instances only using {@link #create()} */ private ListOfMapListener() { - super(); } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/MapListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/MapListener.java index be8bcef01..a4012f3cf 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/MapListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/MapListener.java @@ -33,12 +33,11 @@ public class MapListener extends CallbackSynchronizationSupport implements Query /** * Allow instances only using {@link #create()} */ - private MapListener(){ - super(); + private MapListener() { } /** - * @return a new {@link ObjectListener}. + * @return a new {@link MapListener}. */ public static MapListener create() { return new MapListener(); diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ObjectListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ObjectListener.java index a2f8d707f..ba33329e8 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ObjectListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/ObjectListener.java @@ -32,8 +32,7 @@ public class ObjectListener extends CallbackSynchronizationSupport implements /** * Allow instances only using {@link #create()} */ - private ObjectListener(){ - super(); + private ObjectListener() { } /** diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/QueryListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/QueryListener.java index 701256082..4b3786fc9 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/QueryListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/QueryListener.java @@ -28,13 +28,12 @@ import com.datastax.driver.core.ResultSetFuture; */ public class QueryListener extends CallbackSynchronizationSupport implements AsynchronousQueryListener { - private volatile ResultSetFuture rsf; + private volatile ResultSetFuture resultSetFuture; /** * Allow instances only using {@link #create()} */ private QueryListener() { - super(); } /** @@ -47,11 +46,11 @@ public class QueryListener extends CallbackSynchronizationSupport implements Asy @Override public void onQueryComplete(ResultSetFuture resultSetFuture) { - this.rsf = resultSetFuture; + this.resultSetFuture = resultSetFuture; countDown(); } public ResultSetFuture getResultSetFuture() { - return rsf; + return resultSetFuture; } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/AsynchronousCassandraTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/AsynchronousCassandraTemplateIntegrationTests.java index 34d346a14..3057a97e4 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/AsynchronousCassandraTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/core/AsynchronousCassandraTemplateIntegrationTests.java @@ -21,7 +21,6 @@ import static org.junit.Assume.*; import static org.springframework.data.cassandra.repository.support.BasicMapId.*; import java.util.Collection; -import java.util.Random; import java.util.UUID; import java.util.concurrent.CancellationException; @@ -206,7 +205,7 @@ public class AsynchronousCassandraTemplateIntegrationTests extends AbstractSprin } /** - * @see DATACASS-287 + * @see DATACASS-287 */ @Test(timeout = 10000) public void shouldSelectOneAsynchronously() throws Exception { @@ -225,7 +224,7 @@ public class AsynchronousCassandraTemplateIntegrationTests extends AbstractSprin } /** - * @see DATACASS-287 + * @see DATACASS-287 */ @Test(timeout = 10000) public void shouldSelectOneAsynchronouslyIfObjectIsAbsent() throws Exception { @@ -246,14 +245,13 @@ public class AsynchronousCassandraTemplateIntegrationTests extends AbstractSprin @Data @AllArgsConstructor @NoArgsConstructor + @SuppressWarnings("unused") public static class Person { - private static final Random RNG = new Random(); - @PrimaryKeyColumn(ordinal = 0, type = PrimaryKeyType.PARTITIONED) String id; @Column String firstname; - public static final String uuid() { + public static String uuid() { return UUID.randomUUID().toString(); }