diff --git a/src/main/java/graphql/DeprecatedAt.java b/src/main/java/graphql/DeprecatedAt.java deleted file mode 100644 index 0918e5f6d6..0000000000 --- a/src/main/java/graphql/DeprecatedAt.java +++ /dev/null @@ -1,22 +0,0 @@ -package graphql; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -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; - -/** - * Helper to track deprecation - * - * Please use ISO-8601 format i.e. YYYY-MM-DD - */ -@Retention(RetentionPolicy.SOURCE) -@Target(value = {CONSTRUCTOR, METHOD, TYPE, FIELD, PACKAGE}) -public @interface DeprecatedAt { - String value(); -} diff --git a/src/main/java/graphql/DirectivesUtil.java b/src/main/java/graphql/DirectivesUtil.java index 9a3e1fc3ac..0a560f7233 100644 --- a/src/main/java/graphql/DirectivesUtil.java +++ b/src/main/java/graphql/DirectivesUtil.java @@ -23,9 +23,7 @@ @Internal public class DirectivesUtil { - - @Deprecated // use GraphQLAppliedDirectives eventually - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") // use GraphQLAppliedDirectives eventually public static Map nonRepeatableDirectivesByName(List directives) { // filter the repeatable directives List singletonDirectives = directives.stream() @@ -34,15 +32,13 @@ public static Map nonRepeatableDirectivesByName(List> allDirectivesByName(List directives) { return ImmutableMap.copyOf(FpKit.groupingBy(directives, GraphQLDirective::getName)); } - @Deprecated // use GraphQLAppliedDirectives eventually - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") // use GraphQLAppliedDirectives eventually public static Optional directiveWithArg(List directives, String directiveName, String argumentName) { GraphQLDirective directive = nonRepeatableDirectivesByName(directives).get(directiveName); GraphQLArgument argument = null; @@ -52,9 +48,7 @@ public static Optional directiveWithArg(List return Optional.ofNullable(argument); } - - @Deprecated // use GraphQLAppliedDirectives eventually - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") // use GraphQLAppliedDirectives eventually public static boolean isAllNonRepeatable(List directives) { if (directives == null || directives.isEmpty()) { return false; @@ -67,8 +61,7 @@ public static boolean isAllNonRepeatable(List directives) { return true; } - @Deprecated // use GraphQLAppliedDirectives eventually - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") // use GraphQLAppliedDirectives eventually public static List add(List targetList, GraphQLDirective newDirective) { assertNotNull(targetList, () -> "directive list can't be null"); assertNotNull(newDirective, () -> "directive can't be null"); @@ -76,8 +69,7 @@ public static List add(List targetList, Grap return targetList; } - @Deprecated // use GraphQLAppliedDirectives eventually - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") // use GraphQLAppliedDirectives eventually public static List addAll(List targetList, List newDirectives) { assertNotNull(targetList, () -> "directive list can't be null"); assertNotNull(newDirectives, () -> "directive list can't be null"); @@ -85,8 +77,7 @@ public static List addAll(List targetList, L return targetList; } - @Deprecated // use GraphQLAppliedDirectives eventually - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") // use GraphQLAppliedDirectives eventually public static GraphQLDirective getFirstDirective(String name, Map> allDirectivesByName) { List directives = allDirectivesByName.getOrDefault(name, emptyList()); if (directives.isEmpty()) { diff --git a/src/main/java/graphql/ExecutionInput.java b/src/main/java/graphql/ExecutionInput.java index f924aab7e4..bfda46a3d3 100644 --- a/src/main/java/graphql/ExecutionInput.java +++ b/src/main/java/graphql/ExecutionInput.java @@ -68,8 +68,7 @@ public String getOperationName() { * * @deprecated - use {@link #getGraphQLContext()} */ - @Deprecated - @DeprecatedAt("2021-07-05") + @Deprecated(since = "2021-07-05") public Object getContext() { return context; } @@ -273,8 +272,7 @@ public Builder localContext(Object localContext) { * * @deprecated - the {@link ExecutionInput#getGraphQLContext()} is a fixed mutable instance now */ - @Deprecated - @DeprecatedAt("2021-07-05") + @Deprecated(since = "2021-07-05") public Builder context(Object context) { this.context = context; return this; @@ -289,8 +287,7 @@ public Builder context(Object context) { * * @deprecated - the {@link ExecutionInput#getGraphQLContext()} is a fixed mutable instance now */ - @Deprecated - @DeprecatedAt("2021-07-05") + @Deprecated(since = "2021-07-05") public Builder context(GraphQLContext.Builder contextBuilder) { this.context = contextBuilder.build(); return this; @@ -305,8 +302,7 @@ public Builder context(GraphQLContext.Builder contextBuilder) { * * @deprecated - the {@link ExecutionInput#getGraphQLContext()} is a fixed mutable instance now */ - @Deprecated - @DeprecatedAt("2021-07-05") + @Deprecated(since = "2021-07-05") public Builder context(UnaryOperator contextBuilderFunction) { GraphQLContext.Builder builder = GraphQLContext.newContext(); builder = contextBuilderFunction.apply(builder); diff --git a/src/main/java/graphql/TypeResolutionEnvironment.java b/src/main/java/graphql/TypeResolutionEnvironment.java index c606fdd5fe..ca57979bf5 100644 --- a/src/main/java/graphql/TypeResolutionEnvironment.java +++ b/src/main/java/graphql/TypeResolutionEnvironment.java @@ -94,8 +94,7 @@ public GraphQLSchema getSchema() { * * @deprecated use {@link #getGraphQLContext()} instead */ - @Deprecated - @DeprecatedAt("2021-12-27") + @Deprecated(since = "2021-12-27") public T getContext() { //noinspection unchecked return (T) context; diff --git a/src/main/java/graphql/collect/ImmutableMapWithNullValues.java b/src/main/java/graphql/collect/ImmutableMapWithNullValues.java index 8eab40c56d..e9ca664efb 100644 --- a/src/main/java/graphql/collect/ImmutableMapWithNullValues.java +++ b/src/main/java/graphql/collect/ImmutableMapWithNullValues.java @@ -1,7 +1,6 @@ package graphql.collect; import graphql.Assert; -import graphql.DeprecatedAt; import graphql.Internal; import java.util.Collection; @@ -82,29 +81,25 @@ public V get(Object key) { } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public V put(K key, V value) { throw new UnsupportedOperationException(); } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public V remove(Object key) { throw new UnsupportedOperationException(); } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public void putAll(Map m) { throw new UnsupportedOperationException(); } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public void clear() { throw new UnsupportedOperationException(); } @@ -145,64 +140,55 @@ public void forEach(BiConsumer action) { } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public void replaceAll(BiFunction function) { throw new UnsupportedOperationException(); } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public V putIfAbsent(K key, V value) { throw new UnsupportedOperationException(); } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public boolean remove(Object key, Object value) { throw new UnsupportedOperationException(); } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public boolean replace(K key, V oldValue, V newValue) { throw new UnsupportedOperationException(); } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public V replace(K key, V value) { throw new UnsupportedOperationException(); } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public V computeIfAbsent(K key, Function mappingFunction) { throw new UnsupportedOperationException(); } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public V computeIfPresent(K key, BiFunction remappingFunction) { throw new UnsupportedOperationException(); } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public V compute(K key, BiFunction remappingFunction) { throw new UnsupportedOperationException(); } @Override - @Deprecated - @DeprecatedAt("2020-11-10") + @Deprecated(since = "2020-11-10") public V merge(K key, V value, BiFunction remappingFunction) { throw new UnsupportedOperationException(); } diff --git a/src/main/java/graphql/execution/DataFetcherExceptionHandler.java b/src/main/java/graphql/execution/DataFetcherExceptionHandler.java index 7b7d294a0b..6daafd94dd 100644 --- a/src/main/java/graphql/execution/DataFetcherExceptionHandler.java +++ b/src/main/java/graphql/execution/DataFetcherExceptionHandler.java @@ -1,6 +1,5 @@ package graphql.execution; -import graphql.DeprecatedAt; import graphql.ExecutionResult; import graphql.PublicSpi; import graphql.schema.DataFetcher; diff --git a/src/main/java/graphql/execution/DataFetcherResult.java b/src/main/java/graphql/execution/DataFetcherResult.java index 460b07daf9..3baa4f4fec 100644 --- a/src/main/java/graphql/execution/DataFetcherResult.java +++ b/src/main/java/graphql/execution/DataFetcherResult.java @@ -1,7 +1,6 @@ package graphql.execution; import com.google.common.collect.ImmutableList; -import graphql.DeprecatedAt; import graphql.ExecutionResult; import graphql.GraphQLError; import graphql.Internal; @@ -49,8 +48,7 @@ public class DataFetcherResult { * @deprecated use the {@link #newResult()} builder instead */ @Internal - @Deprecated - @DeprecatedAt("2019-01-11") + @Deprecated(since = "2019-01-11") public DataFetcherResult(T data, List errors) { this(data, errors, null, null); } diff --git a/src/main/java/graphql/execution/ExecutionContext.java b/src/main/java/graphql/execution/ExecutionContext.java index 50db89b566..747f955d1a 100644 --- a/src/main/java/graphql/execution/ExecutionContext.java +++ b/src/main/java/graphql/execution/ExecutionContext.java @@ -3,7 +3,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import graphql.DeprecatedAt; import graphql.ExecutionInput; import graphql.GraphQLContext; import graphql.GraphQLError; @@ -120,8 +119,7 @@ public OperationDefinition getOperationDefinition() { * * @deprecated use {@link #getCoercedVariables()} instead */ - @Deprecated - @DeprecatedAt("2022-05-24") + @Deprecated(since = "2022-05-24") public Map getVariables() { return coercedVariables.toMap(); } @@ -137,8 +135,7 @@ public CoercedVariables getCoercedVariables() { * * @deprecated use {@link #getGraphQLContext()} instead */ - @Deprecated - @DeprecatedAt("2021-07-05") + @Deprecated(since = "2021-07-05") @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"}) public T getContext() { return (T) context; diff --git a/src/main/java/graphql/execution/ExecutionContextBuilder.java b/src/main/java/graphql/execution/ExecutionContextBuilder.java index f941be07b7..7220e8dee7 100644 --- a/src/main/java/graphql/execution/ExecutionContextBuilder.java +++ b/src/main/java/graphql/execution/ExecutionContextBuilder.java @@ -2,7 +2,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import graphql.DeprecatedAt; import graphql.ExecutionInput; import graphql.GraphQLContext; import graphql.GraphQLError; @@ -131,8 +130,7 @@ public ExecutionContextBuilder subscriptionStrategy(ExecutionStrategy subscripti /* * @deprecated use {@link #graphQLContext(GraphQLContext)} instead */ - @Deprecated - @DeprecatedAt("2021-07-05") + @Deprecated(since = "2021-07-05") public ExecutionContextBuilder context(Object context) { this.context = context; return this; @@ -159,8 +157,7 @@ public ExecutionContextBuilder root(Object root) { * * @deprecated use {@link #coercedVariables(CoercedVariables)} instead */ - @Deprecated - @DeprecatedAt("2022-05-24") + @Deprecated(since = "2022-05-24") public ExecutionContextBuilder variables(Map variables) { this.coercedVariables = CoercedVariables.of(variables); return this; diff --git a/src/main/java/graphql/execution/ExecutionStepInfo.java b/src/main/java/graphql/execution/ExecutionStepInfo.java index 884ca79179..08836d977f 100644 --- a/src/main/java/graphql/execution/ExecutionStepInfo.java +++ b/src/main/java/graphql/execution/ExecutionStepInfo.java @@ -1,6 +1,5 @@ package graphql.execution; -import graphql.DeprecatedAt; import graphql.PublicApi; import graphql.collect.ImmutableMapWithNullValues; import graphql.schema.GraphQLFieldDefinition; @@ -84,8 +83,7 @@ private ExecutionStepInfo(Builder builder) { * @see ExecutionStepInfo#getObjectType() * @deprecated use {@link #getObjectType()} instead as it is named better */ - @Deprecated - @DeprecatedAt("2022-02-03") + @Deprecated(since = "2022-02-03") public GraphQLObjectType getFieldContainer() { return fieldContainer; } diff --git a/src/main/java/graphql/execution/TypeResolutionParameters.java b/src/main/java/graphql/execution/TypeResolutionParameters.java index 88a8e2db69..4f20fac4fd 100644 --- a/src/main/java/graphql/execution/TypeResolutionParameters.java +++ b/src/main/java/graphql/execution/TypeResolutionParameters.java @@ -1,6 +1,5 @@ package graphql.execution; -import graphql.DeprecatedAt; import graphql.GraphQLContext; import graphql.Internal; import graphql.TypeResolutionEnvironment; @@ -74,8 +73,7 @@ public static Builder newParameters() { * * @deprecated use {@link #getGraphQLContext()} instead */ - @Deprecated - @DeprecatedAt("2021-07-05") + @Deprecated(since = "2021-07-05") public Object getContext() { return context; } @@ -125,8 +123,7 @@ public Builder schema(GraphQLSchema schema) { return this; } - @Deprecated - @DeprecatedAt("2021-07-05") + @Deprecated(since = "2021-07-05") public Builder context(Object context) { this.context = context; return this; diff --git a/src/main/java/graphql/execution/directives/QueryDirectives.java b/src/main/java/graphql/execution/directives/QueryDirectives.java index a7fafdad9b..162b6f3c53 100644 --- a/src/main/java/graphql/execution/directives/QueryDirectives.java +++ b/src/main/java/graphql/execution/directives/QueryDirectives.java @@ -1,6 +1,5 @@ package graphql.execution.directives; -import graphql.DeprecatedAt; import graphql.GraphQLContext; import graphql.PublicApi; import graphql.execution.CoercedVariables; @@ -56,8 +55,7 @@ public interface QueryDirectives { * * @deprecated - use the {@link QueryAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") Map> getImmediateDirectivesByName(); /** @@ -79,8 +77,7 @@ public interface QueryDirectives { * * @deprecated - use the {@link QueryAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") List getImmediateDirective(String directiveName); /** @@ -91,8 +88,7 @@ public interface QueryDirectives { * * @deprecated - use the {@link QueryAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") Map> getImmediateDirectivesByField(); /** diff --git a/src/main/java/graphql/execution/instrumentation/Instrumentation.java b/src/main/java/graphql/execution/instrumentation/Instrumentation.java index 77c4c6bd83..ae26e360e7 100644 --- a/src/main/java/graphql/execution/instrumentation/Instrumentation.java +++ b/src/main/java/graphql/execution/instrumentation/Instrumentation.java @@ -1,6 +1,5 @@ package graphql.execution.instrumentation; -import graphql.DeprecatedAt; import graphql.ExecutionInput; import graphql.ExecutionResult; import graphql.PublicSpi; @@ -49,8 +48,7 @@ public interface Instrumentation { * * @deprecated use {@link #createState(InstrumentationCreateStateParameters)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") default InstrumentationState createState() { return null; } @@ -63,8 +61,7 @@ default InstrumentationState createState() { * * @return a state object that is passed to each method */ - @Deprecated - @DeprecatedAt("2023-08-25") + @Deprecated(since = "2023-08-25") @Nullable default InstrumentationState createState(InstrumentationCreateStateParameters parameters) { return createState(); @@ -92,8 +89,7 @@ default CompletableFuture createStateAsync(Instrumentation * * @deprecated use {@link #beginExecution(InstrumentationExecutionParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default InstrumentationContext beginExecution(InstrumentationExecutionParameters parameters) { return noOp(); @@ -121,8 +117,7 @@ default InstrumentationContext beginExecution(InstrumentationEx * * @deprecated use {@link #beginParse(InstrumentationExecutionParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default InstrumentationContext beginParse(InstrumentationExecutionParameters parameters) { return noOp(); @@ -150,8 +145,7 @@ default InstrumentationContext beginParse(InstrumentationExecutionPara * * @deprecated use {@link #beginValidation(InstrumentationValidationParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default InstrumentationContext> beginValidation(InstrumentationValidationParameters parameters) { return noOp(); @@ -179,8 +173,7 @@ default InstrumentationContext> beginValidation(Instrument * * @deprecated use {@link #beginExecuteOperation(InstrumentationExecuteOperationParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default InstrumentationContext beginExecuteOperation(InstrumentationExecuteOperationParameters parameters) { return noOp(); @@ -209,8 +202,7 @@ default InstrumentationContext beginExecuteOperation(Instrument * * @deprecated use {@link #beginExecutionStrategy(InstrumentationExecutionStrategyParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default ExecutionStrategyInstrumentationContext beginExecutionStrategy(InstrumentationExecutionStrategyParameters parameters) { return ExecutionStrategyInstrumentationContext.NOOP; @@ -240,8 +232,7 @@ default ExecutionStrategyInstrumentationContext beginExecutionStrategy(Instrumen * * @deprecated use {@link #beginSubscribedFieldEvent(InstrumentationFieldParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default InstrumentationContext beginSubscribedFieldEvent(InstrumentationFieldParameters parameters) { return noOp(); @@ -269,8 +260,7 @@ default InstrumentationContext beginSubscribedFieldEvent(Instru * * @deprecated use {@link #beginField(InstrumentationFieldParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default InstrumentationContext beginField(InstrumentationFieldParameters parameters) { return noOp(); @@ -298,8 +288,7 @@ default InstrumentationContext beginField(InstrumentationFieldP * * @deprecated use {@link #beginFieldFetch(InstrumentationFieldFetchParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default InstrumentationContext beginFieldFetch(InstrumentationFieldFetchParameters parameters) { return noOp(); @@ -328,8 +317,7 @@ default InstrumentationContext beginFieldFetch(InstrumentationFieldFetch * * @deprecated use {@link #beginFieldComplete(InstrumentationFieldCompleteParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default InstrumentationContext beginFieldComplete(InstrumentationFieldCompleteParameters parameters) { return noOp(); @@ -357,8 +345,7 @@ default InstrumentationContext beginFieldComplete(Instrumentati * * @deprecated use {@link #beginFieldListComplete(InstrumentationFieldCompleteParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default InstrumentationContext beginFieldListComplete(InstrumentationFieldCompleteParameters parameters) { return noOp(); @@ -388,8 +375,7 @@ default InstrumentationContext beginFieldListComplete(Instrumen * * @deprecated use {@link #instrumentExecutionInput(ExecutionInput, InstrumentationExecutionParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default ExecutionInput instrumentExecutionInput(ExecutionInput executionInput, InstrumentationExecutionParameters parameters) { return executionInput; @@ -420,8 +406,7 @@ default ExecutionInput instrumentExecutionInput(ExecutionInput executionInput, I * * @deprecated use {@link #instrumentDocumentAndVariables(DocumentAndVariables, InstrumentationExecutionParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default DocumentAndVariables instrumentDocumentAndVariables(DocumentAndVariables documentAndVariables, InstrumentationExecutionParameters parameters) { return documentAndVariables; @@ -452,8 +437,7 @@ default DocumentAndVariables instrumentDocumentAndVariables(DocumentAndVariables * * @deprecated use {@link #instrumentSchema(GraphQLSchema, InstrumentationExecutionParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default GraphQLSchema instrumentSchema(GraphQLSchema schema, InstrumentationExecutionParameters parameters) { return schema; @@ -485,8 +469,7 @@ default GraphQLSchema instrumentSchema(GraphQLSchema schema, InstrumentationExec * * @deprecated use {@link #instrumentExecutionContext(ExecutionContext, InstrumentationExecutionParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default ExecutionContext instrumentExecutionContext(ExecutionContext executionContext, InstrumentationExecutionParameters parameters) { return executionContext; @@ -507,7 +490,6 @@ default ExecutionContext instrumentExecutionContext(ExecutionContext executionCo return instrumentExecutionContext(executionContext, parameters.withNewState(state)); } - /** * This is called to instrument a {@link DataFetcher} just before it is used to fetch a field, allowing you * to adjust what information is passed back or record information about specific data fetches. Note @@ -521,8 +503,7 @@ default ExecutionContext instrumentExecutionContext(ExecutionContext executionCo * * @deprecated use {@link #instrumentDataFetcher(DataFetcher, InstrumentationFieldFetchParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default DataFetcher instrumentDataFetcher(DataFetcher dataFetcher, InstrumentationFieldFetchParameters parameters) { return dataFetcher; @@ -555,8 +536,7 @@ default DataFetcher instrumentDataFetcher(DataFetcher dataFetcher, Instrum * * @deprecated use {@link #instrumentExecutionResult(ExecutionResult, InstrumentationExecutionParameters, InstrumentationState)} instead */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @NotNull default CompletableFuture instrumentExecutionResult(ExecutionResult executionResult, InstrumentationExecutionParameters parameters) { return CompletableFuture.completedFuture(executionResult); diff --git a/src/main/java/graphql/execution/instrumentation/SimpleInstrumentation.java b/src/main/java/graphql/execution/instrumentation/SimpleInstrumentation.java index f35278c551..d2df536e75 100644 --- a/src/main/java/graphql/execution/instrumentation/SimpleInstrumentation.java +++ b/src/main/java/graphql/execution/instrumentation/SimpleInstrumentation.java @@ -1,6 +1,5 @@ package graphql.execution.instrumentation; -import graphql.DeprecatedAt; import graphql.PublicApi; /** @@ -12,8 +11,7 @@ * @deprecated use {@link SimplePerformantInstrumentation} instead as a base class. */ @PublicApi -@Deprecated -@DeprecatedAt(value = "2022-10-05") +@Deprecated(since = "2022-10-05") public class SimpleInstrumentation implements Instrumentation { /** diff --git a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecuteOperationParameters.java b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecuteOperationParameters.java index f8a895657b..4de6a1164c 100644 --- a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecuteOperationParameters.java +++ b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecuteOperationParameters.java @@ -1,6 +1,5 @@ package graphql.execution.instrumentation.parameters; -import graphql.DeprecatedAt; import graphql.PublicApi; import graphql.execution.ExecutionContext; import graphql.execution.instrumentation.Instrumentation; @@ -33,8 +32,7 @@ private InstrumentationExecuteOperationParameters(ExecutionContext executionCont * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") public InstrumentationExecuteOperationParameters withNewState(InstrumentationState instrumentationState) { return new InstrumentationExecuteOperationParameters(executionContext, instrumentationState); } @@ -53,8 +51,7 @@ public ExecutionContext getExecutionContext() { * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") public T getInstrumentationState() { //noinspection unchecked return (T) instrumentationState; diff --git a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecutionParameters.java b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecutionParameters.java index 57ec489851..10cce06031 100644 --- a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecutionParameters.java +++ b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecutionParameters.java @@ -1,6 +1,5 @@ package graphql.execution.instrumentation.parameters; -import graphql.DeprecatedAt; import graphql.ExecutionInput; import graphql.GraphQLContext; import graphql.PublicApi; @@ -45,8 +44,7 @@ public InstrumentationExecutionParameters(ExecutionInput executionInput, GraphQL * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") public InstrumentationExecutionParameters withNewState(InstrumentationState instrumentationState) { return new InstrumentationExecutionParameters(this.getExecutionInput(), this.schema, instrumentationState); } @@ -70,8 +68,7 @@ public String getOperation() { * * @deprecated use {@link #getGraphQLContext()} instead */ - @Deprecated - @DeprecatedAt("2021-07-05") + @Deprecated(since = "2021-07-05") @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"}) public T getContext() { return (T) context; @@ -95,8 +92,7 @@ public Map getVariables() { * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @SuppressWarnings("TypeParameterUnusedInFormals") public T getInstrumentationState() { //noinspection unchecked diff --git a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecutionStrategyParameters.java b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecutionStrategyParameters.java index 7f1ec801b3..a2ce253cdc 100644 --- a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecutionStrategyParameters.java +++ b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationExecutionStrategyParameters.java @@ -1,6 +1,5 @@ package graphql.execution.instrumentation.parameters; -import graphql.DeprecatedAt; import graphql.PublicApi; import graphql.execution.ExecutionContext; import graphql.execution.ExecutionStrategyParameters; @@ -36,8 +35,7 @@ private InstrumentationExecutionStrategyParameters(ExecutionContext executionCon * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") public InstrumentationExecutionStrategyParameters withNewState(InstrumentationState instrumentationState) { return new InstrumentationExecutionStrategyParameters(executionContext, executionStrategyParameters, instrumentationState); } @@ -60,8 +58,7 @@ public ExecutionStrategyParameters getExecutionStrategyParameters() { * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @SuppressWarnings("TypeParameterUnusedInFormals") public T getInstrumentationState() { //noinspection unchecked diff --git a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldCompleteParameters.java b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldCompleteParameters.java index 254e72f47b..dd5d2244d4 100644 --- a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldCompleteParameters.java +++ b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldCompleteParameters.java @@ -1,6 +1,5 @@ package graphql.execution.instrumentation.parameters; -import graphql.DeprecatedAt; import graphql.PublicApi; import graphql.execution.ExecutionContext; import graphql.execution.ExecutionStepInfo; @@ -43,8 +42,7 @@ public InstrumentationFieldCompleteParameters(ExecutionContext executionContext, * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") public InstrumentationFieldCompleteParameters withNewState(InstrumentationState instrumentationState) { return new InstrumentationFieldCompleteParameters( this.executionContext, executionStrategyParameters, this.executionStepInfo, this.fetchedValue, instrumentationState); @@ -63,8 +61,7 @@ public GraphQLFieldDefinition getField() { return getExecutionStepInfo().getFieldDefinition(); } - @Deprecated - @DeprecatedAt("2020-09-08") + @Deprecated(since = "2020-09-08") public ExecutionStepInfo getTypeInfo() { return getExecutionStepInfo(); } @@ -87,8 +84,7 @@ public Object getFetchedValue() { * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @SuppressWarnings("TypeParameterUnusedInFormals") public T getInstrumentationState() { //noinspection unchecked diff --git a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldFetchParameters.java b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldFetchParameters.java index 6013214013..5c54cd3e98 100644 --- a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldFetchParameters.java +++ b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldFetchParameters.java @@ -1,6 +1,5 @@ package graphql.execution.instrumentation.parameters; -import graphql.DeprecatedAt; import graphql.PublicApi; import graphql.execution.ExecutionContext; import graphql.execution.ExecutionStrategyParameters; @@ -42,8 +41,7 @@ private InstrumentationFieldFetchParameters(ExecutionContext getExecutionContext * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @Override public InstrumentationFieldFetchParameters withNewState(InstrumentationState instrumentationState) { return new InstrumentationFieldFetchParameters( diff --git a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldParameters.java b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldParameters.java index 070def45a1..9c6342d2c7 100644 --- a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldParameters.java +++ b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationFieldParameters.java @@ -1,6 +1,5 @@ package graphql.execution.instrumentation.parameters; -import graphql.DeprecatedAt; import graphql.PublicApi; import graphql.execution.ExecutionContext; import graphql.execution.ExecutionStepInfo; @@ -38,8 +37,7 @@ public InstrumentationFieldParameters(ExecutionContext executionContext, Supplie * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") public InstrumentationFieldParameters withNewState(InstrumentationState instrumentationState) { return new InstrumentationFieldParameters( this.executionContext, this.executionStepInfo, instrumentationState); @@ -68,8 +66,7 @@ public ExecutionStepInfo getExecutionStepInfo() { * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @SuppressWarnings("TypeParameterUnusedInFormals") public T getInstrumentationState() { //noinspection unchecked diff --git a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationValidationParameters.java b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationValidationParameters.java index a99619affa..713b75c63c 100644 --- a/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationValidationParameters.java +++ b/src/main/java/graphql/execution/instrumentation/parameters/InstrumentationValidationParameters.java @@ -1,6 +1,5 @@ package graphql.execution.instrumentation.parameters; -import graphql.DeprecatedAt; import graphql.ExecutionInput; import graphql.PublicApi; import graphql.execution.instrumentation.Instrumentation; @@ -29,8 +28,7 @@ public InstrumentationValidationParameters(ExecutionInput executionInput, Docume * * @deprecated state is now passed in direct to instrumentation methods */ - @Deprecated - @DeprecatedAt("2022-07-26") + @Deprecated(since = "2022-07-26") @Override public InstrumentationValidationParameters withNewState(InstrumentationState instrumentationState) { return new InstrumentationValidationParameters( diff --git a/src/main/java/graphql/execution/preparsed/PreparsedDocumentProvider.java b/src/main/java/graphql/execution/preparsed/PreparsedDocumentProvider.java index a9d8f1e842..402b401e43 100644 --- a/src/main/java/graphql/execution/preparsed/PreparsedDocumentProvider.java +++ b/src/main/java/graphql/execution/preparsed/PreparsedDocumentProvider.java @@ -1,7 +1,6 @@ package graphql.execution.preparsed; -import graphql.DeprecatedAt; import graphql.ExecutionInput; import graphql.PublicSpi; @@ -27,8 +26,7 @@ public interface PreparsedDocumentProvider { *

* @deprecated - use {@link #getDocumentAsync(ExecutionInput executionInput, Function parseAndValidateFunction)} */ - @Deprecated - @DeprecatedAt("2021-12-06") + @Deprecated(since = "2021-12-06") PreparsedDocumentEntry getDocument(ExecutionInput executionInput, Function parseAndValidateFunction); /** diff --git a/src/main/java/graphql/execution/preparsed/persisted/PersistedQueryCache.java b/src/main/java/graphql/execution/preparsed/persisted/PersistedQueryCache.java index 034e4b4ebb..52d1e79a18 100644 --- a/src/main/java/graphql/execution/preparsed/persisted/PersistedQueryCache.java +++ b/src/main/java/graphql/execution/preparsed/persisted/PersistedQueryCache.java @@ -1,6 +1,5 @@ package graphql.execution.preparsed.persisted; -import graphql.DeprecatedAt; import graphql.ExecutionInput; import graphql.PublicSpi; import graphql.execution.preparsed.PreparsedDocumentEntry; @@ -32,8 +31,7 @@ public interface PersistedQueryCache { * * @deprecated - use {@link #getPersistedQueryDocumentAsync(Object persistedQueryId, ExecutionInput executionInput, PersistedQueryCacheMiss onCacheMiss)} */ - @Deprecated - @DeprecatedAt("2021-12-06") + @Deprecated(since = "2021-12-06") PreparsedDocumentEntry getPersistedQueryDocument(Object persistedQueryId, ExecutionInput executionInput, PersistedQueryCacheMiss onCacheMiss) throws PersistedQueryNotFound; /** diff --git a/src/main/java/graphql/parser/Parser.java b/src/main/java/graphql/parser/Parser.java index a2bf6b9058..a02ea9567a 100644 --- a/src/main/java/graphql/parser/Parser.java +++ b/src/main/java/graphql/parser/Parser.java @@ -1,7 +1,6 @@ package graphql.parser; import com.google.common.collect.ImmutableList; -import graphql.DeprecatedAt; import graphql.Internal; import graphql.PublicApi; import graphql.language.Document; @@ -167,8 +166,7 @@ public Document parseDocument(Reader reader) throws InvalidSyntaxException { * @throws InvalidSyntaxException if the input is not valid graphql syntax * @deprecated use {#{@link #parse(ParserEnvironment)}} instead */ - @DeprecatedAt("2022-08-31") - @Deprecated + @Deprecated(since = "2022-08-31") public Document parseDocument(String input, String sourceName) throws InvalidSyntaxException { MultiSourceReader multiSourceReader = MultiSourceReader.newMultiSourceReader() .string(input, sourceName) @@ -188,8 +186,7 @@ public Document parseDocument(String input, String sourceName) throws InvalidSyn * @throws InvalidSyntaxException if the input is not valid graphql syntax * @deprecated use {#{@link #parse(ParserEnvironment)}} instead */ - @DeprecatedAt("2022-08-31") - @Deprecated + @Deprecated(since = "2022-08-31") public Document parseDocument(String input, ParserOptions parserOptions) throws InvalidSyntaxException { MultiSourceReader multiSourceReader = MultiSourceReader.newMultiSourceReader() .string(input, null) @@ -209,8 +206,7 @@ public Document parseDocument(String input, ParserOptions parserOptions) throws * @throws InvalidSyntaxException if the input is not valid graphql syntax * @deprecated use {#{@link #parse(ParserEnvironment)}} instead */ - @DeprecatedAt("2022-08-31") - @Deprecated + @Deprecated(since = "2022-08-31") public Document parseDocument(Reader reader, ParserOptions parserOptions) throws InvalidSyntaxException { ParserEnvironment parserEnvironment = ParserEnvironment.newParserEnvironment() .document(reader) diff --git a/src/main/java/graphql/schema/Coercing.java b/src/main/java/graphql/schema/Coercing.java index 0b4d127b80..cf8de535a5 100644 --- a/src/main/java/graphql/schema/Coercing.java +++ b/src/main/java/graphql/schema/Coercing.java @@ -1,7 +1,6 @@ package graphql.schema; -import graphql.DeprecatedAt; import graphql.GraphQLContext; import graphql.PublicSpi; import graphql.execution.CoercedVariables; @@ -54,8 +53,7 @@ public interface Coercing { * * @throws graphql.schema.CoercingSerializeException if value input can't be serialized */ - @Deprecated - @DeprecatedAt("2022-08-22") + @Deprecated(since = "2022-08-22") default @Nullable O serialize(@NotNull Object dataFetcherResult) throws CoercingSerializeException { throw new UnsupportedOperationException("The non deprecated version of serialize has not been implemented by this scalar : " + this.getClass()); } @@ -99,8 +97,7 @@ public interface Coercing { * * @throws graphql.schema.CoercingParseValueException if value input can't be parsed */ - @Deprecated - @DeprecatedAt("2022-08-22") + @Deprecated(since = "2022-08-22") default @Nullable I parseValue(@NotNull Object input) throws CoercingParseValueException { throw new UnsupportedOperationException("The non deprecated version of parseValue has not been implemented by this scalar : " + this.getClass()); } @@ -146,8 +143,7 @@ default I parseValue(@NotNull Object input, @NotNull GraphQLContext graphQLConte * * @throws graphql.schema.CoercingParseLiteralException if input literal can't be parsed */ - @Deprecated - @DeprecatedAt("2022-08-22") + @Deprecated(since = "2022-08-22") default @Nullable I parseLiteral(@NotNull Object input) throws CoercingParseLiteralException { throw new UnsupportedOperationException("The non deprecated version of parseLiteral has not been implemented by this scalar : " + this.getClass()); } @@ -175,8 +171,7 @@ default I parseValue(@NotNull Object input, @NotNull GraphQLContext graphQLConte * @throws graphql.schema.CoercingParseLiteralException if input literal can't be parsed */ @SuppressWarnings("unused") - @Deprecated - @DeprecatedAt("2022-08-22") + @Deprecated(since = "2022-08-22") default @Nullable I parseLiteral(Object input, Map variables) throws CoercingParseLiteralException { return parseLiteral(input); } @@ -222,8 +217,7 @@ default I parseValue(@NotNull Object input, @NotNull GraphQLContext graphQLConte * * @return The literal matching the external input value. */ - @Deprecated - @DeprecatedAt("2022-08-22") + @Deprecated(since = "2022-08-22") default @NotNull Value valueToLiteral(@NotNull Object input) { throw new UnsupportedOperationException("The non deprecated version of valueToLiteral has not been implemented by this scalar : " + this.getClass()); } diff --git a/src/main/java/graphql/schema/DataFetchingEnvironment.java b/src/main/java/graphql/schema/DataFetchingEnvironment.java index 041d6a9ca2..ce46ad75c9 100644 --- a/src/main/java/graphql/schema/DataFetchingEnvironment.java +++ b/src/main/java/graphql/schema/DataFetchingEnvironment.java @@ -1,6 +1,5 @@ package graphql.schema; -import graphql.DeprecatedAt; import graphql.GraphQLContext; import graphql.PublicApi; import graphql.execution.ExecutionId; @@ -87,8 +86,7 @@ public interface DataFetchingEnvironment extends IntrospectionDataFetchingEnviro * * @deprecated - use {@link #getGraphQlContext()} instead */ - @Deprecated - @DeprecatedAt("2021-07-05") + @Deprecated(since = "2021-07-05") T getContext(); /** @@ -138,8 +136,7 @@ public interface DataFetchingEnvironment extends IntrospectionDataFetchingEnviro * * @deprecated Use {@link #getMergedField()}. */ - @Deprecated - @DeprecatedAt("2018-12-20") + @Deprecated(since = "2018-12-20") List getFields(); /** diff --git a/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java b/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java index dbf9618a43..d94197141e 100644 --- a/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java +++ b/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java @@ -2,7 +2,6 @@ import com.google.common.collect.ImmutableMap; -import graphql.DeprecatedAt; import graphql.GraphQLContext; import graphql.Internal; import graphql.collect.ImmutableKit; @@ -306,8 +305,7 @@ public Builder arguments(Supplier> arguments) { return this; } - @Deprecated - @DeprecatedAt("2021-07-05") + @Deprecated(since = "2021-07-05") public Builder context(Object context) { this.context = context; return this; diff --git a/src/main/java/graphql/schema/DelegatingDataFetchingEnvironment.java b/src/main/java/graphql/schema/DelegatingDataFetchingEnvironment.java index ff10e1cdd7..41d6795556 100644 --- a/src/main/java/graphql/schema/DelegatingDataFetchingEnvironment.java +++ b/src/main/java/graphql/schema/DelegatingDataFetchingEnvironment.java @@ -1,6 +1,5 @@ package graphql.schema; -import graphql.DeprecatedAt; import graphql.GraphQLContext; import graphql.PublicApi; import graphql.execution.ExecutionId; @@ -64,8 +63,7 @@ public T getArgumentOrDefault(String name, T defaultValue) { return delegateEnvironment.getArgumentOrDefault(name, defaultValue); } - @Deprecated - @DeprecatedAt("2022-04-17") + @Deprecated(since = "2022-04-17") @Override public T getContext() { return delegateEnvironment.getContext(); @@ -91,8 +89,7 @@ public GraphQLFieldDefinition getFieldDefinition() { return delegateEnvironment.getFieldDefinition(); } - @Deprecated - @DeprecatedAt("2019-10-07") + @Deprecated(since = "2019-10-07") @Override public List getFields() { return delegateEnvironment.getFields(); diff --git a/src/main/java/graphql/schema/GraphQLArgument.java b/src/main/java/graphql/schema/GraphQLArgument.java index 4ba3f123ea..99919b48b2 100644 --- a/src/main/java/graphql/schema/GraphQLArgument.java +++ b/src/main/java/graphql/schema/GraphQLArgument.java @@ -1,7 +1,6 @@ package graphql.schema; -import graphql.DeprecatedAt; import graphql.DirectivesUtil; import graphql.GraphQLContext; import graphql.PublicApi; @@ -125,8 +124,7 @@ public boolean hasSetValue() { * * @deprecated use {@link GraphQLAppliedDirectiveArgument} instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public @NotNull InputValueWithState getArgumentValue() { return value; } @@ -149,8 +147,7 @@ public boolean hasSetValue() { * * @deprecated use {@link GraphQLAppliedDirectiveArgument} instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public static T getArgumentValue(GraphQLArgument argument) { return getInputValueImpl(argument.getType(), argument.getArgumentValue(), GraphQLContext.getDefault(), Locale.getDefault()); } @@ -374,8 +371,7 @@ public Builder type(GraphQLInputType type) { * * @deprecated use {@link #defaultValueLiteral(Value)} or {@link #defaultValueProgrammatic(Object)} */ - @Deprecated - @DeprecatedAt("2021-05-10") + @Deprecated(since = "2021-05-10") public Builder defaultValue(Object defaultValue) { this.defaultValue = InputValueWithState.newInternalValue(defaultValue); return this; @@ -420,8 +416,7 @@ public Builder clearDefaultValue() { * * @deprecated use {@link #valueLiteral(Value)} or {@link #valueProgrammatic(Object)} */ - @Deprecated - @DeprecatedAt("2021-05-10") + @Deprecated(since = "2021-05-10") public Builder value(@Nullable Object value) { this.value = InputValueWithState.newInternalValue(value); return this; @@ -436,8 +431,7 @@ public Builder value(@Nullable Object value) { * * @deprecated use {@link GraphQLAppliedDirectiveArgument} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public Builder valueLiteral(@NotNull Value value) { this.value = InputValueWithState.newLiteralValue(value); return this; @@ -450,8 +444,7 @@ public Builder valueLiteral(@NotNull Value value) { * * @deprecated use {@link GraphQLAppliedDirectiveArgument} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public Builder valueProgrammatic(@Nullable Object value) { this.value = InputValueWithState.newExternalValue(value); return this; @@ -464,8 +457,7 @@ public Builder valueProgrammatic(@Nullable Object value) { * * @deprecated use {@link GraphQLAppliedDirectiveArgument} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public Builder clearValue() { this.value = InputValueWithState.NOT_SET; return this; diff --git a/src/main/java/graphql/schema/GraphQLCodeRegistry.java b/src/main/java/graphql/schema/GraphQLCodeRegistry.java index 9620ca19a7..d1b0f94d4c 100644 --- a/src/main/java/graphql/schema/GraphQLCodeRegistry.java +++ b/src/main/java/graphql/schema/GraphQLCodeRegistry.java @@ -1,7 +1,6 @@ package graphql.schema; import graphql.Assert; -import graphql.DeprecatedAt; import graphql.Internal; import graphql.PublicApi; import graphql.schema.visibility.GraphqlFieldVisibility; @@ -62,8 +61,7 @@ public GraphqlFieldVisibility getFieldVisibility() { * @deprecated This is confusing because {@link GraphQLInterfaceType}s cant have data fetchers. At runtime only a {@link GraphQLObjectType} * can be used to fetch a field. This method allows the mapping to be made, but it is never useful if an interface is passed in. */ - @Deprecated - @DeprecatedAt("2023-05-13") + @Deprecated(since = "2023-05-13") public DataFetcher getDataFetcher(GraphQLFieldsContainer parentType, GraphQLFieldDefinition fieldDefinition) { return getDataFetcherImpl(FieldCoordinates.coordinates(parentType, fieldDefinition), fieldDefinition, dataFetcherMap, systemDataFetcherMap, defaultDataFetcherFactory); } @@ -266,8 +264,7 @@ private Builder markChanged(boolean condition) { * @deprecated This is confusing because {@link GraphQLInterfaceType}s cant have data fetchers. At runtime only a {@link GraphQLObjectType} * can be used to fetch a field. This method allows the mapping to be made, but it is never useful if an interface is passed in. */ - @Deprecated - @DeprecatedAt("2023-05-13") + @Deprecated(since = "2023-05-13") public DataFetcher getDataFetcher(GraphQLFieldsContainer parentType, GraphQLFieldDefinition fieldDefinition) { return getDataFetcherImpl(FieldCoordinates.coordinates(parentType, fieldDefinition), fieldDefinition, dataFetcherMap, systemDataFetcherMap, defaultDataFetcherFactory); } @@ -373,13 +370,11 @@ public Builder dataFetcher(FieldCoordinates coordinates, DataFetcher dataFetc * @deprecated This is confusing because {@link GraphQLInterfaceType}s cant have data fetchers. At runtime only a {@link GraphQLObjectType} * can be used to fetch a field. This method allows the mapping to be made, but it is never useful if an interface is passed in. */ - @Deprecated - @DeprecatedAt("2023-05-13") + @Deprecated(since = "2023-05-13") public Builder dataFetcher(GraphQLFieldsContainer parentType, GraphQLFieldDefinition fieldDefinition, DataFetcher dataFetcher) { return dataFetcher(FieldCoordinates.coordinates(parentType.getName(), fieldDefinition.getName()), dataFetcher); } - /** * Sets the data fetcher for a specific field inside an object type * diff --git a/src/main/java/graphql/schema/GraphQLDirectiveContainer.java b/src/main/java/graphql/schema/GraphQLDirectiveContainer.java index 52caebef29..4bee55aa36 100644 --- a/src/main/java/graphql/schema/GraphQLDirectiveContainer.java +++ b/src/main/java/graphql/schema/GraphQLDirectiveContainer.java @@ -1,6 +1,5 @@ package graphql.schema; -import graphql.DeprecatedAt; import graphql.PublicApi; import java.util.List; @@ -76,8 +75,7 @@ default List getAppliedDirectives(String directiveName) * * @deprecated use {@link #hasAppliedDirective(String)} instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") default boolean hasDirective(String directiveName) { return getAllDirectivesByName().containsKey(directiveName); } @@ -101,8 +99,7 @@ default boolean hasAppliedDirective(String directiveName) { * * @deprecated - use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") List getDirectives(); /** @@ -113,8 +110,7 @@ default boolean hasAppliedDirective(String directiveName) { * * @deprecated - use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") Map getDirectivesByName(); /** @@ -125,8 +121,7 @@ default boolean hasAppliedDirective(String directiveName) { * * @deprecated - use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") Map> getAllDirectivesByName(); /** @@ -139,8 +134,7 @@ default boolean hasAppliedDirective(String directiveName) { * * @deprecated - use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") GraphQLDirective getDirective(String directiveName); /** @@ -152,8 +146,7 @@ default boolean hasAppliedDirective(String directiveName) { * * @deprecated - use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") default List getDirectives(String directiveName) { return getAllDirectivesByName().getOrDefault(directiveName, emptyList()); } diff --git a/src/main/java/graphql/schema/GraphQLFieldDefinition.java b/src/main/java/graphql/schema/GraphQLFieldDefinition.java index 79f824997d..c717c929a2 100644 --- a/src/main/java/graphql/schema/GraphQLFieldDefinition.java +++ b/src/main/java/graphql/schema/GraphQLFieldDefinition.java @@ -2,7 +2,6 @@ import com.google.common.collect.ImmutableList; -import graphql.DeprecatedAt; import graphql.DirectivesUtil; import graphql.Internal; import graphql.PublicApi; @@ -88,8 +87,7 @@ public GraphQLOutputType getType() { // to be removed in a future version when all code is in the code registry @Internal - @Deprecated - @DeprecatedAt("2018-12-03") + @Deprecated(since = "2018-12-03") DataFetcher getDataFetcher() { if (dataFetcherFactory == null) { return null; @@ -310,8 +308,7 @@ public Builder type(GraphQLOutputType type) { * * @deprecated use {@link graphql.schema.GraphQLCodeRegistry} instead */ - @Deprecated - @DeprecatedAt("2018-12-03") + @Deprecated(since = "2018-12-03") public Builder dataFetcher(DataFetcher dataFetcher) { assertNotNull(dataFetcher, () -> "dataFetcher must be not null"); this.dataFetcherFactory = DataFetcherFactories.useDataFetcher(dataFetcher); @@ -327,8 +324,7 @@ public Builder dataFetcher(DataFetcher dataFetcher) { * * @deprecated use {@link graphql.schema.GraphQLCodeRegistry} instead */ - @Deprecated - @DeprecatedAt("2018-12-03") + @Deprecated(since = "2018-12-03") public Builder dataFetcherFactory(DataFetcherFactory dataFetcherFactory) { assertNotNull(dataFetcherFactory, () -> "dataFetcherFactory must be not null"); this.dataFetcherFactory = dataFetcherFactory; @@ -344,8 +340,7 @@ public Builder dataFetcherFactory(DataFetcherFactory dataFetcherFactory) { * * @deprecated use {@link graphql.schema.GraphQLCodeRegistry} instead */ - @Deprecated - @DeprecatedAt("2018-12-03") + @Deprecated(since = "2018-12-03") public Builder staticValue(final Object value) { this.dataFetcherFactory = DataFetcherFactories.useDataFetcher(environment -> value); return this; @@ -398,8 +393,7 @@ public Builder argument(GraphQLArgument.Builder builder) { * * @deprecated This is a badly named method and is replaced by {@link #arguments(java.util.List)} */ - @Deprecated - @DeprecatedAt("2019-02-06") + @Deprecated(since = "2019-02-06") public Builder argument(List arguments) { return arguments(arguments); } diff --git a/src/main/java/graphql/schema/GraphQLInputObjectField.java b/src/main/java/graphql/schema/GraphQLInputObjectField.java index fda458defc..9a9aa0a85f 100644 --- a/src/main/java/graphql/schema/GraphQLInputObjectField.java +++ b/src/main/java/graphql/schema/GraphQLInputObjectField.java @@ -1,7 +1,6 @@ package graphql.schema; -import graphql.DeprecatedAt; import graphql.DirectivesUtil; import graphql.GraphQLContext; import graphql.PublicApi; @@ -315,8 +314,7 @@ public Builder type(GraphQLInputType type) { * * @deprecated use {@link #defaultValueLiteral(Value)} */ - @Deprecated - @DeprecatedAt("2021-05-10") + @Deprecated(since = "2021-05-10") public Builder defaultValue(Object defaultValue) { this.defaultValue = InputValueWithState.newInternalValue(defaultValue); return this; diff --git a/src/main/java/graphql/schema/GraphQLInterfaceType.java b/src/main/java/graphql/schema/GraphQLInterfaceType.java index 814609a7c5..238b5abdd3 100644 --- a/src/main/java/graphql/schema/GraphQLInterfaceType.java +++ b/src/main/java/graphql/schema/GraphQLInterfaceType.java @@ -3,7 +3,6 @@ import com.google.common.collect.ImmutableList; import graphql.Assert; import graphql.AssertException; -import graphql.DeprecatedAt; import graphql.DirectivesUtil; import graphql.Internal; import graphql.PublicApi; @@ -114,8 +113,7 @@ public String getDescription() { // to be removed in a future version when all code is in the code registry @Internal - @Deprecated - @DeprecatedAt("2018-12-03") + @Deprecated(since = "2018-12-03") TypeResolver getTypeResolver() { return typeResolver; } @@ -370,8 +368,7 @@ public Builder clearFields() { * * @deprecated use {@link graphql.schema.GraphQLCodeRegistry.Builder#typeResolver(GraphQLInterfaceType, TypeResolver)} instead */ - @Deprecated - @DeprecatedAt("2018-12-03") + @Deprecated(since = "2018-12-03") public Builder typeResolver(TypeResolver typeResolver) { this.typeResolver = typeResolver; return this; diff --git a/src/main/java/graphql/schema/GraphQLSchema.java b/src/main/java/graphql/schema/GraphQLSchema.java index 335c694af6..e365ef774b 100644 --- a/src/main/java/graphql/schema/GraphQLSchema.java +++ b/src/main/java/graphql/schema/GraphQLSchema.java @@ -5,7 +5,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import graphql.Assert; -import graphql.DeprecatedAt; import graphql.Directives; import graphql.DirectivesUtil; import graphql.Internal; @@ -418,8 +417,7 @@ public GraphQLObjectType getSubscriptionType() { * * @deprecated use {@link GraphQLCodeRegistry#getFieldVisibility()} instead */ - @Deprecated - @DeprecatedAt("2018-12-03") + @Deprecated(since = "2018-12-03") public GraphqlFieldVisibility getFieldVisibility() { return codeRegistry.getFieldVisibility(); } @@ -464,8 +462,7 @@ public GraphQLDirective getDirective(String directiveName) { * * @deprecated Use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public List getSchemaDirectives() { return schemaAppliedDirectivesHolder.getDirectives(); } @@ -480,8 +477,7 @@ public List getSchemaDirectives() { * * @deprecated Use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public Map getSchemaDirectiveByName() { return schemaAppliedDirectivesHolder.getDirectivesByName(); } @@ -496,8 +492,7 @@ public Map getSchemaDirectiveByName() { * * @deprecated Use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public Map> getAllSchemaDirectivesByName() { return schemaAppliedDirectivesHolder.getAllDirectivesByName(); } @@ -514,8 +509,7 @@ public Map> getAllSchemaDirectivesByName() { * * @deprecated Use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public GraphQLDirective getSchemaDirective(String directiveName) { return schemaAppliedDirectivesHolder.getDirective(directiveName); } @@ -530,8 +524,7 @@ public GraphQLDirective getSchemaDirective(String directiveName) { * * @deprecated Use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public List getSchemaDirectives(String directiveName) { return schemaAppliedDirectivesHolder.getDirectives(directiveName); } @@ -742,8 +735,7 @@ public Builder subscription(GraphQLObjectType subscriptionType) { * * @deprecated use {@link graphql.schema.GraphQLCodeRegistry.Builder#fieldVisibility(graphql.schema.visibility.GraphqlFieldVisibility)} instead */ - @Deprecated - @DeprecatedAt("2018-12-03") + @Deprecated(since = "2018-12-03") public Builder fieldVisibility(GraphqlFieldVisibility fieldVisibility) { this.codeRegistry = this.codeRegistry.transform(builder -> builder.fieldVisibility(fieldVisibility)); return this; @@ -873,8 +865,7 @@ public Builder introspectionSchemaType(GraphQLObjectType introspectionSchemaType * * @deprecated - Use the {@link #additionalType(GraphQLType)} methods */ - @Deprecated - @DeprecatedAt("2018-07-30") + @Deprecated(since = "2018-07-30") public GraphQLSchema build(Set additionalTypes) { return additionalTypes(additionalTypes).build(); } @@ -889,8 +880,7 @@ public GraphQLSchema build(Set additionalTypes) { * * @deprecated - Use the {@link #additionalType(GraphQLType)} and {@link #additionalDirective(GraphQLDirective)} methods */ - @Deprecated - @DeprecatedAt("2018-07-30") + @Deprecated(since = "2018-07-30") public GraphQLSchema build(Set additionalTypes, Set additionalDirectives) { return additionalTypes(additionalTypes).additionalDirectives(additionalDirectives).build(); } diff --git a/src/main/java/graphql/schema/GraphQLUnionType.java b/src/main/java/graphql/schema/GraphQLUnionType.java index 452fcd2da9..6c5fffce39 100644 --- a/src/main/java/graphql/schema/GraphQLUnionType.java +++ b/src/main/java/graphql/schema/GraphQLUnionType.java @@ -3,7 +3,6 @@ import com.google.common.collect.ImmutableList; import graphql.Assert; -import graphql.DeprecatedAt; import graphql.DirectivesUtil; import graphql.Internal; import graphql.PublicApi; @@ -102,8 +101,7 @@ public boolean isPossibleType(GraphQLObjectType graphQLObjectType) { // to be removed in a future version when all code is in the code registry @Internal - @Deprecated - @DeprecatedAt("2018-12-03") + @Deprecated(since = "2018-12-03") TypeResolver getTypeResolver() { return typeResolver; } @@ -282,14 +280,12 @@ public Builder extensionDefinitions(List extension * * @deprecated use {@link graphql.schema.GraphQLCodeRegistry.Builder#typeResolver(GraphQLUnionType, TypeResolver)} instead */ - @Deprecated - @DeprecatedAt("2018-12-03") + @Deprecated(since = "2018-12-03") public Builder typeResolver(TypeResolver typeResolver) { this.typeResolver = typeResolver; return this; } - public Builder possibleType(GraphQLObjectType type) { assertNotNull(type, () -> "possible type can't be null"); types.put(type.getName(), type); diff --git a/src/main/java/graphql/schema/GraphqlDirectivesContainerTypeBuilder.java b/src/main/java/graphql/schema/GraphqlDirectivesContainerTypeBuilder.java index b42d2eb03a..b9db03ebb0 100644 --- a/src/main/java/graphql/schema/GraphqlDirectivesContainerTypeBuilder.java +++ b/src/main/java/graphql/schema/GraphqlDirectivesContainerTypeBuilder.java @@ -1,6 +1,5 @@ package graphql.schema; -import graphql.DeprecatedAt; import graphql.Internal; import java.util.ArrayList; @@ -50,8 +49,7 @@ public B withAppliedDirective(GraphQLAppliedDirective.Builder builder) { * * @deprecated - use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public B replaceDirectives(List directives) { assertNotNull(directives, () -> "directive can't be null"); this.directives.clear(); @@ -66,8 +64,7 @@ public B replaceDirectives(List directives) { * * @deprecated - use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public B withDirectives(GraphQLDirective... directives) { assertNotNull(directives, () -> "directives can't be null"); this.directives.clear(); @@ -84,8 +81,7 @@ public B withDirectives(GraphQLDirective... directives) { * * @deprecated - use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public B withDirective(GraphQLDirective directive) { assertNotNull(directive, () -> "directive can't be null"); this.directives.add(directive); @@ -99,8 +95,7 @@ public B withDirective(GraphQLDirective directive) { * * @deprecated - use the {@link GraphQLAppliedDirective} methods instead */ - @Deprecated - @DeprecatedAt("2022-02-24") + @Deprecated(since = "2022-02-24") public B withDirective(GraphQLDirective.Builder builder) { return withDirective(builder.build()); } diff --git a/src/main/java/graphql/schema/diff/DiffSet.java b/src/main/java/graphql/schema/diff/DiffSet.java index 3823c30d59..68c06aa13d 100644 --- a/src/main/java/graphql/schema/diff/DiffSet.java +++ b/src/main/java/graphql/schema/diff/DiffSet.java @@ -1,7 +1,6 @@ package graphql.schema.diff; import graphql.Assert; -import graphql.DeprecatedAt; import graphql.ExecutionResult; import graphql.GraphQL; import graphql.PublicApi; @@ -16,8 +15,7 @@ * {@link graphql.introspection.IntrospectionQuery}. */ @PublicApi -@Deprecated -@DeprecatedAt("2023-10-04") +@Deprecated(since = "2023-10-04") public class DiffSet { private final Map introspectionOld; diff --git a/src/main/java/graphql/schema/diff/SchemaDiff.java b/src/main/java/graphql/schema/diff/SchemaDiff.java index 9012c217f9..72161dfde3 100644 --- a/src/main/java/graphql/schema/diff/SchemaDiff.java +++ b/src/main/java/graphql/schema/diff/SchemaDiff.java @@ -1,7 +1,6 @@ package graphql.schema.diff; import graphql.Assert; -import graphql.DeprecatedAt; import graphql.PublicSpi; import graphql.introspection.IntrospectionResultToSchema; import graphql.language.Argument; @@ -121,8 +120,7 @@ public SchemaDiff(Options options) { * * @return the number of API breaking changes */ - @Deprecated - @DeprecatedAt("2023-10-04") + @Deprecated(since = "2023-10-04") @SuppressWarnings("unchecked") public int diffSchema(DiffSet diffSet, DifferenceReporter reporter) { CountingReporter countingReporter = new CountingReporter(reporter); diff --git a/src/main/java/graphql/schema/idl/RuntimeWiring.java b/src/main/java/graphql/schema/idl/RuntimeWiring.java index 69ba9f6633..52f909ac63 100644 --- a/src/main/java/graphql/schema/idl/RuntimeWiring.java +++ b/src/main/java/graphql/schema/idl/RuntimeWiring.java @@ -1,6 +1,5 @@ package graphql.schema.idl; -import graphql.DeprecatedAt; import graphql.PublicApi; import graphql.schema.DataFetcher; import graphql.schema.GraphQLCodeRegistry; @@ -356,8 +355,7 @@ public Builder comparatorRegistry(GraphqlTypeComparatorRegistry comparatorRegist * @deprecated This mechanism can be achieved in a better way via {@link graphql.schema.SchemaTransformer} * after the schema is built */ - @Deprecated - @DeprecatedAt(value = "2022-10-29") + @Deprecated(since = "2022-10-29") public Builder transformer(SchemaGeneratorPostProcessing schemaGeneratorPostProcessing) { this.schemaGeneratorPostProcessings.add(assertNotNull(schemaGeneratorPostProcessing)); return this; diff --git a/src/main/java/graphql/schema/idl/SchemaDirectiveWiringEnvironment.java b/src/main/java/graphql/schema/idl/SchemaDirectiveWiringEnvironment.java index dfe09acb43..e888039308 100644 --- a/src/main/java/graphql/schema/idl/SchemaDirectiveWiringEnvironment.java +++ b/src/main/java/graphql/schema/idl/SchemaDirectiveWiringEnvironment.java @@ -1,6 +1,5 @@ package graphql.schema.idl; -import graphql.DeprecatedAt; import graphql.PublicApi; import graphql.language.NamedNode; import graphql.language.NodeParentTree; @@ -43,8 +42,7 @@ public interface SchemaDirectiveWiringEnvironment getDirectives(); /** @@ -79,8 +76,7 @@ public interface SchemaDirectiveWiringEnvironment queryPath = new ArrayList<>(); private final ImmutableMap extensions; + @Deprecated(since = "2022-07-10", forRemoval = true) + public ValidationError(ValidationErrorClassification validationErrorType) { + this(newValidationError() + .validationErrorType(validationErrorType)); + } + + @Deprecated(since = "2022-07-10", forRemoval = true) + public ValidationError(ValidationErrorClassification validationErrorType, SourceLocation sourceLocation, String description) { + this(newValidationError() + .validationErrorType(validationErrorType) + .sourceLocation(sourceLocation) + .description(description)); + } + + @Deprecated(since = "2022-07-10", forRemoval = true) + public ValidationError(ValidationErrorType validationErrorType, SourceLocation sourceLocation, String description, List queryPath) { + this(newValidationError() + .validationErrorType(validationErrorType) + .sourceLocation(sourceLocation) + .description(description) + .queryPath(queryPath)); + } + + @Deprecated(since = "2022-07-10", forRemoval = true) + public ValidationError(ValidationErrorType validationErrorType, List sourceLocations, String description) { + this(newValidationError() + .validationErrorType(validationErrorType) + .sourceLocations(sourceLocations) + .description(description)); + } + + @Deprecated(since = "2022-07-10", forRemoval = true) + public ValidationError(ValidationErrorType validationErrorType, List sourceLocations, String description, List queryPath) { + this(newValidationError() + .validationErrorType(validationErrorType) + .sourceLocations(sourceLocations) + .description(description) + .queryPath(queryPath)); + } + private ValidationError(Builder builder) { this.validationErrorType = builder.validationErrorType; this.description = builder.description;