From 5a07883f6a1326ac2c0395b893d7c564ad1004ef Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 1 Oct 2021 12:37:40 +0100 Subject: [PATCH] Make TestExecutionResult package private --- .../boot/actuate/metrics/GraphQlTagsTests.java | 9 +++++---- .../graphql/test/tester/TestExecutionResult.java | 12 +++++++++--- .../graphql/test/tester/TestGraphQlError.java | 5 +++-- .../graphql/test/tester/TypeRefAdapter.java | 7 ++++--- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/actuate/metrics/GraphQlTagsTests.java b/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/actuate/metrics/GraphQlTagsTests.java index 92086337..a872b315 100644 --- a/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/actuate/metrics/GraphQlTagsTests.java +++ b/graphql-spring-boot-starter/src/test/java/org/springframework/graphql/boot/actuate/metrics/GraphQlTagsTests.java @@ -19,14 +19,13 @@ package org.springframework.graphql.boot.actuate.metrics; import java.util.Arrays; import graphql.ErrorType; +import graphql.ExecutionResult; import graphql.ExecutionResultImpl; import graphql.GraphQLError; import graphql.GraphqlErrorBuilder; import io.micrometer.core.instrument.Tag; import org.junit.jupiter.api.Test; -import org.springframework.graphql.test.tester.TestExecutionResult; - import static org.assertj.core.api.Assertions.assertThat; /** @@ -38,13 +37,15 @@ class GraphQlTagsTests { @Test void executionOutcomeShouldSucceed() { - Tag outcomeTag = GraphQlTags.executionOutcome(new TestExecutionResult(), null); + ExecutionResult result = ExecutionResultImpl.newExecutionResult().build(); + Tag outcomeTag = GraphQlTags.executionOutcome(result, null); assertThat(outcomeTag.getValue()).isEqualTo("SUCCESS"); } @Test void executionOutcomeShouldErrorWhenExceptionThrown() { - Tag tag = GraphQlTags.executionOutcome(new TestExecutionResult(), new IllegalArgumentException("test error")); + ExecutionResult result = ExecutionResultImpl.newExecutionResult().build(); + Tag tag = GraphQlTags.executionOutcome(result, new IllegalArgumentException("test error")); assertThat(tag.getValue()).isEqualTo("ERROR"); } diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestExecutionResult.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestExecutionResult.java index df1f7c3c..b9949166 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestExecutionResult.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestExecutionResult.java @@ -26,14 +26,18 @@ import graphql.ExecutionResult; import graphql.ExecutionResultImpl; import graphql.GraphQLError; +import org.springframework.lang.Nullable; + /** - * {@link GraphQLError} with setters for deserialization. + * {@link GraphQLError} with setters, for internal use to use to deserialize + * from a response. * * @author Rossen Stoyanchev * @since 1.0.0 */ -public class TestExecutionResult implements ExecutionResult { +final class TestExecutionResult implements ExecutionResult { + @Nullable private Object data; private List errors = Collections.emptyList(); @@ -46,6 +50,7 @@ public class TestExecutionResult implements ExecutionResult { @Override @SuppressWarnings("unchecked") + @Nullable public T getData() { return (T) this.data; } @@ -75,7 +80,8 @@ public class TestExecutionResult implements ExecutionResult { @Override public Map toSpecification() { - ExecutionResultImpl.Builder builder = ExecutionResultImpl.newExecutionResult().addErrors(this.errors) + ExecutionResultImpl.Builder builder = ExecutionResultImpl.newExecutionResult() + .addErrors(this.errors) .extensions(this.extensions); if (isDataPresent()) { diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestGraphQlError.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestGraphQlError.java index 9b0028b1..eec9e3ec 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestGraphQlError.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TestGraphQlError.java @@ -30,12 +30,13 @@ import graphql.language.SourceLocation; import org.springframework.lang.Nullable; /** - * {@link GraphQLError} with setters to use for deserialization. + * {@link GraphQLError} with setters, for internal use to use to deserialize + * from a response. * * @author Rossen Stoyanchev */ @SuppressWarnings("serial") -class TestGraphQlError implements GraphQLError { +final class TestGraphQlError implements GraphQLError { @Nullable private String message; diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TypeRefAdapter.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TypeRefAdapter.java index 17f67a2d..5ca0f3a6 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TypeRefAdapter.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/TypeRefAdapter.java @@ -24,13 +24,14 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ResolvableType; /** - * {@link TypeRef} with a {@link #getType() type} that is given rather than obtained from - * the declared generic type information. + * Adapter for a JSONPath {@link TypeRef} with a {@link #getType() type} that + * returns fixed type information rather than obtained from the generic type + * declaration. * * @param the referenced type * @author Rossen Stoyanchev */ -class TypeRefAdapter extends TypeRef { +final class TypeRefAdapter extends TypeRef { private final Type type;