Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a problem that would prevent Quarkus 3.12 upgrade (due to change in Smallrye lib) #1248

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Fix a problem that would prevent Quarkus 3.12 upgrade (due to change in Smallrye lib) #1248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a3f8ad
Fix a problem that would prevent Quarkus 3.12 upgrade (due to change …
tatu-at-datastax Jul 9, 2024
6723fb2
Second part of the fix
tatu-at-datastax Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...n/offline/io/stargate/sgv2/jsonapi/service/cqldriver/sstablewriter/FileWriterSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.datastax.oss.protocol.internal.response.result.RawType;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import io.smallrye.faulttolerance.core.util.CompletionStages;
import io.stargate.sgv2.jsonapi.api.request.FileWriterParams;
import io.stargate.sgv2.jsonapi.service.cqldriver.CQLSessionCache;
import java.io.File;
Expand All @@ -32,6 +31,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cassandra.config.Config;
Expand Down Expand Up @@ -213,7 +213,7 @@ public <RequestT extends Request, ResultT> ResultT execute(
this.cqlsSSTableWriter.addRow(boundValues);
buffers.add(TypeCodecs.BOOLEAN.encode(Boolean.TRUE, ProtocolVersion.DEFAULT));
CompletionStage<AsyncResultSet> resultSetCompletionStage =
CompletionStages.completedStage(
CompletableFuture.completedFuture(
new FileWriterAsyncResultSet(
responseColumnDefinitions,
new FileWriterResponseRow(responseColumnDefinitions, 0, buffers)));
Expand Down Expand Up @@ -269,7 +269,7 @@ public CompletionStage<Void> closeAsync() {
throw new RuntimeException(e);
}
cqlSessionCache.removeSession(this.cacheKey);
return CompletionStages.completedStage(null);
return CompletableFuture.completedFuture(null);
}

@NonNull
Expand Down