Skip to content

Commit 03961c9

Browse files
JAVA-3041: Update Guava session sample code to use ProgrammaticArguments (#1606)
Enabling support for Astra in the Guava ListenableFuture examples requires use of the new ProgrammaticArguments constructor/method
1 parent 65d2c19 commit 03961c9

File tree

2 files changed

+6
-50
lines changed

2 files changed

+6
-50
lines changed

integration-tests/src/test/java/com/datastax/oss/driver/example/guava/api/GuavaSessionBuilder.java

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,18 @@
1818
import com.datastax.oss.driver.api.core.CqlSession;
1919
import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
2020
import com.datastax.oss.driver.api.core.context.DriverContext;
21-
import com.datastax.oss.driver.api.core.metadata.Node;
22-
import com.datastax.oss.driver.api.core.metadata.NodeStateListener;
23-
import com.datastax.oss.driver.api.core.metadata.schema.SchemaChangeListener;
21+
import com.datastax.oss.driver.api.core.session.ProgrammaticArguments;
2422
import com.datastax.oss.driver.api.core.session.SessionBuilder;
25-
import com.datastax.oss.driver.api.core.tracker.RequestTracker;
26-
import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
2723
import com.datastax.oss.driver.example.guava.internal.DefaultGuavaSession;
2824
import com.datastax.oss.driver.example.guava.internal.GuavaDriverContext;
2925
import edu.umd.cs.findbugs.annotations.NonNull;
30-
import java.util.List;
31-
import java.util.Map;
32-
import java.util.function.Predicate;
3326

3427
public class GuavaSessionBuilder extends SessionBuilder<GuavaSessionBuilder, GuavaSession> {
3528

3629
@Override
3730
protected DriverContext buildContext(
38-
DriverConfigLoader configLoader,
39-
List<TypeCodec<?>> typeCodecs,
40-
NodeStateListener nodeStateListener,
41-
SchemaChangeListener schemaChangeListener,
42-
RequestTracker requestTracker,
43-
Map<String, String> localDatacenters,
44-
Map<String, Predicate<Node>> nodeFilters,
45-
ClassLoader classLoader) {
46-
return new GuavaDriverContext(
47-
configLoader,
48-
typeCodecs,
49-
nodeStateListener,
50-
schemaChangeListener,
51-
requestTracker,
52-
localDatacenters,
53-
nodeFilters,
54-
classLoader);
31+
DriverConfigLoader configLoader, ProgrammaticArguments programmaticArguments) {
32+
return new GuavaDriverContext(configLoader, programmaticArguments);
5533
}
5634

5735
@Override

integration-tests/src/test/java/com/datastax/oss/driver/example/guava/internal/GuavaDriverContext.java

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,14 @@
1818
import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
1919
import com.datastax.oss.driver.api.core.cql.PrepareRequest;
2020
import com.datastax.oss.driver.api.core.cql.Statement;
21-
import com.datastax.oss.driver.api.core.metadata.Node;
22-
import com.datastax.oss.driver.api.core.metadata.NodeStateListener;
23-
import com.datastax.oss.driver.api.core.metadata.schema.SchemaChangeListener;
24-
import com.datastax.oss.driver.api.core.tracker.RequestTracker;
25-
import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
21+
import com.datastax.oss.driver.api.core.session.ProgrammaticArguments;
2622
import com.datastax.oss.driver.example.guava.api.GuavaSession;
2723
import com.datastax.oss.driver.internal.core.context.DefaultDriverContext;
2824
import com.datastax.oss.driver.internal.core.cql.CqlPrepareAsyncProcessor;
2925
import com.datastax.oss.driver.internal.core.cql.CqlPrepareSyncProcessor;
3026
import com.datastax.oss.driver.internal.core.cql.CqlRequestAsyncProcessor;
3127
import com.datastax.oss.driver.internal.core.cql.CqlRequestSyncProcessor;
3228
import com.datastax.oss.driver.internal.core.session.RequestProcessorRegistry;
33-
import java.util.List;
34-
import java.util.Map;
35-
import java.util.function.Predicate;
3629

3730
/**
3831
* A Custom {@link DefaultDriverContext} that overrides {@link #getRequestProcessorRegistry()} to
@@ -41,23 +34,8 @@
4134
public class GuavaDriverContext extends DefaultDriverContext {
4235

4336
public GuavaDriverContext(
44-
DriverConfigLoader configLoader,
45-
List<TypeCodec<?>> typeCodecs,
46-
NodeStateListener nodeStateListener,
47-
SchemaChangeListener schemaChangeListener,
48-
RequestTracker requestTracker,
49-
Map<String, String> localDatacenters,
50-
Map<String, Predicate<Node>> nodeFilters,
51-
ClassLoader classLoader) {
52-
super(
53-
configLoader,
54-
typeCodecs,
55-
nodeStateListener,
56-
schemaChangeListener,
57-
requestTracker,
58-
localDatacenters,
59-
nodeFilters,
60-
classLoader);
37+
DriverConfigLoader configLoader, ProgrammaticArguments programmaticArguments) {
38+
super(configLoader, programmaticArguments);
6139
}
6240

6341
@Override

0 commit comments

Comments
 (0)