Skip to content

Commit aaefe1c

Browse files
olim7tKevin Gallardo
andcommitted
Extract utility method resolveExecutionProfile()
Co-authored-by: Kevin Gallardo <kevin.gallardo@datastax.com>
1 parent 791656a commit aaefe1c

File tree

3 files changed

+18
-24
lines changed

3 files changed

+18
-24
lines changed

core/src/main/java/com/datastax/oss/driver/internal/core/cql/Conversions.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
import com.datastax.oss.driver.api.core.CqlSession;
2121
import com.datastax.oss.driver.api.core.ProtocolVersion;
2222
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
23+
import com.datastax.oss.driver.api.core.config.DriverConfig;
2324
import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
25+
import com.datastax.oss.driver.api.core.context.DriverContext;
2426
import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
2527
import com.datastax.oss.driver.api.core.cql.BatchStatement;
2628
import com.datastax.oss.driver.api.core.cql.BatchableStatement;
@@ -51,6 +53,7 @@
5153
import com.datastax.oss.driver.api.core.servererrors.UnavailableException;
5254
import com.datastax.oss.driver.api.core.servererrors.WriteFailureException;
5355
import com.datastax.oss.driver.api.core.servererrors.WriteTimeoutException;
56+
import com.datastax.oss.driver.api.core.session.Request;
5457
import com.datastax.oss.driver.api.core.type.codec.TypeCodecs;
5558
import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry;
5659
import com.datastax.oss.driver.internal.core.DefaultProtocolFeature;
@@ -94,6 +97,19 @@
9497
*/
9598
public class Conversions {
9699

100+
public static DriverExecutionProfile resolveExecutionProfile(
101+
Request request, DriverContext context) {
102+
if (request.getExecutionProfile() != null) {
103+
return request.getExecutionProfile();
104+
} else {
105+
DriverConfig config = context.getConfig();
106+
String profileName = request.getExecutionProfileName();
107+
return (profileName == null || profileName.isEmpty())
108+
? config.getDefaultProfile()
109+
: config.getProfile(profileName);
110+
}
111+
}
112+
97113
public static Message toMessage(
98114
Statement<?> statement, DriverExecutionProfile config, InternalDriverContext context) {
99115
ConsistencyLevel consistency =

core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareHandlerBase.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.datastax.oss.driver.api.core.ProtocolVersion;
2222
import com.datastax.oss.driver.api.core.RequestThrottlingException;
2323
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
24-
import com.datastax.oss.driver.api.core.config.DriverConfig;
2524
import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
2625
import com.datastax.oss.driver.api.core.cql.PrepareRequest;
2726
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
@@ -116,17 +115,7 @@ protected CqlPrepareHandlerBase(
116115
this.preparedStatementsCache = preparedStatementsCache;
117116
this.session = session;
118117
this.context = context;
119-
120-
if (request.getExecutionProfile() != null) {
121-
this.executionProfile = request.getExecutionProfile();
122-
} else {
123-
DriverConfig config = context.getConfig();
124-
String profileName = request.getExecutionProfileName();
125-
this.executionProfile =
126-
(profileName == null || profileName.isEmpty())
127-
? config.getDefaultProfile()
128-
: config.getProfile(profileName);
129-
}
118+
this.executionProfile = Conversions.resolveExecutionProfile(request, context);
130119
this.queryPlan =
131120
context
132121
.getLoadBalancingPolicyWrapper()

core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandlerBase.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.datastax.oss.driver.api.core.DriverTimeoutException;
2222
import com.datastax.oss.driver.api.core.RequestThrottlingException;
2323
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
24-
import com.datastax.oss.driver.api.core.config.DriverConfig;
2524
import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
2625
import com.datastax.oss.driver.api.core.connection.FrameTooLongException;
2726
import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
@@ -143,17 +142,7 @@ protected CqlRequestHandlerBase(
143142
this.session = session;
144143
this.keyspace = session.getKeyspace().orElse(null);
145144
this.context = context;
146-
147-
if (statement.getExecutionProfile() != null) {
148-
this.executionProfile = statement.getExecutionProfile();
149-
} else {
150-
DriverConfig config = context.getConfig();
151-
String profileName = statement.getExecutionProfileName();
152-
this.executionProfile =
153-
(profileName == null || profileName.isEmpty())
154-
? config.getDefaultProfile()
155-
: config.getProfile(profileName);
156-
}
145+
this.executionProfile = Conversions.resolveExecutionProfile(statement, context);
157146
if (this.statement.getNode() != null) {
158147
this.queryPlan = new QueryPlan(this.statement.getNode());
159148

0 commit comments

Comments
 (0)