Skip to content

Commit e9baf2f

Browse files
timward60timward60
committed
Remove public common interface for ExectuableNormalizedOperations and NormalizedOperations
1 parent 7c8b8aa commit e9baf2f

13 files changed

Lines changed: 39 additions & 52 deletions

‎src/main/java/graphql/execution/ExecutionContext.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import graphql.execution.incremental.IncrementalCallState;
1515
import graphql.execution.instrumentation.Instrumentation;
1616
import graphql.execution.instrumentation.InstrumentationState;
17-
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters;
17+
import graphql.execution.instrumentation.parameters.InstrumentationCreateExecutableNormalizedOperationParameters;
1818
import graphql.language.Document;
1919
import graphql.language.FragmentDefinition;
2020
import graphql.language.OperationDefinition;
@@ -370,8 +370,8 @@ public ResultNodesInfo getResultNodesInfo() {
370370
}
371371

372372
private ExecutableNormalizedOperation createExecutableNormalizedOperation() {
373-
var parameters = new InstrumentationCreateNormalizedOperationParameters(executionInput, graphQLSchema);
374-
var instrument = instrumentation.beginCreateNormalizedOperation(parameters, instrumentationState);
373+
var parameters = new InstrumentationCreateExecutableNormalizedOperationParameters(executionInput, graphQLSchema);
374+
var instrument = instrumentation.beginCreateExecutableNormalizedOperation(parameters, instrumentationState);
375375
var result = ExecutableNormalizedOperationFactory.createExecutableNormalizedOperation(graphQLSchema, operationDefinition, fragmentsByName, coercedVariables);
376376
if (instrument != null) {
377377
instrument.onCompleted(result, null);

‎src/main/java/graphql/execution/instrumentation/ChainedInstrumentation.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import graphql.execution.Async;
99
import graphql.execution.ExecutionContext;
1010
import graphql.execution.FieldValueInfo;
11-
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters;
11+
import graphql.execution.instrumentation.parameters.InstrumentationCreateExecutableNormalizedOperationParameters;
1212
import graphql.execution.instrumentation.parameters.InstrumentationCreateStateParameters;
1313
import graphql.execution.instrumentation.parameters.InstrumentationExecuteOperationParameters;
1414
import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters;
@@ -18,7 +18,7 @@
1818
import graphql.execution.instrumentation.parameters.InstrumentationFieldParameters;
1919
import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters;
2020
import graphql.language.Document;
21-
import graphql.normalized.GraphQlNormalizedOperation;
21+
import graphql.normalized.ExecutableNormalizedOperation;
2222
import graphql.schema.DataFetcher;
2323
import graphql.schema.GraphQLSchema;
2424
import graphql.validation.ValidationError;
@@ -129,9 +129,9 @@ public InstrumentationContext<Document> beginParse(InstrumentationExecutionParam
129129
}
130130

131131
@Override
132-
public InstrumentationContext<GraphQlNormalizedOperation> beginCreateNormalizedOperation(InstrumentationCreateNormalizedOperationParameters parameters, InstrumentationState state) {
132+
public InstrumentationContext<ExecutableNormalizedOperation> beginCreateExecutableNormalizedOperation(InstrumentationCreateExecutableNormalizedOperationParameters parameters, InstrumentationState state) {
133133
return chainedCtx(state, (instrumentation, specificState) ->
134-
instrumentation.beginCreateNormalizedOperation(parameters, specificState));
134+
instrumentation.beginCreateExecutableNormalizedOperation(parameters, specificState));
135135
}
136136

137137

‎src/main/java/graphql/execution/instrumentation/Instrumentation.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
import graphql.execution.instrumentation.parameters.InstrumentationFieldCompleteParameters;
1313
import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters;
1414
import graphql.execution.instrumentation.parameters.InstrumentationFieldParameters;
15-
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters;
15+
import graphql.execution.instrumentation.parameters.InstrumentationCreateExecutableNormalizedOperationParameters;
1616
import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters;
1717
import graphql.language.Document;
18-
import graphql.normalized.GraphQlNormalizedOperation;
18+
import graphql.normalized.ExecutableNormalizedOperation;
1919
import graphql.schema.DataFetcher;
2020
import graphql.schema.GraphQLSchema;
2121
import graphql.validation.ValidationError;
@@ -123,14 +123,15 @@ default InstrumentationContext<ExecutionResult> beginExecuteOperation(Instrument
123123
}
124124

125125
/**
126-
* This is called just before the creation of the normalized operation is started.
126+
* This is called just before the creation of the executable normalized operation is started.
127127
*
128128
* @param parameters the parameters to this step
129129
* @param state the state created during the call to {@link #createState(InstrumentationCreateStateParameters)}
130130
* @return a nullable {@link InstrumentationContext} object that will be called back when the step ends (assuming it's not null)
131131
*/
132+
@ExperimentalApi
132133
@Nullable
133-
default InstrumentationContext<GraphQlNormalizedOperation> beginCreateNormalizedOperation(InstrumentationCreateNormalizedOperationParameters parameters, InstrumentationState state) {
134+
default InstrumentationContext<ExecutableNormalizedOperation> beginCreateExecutableNormalizedOperation(InstrumentationCreateExecutableNormalizedOperationParameters parameters, InstrumentationState state) {
134135
return noOp();
135136
}
136137

‎src/main/java/graphql/execution/instrumentation/NoContextChainedInstrumentation.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import graphql.execution.instrumentation.parameters.InstrumentationFieldCompleteParameters;
99
import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters;
1010
import graphql.execution.instrumentation.parameters.InstrumentationFieldParameters;
11-
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters;
11+
import graphql.execution.instrumentation.parameters.InstrumentationCreateExecutableNormalizedOperationParameters;
1212
import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters;
1313
import graphql.language.Document;
14-
import graphql.normalized.GraphQlNormalizedOperation;
14+
import graphql.normalized.ExecutableNormalizedOperation;
1515
import graphql.validation.ValidationError;
1616
import org.jspecify.annotations.Nullable;
1717

@@ -86,8 +86,8 @@ public ExecutionStrategyInstrumentationContext beginExecutionStrategy(Instrument
8686
}
8787

8888
@Override
89-
public @Nullable InstrumentationContext<GraphQlNormalizedOperation> beginCreateNormalizedOperation(InstrumentationCreateNormalizedOperationParameters parameters, InstrumentationState state) {
90-
return runAll(state, (instrumentation, specificState) -> instrumentation.beginCreateNormalizedOperation(parameters, specificState));
89+
public @Nullable InstrumentationContext<ExecutableNormalizedOperation> beginCreateExecutableNormalizedOperation(InstrumentationCreateExecutableNormalizedOperationParameters parameters, InstrumentationState state) {
90+
return runAll(state, (instrumentation, specificState) -> instrumentation.beginCreateExecutableNormalizedOperation(parameters, specificState));
9191
}
9292

9393
@Override

src/main/java/graphql/execution/instrumentation/parameters/InstrumentationCreateNormalizedOperationParameters.java renamed to src/main/java/graphql/execution/instrumentation/parameters/InstrumentationCreateExecutableNormalizedOperationParameters.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package graphql.execution.instrumentation.parameters;
22

33
import graphql.ExecutionInput;
4-
import graphql.PublicApi;
4+
import graphql.ExperimentalApi;
55
import graphql.execution.instrumentation.Instrumentation;
66
import graphql.schema.GraphQLSchema;
77

88
/**
99
* Parameters sent to {@link Instrumentation} methods
1010
*/
1111
@SuppressWarnings("TypeParameterUnusedInFormals")
12-
@PublicApi
13-
public class InstrumentationCreateNormalizedOperationParameters extends InstrumentationExecutionParameters {
14-
public InstrumentationCreateNormalizedOperationParameters(ExecutionInput executionInput, GraphQLSchema schema) {
12+
@ExperimentalApi
13+
public class InstrumentationCreateExecutableNormalizedOperationParameters extends InstrumentationExecutionParameters {
14+
public InstrumentationCreateExecutableNormalizedOperationParameters(ExecutionInput executionInput, GraphQLSchema schema) {
1515
super(executionInput, schema);
1616
}
1717
}

‎src/main/java/graphql/normalized/ExecutableNormalizedOperation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* An operation consists of a list of {@link ExecutableNormalizedField}s in a parent child hierarchy
2424
*/
2525
@PublicApi
26-
public class ExecutableNormalizedOperation implements GraphQlNormalizedOperation {
26+
public class ExecutableNormalizedOperation {
2727
private final OperationDefinition.Operation operation;
2828
private final String operationName;
2929
private final List<ExecutableNormalizedField> topLevelFields;

‎src/main/java/graphql/normalized/GraphQlNormalizedOperation.java‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/main/java/graphql/normalized/nf/NormalizedOperation.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import graphql.execution.directives.QueryDirectives;
99
import graphql.language.Field;
1010
import graphql.language.OperationDefinition;
11-
import graphql.normalized.GraphQlNormalizedOperation;
1211
import graphql.schema.FieldCoordinates;
1312
import graphql.schema.GraphQLFieldsContainer;
1413

@@ -24,7 +23,7 @@
2423
* An operation consists of a list of {@link NormalizedField}s in a parent child hierarchy
2524
*/
2625
@ExperimentalApi
27-
public class NormalizedOperation implements GraphQlNormalizedOperation {
26+
public class NormalizedOperation {
2827
private final OperationDefinition.Operation operation;
2928
private final String operationName;
3029
private final List<NormalizedField> rootFields;

‎src/test/groovy/graphql/execution/instrumentation/ChainedInstrumentationStateTest.groovy‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ class ChainedInstrumentationStateTest extends Specification {
5555
"start:fetch-hero",
5656
"end:fetch-hero",
5757
"start:complete-hero",
58-
"start:create-normalized-operation",
59-
"end:create-normalized-operation",
58+
"start:create-executable-normalized-operation",
59+
"end:create-executable-normalized-operation",
6060

6161
"start:execute-object",
6262

@@ -145,8 +145,8 @@ class ChainedInstrumentationStateTest extends Specification {
145145
"start:fetch-hero",
146146
"end:fetch-hero",
147147
"start:complete-hero",
148-
"start:create-normalized-operation",
149-
"end:create-normalized-operation",
148+
"start:create-executable-normalized-operation",
149+
"end:create-executable-normalized-operation",
150150

151151
"start:execute-object",
152152

@@ -187,8 +187,8 @@ class ChainedInstrumentationStateTest extends Specification {
187187
"start:fetch-hero",
188188
"end:fetch-hero",
189189
"start:complete-hero",
190-
"start:create-normalized-operation",
191-
"end:create-normalized-operation",
190+
"start:create-executable-normalized-operation",
191+
"end:create-executable-normalized-operation",
192192

193193
"start:execute-object",
194194

‎src/test/groovy/graphql/execution/instrumentation/InstrumentationTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,8 @@ class InstrumentationTest extends Specification {
312312
"onDispatched:fetch-hero",
313313
"end:fetch-hero",
314314
"start:complete-hero",
315-
"start:create-normalized-operation",
316-
"end:create-normalized-operation",
315+
"start:create-executable-normalized-operation",
316+
"end:create-executable-normalized-operation",
317317
"start:execute-object",
318318
"start:field-id",
319319
"start:fetch-id",

0 commit comments

Comments
 (0)