diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/CoreProtocolVersion.java b/core/src/main/java/com/datastax/oss/driver/api/core/CoreProtocolVersion.java index f8304dd6e94..ae56e403d64 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/CoreProtocolVersion.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/CoreProtocolVersion.java @@ -47,6 +47,7 @@ public enum CoreProtocolVersion implements ProtocolVersion { this.beta = beta; } + @Override public int getCode() { return code; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfigLoader.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfigLoader.java index 768cf9b59fb..137d4189cf9 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfigLoader.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfigLoader.java @@ -35,5 +35,6 @@ public interface DriverConfigLoader extends AutoCloseable { * Called when the cluster closes. This is a good time to release any external resource, for * example cancel a scheduled reloading task. */ + @Override void close(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/connection/ExponentialReconnectionPolicy.java b/core/src/main/java/com/datastax/oss/driver/api/core/connection/ExponentialReconnectionPolicy.java index c65688706e8..8fd943f4738 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/connection/ExponentialReconnectionPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/connection/ExponentialReconnectionPolicy.java @@ -58,7 +58,7 @@ public ExponentialReconnectionPolicy(DriverContext context) { // Maximum number of attempts after which we overflow int ceil = (baseDelayMs & (baseDelayMs - 1)) == 0 ? 0 : 1; - this.maxAttempts = 64 - Long.numberOfLeadingZeros(Long.MAX_VALUE / baseDelayMs) - ceil; + this.maxAttempts = 64L - Long.numberOfLeadingZeros(Long.MAX_VALUE / baseDelayMs) - ceil; } /** diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatementBuilder.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatementBuilder.java index dc0252249e4..4077096ca23 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatementBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatementBuilder.java @@ -121,6 +121,7 @@ public SimpleStatementBuilder clearNamedValues() { return this; } + @Override public SimpleStatement build() { return new DefaultSimpleStatement( query, diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlDuration.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlDuration.java index 389cde6c65e..1b52670473f 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlDuration.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlDuration.java @@ -351,7 +351,10 @@ public Builder(boolean isNegative) { public Builder addYears(long numberOfYears) { validateOrder(1); validateMonths(numberOfYears, MONTHS_PER_YEAR); - months += numberOfYears * MONTHS_PER_YEAR; + // Cast to avoid http://errorprone.info/bugpattern/NarrowingCompoundAssignment + // We could also change the method to accept an int, but keeping long allows us to keep the + // calling code generic. + months += (int) numberOfYears * MONTHS_PER_YEAR; return this; } @@ -364,7 +367,7 @@ public Builder addYears(long numberOfYears) { public Builder addMonths(long numberOfMonths) { validateOrder(2); validateMonths(numberOfMonths, 1); - months += numberOfMonths; + months += (int) numberOfMonths; return this; } @@ -377,7 +380,7 @@ public Builder addMonths(long numberOfMonths) { public Builder addWeeks(long numberOfWeeks) { validateOrder(3); validateDays(numberOfWeeks, DAYS_PER_WEEK); - days += numberOfWeeks * DAYS_PER_WEEK; + days += (int) numberOfWeeks * DAYS_PER_WEEK; return this; } @@ -390,7 +393,7 @@ public Builder addWeeks(long numberOfWeeks) { public Builder addDays(long numberOfDays) { validateOrder(4); validateDays(numberOfDays, 1); - days += numberOfDays; + days += (int) numberOfDays; return this; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/CustomType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/CustomType.java index 67beef478ab..0a22b61f5a5 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/CustomType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/CustomType.java @@ -29,6 +29,7 @@ default String asCql(boolean includeFrozen, boolean pretty) { return String.format("'%s'", getClassName()); } + @Override default int getProtocolCode() { return ProtocolConstants.DataType.CUSTOM; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/ListType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/ListType.java index 7aa880aa231..32c362e3b55 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/ListType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/ListType.java @@ -28,6 +28,7 @@ default String asCql(boolean includeFrozen, boolean pretty) { return String.format(template, getElementType().asCql(includeFrozen, pretty)); } + @Override default int getProtocolCode() { return ProtocolConstants.DataType.LIST; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/MapType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/MapType.java index c5be9a3947b..0475bf4632d 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/MapType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/MapType.java @@ -33,6 +33,7 @@ default String asCql(boolean includeFrozen, boolean pretty) { getValueType().asCql(includeFrozen, pretty)); } + @Override default int getProtocolCode() { return ProtocolConstants.DataType.MAP; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/SetType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/SetType.java index 9e42d25254a..34a2ca6f0d1 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/SetType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/SetType.java @@ -28,6 +28,7 @@ default String asCql(boolean includeFrozen, boolean pretty) { return String.format(template, getElementType().asCql(includeFrozen, pretty)); } + @Override default int getProtocolCode() { return ProtocolConstants.DataType.SET; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/TupleType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/TupleType.java index 15b49c4cece..7587997b98a 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/TupleType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/TupleType.java @@ -47,6 +47,7 @@ default String asCql(boolean includeFrozen, boolean pretty) { return builder.toString(); } + @Override default int getProtocolCode() { return ProtocolConstants.DataType.TUPLE; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/UserDefinedType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/UserDefinedType.java index 1d87e38cc14..63f8c802ad7 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/UserDefinedType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/UserDefinedType.java @@ -91,6 +91,7 @@ default String describeWithChildren(boolean pretty) { return describe(pretty); } + @Override default int getProtocolCode() { return ProtocolConstants.DataType.UDT; } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelHandlerRequest.java b/core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelHandlerRequest.java index f0969487cac..212d43232e1 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelHandlerRequest.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelHandlerRequest.java @@ -17,6 +17,7 @@ import com.datastax.oss.driver.api.core.DriverTimeoutException; import com.datastax.oss.driver.internal.core.util.ProtocolUtils; +import com.datastax.oss.driver.internal.core.util.concurrent.UncaughtExceptions; import com.datastax.oss.protocol.internal.Frame; import com.datastax.oss.protocol.internal.Message; import com.datastax.oss.protocol.internal.response.Error; @@ -91,7 +92,7 @@ private void onTimeout() { fail(new DriverTimeoutException(describe() + ": timed out after " + timeoutMillis + " ms")); if (!channel.closeFuture().isDone()) { // Cancel the response callback - channel.writeAndFlush(this); + channel.writeAndFlush(this).addListener(UncaughtExceptions::log); } } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/channel/DriverChannel.java b/core/src/main/java/com/datastax/oss/driver/internal/core/channel/DriverChannel.java index da5e9a9e175..4666f8cc086 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/channel/DriverChannel.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/channel/DriverChannel.java @@ -17,6 +17,7 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.ProtocolVersion; +import com.datastax.oss.driver.internal.core.util.concurrent.UncaughtExceptions; import com.datastax.oss.protocol.internal.Message; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; @@ -82,7 +83,7 @@ public Future write( public void cancel(ResponseCallback responseCallback) { // To avoid creating an extra message, we adopt the convention that writing the callback // directly means cancellation - writeCoalescer.writeAndFlush(channel, responseCallback); + writeCoalescer.writeAndFlush(channel, responseCallback).addListener(UncaughtExceptions::log); } /** @@ -149,10 +150,12 @@ public SocketAddress localAddress() { * be allowed to complete before the underlying channel is closed. */ public Future close() { - if (closing.compareAndSet(false, true)) { + if (closing.compareAndSet(false, true) && channel.isOpen()) { // go through the coalescer: this guarantees that we won't reject writes that were submitted // before, but had not been coalesced yet. - writeCoalescer.writeAndFlush(channel, GRACEFUL_CLOSE_MESSAGE); + writeCoalescer + .writeAndFlush(channel, GRACEFUL_CLOSE_MESSAGE) + .addListener(UncaughtExceptions::log); } return channel.closeFuture(); } @@ -163,8 +166,10 @@ public Future close() { */ public Future forceClose() { this.close(); - if (forceClosing.compareAndSet(false, true)) { - writeCoalescer.writeAndFlush(channel, FORCEFUL_CLOSE_MESSAGE); + if (forceClosing.compareAndSet(false, true) && channel.isOpen()) { + writeCoalescer + .writeAndFlush(channel, FORCEFUL_CLOSE_MESSAGE) + .addListener(UncaughtExceptions::log); } return channel.closeFuture(); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultTraceEvent.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultTraceEvent.java index 198cf5019e2..7dffbe31f3a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultTraceEvent.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultTraceEvent.java @@ -56,6 +56,7 @@ public InetAddress getSource() { return source; } + @Override public int getSourceElapsedMicros() { return sourceElapsedMicros; } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/MultiPageResultSet.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/MultiPageResultSet.java index 8a205733d74..b0b0bf69128 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/MultiPageResultSet.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/MultiPageResultSet.java @@ -24,9 +24,10 @@ import com.datastax.oss.driver.internal.core.util.CountingIterator; import com.datastax.oss.driver.internal.core.util.concurrent.BlockingOperation; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; +import java.util.ArrayDeque; import java.util.ArrayList; +import java.util.Deque; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; public class MultiPageResultSet implements ResultSet { @@ -81,7 +82,7 @@ public boolean wasApplied() { private class RowIterator extends CountingIterator { // The pages fetched so far. The first is the one we're currently iterating. - private LinkedList pages = new LinkedList<>(); + private Deque pages = new ArrayDeque<>(); private Iterator currentRows; private RowIterator(AsyncResultSet firstPage) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNode.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNode.java index 2e975cc00a1..20f649aaa5f 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNode.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNode.java @@ -98,6 +98,7 @@ public NodeState getState() { return state; } + @Override public int getOpenConnections() { return openConnections; } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultIndexMetadata.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultIndexMetadata.java index 01346006cc5..d1a538942af 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultIndexMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultIndexMetadata.java @@ -70,6 +70,7 @@ public String getTarget() { return target; } + @Override public Map getOptions() { return options; } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/RelationParser.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/RelationParser.java index 7902ee6a7c8..8876d871ab4 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/RelationParser.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/RelationParser.java @@ -114,7 +114,7 @@ public static void appendOptions(Map options, ScriptBuild * The columns of the system table that are turned into entries in {@link * RelationMetadata#getOptions()}. */ - public static final Map> OPTION_CODECS = + public static final ImmutableMap> OPTION_CODECS = ImmutableMap.>builder() .put("bloom_filter_fp_chance", TypeCodecs.DOUBLE) // In C* <= 2.2, this is a string, not a map (this is special-cased in parseOptions): diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/TableParser.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/TableParser.java index c983dff5394..7f81aa7c582 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/TableParser.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/TableParser.java @@ -292,9 +292,9 @@ private static String buildLegacyIndexTarget(ColumnMetadata column, Map refreshFuture) { String logPrefix = context.sessionName(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/session/ReprepareOnUp.java b/core/src/main/java/com/datastax/oss/driver/internal/core/session/ReprepareOnUp.java index b27fb11d6fe..e18046a41e6 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/session/ReprepareOnUp.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/session/ReprepareOnUp.java @@ -33,9 +33,9 @@ import com.google.common.annotations.VisibleForTesting; import java.nio.ByteBuffer; import java.time.Duration; +import java.util.ArrayDeque; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedList; import java.util.Map; import java.util.Queue; import java.util.Set; @@ -161,7 +161,7 @@ private void gatherServerIds(AdminResult rows, Throwable error) { private void gatherPayloadsToReprepare() { assert channel.eventLoop().inEventLoop(); - toReprepare = new LinkedList<>(); + toReprepare = new ArrayDeque<>(); for (RepreparePayload payload : repreparePayloads.values()) { if (serverKnownIds.contains(payload.id)) { LOG.trace( diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/util/VIntCoding.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/util/VIntCoding.java index e3a508452b6..731d1139046 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/util/VIntCoding.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/util/VIntCoding.java @@ -96,9 +96,9 @@ private static int firstByteValueMask(int extraBytesToRead) { return 0xff >> extraBytesToRead; } - private static int encodeExtraBytesToRead(int extraBytesToRead) { + private static byte encodeExtraBytesToRead(int extraBytesToRead) { // because we have an extra bit in the value mask, we just need to invert it - return ~firstByteValueMask(extraBytesToRead); + return (byte) ~firstByteValueMask(extraBytesToRead); } private static int numberOfExtraBytesToRead(int firstByte) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/DirectedGraph.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/DirectedGraph.java index 6fc24bf8f2a..a0939eb3bc7 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/DirectedGraph.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/DirectedGraph.java @@ -21,9 +21,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; +import java.util.ArrayDeque; import java.util.Arrays; import java.util.Collection; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Queue; @@ -67,7 +67,7 @@ public List topologicalSort() { Preconditions.checkState(!wasSorted); wasSorted = true; - Queue queue = new LinkedList(); + Queue queue = new ArrayDeque<>(); for (Map.Entry entry : vertices.entrySet()) { if (entry.getValue() == 0) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/Strings.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/Strings.java index 196e4d9a1df..1444d6ca9fb 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/Strings.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/Strings.java @@ -255,7 +255,7 @@ public static boolean isLongLiteral(String str) { private Strings() {} - private static final Set RESERVED_KEYWORDS = + private static final ImmutableSet RESERVED_KEYWORDS = ImmutableSet.of( // See https://github.com/apache/cassandra/blob/trunk/doc/cql3/CQL.textile#appendixA "add", diff --git a/core/src/test/java/com/datastax/oss/driver/api/core/CassandraVersionAssert.java b/core/src/test/java/com/datastax/oss/driver/api/core/CassandraVersionAssert.java index a97af4b694c..268092ad68f 100644 --- a/core/src/test/java/com/datastax/oss/driver/api/core/CassandraVersionAssert.java +++ b/core/src/test/java/com/datastax/oss/driver/api/core/CassandraVersionAssert.java @@ -59,6 +59,7 @@ public CassandraVersionAssert hasNextStable(String version) { return this; } + @Override public CassandraVersionAssert hasToString(String string) { Assertions.assertThat(actual.toString()).isEqualTo(string); return this; diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactoryAvailableIdsTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactoryAvailableIdsTest.java index c356305cf8d..3f4a66ea6d9 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactoryAvailableIdsTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactoryAvailableIdsTest.java @@ -36,6 +36,7 @@ public class ChannelFactoryAvailableIdsTest extends ChannelFactoryTestBase { @Mock private ResponseCallback responseCallback; @Before + @Override public void setup() throws InterruptedException { super.setup(); Mockito.when(defaultConfigProfile.isDefined(CoreDriverOption.PROTOCOL_VERSION)) diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactoryTestBase.java b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactoryTestBase.java index bc25095b5df..9689ce80083 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactoryTestBase.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactoryTestBase.java @@ -121,7 +121,7 @@ public void setup() throws InterruptedException { Mockito.when(defaultConfigProfile.getInt(CoreDriverOption.CONNECTION_MAX_REQUESTS)) .thenReturn(1); Mockito.when(defaultConfigProfile.getDuration(CoreDriverOption.CONNECTION_HEARTBEAT_INTERVAL)) - .thenReturn(Duration.ofMillis(30000)); + .thenReturn(Duration.ofSeconds(30)); Mockito.when(context.protocolVersionRegistry()).thenReturn(protocolVersionRegistry); Mockito.when(context.nettyOptions()).thenReturn(nettyOptions); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/DriverChannelTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/DriverChannelTest.java index 6d3c4d2ee3a..cf874b3c8fe 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/DriverChannelTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/DriverChannelTest.java @@ -25,7 +25,7 @@ import io.netty.channel.ChannelPromise; import io.netty.util.concurrent.Future; import java.util.AbstractMap; -import java.util.LinkedList; +import java.util.ArrayDeque; import java.util.Map; import java.util.Queue; import org.junit.Before; @@ -142,7 +142,7 @@ public void should_wait_for_coalesced_writes_when_closing_forcefully() { // Simple implementation that holds all the writes, and flushes them when it's explicitly // triggered. private class MockWriteCoalescer implements WriteCoalescer { - private Queue> messages = new LinkedList<>(); + private Queue> messages = new ArrayDeque<>(); @Override public ChannelFuture writeAndFlush(Channel channel, Object message) { diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/MockChannelFactoryHelper.java b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/MockChannelFactoryHelper.java index 08578459b0f..d6fd9de2640 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/MockChannelFactoryHelper.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/MockChannelFactoryHelper.java @@ -20,8 +20,9 @@ import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Sets; import java.net.SocketAddress; +import java.util.ArrayDeque; +import java.util.Deque; import java.util.HashMap; -import java.util.LinkedList; import java.util.Map; import java.util.Set; import java.util.concurrent.CompletableFuture; @@ -148,7 +149,7 @@ public MockChannelFactoryHelper build() { private void stub() { for (SocketAddress address : invocations.keySet()) { - LinkedList> results = new LinkedList<>(); + Deque> results = new ArrayDeque<>(); for (Object object : invocations.get(address)) { if (object instanceof DriverChannel) { results.add(CompletableFuture.completedFuture(((DriverChannel) object))); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/MockResponseCallback.java b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/MockResponseCallback.java index c0bb98ee640..d5360d63120 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/MockResponseCallback.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/MockResponseCallback.java @@ -16,12 +16,12 @@ package com.datastax.oss.driver.internal.core.channel; import com.datastax.oss.protocol.internal.Frame; -import java.util.LinkedList; +import java.util.ArrayDeque; import java.util.Queue; class MockResponseCallback implements ResponseCallback { private final boolean holdStreamId; - private final Queue responses = new LinkedList<>(); + private final Queue responses = new ArrayDeque<>(); volatile int streamId = -1; diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ProtocolInitHandlerTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ProtocolInitHandlerTest.java index a9ee0a8e621..d75bad658fa 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ProtocolInitHandlerTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/ProtocolInitHandlerTest.java @@ -93,7 +93,7 @@ public void setup() { Mockito.when(defaultConfigProfile.getDuration(CoreDriverOption.CONNECTION_INIT_QUERY_TIMEOUT)) .thenReturn(Duration.ofMillis(QUERY_TIMEOUT_MILLIS)); Mockito.when(defaultConfigProfile.getDuration(CoreDriverOption.CONNECTION_HEARTBEAT_INTERVAL)) - .thenReturn(Duration.ofMillis(30000)); + .thenReturn(Duration.ofSeconds(30)); Mockito.when( defaultConfigProfile.getBoolean(CoreDriverOption.AUTH_PROVIDER_WARN_IF_NO_SERVER_AUTH)) .thenReturn(true); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandlerTestBase.java b/core/src/test/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandlerTestBase.java index b3c2ded3481..a1b3a55095f 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandlerTestBase.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandlerTestBase.java @@ -31,8 +31,8 @@ import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; import java.nio.ByteBuffer; +import java.util.ArrayDeque; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Queue; import org.junit.Before; @@ -83,7 +83,7 @@ protected static Message singleRow() { null, new int[] {}, null); - Queue> data = new LinkedList<>(); + Queue> data = new ArrayDeque<>(); data.add(ImmutableList.of(Bytes.fromHexString("0x68656C6C6F2C20776F726C64"))); return new DefaultRows(metadata, data); } diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/cql/DefaultAsyncResultSetTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/cql/DefaultAsyncResultSetTest.java index 3fa049f9b8a..12906c0543f 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/cql/DefaultAsyncResultSetTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/cql/DefaultAsyncResultSetTest.java @@ -16,12 +16,12 @@ package com.datastax.oss.driver.internal.core.cql; import com.datastax.oss.driver.api.core.CoreProtocolVersion; +import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.cql.AsyncResultSet; import com.datastax.oss.driver.api.core.cql.ColumnDefinition; import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.cql.Statement; -import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; @@ -29,7 +29,7 @@ import com.datastax.oss.protocol.internal.util.Bytes; import com.google.common.collect.Lists; import java.nio.ByteBuffer; -import java.util.LinkedList; +import java.util.ArrayDeque; import java.util.List; import java.util.Queue; import java.util.concurrent.CompletableFuture; @@ -67,7 +67,7 @@ public void should_fail_to_fetch_next_page_if_last() { // When DefaultAsyncResultSet resultSet = new DefaultAsyncResultSet( - columnDefinitions, executionInfo, new LinkedList<>(), session, context); + columnDefinitions, executionInfo, new ArrayDeque<>(), session, context); // Then assertThat(resultSet.hasMorePages()).isFalse(); @@ -89,7 +89,7 @@ public void should_invoke_session_to_fetch_next_page() { // When DefaultAsyncResultSet resultSet = new DefaultAsyncResultSet( - columnDefinitions, executionInfo, new LinkedList<>(), session, context); + columnDefinitions, executionInfo, new ArrayDeque<>(), session, context); assertThat(resultSet.hasMorePages()).isTrue(); CompletionStage nextPageFuture = resultSet.fetchNextPage(); @@ -107,7 +107,7 @@ public void should_report_applied_if_column_not_present_and_empty() { // When DefaultAsyncResultSet resultSet = new DefaultAsyncResultSet( - columnDefinitions, executionInfo, new LinkedList<>(), session, context); + columnDefinitions, executionInfo, new ArrayDeque<>(), session, context); // Then assertThat(resultSet.wasApplied()).isTrue(); @@ -117,7 +117,7 @@ public void should_report_applied_if_column_not_present_and_empty() { public void should_report_applied_if_column_not_present_and_not_empty() { // Given Mockito.when(columnDefinitions.contains("[applied]")).thenReturn(false); - Queue> data = new LinkedList<>(); + Queue> data = new ArrayDeque<>(); data.add(Lists.newArrayList(Bytes.fromHexString("0xffff"))); // When @@ -138,7 +138,7 @@ public void should_report_not_applied_if_column_present_and_false() { Mockito.when(columnDefinitions.firstIndexOf("[applied]")).thenReturn(0); Mockito.when(columnDefinitions.get(0)).thenReturn(columnDefinition); - Queue> data = new LinkedList<>(); + Queue> data = new ArrayDeque<>(); data.add(Lists.newArrayList(TypeCodecs.BOOLEAN.encode(false, CoreProtocolVersion.DEFAULT))); // When @@ -159,7 +159,7 @@ public void should_report_not_applied_if_column_present_and_true() { Mockito.when(columnDefinitions.firstIndexOf("[applied]")).thenReturn(0); Mockito.when(columnDefinitions.get(0)).thenReturn(columnDefinition); - Queue> data = new LinkedList<>(); + Queue> data = new ArrayDeque<>(); data.add(Lists.newArrayList(TypeCodecs.BOOLEAN.encode(true, CoreProtocolVersion.DEFAULT))); // When @@ -181,7 +181,7 @@ public void should_fail_to_report_if_applied_if_column_present_but_empty() { // When DefaultAsyncResultSet resultSet = new DefaultAsyncResultSet( - columnDefinitions, executionInfo, new LinkedList<>(), session, context); + columnDefinitions, executionInfo, new ArrayDeque<>(), session, context); // Then resultSet.wasApplied(); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyEventsTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyEventsTest.java index 4e4960f8801..84fe778dbf5 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyEventsTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyEventsTest.java @@ -35,6 +35,7 @@ public class DefaultLoadBalancingPolicyEventsTest extends DefaultLoadBalancingPo private DefaultLoadBalancingPolicy policy; @Before + @Override public void setup() { super.setup(); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyQueryPlanTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyQueryPlanTest.java index 01a5eaa31d7..7e2fe170802 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyQueryPlanTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyQueryPlanTest.java @@ -60,6 +60,7 @@ public class DefaultLoadBalancingPolicyQueryPlanTest extends DefaultLoadBalancin private DefaultLoadBalancingPolicy policy; @Before + @Override public void setup() { super.setup(); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/DefaultTopologyMonitorTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/DefaultTopologyMonitorTest.java index c3f500b3a4b..9bc5b22a2af 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/DefaultTopologyMonitorTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/DefaultTopologyMonitorTest.java @@ -32,10 +32,10 @@ import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.time.Duration; +import java.util.ArrayDeque; import java.util.Arrays; import java.util.Collections; import java.util.Iterator; -import java.util.LinkedList; import java.util.Map; import java.util.Optional; import java.util.Queue; @@ -245,7 +245,7 @@ public void should_stop_executing_queries_once_closed() throws Exception { /** Mocks the query execution logic. */ private static class TestTopologyMonitor extends DefaultTopologyMonitor { - private final Queue queries = new LinkedList<>(); + private final Queue queries = new ArrayDeque<>(); private TestTopologyMonitor(InternalDriverContext context) { super(context); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/MetadataManagerTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/MetadataManagerTest.java index af03857003f..944e2a89194 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/MetadataManagerTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/MetadataManagerTest.java @@ -243,7 +243,7 @@ public void should_remove_node() { assertThat(refresh.toRemove).isEqualTo(ADDRESS1); } - private class TestMetadataManager extends MetadataManager { + private static class TestMetadataManager extends MetadataManager { private List refreshes = new CopyOnWriteArrayList<>(); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/SchemaAgreementCheckerTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/SchemaAgreementCheckerTest.java index da645b5205c..df75f64f9c5 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/SchemaAgreementCheckerTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/SchemaAgreementCheckerTest.java @@ -33,8 +33,8 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.time.Duration; +import java.util.ArrayDeque; import java.util.Arrays; -import java.util.LinkedList; import java.util.Map; import java.util.Queue; import java.util.UUID; @@ -273,7 +273,7 @@ public void should_fail_if_versions_do_not_match_after_timeout() { /** Extend to mock the query execution logic. */ private static class TestSchemaAgreementChecker extends SchemaAgreementChecker { - private final Queue queries = new LinkedList<>(); + private final Queue queries = new ArrayDeque<>(); TestSchemaAgreementChecker(DriverChannel channel, InternalDriverContext context) { super(channel, context, 9042, "test"); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/TableParserTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/TableParserTest.java index 1284465f8f3..f7bcbf7e691 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/TableParserTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/TableParserTest.java @@ -40,7 +40,7 @@ public class TableParserTest extends SchemaParserTestBase { "ks", "foo", "org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.Int32Type,org.apache.cassandra.db.marshal.Int32Type,org.apache.cassandra.db.marshal.UTF8Type)"); - private static final Iterable COLUMN_ROWS_2_2 = + private static final ImmutableList COLUMN_ROWS_2_2 = ImmutableList.of( mockLegacyColumnRow( "ks", "foo", "k2", "partition_key", "org.apache.cassandra.db.marshal.UTF8Type", 1), @@ -67,14 +67,14 @@ public class TableParserTest extends SchemaParserTestBase { "{}")); static final AdminRow TABLE_ROW_3_0 = mockModernTableRow("ks", "foo"); - static final Iterable COLUMN_ROWS_3_0 = + static final ImmutableList COLUMN_ROWS_3_0 = ImmutableList.of( mockModernColumnRow("ks", "foo", "k2", "partition_key", "text", "none", 1), mockModernColumnRow("ks", "foo", "k1", "partition_key", "int", "none", 0), mockModernColumnRow("ks", "foo", "cc1", "clustering", "int", "asc", 0), mockModernColumnRow("ks", "foo", "cc2", "clustering", "int", "desc", 1), mockModernColumnRow("ks", "foo", "v", "regular", "int", "none", -1)); - static final Iterable INDEX_ROWS_3_0 = + static final ImmutableList INDEX_ROWS_3_0 = ImmutableList.of( mockIndexRow("ks", "foo", "foo_v_idx", "COMPOSITES", ImmutableMap.of("target", "v"))); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/ViewParserTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/ViewParserTest.java index 12ae0402b7c..1abf65bb960 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/ViewParserTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/ViewParserTest.java @@ -32,7 +32,7 @@ public class ViewParserTest extends SchemaParserTestBase { static final AdminRow VIEW_ROW_3_0 = mockViewRow("ks", "alltimehigh", "scores", false, "game IS NOT NULL"); - static final Iterable COLUMN_ROWS_3_0 = + static final ImmutableList COLUMN_ROWS_3_0 = ImmutableList.of( mockModernColumnRow("ks", "alltimehigh", "game", "partition_key", "text", "none", 0), mockModernColumnRow("ks", "alltimehigh", "score", "clustering", "int", "desc", 0), diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/Cassandra3SchemaQueriesTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/Cassandra3SchemaQueriesTest.java index dc11e1028f9..b2456c24953 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/Cassandra3SchemaQueriesTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/Cassandra3SchemaQueriesTest.java @@ -34,6 +34,7 @@ public class Cassandra3SchemaQueriesTest extends SchemaQueriesTest { @Before + @Override public void setup() { super.setup(); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/session/MockChannelPoolFactoryHelper.java b/core/src/test/java/com/datastax/oss/driver/internal/core/session/MockChannelPoolFactoryHelper.java index 3b28cf35c3f..1ebd54b8664 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/session/MockChannelPoolFactoryHelper.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/session/MockChannelPoolFactoryHelper.java @@ -25,8 +25,9 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Sets; +import java.util.ArrayDeque; +import java.util.Deque; import java.util.HashMap; -import java.util.LinkedList; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -157,7 +158,7 @@ public MockChannelPoolFactoryHelper build() { private void stub() { for (Params params : invocations.keySet()) { - LinkedList> results = new LinkedList<>(); + Deque> results = new ArrayDeque<>(); for (Object object : invocations.get(params)) { if (object instanceof ChannelPool) { results.add(CompletableFuture.completedFuture(((ChannelPool) object))); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/session/ReprepareOnUpTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/session/ReprepareOnUpTest.java index ff7aa0c9e9d..eaf234ddf89 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/session/ReprepareOnUpTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/session/ReprepareOnUpTest.java @@ -40,8 +40,8 @@ import io.netty.channel.EventLoop; import java.nio.ByteBuffer; import java.time.Duration; +import java.util.ArrayDeque; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Queue; @@ -312,7 +312,7 @@ private Map getMockPayloads(char... values) { /** Bypasses the channel to make testing easier. */ private static class MockReprepareOnUp extends ReprepareOnUp { - private Queue queries = new LinkedList<>(); + private Queue queries = new ArrayDeque<>(); MockReprepareOnUp( String logPrefix, @@ -352,7 +352,7 @@ private Rows preparedIdRows(char... values) { RawType.PRIMITIVES.get(ProtocolConstants.DataType.BLOB)); RowsMetadata rowsMetadata = new RowsMetadata(ImmutableList.of(preparedIdSpec), null, null, null); - Queue> data = new LinkedList<>(); + Queue> data = new ArrayDeque<>(); for (char value : values) { data.add(ImmutableList.of(Bytes.fromHexString("0x0" + value))); } diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/util/concurrent/CycleDetectorTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/util/concurrent/CycleDetectorTest.java index 1e28170886d..f5be850f1f7 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/util/concurrent/CycleDetectorTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/util/concurrent/CycleDetectorTest.java @@ -36,6 +36,7 @@ public void should_detect_cycle_within_same_thread() { CyclicContext context = new CyclicContext(checker, false); try { context.a.get(); + fail("Expected an exception"); } catch (Exception e) { assertThat(e) .isInstanceOf(IllegalStateException.class) diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/ProtocolVersionInitialNegotiationIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/ProtocolVersionInitialNegotiationIT.java index 633fee11622..d9bd50a9055 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/ProtocolVersionInitialNegotiationIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/ProtocolVersionInitialNegotiationIT.java @@ -24,6 +24,7 @@ import org.junit.experimental.categories.Category; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; /** Covers protocol negotiation for the initial connection to the first contact point. */ @Category(ParallelizableTests.class) @@ -54,6 +55,7 @@ public void should_fail_if_provided_version_isnt_supported() { try (CqlSession session = SessionUtils.newSession(ccm, "protocol.version = V4")) { assertThat(session.getContext().protocolVersion().getCode()).isEqualTo(3); session.execute("select * from system.local"); + fail("Expected an AllNodesFailedException"); } catch (AllNodesFailedException anfe) { Throwable cause = anfe.getErrors().values().iterator().next(); assertThat(cause).isInstanceOf(UnsupportedProtocolVersionException.class); diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/config/DriverConfigProfileReloadIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/config/DriverConfigProfileReloadIT.java index b361106bcb6..79649594ce4 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/config/DriverConfigProfileReloadIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/config/DriverConfigProfileReloadIT.java @@ -15,8 +15,8 @@ */ package com.datastax.oss.driver.api.core.config; -import com.datastax.oss.driver.api.core.DriverTimeoutException; import com.datastax.oss.driver.api.core.CqlSession; +import com.datastax.oss.driver.api.core.DriverTimeoutException; import com.datastax.oss.driver.api.core.cql.SimpleStatement; import com.datastax.oss.driver.api.testinfra.simulacron.SimulacronRule; import com.datastax.oss.driver.internal.core.config.ConfigChangeEvent; @@ -147,7 +147,8 @@ public void should_not_allow_dynamically_adding_profile() throws Exception { configSource.set("profiles.slow.request.timeout = 2s"); waitForConfigChange(session, 3, TimeUnit.SECONDS); - // Execute again, should expect to fail again because doesn't allow to dynamically define profile. + // Execute again, should expect to fail again because doesn't allow to dynamically define + // profile. thrown.expect(IllegalArgumentException.class); session.execute(SimpleStatement.builder(query).withConfigProfileName("slow").build()); } @@ -200,7 +201,7 @@ private void waitForConfigChange(CqlSession session, long timeout, TimeUnit unit boolean success = latch.await(timeout, unit); assertThat(success).isTrue(); } catch (InterruptedException e) { - fail("Interrupted while waiting for config change event"); + throw new AssertionError("Interrupted while waiting for config change event", e); } } } diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/data/DataTypeIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/data/DataTypeIT.java index a050af1e406..c4ecd629711 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/data/DataTypeIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/data/DataTypeIT.java @@ -17,10 +17,10 @@ import com.datastax.oss.driver.api.core.CassandraVersion; import com.datastax.oss.driver.api.core.CqlIdentifier; +import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.cql.BoundStatement; import com.datastax.oss.driver.api.core.cql.BoundStatementBuilder; -import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.cql.PreparedStatement; import com.datastax.oss.driver.api.core.cql.ResultSet; import com.datastax.oss.driver.api.core.cql.Row; @@ -100,11 +100,11 @@ public class DataTypeIT { @DataProvider public static Object[][] primitiveTypeSamples() { - InetAddress address = null; + InetAddress address; try { address = InetAddress.getByAddress(new byte[] {127, 0, 0, 1}); } catch (UnknownHostException uhae) { - fail("Could not get address from 127.0.0.1 for some reason"); + throw new AssertionError("Could not get address from 127.0.0.1", uhae); } Object[][] samples = @@ -254,7 +254,8 @@ public static Object[][] typeSamples() { @BeforeClass public static void createTable() { // Create a table with all types being tested with. - // This is a bit more lenient than creating a table for each sample, which would put a lot of burden on C* and + // This is a bit more lenient than creating a table for each sample, which would put a lot of + // burden on C* and // the filesystem. int counter = 0; @@ -437,7 +438,8 @@ private static > S setValue( ? sessionRule.session().getContext().codecRegistry().codecFor(dataType) : null; - // set to null if value is null instead of getting possible NPE when casting from null to primitive. + // set to null if value is null instead of getting possible NPE when casting from null to + // primitive. if (value == null) { return bs.setToNull(index); } @@ -528,7 +530,8 @@ private static > S setValue( ? sessionRule.session().getContext().codecRegistry().codecFor(dataType) : null; - // set to null if value is null instead of getting possible NPE when casting from null to primitive. + // set to null if value is null instead of getting possible NPE when casting from null to + // primitive. if (value == null) { return bs.setToNull(name); } @@ -725,9 +728,10 @@ private void readValue( assertThat(returnedValue.get(i, typeCodec)).isEqualTo(exValue.get(i, typeCodec)); } - //assertThat(row.getTupleValue(columnName)).isEqualTo(expectedValue); - //assertThat(row.getTupleValue(0)).isEqualTo(expectedValue); - return; // return instead of break here since we don't want to compare using decode output since it has same problem. + // assertThat(row.getTupleValue(columnName)).isEqualTo(expectedValue); + // assertThat(row.getTupleValue(0)).isEqualTo(expectedValue); + return; // return instead of break here since we don't want to compare using decode output + // since it has same problem. case ProtocolConstants.DataType.UDT: // TODO: Replace this when JAVA-1572 is fixed UdtValue returnedUdtValue = row.getUdtValue(columnName); diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/heartbeat/HeartbeatIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/heartbeat/HeartbeatIT.java index c2b252245e9..8619867092c 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/heartbeat/HeartbeatIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/heartbeat/HeartbeatIT.java @@ -232,7 +232,7 @@ private AtomicInteger countHeartbeats(boolean regularConnection) { false, (l) -> IS_OPTION_REQUEST.test(l) - && regularConnection ^ l.getConnection().equals(controlConnectionAddress)); + && (regularConnection ^ l.getConnection().equals(controlConnectionAddress))); return count; } diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/metadata/NodeStateIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/metadata/NodeStateIT.java index 86b009e210e..8e2b49432b2 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/metadata/NodeStateIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/metadata/NodeStateIT.java @@ -586,22 +586,12 @@ private InetSocketAddress withUnusedPort(InetSocketAddress address) { * AvailablePortFinder. */ private static synchronized int findAvailablePort() throws RuntimeException { - ServerSocket ss = null; - try { - // let the system pick an ephemeral port - ss = new ServerSocket(0); + // let the system pick an ephemeral port + try (ServerSocket ss = new ServerSocket(0)) { ss.setReuseAddress(true); return ss.getLocalPort(); } catch (IOException e) { throw new AssertionError(e); - } finally { - if (ss != null) { - try { - ss.close(); - } catch (IOException e) { - throw new AssertionError(e); - } - } } } diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/retry/DefaultRetryPolicyIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/retry/DefaultRetryPolicyIT.java index d727acb1ae6..43745e71188 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/retry/DefaultRetryPolicyIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/retry/DefaultRetryPolicyIT.java @@ -375,6 +375,7 @@ public void should_only_retry_once_on_unavailable() { try { // when executing a query. sessionRule.session().execute(queryStr); + fail("Expected an UnavailableException"); } catch (UnavailableException ue) { // then we should get an unavailable exception with the host being node 1 (since it was second tried). assertThat(ue.getCoordinator().getConnectAddress()) @@ -398,6 +399,7 @@ public void should_keep_retrying_on_next_host_on_error_response() { try { // when executing a query. sessionRule.session().execute(queryStr); + fail("Expected an AllNodesFailedException"); } catch (AllNodesFailedException e) { // then we should get an all nodes failed exception, indicating the query was tried each node. assertThat(e.getErrors()).hasSize(3); @@ -426,6 +428,7 @@ public void should_not_retry_on_next_host_on_error_response_if_non_idempotent() sessionRule .session() .execute(SimpleStatement.builder(queryStr).withIdempotence(false).build()); + fail("Expected a ServerError"); } catch (ServerError e) { // then should get a server error from first host. assertThat(e.getMessage()).isEqualTo("this is a server error"); diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/type/codec/registry/CodecRegistryIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/type/codec/registry/CodecRegistryIT.java index e549229e9a2..27879c3499e 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/type/codec/registry/CodecRegistryIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/type/codec/registry/CodecRegistryIT.java @@ -243,8 +243,8 @@ private static class OptionalCodec extends MappingCodec, T> { Predicate isAbsent = (i) -> i == null - || (i instanceof Collection && ((Collection) i).isEmpty()) - || (i instanceof Map) && ((Map) i).isEmpty(); + || ((i instanceof Collection && ((Collection) i).isEmpty())) + || ((i instanceof Map) && ((Map) i).isEmpty()); OptionalCodec(TypeCodec innerCodec) { super( diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/internal/KeyRequestProcessor.java b/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/internal/KeyRequestProcessor.java index e1037dfe282..8390f661589 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/internal/KeyRequestProcessor.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/internal/KeyRequestProcessor.java @@ -62,7 +62,7 @@ public RequestHandler newHandler( return new KeyRequestHandler(subHandler); } - class KeyRequestHandler implements RequestHandler { + static class KeyRequestHandler implements RequestHandler { private final RequestHandler, ResultSet> subHandler; diff --git a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/loadbalancing/SortingLoadBalancingPolicy.java b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/loadbalancing/SortingLoadBalancingPolicy.java index 3b66ed96ef1..774f7e5cb25 100644 --- a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/loadbalancing/SortingLoadBalancingPolicy.java +++ b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/loadbalancing/SortingLoadBalancingPolicy.java @@ -15,7 +15,6 @@ */ package com.datastax.oss.driver.api.testinfra.loadbalancing; -import com.datastax.oss.driver.api.core.config.DriverOption; import com.datastax.oss.driver.api.core.context.DriverContext; import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy; import com.datastax.oss.driver.api.core.loadbalancing.NodeDistance; @@ -24,7 +23,7 @@ import com.datastax.oss.driver.api.core.session.Session; import java.net.InetAddress; import java.net.InetSocketAddress; -import java.util.LinkedList; +import java.util.ArrayDeque; import java.util.Map; import java.util.Queue; import java.util.Set; @@ -75,7 +74,7 @@ public void init( @Override public Queue newQueryPlan(Request request, Session session) { - return new LinkedList<>(nodes); + return new ArrayDeque<>(nodes); } @Override