Skip to content

Commit 9da637b

Browse files
timward60timward60
committed
Rename beginParsedNormalizedOperation to beginCreateNormalizedOperation
1 parent 0ed10be commit 9da637b

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

‎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.InstrumentationParsedNormalizedOperationParameters;
17+
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters;
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 InstrumentationParsedNormalizedOperationParameters(executionInput, graphQLSchema);
374-
var instrument = instrumentation.beginParsedNormalizedOperation(parameters, instrumentationState);
373+
var parameters = new InstrumentationCreateNormalizedOperationParameters(executionInput, graphQLSchema);
374+
var instrument = instrumentation.beginCreateNormalizedOperation(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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ public InstrumentationContext<Document> beginParse(InstrumentationExecutionParam
121121
}
122122

123123
@Override
124-
public InstrumentationContext<ParsedNormalizedOperation> beginParsedNormalizedOperation(InstrumentationParsedNormalizedOperationParameters parameters, InstrumentationState state) {
124+
public InstrumentationContext<ParsedNormalizedOperation> beginCreateNormalizedOperation(InstrumentationCreateNormalizedOperationParameters parameters, InstrumentationState state) {
125125
return chainedCtx(state, (instrumentation, specificState) ->
126-
instrumentation.beginParsedNormalizedOperation(parameters, specificState));
126+
instrumentation.beginCreateNormalizedOperation(parameters, specificState));
127127
}
128128

129129

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
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.InstrumentationParsedNormalizedOperationParameters;
15+
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters;
1616
import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters;
1717
import graphql.language.Document;
1818
import graphql.normalized.ParsedNormalizedOperation;
@@ -123,14 +123,14 @@ default InstrumentationContext<ExecutionResult> beginExecuteOperation(Instrument
123123
}
124124

125125
/**
126-
* This is called just before the parsing of the normalized operation is started.
126+
* This is called just before the creation of the 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
*/
132132
@Nullable
133-
default InstrumentationContext<ParsedNormalizedOperation> beginParsedNormalizedOperation(InstrumentationParsedNormalizedOperationParameters parameters, InstrumentationState state) {
133+
default InstrumentationContext<ParsedNormalizedOperation> beginCreateNormalizedOperation(InstrumentationCreateNormalizedOperationParameters parameters, InstrumentationState state) {
134134
return noOp();
135135
}
136136

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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.InstrumentationParsedNormalizedOperationParameters;
11+
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters;
1212
import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters;
1313
import graphql.language.Document;
1414
import graphql.normalized.ParsedNormalizedOperation;
@@ -86,8 +86,8 @@ public ExecutionStrategyInstrumentationContext beginExecutionStrategy(Instrument
8686
}
8787

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

9393
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*/
1111
@SuppressWarnings("TypeParameterUnusedInFormals")
1212
@PublicApi
13-
public class InstrumentationParsedNormalizedOperationParameters extends InstrumentationExecutionParameters {
14-
public InstrumentationParsedNormalizedOperationParameters(ExecutionInput executionInput, GraphQLSchema schema) {
13+
public class InstrumentationCreateNormalizedOperationParameters extends InstrumentationExecutionParameters {
14+
public InstrumentationCreateNormalizedOperationParameters(ExecutionInput executionInput, GraphQLSchema schema) {
1515
super(executionInput, schema);
1616
}
1717
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import graphql.execution.instrumentation.parameters.InstrumentationExecutionStra
1010
import graphql.execution.instrumentation.parameters.InstrumentationFieldCompleteParameters
1111
import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters
1212
import graphql.execution.instrumentation.parameters.InstrumentationFieldParameters
13-
import graphql.execution.instrumentation.parameters.InstrumentationParsedNormalizedOperationParameters
13+
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters
1414
import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters
1515
import graphql.language.Document
1616
import graphql.normalized.ParsedNormalizedOperation
@@ -76,7 +76,7 @@ class ModernTestingInstrumentation implements Instrumentation {
7676
}
7777

7878
@Override
79-
InstrumentationContext<ParsedNormalizedOperation> beginParsedNormalizedOperation(InstrumentationParsedNormalizedOperationParameters parameters, InstrumentationState state) {
79+
InstrumentationContext<ParsedNormalizedOperation> beginCreateNormalizedOperation(InstrumentationCreateNormalizedOperationParameters parameters, InstrumentationState state) {
8080
assert state == instrumentationState
8181
return new TestingInstrumentContext("parsed-normalized-operation", executionList, throwableList, useOnDispatch)
8282
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import graphql.execution.instrumentation.parameters.InstrumentationExecutionPara
77
import graphql.execution.instrumentation.parameters.InstrumentationExecutionStrategyParameters
88
import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters
99
import graphql.execution.instrumentation.parameters.InstrumentationFieldParameters
10-
import graphql.execution.instrumentation.parameters.InstrumentationParsedNormalizedOperationParameters
10+
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters
1111
import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters
1212
import graphql.language.Document
1313
import graphql.normalized.ParsedNormalizedOperation
@@ -75,9 +75,9 @@ class NamedInstrumentation extends ModernTestingInstrumentation {
7575
}
7676

7777
@Override
78-
InstrumentationContext<ParsedNormalizedOperation> beginParsedNormalizedOperation(InstrumentationParsedNormalizedOperationParameters parameters, InstrumentationState state) {
78+
InstrumentationContext<ParsedNormalizedOperation> beginCreateNormalizedOperation(InstrumentationCreateNormalizedOperationParameters parameters, InstrumentationState state) {
7979
assertState(state)
80-
return super.beginParsedNormalizedOperation(parameters, state)
80+
return super.beginCreateNormalizedOperation(parameters, state)
8181
}
8282

8383
@Override

0 commit comments

Comments
 (0)