Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/graphql/Internal.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import static java.lang.annotation.ElementType.CONSTRUCTOR;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;

/**
Expand All @@ -16,6 +17,6 @@
* In general unnecessary changes will be avoided but you should not depend on internal classes being stable
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(value = {CONSTRUCTOR, METHOD, TYPE, FIELD})
@Target(value = {CONSTRUCTOR, METHOD, TYPE, FIELD, PACKAGE})
public @interface Internal {
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
import graphql.Internal;
import graphql.schema.DataFetcher;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public interface BatchedDataFetcher<T> extends DataFetcher<T> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
import static graphql.util.FpKit.transposeMatrix;
import static java.util.concurrent.CompletableFuture.completedFuture;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class BatchedExecutionStrategy implements ExecutionStrategy {

Expand All @@ -57,9 +61,9 @@ public CompletableFuture<RootExecutionResultNode> executeImpl(ExecutionContext e
.thenApply(RootExecutionResultNode::new);

return rootCF.thenCompose(rootNode -> {
NodeMultiZipper<ExecutionResultNode> unresolvedNodes = ResultNodesUtil.getUnresolvedNodes(rootNode);
return nextStep(executionContext, unresolvedNodes);
})
NodeMultiZipper<ExecutionResultNode> unresolvedNodes = ResultNodesUtil.getUnresolvedNodes(rootNode);
return nextStep(executionContext, unresolvedNodes);
})
.thenApply(multiZipper -> multiZipper.toRootNode())
.thenApply(RootExecutionResultNode.class::cast);
}
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/graphql/execution/nextgen/Common.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
import static graphql.language.OperationDefinition.Operation.QUERY;
import static graphql.language.OperationDefinition.Operation.SUBSCRIPTION;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class Common {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
import static graphql.execution.Async.each;
import static graphql.execution.Async.mapCompose;

/**
*
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class DefaultExecutionStrategy implements ExecutionStrategy {

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/graphql/execution/nextgen/Execution.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@

import java.util.concurrent.CompletableFuture;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class Execution {

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/graphql/execution/nextgen/ExecutionHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
import static graphql.execution.ExecutionContextBuilder.newExecutionContextBuilder;
import static graphql.execution.ExecutionStepInfo.newExecutionStepInfo;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class ExecutionHelper {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

import java.util.concurrent.CompletableFuture;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public interface ExecutionStrategy {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
import static graphql.collect.ImmutableKit.map;
import static graphql.execution.FieldCollectorParameters.newParameters;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class ExecutionStrategyUtil {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@

import static graphql.Assert.assertNotNull;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class FetchedValueAnalysis {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
import static graphql.execution.nextgen.FetchedValueAnalysis.newFetchedValueAnalysis;
import static graphql.schema.GraphQLTypeUtil.isList;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class FetchedValueAnalyzer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
/**
* A map from name to List of Field representing the actual sub selections (during execution) of a Field with Fragments
* evaluated and conditional directives considered.
*
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class FieldSubSelection {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@

import static graphql.collect.ImmutableKit.map;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class ResultNodesCreator {

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/graphql/execution/nextgen/ValueFetcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
import static graphql.schema.DataFetchingEnvironmentImpl.newDataFetchingEnvironment;
import static java.util.Collections.singletonList;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class ValueFetcher {

Expand Down
8 changes: 7 additions & 1 deletion src/main/java/graphql/execution/nextgen/package-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
/**
* WARNING: All code in this package is a work in progress for a new execution engine.
* It is not really "wired up" and can't be really used and should not be used yet!
*
* Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
package graphql.execution.nextgen;
@Internal
@Deprecated
package graphql.execution.nextgen;

import graphql.Internal;
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@

import static graphql.Assert.assertNotNull;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public abstract class ExecutionResultNode {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
import java.util.Collections;
import java.util.List;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class LeafExecutionResultNode extends ExecutionResultNode {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
import java.util.Collections;
import java.util.List;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class ListExecutionResultNode extends ExecutionResultNode {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import graphql.Internal;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class NamedResultNode {
private final String name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
import java.util.Collections;
import java.util.List;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class ObjectExecutionResultNode extends ExecutionResultNode {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
import java.util.List;
import java.util.function.Consumer;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class ResolvedValue {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
import static graphql.Assert.assertNotNull;
import static graphql.Assert.assertTrue;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class ResultNodeAdapter implements NodeAdapter<ExecutionResultNode> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

import java.util.Collection;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class ResultNodeTraverser {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
import static java.util.Collections.emptyList;
import static java.util.Collections.singleton;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class ResultNodesUtil {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

import static graphql.Assert.assertShouldNeverHappen;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class RootExecutionResultNode extends ObjectExecutionResultNode {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

import java.util.Collections;

/**
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@Internal
public class UnresolvedObjectResultNode extends ObjectExecutionResultNode {

Expand Down
5 changes: 5 additions & 0 deletions src/main/java/graphql/nextgen/GraphQL.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@

import static graphql.Assert.assertNotNull;

/**
*
* @deprecated Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Deprecated
@SuppressWarnings("Duplicates")
@Internal
public class GraphQL {
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/graphql/nextgen/package-info.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
/**
* WARNING: All code in this package is a work in progress for a new execution engine.
*
*Jan 2022 - We have decided to deprecate the NextGen engine, and it will be removed in a future release.
*/
@Internal
@Deprecated
package graphql.nextgen;

import graphql.Internal;