Skip to content

Commit a054e8d

Browse files
Formatting
1 parent 8ad5567 commit a054e8d

File tree

9 files changed

+22
-16
lines changed

9 files changed

+22
-16
lines changed

integration-tests/src/test/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousPagingIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import java.time.Duration;
4747
import java.util.Collections;
4848
import java.util.Iterator;
49-
import java.util.Objects;
5049
import java.util.concurrent.CancellationException;
5150
import java.util.concurrent.CompletableFuture;
5251
import java.util.concurrent.CompletionStage;
@@ -281,7 +280,8 @@ public void prepared_statement_paging_should_be_resilient_to_schema_change() {
281280
// dropped.
282281
Row row = it.next();
283282
assertThat(row.getString("k")).isNotNull();
284-
if (ccmRule.isDistributionOf(BackendType.DSE, (dist, cass) -> dist.compareTo(Version.parse("6.0.0")) >= 0)) {
283+
if (ccmRule.isDistributionOf(
284+
BackendType.DSE, (dist, cass) -> dist.compareTo(Version.parse("6.0.0")) >= 0)) {
285285
// DSE 6 only, v should be null here since dropped.
286286
// Not reliable for 5.1 since we may have gotten page queued before schema changed.
287287
assertThat(row.isNull("v")).isTrue();

integration-tests/src/test/java/com/datastax/dse/driver/api/core/graph/remote/GraphTraversalRemoteITBase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,8 +644,9 @@ public void should_allow_use_of_dsl_graph_binary() {
644644
*/
645645
@Test
646646
public void should_return_correct_results_when_bulked() {
647-
Assumptions.assumeThat(CcmBridge.isDistributionOf(BackendType.DSE,
648-
(dist, cass) -> dist.compareTo(Version.parse("5.1.2")) > 0))
647+
Assumptions.assumeThat(
648+
CcmBridge.isDistributionOf(
649+
BackendType.DSE, (dist, cass) -> dist.compareTo(Version.parse("5.1.2")) > 0))
649650
.isTrue();
650651

651652
List<String> results = graphTraversalSource().E().label().barrier().toList();

integration-tests/src/test/java/com/datastax/dse/driver/api/core/graph/statement/GraphTraversalITBase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,9 @@ public void should_allow_use_of_dsl_graph_binary() throws Exception {
599599
*/
600600
@Test
601601
public void should_return_correct_results_when_bulked() {
602-
Assumptions.assumeThat(CcmBridge.isDistributionOf(BackendType.DSE,
603-
(dist, cass) -> dist.compareTo(Version.parse("5.1.2")) > 0))
602+
Assumptions.assumeThat(
603+
CcmBridge.isDistributionOf(
604+
BackendType.DSE, (dist, cass) -> dist.compareTo(Version.parse("5.1.2")) > 0))
604605
.isTrue();
605606

606607
GraphResultSet rs =

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/SchemaChangesIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public class SchemaChangesIT {
5555

5656
static {
5757
CustomCcmRule.Builder builder = CustomCcmRule.builder();
58-
if (!CcmBridge.isDistributionOf(BackendType.DSE,
59-
(dist, cass) -> cass.nextStable().compareTo(Version.V4_0_0) >= 0)) {
58+
if (!CcmBridge.isDistributionOf(
59+
BackendType.DSE, (dist, cass) -> cass.nextStable().compareTo(Version.V4_0_0) >= 0)) {
6060
builder.withCassandraConfiguration("enable_materialized_views", true);
6161
}
6262
CCM_RULE = builder.build();

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/SchemaIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,8 @@ public void should_exclude_virtual_keyspaces_from_token_map() {
335335

336336
private void skipIfDse60() {
337337
// Special case: DSE 6.0 reports C* 4.0 but does not support virtual tables
338-
if (!ccmRule.isDistributionOf(BackendType.DSE, (dist, cass) -> dist.compareTo(DSE_MIN_VIRTUAL_TABLES) >= 0)) {
338+
if (!ccmRule.isDistributionOf(
339+
BackendType.DSE, (dist, cass) -> dist.compareTo(DSE_MIN_VIRTUAL_TABLES) >= 0)) {
339340
throw new AssumptionViolatedException("DSE 6.0 does not support virtual tables");
340341
}
341342
}

integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteReactiveIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public class DeleteReactiveIT extends InventoryITBase {
5858
@ClassRule public static TestRule chain = RuleChain.outerRule(ccmRule).around(sessionRule);
5959

6060
private static CustomCcmRule.Builder configureCcm(CustomCcmRule.Builder builder) {
61-
if (!CcmBridge.isDistributionOf(BackendType.DSE,
62-
(dist, cass) -> cass.nextStable().compareTo(Version.V4_0_0) >= 0)) {
61+
if (!CcmBridge.isDistributionOf(
62+
BackendType.DSE, (dist, cass) -> cass.nextStable().compareTo(Version.V4_0_0) >= 0)) {
6363
builder.withCassandraConfiguration("enable_sasi_indexes", true);
6464
}
6565
return builder;

integration-tests/src/test/java/com/datastax/oss/driver/mapper/InventoryITBase.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,14 @@ protected static List<String> createStatements(BaseCcmRule ccmRule) {
8989
return builder.build();
9090
}
9191

92-
private static final Version MINIMUM_SASI_VERSION = Objects.requireNonNull(Version.parse("3.4.0"));
92+
private static final Version MINIMUM_SASI_VERSION =
93+
Objects.requireNonNull(Version.parse("3.4.0"));
9394
private static final Version BROKEN_SASI_VERSION = Objects.requireNonNull(Version.parse("6.8.0"));
9495

9596
protected static boolean isSasiBroken(BaseCcmRule ccmRule) {
9697
// creating SASI indexes is broken in DSE 6.8.0
97-
return ccmRule.isDistributionOf(BackendType.DSE, (dist, cass) -> dist.compareTo(BROKEN_SASI_VERSION) == 0);
98+
return ccmRule.isDistributionOf(
99+
BackendType.DSE, (dist, cass) -> dist.compareTo(BROKEN_SASI_VERSION) == 0);
98100
}
99101

100102
protected static boolean supportsSASI(BaseCcmRule ccmRule) {

test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ public static boolean isDistributionOf(BackendType type) {
181181
}
182182

183183
public static boolean isDistributionOf(BackendType type, VersionComparator comparator) {
184-
return isDistributionOf(type) && comparator.accept(getDistributionVersion(), getCassandraVersion());
184+
return isDistributionOf(type)
185+
&& comparator.accept(getDistributionVersion(), getCassandraVersion());
185186
}
186187

187188
public static Version getDistributionVersion() {

test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/DefaultCcmBridgeBuilderCustomizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
public class DefaultCcmBridgeBuilderCustomizer {
2626

2727
public static CcmBridge.Builder configureBuilder(CcmBridge.Builder builder) {
28-
if ((!CcmBridge.isDistributionOf(BackendType.DSE,
29-
(dist, cass) -> dist.nextStable().compareTo(Version.V4_0_0) >= 0))
28+
if ((!CcmBridge.isDistributionOf(
29+
BackendType.DSE, (dist, cass) -> dist.nextStable().compareTo(Version.V4_0_0) >= 0))
3030
|| CcmBridge.isDistributionOf(BackendType.HCD)) {
3131
builder.withCassandraConfiguration("enable_materialized_views", true);
3232
builder.withCassandraConfiguration("enable_sasi_indexes", true);

0 commit comments

Comments
 (0)