From bb4ebf6cb8ef91968f8f4e52bdf2bd191aafd511 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Sun, 20 Mar 2022 21:05:37 +0000 Subject: [PATCH] Correct names of AbstractDirectTransport and subclasses See gh-332 --- ...nsport.java => AbstractDirectGraphQlTransport.java} | 2 +- .../test/tester/DefaultGraphQlServiceTester.java | 8 ++++---- .../graphql/test/tester/DefaultWebGraphQlTester.java | 10 +++++----- ...nsport.java => GraphQlServiceGraphQlTransport.java} | 4 ++-- ...ort.java => WebGraphQlHandlerGraphQlTransport.java} | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) rename spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/{AbstractDirectTransport.java => AbstractDirectGraphQlTransport.java} (97%) rename spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/{GraphQlServiceTransport.java => GraphQlServiceGraphQlTransport.java} (90%) rename spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/{WebGraphQlHandlerTransport.java => WebGraphQlHandlerGraphQlTransport.java} (95%) diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/AbstractDirectTransport.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/AbstractDirectGraphQlTransport.java similarity index 97% rename from spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/AbstractDirectTransport.java rename to spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/AbstractDirectGraphQlTransport.java index 0c802b8a..188b31d1 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/AbstractDirectTransport.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/AbstractDirectGraphQlTransport.java @@ -43,7 +43,7 @@ import org.springframework.util.IdGenerator; * @author Rossen Stoyanchev * @since 1.0.0 */ -abstract class AbstractDirectTransport implements GraphQlTransport { +abstract class AbstractDirectGraphQlTransport implements GraphQlTransport { protected static final IdGenerator idGenerator = new AlternativeJdkIdGenerator(); diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlServiceTester.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlServiceTester.java index caeaa367..82491824 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlServiceTester.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlServiceTester.java @@ -32,12 +32,12 @@ import org.springframework.util.Assert; */ final class DefaultGraphQlServiceTester extends AbstractDelegatingGraphQlTester implements GraphQlServiceTester { - private final GraphQlServiceTransport transport; + private final GraphQlServiceGraphQlTransport transport; private final Consumer> builderInitializer; - DefaultGraphQlServiceTester(GraphQlTester tester, GraphQlServiceTransport transport, + DefaultGraphQlServiceTester(GraphQlTester tester, GraphQlServiceGraphQlTransport transport, Consumer> builderInitializer) { super(tester); @@ -71,13 +71,13 @@ final class DefaultGraphQlServiceTester extends AbstractDelegatingGraphQlTester this.service = service; } - Builder(GraphQlServiceTransport transport) { + Builder(GraphQlServiceGraphQlTransport transport) { this.service = transport.getGraphQlService(); } @Override public GraphQlServiceTester build() { - GraphQlServiceTransport transport = new GraphQlServiceTransport(this.service); + GraphQlServiceGraphQlTransport transport = new GraphQlServiceGraphQlTransport(this.service); GraphQlTester tester = super.buildGraphQlTester(transport); return new DefaultGraphQlServiceTester(tester, transport, getBuilderInitializer()); } diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java index ac4caba0..73a3da19 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultWebGraphQlTester.java @@ -37,12 +37,12 @@ import org.springframework.web.util.DefaultUriBuilderFactory; */ final class DefaultWebGraphQlTester extends AbstractDelegatingGraphQlTester implements WebGraphQlTester { - private final WebGraphQlHandlerTransport transport; + private final WebGraphQlHandlerGraphQlTransport transport; private final Consumer> builderInitializer; - DefaultWebGraphQlTester(GraphQlTester tester, WebGraphQlHandlerTransport transport, + DefaultWebGraphQlTester(GraphQlTester tester, WebGraphQlHandlerGraphQlTransport transport, Consumer> builderInitializer) { super(tester); @@ -78,7 +78,7 @@ final class DefaultWebGraphQlTester extends AbstractDelegatingGraphQlTester impl this.handler = handler; } - Builder(WebGraphQlHandlerTransport transport) { + Builder(WebGraphQlHandlerGraphQlTransport transport) { this.url = transport.getUrl(); this.headers.putAll(transport.getHeaders()); this.handler = transport.getGraphQlHandler(); @@ -124,8 +124,8 @@ final class DefaultWebGraphQlTester extends AbstractDelegatingGraphQlTester impl registerJsonPathMappingProvider(); - WebGraphQlHandlerTransport transport = - new WebGraphQlHandlerTransport(this.url, this.headers, this.handler, this.codecConfigurer); + WebGraphQlHandlerGraphQlTransport transport = + new WebGraphQlHandlerGraphQlTransport(this.url, this.headers, this.handler, this.codecConfigurer); GraphQlTester tester = super.buildGraphQlTester(transport); return new DefaultWebGraphQlTester(tester, transport, getBuilderInitializer()); diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlServiceTransport.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlServiceGraphQlTransport.java similarity index 90% rename from spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlServiceTransport.java rename to spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlServiceGraphQlTransport.java index f55a195f..ead1a4c6 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlServiceTransport.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlServiceGraphQlTransport.java @@ -31,12 +31,12 @@ import org.springframework.util.Assert; * @author Rossen Stoyanchev * @since 1.0.0 */ -final class GraphQlServiceTransport extends AbstractDirectTransport { +final class GraphQlServiceGraphQlTransport extends AbstractDirectGraphQlTransport { private final ExecutionGraphQlService graphQlService; - GraphQlServiceTransport(ExecutionGraphQlService graphQlService) { + GraphQlServiceGraphQlTransport(ExecutionGraphQlService graphQlService) { Assert.notNull(graphQlService, "GraphQlService is required"); this.graphQlService = graphQlService; } diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlHandlerTransport.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlHandlerGraphQlTransport.java similarity index 95% rename from spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlHandlerTransport.java rename to spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlHandlerGraphQlTransport.java index 6435995e..c3467c25 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlHandlerTransport.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlHandlerGraphQlTransport.java @@ -37,7 +37,7 @@ import org.springframework.lang.Nullable; * @author Rossen Stoyanchev * @since 1.0.0 */ -final class WebGraphQlHandlerTransport extends AbstractDirectTransport { +final class WebGraphQlHandlerGraphQlTransport extends AbstractDirectGraphQlTransport { private final URI url; @@ -48,7 +48,7 @@ final class WebGraphQlHandlerTransport extends AbstractDirectTransport { private final CodecConfigurer codecConfigurer; - WebGraphQlHandlerTransport( + WebGraphQlHandlerGraphQlTransport( @Nullable URI url, HttpHeaders headers, WebGraphQlHandler handler, CodecConfigurer configurer) { this.url = (url != null ? url : URI.create(""));