Skip to content

Commit 7c8b8aa

Browse files
timward60timward60
committed
Rename ParsedNormalizedOperation to GraphQlNormalizedOperation
1 parent 5b74d1f commit 7c8b8aa

8 files changed

Lines changed: 15 additions & 15 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.ParsedNormalizedOperation;
21+
import graphql.normalized.GraphQlNormalizedOperation;
2222
import graphql.schema.DataFetcher;
2323
import graphql.schema.GraphQLSchema;
2424
import graphql.validation.ValidationError;
@@ -129,7 +129,7 @@ public InstrumentationContext<Document> beginParse(InstrumentationExecutionParam
129129
}
130130

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters;
1616
import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters;
1717
import graphql.language.Document;
18-
import graphql.normalized.ParsedNormalizedOperation;
18+
import graphql.normalized.GraphQlNormalizedOperation;
1919
import graphql.schema.DataFetcher;
2020
import graphql.schema.GraphQLSchema;
2121
import graphql.validation.ValidationError;
@@ -130,7 +130,7 @@ default InstrumentationContext<ExecutionResult> beginExecuteOperation(Instrument
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> beginCreateNormalizedOperation(InstrumentationCreateNormalizedOperationParameters parameters, InstrumentationState state) {
133+
default InstrumentationContext<GraphQlNormalizedOperation> beginCreateNormalizedOperation(InstrumentationCreateNormalizedOperationParameters parameters, InstrumentationState state) {
134134
return noOp();
135135
}
136136

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters;
1212
import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters;
1313
import graphql.language.Document;
14-
import graphql.normalized.ParsedNormalizedOperation;
14+
import graphql.normalized.GraphQlNormalizedOperation;
1515
import graphql.validation.ValidationError;
1616
import org.jspecify.annotations.Nullable;
1717

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

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

‎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 ParsedNormalizedOperation {
26+
public class ExecutableNormalizedOperation implements GraphQlNormalizedOperation {
2727
private final OperationDefinition.Operation operation;
2828
private final String operationName;
2929
private final List<ExecutableNormalizedField> topLevelFields;

src/main/java/graphql/normalized/ParsedNormalizedOperation.java renamed to src/main/java/graphql/normalized/GraphQlNormalizedOperation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import graphql.PublicApi;
44

55
/**
6-
* A {@link ParsedNormalizedOperation} represents a parsed and normalized operation in GraphQL.
6+
* A {@link GraphQlNormalizedOperation} represents a normalized operation in GraphQL.
77
* It is used to handle the execution of GraphQL operations according to the specification,
88
* including merging duplicate fields and handling type detection for fields that may correspond
99
* to multiple object types.
1010
*/
1111
@PublicApi
12-
public interface ParsedNormalizedOperation {
12+
public interface GraphQlNormalizedOperation {
1313
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import graphql.execution.directives.QueryDirectives;
99
import graphql.language.Field;
1010
import graphql.language.OperationDefinition;
11-
import graphql.normalized.ParsedNormalizedOperation;
11+
import graphql.normalized.GraphQlNormalizedOperation;
1212
import graphql.schema.FieldCoordinates;
1313
import graphql.schema.GraphQLFieldsContainer;
1414

@@ -24,7 +24,7 @@
2424
* An operation consists of a list of {@link NormalizedField}s in a parent child hierarchy
2525
*/
2626
@ExperimentalApi
27-
public class NormalizedOperation implements ParsedNormalizedOperation {
27+
public class NormalizedOperation implements GraphQlNormalizedOperation {
2828
private final OperationDefinition.Operation operation;
2929
private final String operationName;
3030
private final List<NormalizedField> rootFields;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import graphql.execution.instrumentation.parameters.InstrumentationFieldParamete
1313
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters
1414
import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters
1515
import graphql.language.Document
16-
import graphql.normalized.ParsedNormalizedOperation
16+
import graphql.normalized.GraphQlNormalizedOperation
1717
import graphql.schema.DataFetcher
1818
import graphql.schema.DataFetchingEnvironment
1919
import graphql.schema.GraphQLSchema
@@ -76,7 +76,7 @@ class ModernTestingInstrumentation implements Instrumentation {
7676
}
7777

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import graphql.execution.instrumentation.parameters.InstrumentationFieldParamete
1010
import graphql.execution.instrumentation.parameters.InstrumentationCreateNormalizedOperationParameters
1111
import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters
1212
import graphql.language.Document
13-
import graphql.normalized.ParsedNormalizedOperation
13+
import graphql.normalized.GraphQlNormalizedOperation
1414
import graphql.schema.DataFetcher
1515
import graphql.validation.ValidationError
1616

@@ -75,7 +75,7 @@ class NamedInstrumentation extends ModernTestingInstrumentation {
7575
}
7676

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

0 commit comments

Comments
 (0)