This is an automated email from the ASF dual-hosted git repository.
absurdfarce pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
The following commit(s) were added to refs/heads/4.x by this push:
new 3c08f8efa Fixes to get past code formatting issues
3c08f8efa is described below
commit 3c08f8efa24cddb33b807a5e1f8f16824632a611
Author: absurdfarce <bret.mcgu...@datastax.com>
AuthorDate: Wed Apr 17 01:34:40 2024 -0500
Fixes to get past code formatting issues
patch by Bret McGuire; reviewed by Bret McGuire for PR 1928
---
.../internal/core/metadata/MetadataManager.java | 46 +++++++++++-----------
.../core/metadata/MetadataManagerTest.java | 12 ++++--
2 files changed, 31 insertions(+), 27 deletions(-)
diff --git
a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MetadataManager.java
b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MetadataManager.java
index c9abfb7a6..efb04bde5 100644
---
a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MetadataManager.java
+++
b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MetadataManager.java
@@ -439,29 +439,29 @@ public class MetadataManager implements
AsyncAutoCloseable {
} else {
try {
schemaQueriesFactory
- .newInstance()
- .execute()
- .thenApplyAsync(this::parseAndApplySchemaRows,
adminExecutor)
- .whenComplete(
- (newMetadata, metadataError) -> {
- if (metadataError != null) {
-
refreshFuture.completeExceptionally(metadataError);
- } else {
- refreshFuture.complete(
- new
RefreshSchemaResult(newMetadata, schemaInAgreement));
- }
-
-
firstSchemaRefreshFuture.complete(null);
-
- currentSchemaRefresh = null;
- // If another refresh was enqueued
during this one, run it now
- if (queuedSchemaRefresh != null) {
-
CompletableFuture<RefreshSchemaResult> tmp =
- this.queuedSchemaRefresh;
- this.queuedSchemaRefresh = null;
- startSchemaRequest(tmp);
- }
- });
+ .newInstance()
+ .execute()
+ .thenApplyAsync(this::parseAndApplySchemaRows,
adminExecutor)
+ .whenComplete(
+ (newMetadata, metadataError) -> {
+ if (metadataError != null) {
+
refreshFuture.completeExceptionally(metadataError);
+ } else {
+ refreshFuture.complete(
+ new RefreshSchemaResult(newMetadata,
schemaInAgreement));
+ }
+
+ firstSchemaRefreshFuture.complete(null);
+
+ currentSchemaRefresh = null;
+ // If another refresh was enqueued during this
one, run it now
+ if (queuedSchemaRefresh != null) {
+ CompletableFuture<RefreshSchemaResult> tmp =
+ this.queuedSchemaRefresh;
+ this.queuedSchemaRefresh = null;
+ startSchemaRequest(tmp);
+ }
+ });
} catch (Throwable t) {
LOG.debug("[{}] Exception getting new metadata",
logPrefix, t);
refreshFuture.completeExceptionally(t);
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 375209d9f..f9a909400 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
@@ -295,14 +295,18 @@ public class MetadataManagerTest {
// Given
IllegalStateException expectedException = new IllegalStateException("Error
we're testing");
when(schemaQueriesFactory.newInstance()).thenThrow(expectedException);
-
when(topologyMonitor.refreshNodeList()).thenReturn(CompletableFuture.completedFuture(ImmutableList.of(mock(NodeInfo.class))));
-
when(topologyMonitor.checkSchemaAgreement()).thenReturn(CompletableFuture.completedFuture(Boolean.TRUE));
- when(controlConnection.init(anyBoolean(), anyBoolean(),
anyBoolean())).thenReturn(CompletableFuture.completedFuture(null));
+ when(topologyMonitor.refreshNodeList())
+
.thenReturn(CompletableFuture.completedFuture(ImmutableList.of(mock(NodeInfo.class))));
+ when(topologyMonitor.checkSchemaAgreement())
+ .thenReturn(CompletableFuture.completedFuture(Boolean.TRUE));
+ when(controlConnection.init(anyBoolean(), anyBoolean(), anyBoolean()))
+ .thenReturn(CompletableFuture.completedFuture(null));
metadataManager.refreshNodes(); // required internal state setup for this
waitForPendingAdminTasks(() -> metadataManager.refreshes.size() == 1); //
sanity check
// When
- CompletionStage<MetadataManager.RefreshSchemaResult> result =
metadataManager.refreshSchema("foo", true, true);
+ CompletionStage<MetadataManager.RefreshSchemaResult> result =
+ metadataManager.refreshSchema("foo", true, true);
// Then
waitForPendingAdminTasks(() -> result.toCompletableFuture().isDone());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
