Skip to content

Commit 762faa8

Browse files
andimarekandimarek
committed
rename to ValueUnboxer
1 parent 0accce9 commit 762faa8

14 files changed

Lines changed: 51 additions & 52 deletions

‎src/main/java/graphql/GraphQL.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import graphql.execution.ExecutionId;
88
import graphql.execution.ExecutionIdProvider;
99
import graphql.execution.ExecutionStrategy;
10-
import graphql.execution.PossibleOptionalUnboxer;
1110
import graphql.execution.SubscriptionExecutionStrategy;
11+
import graphql.execution.ValueUnboxer;
1212
import graphql.execution.instrumentation.ChainedInstrumentation;
1313
import graphql.execution.instrumentation.DocumentAndVariables;
1414
import graphql.execution.instrumentation.Instrumentation;
@@ -105,7 +105,7 @@ public class GraphQL {
105105
private final ExecutionIdProvider idProvider;
106106
private final Instrumentation instrumentation;
107107
private final PreparsedDocumentProvider preparsedDocumentProvider;
108-
private final PossibleOptionalUnboxer possibleOptionalUnboxer;
108+
private final ValueUnboxer valueUnboxer;
109109

110110

111111
/**
@@ -149,7 +149,7 @@ public GraphQL(GraphQLSchema graphQLSchema, ExecutionStrategy queryStrategy) {
149149
@Internal
150150
@Deprecated
151151
public GraphQL(GraphQLSchema graphQLSchema, ExecutionStrategy queryStrategy, ExecutionStrategy mutationStrategy) {
152-
this(graphQLSchema, queryStrategy, mutationStrategy, null, DEFAULT_EXECUTION_ID_PROVIDER, DEFAULT_INSTRUMENTATION, NoOpPreparsedDocumentProvider.INSTANCE, PossibleOptionalUnboxer.DEFAULT);
152+
this(graphQLSchema, queryStrategy, mutationStrategy, null, DEFAULT_EXECUTION_ID_PROVIDER, DEFAULT_INSTRUMENTATION, NoOpPreparsedDocumentProvider.INSTANCE, ValueUnboxer.DEFAULT);
153153
}
154154

155155
/**
@@ -165,7 +165,7 @@ public GraphQL(GraphQLSchema graphQLSchema, ExecutionStrategy queryStrategy, Exe
165165
@Internal
166166
@Deprecated
167167
public GraphQL(GraphQLSchema graphQLSchema, ExecutionStrategy queryStrategy, ExecutionStrategy mutationStrategy, ExecutionStrategy subscriptionStrategy) {
168-
this(graphQLSchema, queryStrategy, mutationStrategy, subscriptionStrategy, DEFAULT_EXECUTION_ID_PROVIDER, DEFAULT_INSTRUMENTATION, NoOpPreparsedDocumentProvider.INSTANCE, PossibleOptionalUnboxer.DEFAULT);
168+
this(graphQLSchema, queryStrategy, mutationStrategy, subscriptionStrategy, DEFAULT_EXECUTION_ID_PROVIDER, DEFAULT_INSTRUMENTATION, NoOpPreparsedDocumentProvider.INSTANCE, ValueUnboxer.DEFAULT);
169169
}
170170

171171
private GraphQL(GraphQLSchema graphQLSchema,
@@ -175,15 +175,15 @@ private GraphQL(GraphQLSchema graphQLSchema,
175175
ExecutionIdProvider idProvider,
176176
Instrumentation instrumentation,
177177
PreparsedDocumentProvider preparsedDocumentProvider,
178-
PossibleOptionalUnboxer possibleOptionalUnboxer) {
178+
ValueUnboxer valueUnboxer) {
179179
this.graphQLSchema = assertNotNull(graphQLSchema, "graphQLSchema must be non null");
180180
this.queryStrategy = queryStrategy != null ? queryStrategy : new AsyncExecutionStrategy();
181181
this.mutationStrategy = mutationStrategy != null ? mutationStrategy : new AsyncSerialExecutionStrategy();
182182
this.subscriptionStrategy = subscriptionStrategy != null ? subscriptionStrategy : new SubscriptionExecutionStrategy();
183183
this.idProvider = assertNotNull(idProvider, "idProvider must be non null");
184184
this.instrumentation = assertNotNull(instrumentation);
185185
this.preparsedDocumentProvider = assertNotNull(preparsedDocumentProvider, "preparsedDocumentProvider must be non null");
186-
this.possibleOptionalUnboxer = possibleOptionalUnboxer;
186+
this.valueUnboxer = valueUnboxer;
187187
}
188188

189189
/**
@@ -234,7 +234,7 @@ public static class Builder {
234234
private Instrumentation instrumentation = null; // deliberate default here
235235
private PreparsedDocumentProvider preparsedDocumentProvider = NoOpPreparsedDocumentProvider.INSTANCE;
236236
private boolean doNotAddDefaultInstrumentations = false;
237-
private PossibleOptionalUnboxer possibleOptionalUnboxer = PossibleOptionalUnboxer.DEFAULT;
237+
private ValueUnboxer valueUnboxer = ValueUnboxer.DEFAULT;
238238

239239

240240
public Builder(GraphQLSchema graphQLSchema) {
@@ -293,8 +293,8 @@ public Builder doNotAddDefaultInstrumentations() {
293293
return this;
294294
}
295295

296-
public Builder possibleOptionalUnboxer(PossibleOptionalUnboxer possibleOptionalUnboxer) {
297-
this.possibleOptionalUnboxer = possibleOptionalUnboxer;
296+
public Builder valueUnboxer(ValueUnboxer valueUnboxer) {
297+
this.valueUnboxer = valueUnboxer;
298298
return this;
299299
}
300300

@@ -303,7 +303,7 @@ public GraphQL build() {
303303
assertNotNull(queryExecutionStrategy, "queryStrategy must be non null");
304304
assertNotNull(idProvider, "idProvider must be non null");
305305
final Instrumentation augmentedInstrumentation = checkInstrumentationDefaultState(instrumentation, doNotAddDefaultInstrumentations);
306-
return new GraphQL(graphQLSchema, queryExecutionStrategy, mutationExecutionStrategy, subscriptionExecutionStrategy, idProvider, augmentedInstrumentation, preparsedDocumentProvider, possibleOptionalUnboxer);
306+
return new GraphQL(graphQLSchema, queryExecutionStrategy, mutationExecutionStrategy, subscriptionExecutionStrategy, idProvider, augmentedInstrumentation, preparsedDocumentProvider, valueUnboxer);
307307
}
308308
}
309309

@@ -616,7 +616,7 @@ private List<ValidationError> validate(ExecutionInput executionInput, Document d
616616

617617
private CompletableFuture<ExecutionResult> execute(ExecutionInput executionInput, Document document, GraphQLSchema graphQLSchema, InstrumentationState instrumentationState) {
618618

619-
Execution execution = new Execution(queryStrategy, mutationStrategy, subscriptionStrategy, instrumentation, possibleOptionalUnboxer);
619+
Execution execution = new Execution(queryStrategy, mutationStrategy, subscriptionStrategy, instrumentation, valueUnboxer);
620620
ExecutionId executionId = executionInput.getExecutionId();
621621

622622
logNotSafe.debug("Executing '{}'. operation name: '{}'. query: '{}'. variables '{}'", executionId, executionInput.getOperationName(), executionInput.getQuery(), executionInput.getVariables());

src/main/java/graphql/execution/DefaultOptionalUnboxer.java renamed to src/main/java/graphql/execution/DefaultValueUnboxer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
import java.util.OptionalLong;
1010

1111
/**
12-
* Public API because it should be used as a delegate when implementing a custom PossibleOptionalUnboxer
12+
* Public API because it should be used as a delegate when implementing a custom {@link ValueUnboxer}
1313
*/
1414
@PublicApi
15-
public class DefaultOptionalUnboxer implements PossibleOptionalUnboxer {
15+
public class DefaultValueUnboxer implements ValueUnboxer {
1616

1717

1818
@Override
1919
public Object unbox(final Object object) {
20-
return unboxPossibleOptional(object);
20+
return unboxValue(object);
2121
}
2222

2323
@Internal // used by next-gen at the moment
24-
public static Object unboxPossibleOptional(Object result) {
24+
public static Object unboxValue(Object result) {
2525
if (result instanceof Optional) {
2626
Optional optional = (Optional) result;
2727
if (optional.isPresent()) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ public class Execution {
4949
private final ExecutionStrategy mutationStrategy;
5050
private final ExecutionStrategy subscriptionStrategy;
5151
private final Instrumentation instrumentation;
52-
private PossibleOptionalUnboxer possibleOptionalUnboxer;
52+
private ValueUnboxer valueUnboxer;
5353

54-
public Execution(ExecutionStrategy queryStrategy, ExecutionStrategy mutationStrategy, ExecutionStrategy subscriptionStrategy, Instrumentation instrumentation, PossibleOptionalUnboxer possibleOptionalUnboxer) {
54+
public Execution(ExecutionStrategy queryStrategy, ExecutionStrategy mutationStrategy, ExecutionStrategy subscriptionStrategy, Instrumentation instrumentation, ValueUnboxer valueUnboxer) {
5555
this.queryStrategy = queryStrategy != null ? queryStrategy : new AsyncExecutionStrategy();
5656
this.mutationStrategy = mutationStrategy != null ? mutationStrategy : new AsyncSerialExecutionStrategy();
5757
this.subscriptionStrategy = subscriptionStrategy != null ? subscriptionStrategy : new AsyncExecutionStrategy();
5858
this.instrumentation = instrumentation;
59-
this.possibleOptionalUnboxer = possibleOptionalUnboxer;
59+
this.valueUnboxer = valueUnboxer;
6060
}
6161

6262
public CompletableFuture<ExecutionResult> execute(Document document, GraphQLSchema graphQLSchema, ExecutionId executionId, ExecutionInput executionInput, InstrumentationState instrumentationState) {
@@ -95,7 +95,7 @@ public CompletableFuture<ExecutionResult> execute(Document document, GraphQLSche
9595
.dataLoaderRegistry(executionInput.getDataLoaderRegistry())
9696
.cacheControl(executionInput.getCacheControl())
9797
.locale(executionInput.getLocale())
98-
.possibleOptionalUnboxer(possibleOptionalUnboxer)
98+
.valueUnboxer(valueUnboxer)
9999
.build();
100100

101101

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
import graphql.GraphQLError;
5-
import graphql.Internal;
65
import graphql.PublicApi;
76
import graphql.cachecontrol.CacheControl;
87
import graphql.execution.defer.DeferSupport;
@@ -46,9 +45,9 @@ public class ExecutionContext {
4645
private final CacheControl cacheControl;
4746
private final Locale locale;
4847
private final DeferSupport deferSupport = new DeferSupport();
49-
private final PossibleOptionalUnboxer possibleOptionalUnboxer;
48+
private final ValueUnboxer valueUnboxer;
5049

51-
ExecutionContext(Instrumentation instrumentation, ExecutionId executionId, GraphQLSchema graphQLSchema, InstrumentationState instrumentationState, ExecutionStrategy queryStrategy, ExecutionStrategy mutationStrategy, ExecutionStrategy subscriptionStrategy, Map<String, FragmentDefinition> fragmentsByName, Document document, OperationDefinition operationDefinition, Map<String, Object> variables, Object context, Object root, DataLoaderRegistry dataLoaderRegistry, CacheControl cacheControl, Locale locale, List<GraphQLError> startingErrors, PossibleOptionalUnboxer possibleOptionalUnboxer) {
50+
ExecutionContext(Instrumentation instrumentation, ExecutionId executionId, GraphQLSchema graphQLSchema, InstrumentationState instrumentationState, ExecutionStrategy queryStrategy, ExecutionStrategy mutationStrategy, ExecutionStrategy subscriptionStrategy, Map<String, FragmentDefinition> fragmentsByName, Document document, OperationDefinition operationDefinition, Map<String, Object> variables, Object context, Object root, DataLoaderRegistry dataLoaderRegistry, CacheControl cacheControl, Locale locale, List<GraphQLError> startingErrors, ValueUnboxer valueUnboxer) {
5251
this.graphQLSchema = graphQLSchema;
5352
this.executionId = executionId;
5453
this.instrumentationState = instrumentationState;
@@ -65,7 +64,7 @@ public class ExecutionContext {
6564
this.dataLoaderRegistry = dataLoaderRegistry;
6665
this.cacheControl = cacheControl;
6766
this.locale = locale;
68-
this.possibleOptionalUnboxer = possibleOptionalUnboxer;
67+
this.valueUnboxer = valueUnboxer;
6968
this.errors.addAll(startingErrors);
7069
}
7170

@@ -128,8 +127,8 @@ public Locale getLocale() {
128127
return locale;
129128
}
130129

131-
public PossibleOptionalUnboxer getPossibleOptionalUnboxer() {
132-
return possibleOptionalUnboxer;
130+
public ValueUnboxer getValueUnboxer() {
131+
return valueUnboxer;
133132
}
134133

135134
/**

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class ExecutionContextBuilder {
4040
private CacheControl cacheControl;
4141
private Locale locale;
4242
private List<GraphQLError> errors = new ArrayList<>();
43-
private PossibleOptionalUnboxer possibleOptionalUnboxer;
43+
private ValueUnboxer valueUnboxer;
4444

4545
/**
4646
* @return a new builder of {@link graphql.execution.ExecutionContext}s
@@ -83,7 +83,7 @@ public ExecutionContextBuilder() {
8383
cacheControl = other.getCacheControl();
8484
locale = other.getLocale();
8585
errors = new ArrayList<>(other.getErrors());
86-
possibleOptionalUnboxer = other.getPossibleOptionalUnboxer();
86+
valueUnboxer = other.getValueUnboxer();
8787

8888
}
8989

@@ -167,8 +167,8 @@ public ExecutionContextBuilder locale(Locale locale) {
167167
return this;
168168
}
169169

170-
public ExecutionContextBuilder possibleOptionalUnboxer(PossibleOptionalUnboxer possibleOptionalUnboxer) {
171-
this.possibleOptionalUnboxer = possibleOptionalUnboxer;
170+
public ExecutionContextBuilder valueUnboxer(ValueUnboxer valueUnboxer) {
171+
this.valueUnboxer = valueUnboxer;
172172
return this;
173173
}
174174

@@ -194,7 +194,7 @@ public ExecutionContext build() {
194194
cacheControl,
195195
locale,
196196
errors,
197-
possibleOptionalUnboxer);
197+
valueUnboxer);
198198
}
199199

200200
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,14 +314,14 @@ FetchedValue unboxPossibleDataFetcherResult(ExecutionContext executionContext,
314314
localContext = parameters.getLocalContext();
315315
}
316316
return FetchedValue.newFetchedValue()
317-
.fetchedValue(executionContext.getPossibleOptionalUnboxer().unbox(dataFetcherResult.getData()))
317+
.fetchedValue(executionContext.getValueUnboxer().unbox(dataFetcherResult.getData()))
318318
.rawFetchedValue(dataFetcherResult.getData())
319319
.errors(dataFetcherResult.getErrors())
320320
.localContext(localContext)
321321
.build();
322322
} else {
323323
return FetchedValue.newFetchedValue()
324-
.fetchedValue(executionContext.getPossibleOptionalUnboxer().unbox(result))
324+
.fetchedValue(executionContext.getValueUnboxer().unbox(result))
325325
.rawFetchedValue(result)
326326
.localContext(parameters.getLocalContext())
327327
.build();
@@ -414,7 +414,7 @@ protected FieldValueInfo completeField(ExecutionContext executionContext, Execut
414414
*/
415415
protected FieldValueInfo completeValue(ExecutionContext executionContext, ExecutionStrategyParameters parameters) throws NonNullableFieldWasNullException {
416416
ExecutionStepInfo executionStepInfo = parameters.getExecutionStepInfo();
417-
Object result = executionContext.getPossibleOptionalUnboxer().unbox(parameters.getSource());
417+
Object result = executionContext.getValueUnboxer().unbox(parameters.getSource());
418418
GraphQLType fieldType = executionStepInfo.getUnwrappedNonNullType();
419419
CompletableFuture<ExecutionResult> fieldValue;
420420

src/main/java/graphql/execution/PossibleOptionalUnboxer.java renamed to src/main/java/graphql/execution/ValueUnboxer.java

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

55
@PublicSpi
6-
public interface PossibleOptionalUnboxer {
6+
public interface ValueUnboxer {
77

8-
PossibleOptionalUnboxer DEFAULT = new DefaultOptionalUnboxer();
8+
ValueUnboxer DEFAULT = new DefaultValueUnboxer();
99

1010
/**
1111
* Unboxes 'object' if it is boxed in an {@link java.util.Optional } like

‎src/main/java/graphql/execution/batched/BatchedExecutionStrategy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ private BiFunction<List<Object>, Throwable, FetchedValues> handleResult(Executio
309309
List<Object> values = result;
310310
List<FetchedValue> retVal = new ArrayList<>();
311311
for (int i = 0; i < parentResults.size(); i++) {
312-
Object value = executionContext.getPossibleOptionalUnboxer().unbox(values.get(i));
312+
Object value = executionContext.getValueUnboxer().unbox(values.get(i));
313313
retVal.add(new FetchedValue(parentResults.get(i), value));
314314
}
315315
return new FetchedValues(retVal, parameters.getExecutionStepInfo(), parameters.getPath());
@@ -375,7 +375,7 @@ private List<ExecutionNode> handleList(ExecutionContext executionContext, Map<St
375375

376376
MapOrList listResult = mapOrList.createAndPutList(fieldName);
377377
for (Object rawValue : toIterable(value.getValue())) {
378-
rawValue = executionContext.getPossibleOptionalUnboxer().unbox(rawValue);
378+
rawValue = executionContext.getValueUnboxer().unbox(rawValue);
379379
flattenedValues.add(new FetchedValue(listResult, rawValue));
380380
}
381381
}

‎src/main/java/graphql/execution/nextgen/ValueFetcher.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import graphql.execution.AbsoluteGraphQLError;
99
import graphql.execution.Async;
1010
import graphql.execution.DataFetcherResult;
11-
import graphql.execution.DefaultOptionalUnboxer;
11+
import graphql.execution.DefaultValueUnboxer;
1212
import graphql.execution.ExecutionContext;
1313
import graphql.execution.ExecutionId;
1414
import graphql.execution.ExecutionPath;
@@ -154,7 +154,7 @@ private FetchedValue handleExceptionWhileFetching(Field field, ExecutionPath pat
154154

155155
private FetchedValue unboxPossibleOptional(FetchedValue result) {
156156
return result.transform(
157-
builder -> builder.fetchedValue(DefaultOptionalUnboxer.unboxPossibleOptional(result.getFetchedValue()))
157+
builder -> builder.fetchedValue(DefaultValueUnboxer.unboxValue(result.getFetchedValue()))
158158
);
159159
}
160160

‎src/test/groovy/graphql/execution/AsyncExecutionStrategyTest.groovy‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class AsyncExecutionStrategyTest extends Specification {
8181
.executionId(ExecutionId.generate())
8282
.operationDefinition(operation)
8383
.instrumentation(SimpleInstrumentation.INSTANCE)
84-
.possibleOptionalUnboxer(PossibleOptionalUnboxer.DEFAULT)
84+
.valueUnboxer(ValueUnboxer.DEFAULT)
8585
.build()
8686
ExecutionStrategyParameters executionStrategyParameters = ExecutionStrategyParameters
8787
.newParameters()
@@ -119,7 +119,7 @@ class AsyncExecutionStrategyTest extends Specification {
119119
.graphQLSchema(schema)
120120
.executionId(ExecutionId.generate())
121121
.operationDefinition(operation)
122-
.possibleOptionalUnboxer(PossibleOptionalUnboxer.DEFAULT)
122+
.valueUnboxer(ValueUnboxer.DEFAULT)
123123
.instrumentation(SimpleInstrumentation.INSTANCE)
124124
.build()
125125
ExecutionStrategyParameters executionStrategyParameters = ExecutionStrategyParameters
@@ -160,7 +160,7 @@ class AsyncExecutionStrategyTest extends Specification {
160160
.graphQLSchema(schema)
161161
.executionId(ExecutionId.generate())
162162
.operationDefinition(operation)
163-
.possibleOptionalUnboxer(PossibleOptionalUnboxer.DEFAULT)
163+
.valueUnboxer(ValueUnboxer.DEFAULT)
164164
.instrumentation(SimpleInstrumentation.INSTANCE)
165165
.build()
166166
ExecutionStrategyParameters executionStrategyParameters = ExecutionStrategyParameters
@@ -201,7 +201,7 @@ class AsyncExecutionStrategyTest extends Specification {
201201
.executionId(ExecutionId.generate())
202202
.operationDefinition(operation)
203203
.instrumentation(SimpleInstrumentation.INSTANCE)
204-
.possibleOptionalUnboxer(PossibleOptionalUnboxer.DEFAULT)
204+
.valueUnboxer(ValueUnboxer.DEFAULT)
205205
.build()
206206
ExecutionStrategyParameters executionStrategyParameters = ExecutionStrategyParameters
207207
.newParameters()
@@ -239,7 +239,7 @@ class AsyncExecutionStrategyTest extends Specification {
239239
.graphQLSchema(schema)
240240
.executionId(ExecutionId.generate())
241241
.operationDefinition(operation)
242-
.possibleOptionalUnboxer(PossibleOptionalUnboxer.DEFAULT)
242+
.valueUnboxer(ValueUnboxer.DEFAULT)
243243
.instrumentation(new SimpleInstrumentation() {
244244
@Override
245245
ExecutionStrategyInstrumentationContext beginExecutionStrategy(InstrumentationExecutionStrategyParameters parameters) {

0 commit comments

Comments
 (0)