Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit 0f3a581

Browse files
oliemansmoliemansm
committed
Fix build errors after renaming base package
1 parent c979135 commit 0f3a581

File tree

8 files changed

+42
-43
lines changed

8 files changed

+42
-43
lines changed

‎example-request-scoped-dataloader/src/main/java/graphql/servlet/examples/dataloader/requestscope/CustomGraphQLContextBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import graphql.kickstart.execution.context.DefaultGraphQLContext;
44
import graphql.kickstart.execution.context.GraphQLContext;
5-
import graphql.servlet.context.DefaultGraphQLServletContext;
6-
import graphql.servlet.context.DefaultGraphQLWebSocketContext;
7-
import graphql.servlet.context.GraphQLServletContextBuilder;
5+
import graphql.kickstart.servlet.context.DefaultGraphQLServletContext;
6+
import graphql.kickstart.servlet.context.DefaultGraphQLWebSocketContext;
7+
import graphql.kickstart.servlet.context.GraphQLServletContextBuilder;
88
import java.util.concurrent.CompletableFuture;
99
import javax.servlet.http.HttpServletRequest;
1010
import javax.servlet.http.HttpServletResponse;

‎example-spring-common/src/main/java/graphql/kickstart/spring/web/boot/sample/schema/TodoSchema.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,22 @@
1919

2020
package graphql.kickstart.spring.web.boot.sample.schema;
2121

22-
import graphql.kickstart.spring.web.boot.sample.TodoSimpleListConnection;
23-
import graphql.kickstart.spring.web.boot.sample.schema.objecttype.RootObjectType;
24-
import graphql.kickstart.spring.web.boot.sample.schema.objecttype.TodoObjectType;
25-
import graphql.kickstart.spring.web.boot.sample.schema.objecttype.UserObjectType;
2622
import com.oembedler.moon.graphql.engine.stereotype.GraphQLDescription;
2723
import com.oembedler.moon.graphql.engine.stereotype.GraphQLIn;
2824
import com.oembedler.moon.graphql.engine.stereotype.GraphQLMutation;
2925
import com.oembedler.moon.graphql.engine.stereotype.GraphQLOut;
3026
import com.oembedler.moon.graphql.engine.stereotype.GraphQLSchema;
3127
import com.oembedler.moon.graphql.engine.stereotype.GraphQLSchemaQuery;
32-
import graphql.servlet.context.GraphQLServletContext;
33-
34-
import javax.servlet.http.Part;
28+
import graphql.kickstart.servlet.context.GraphQLServletContext;
29+
import graphql.kickstart.spring.web.boot.sample.TodoSimpleListConnection;
30+
import graphql.kickstart.spring.web.boot.sample.schema.objecttype.RootObjectType;
31+
import graphql.kickstart.spring.web.boot.sample.schema.objecttype.TodoObjectType;
32+
import graphql.kickstart.spring.web.boot.sample.schema.objecttype.UserObjectType;
3533
import java.util.ArrayList;
3634
import java.util.Collection;
3735
import java.util.List;
3836
import java.util.stream.Collectors;
37+
import javax.servlet.http.Part;
3938

4039
@GraphQLSchema
4140
public class TodoSchema {

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLInstrumentationAutoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package graphql.kickstart.spring.web.boot;
22

3+
import graphql.kickstart.servlet.GraphQLWebsocketServlet;
34
import graphql.kickstart.spring.web.boot.metrics.MetricsInstrumentation;
45
import graphql.kickstart.spring.web.boot.metrics.TracingNoResolversInstrumentation;
56
import graphql.kickstart.spring.web.boot.metrics.WebsocketMetrics;
67
import graphql.analysis.MaxQueryComplexityInstrumentation;
78
import graphql.analysis.MaxQueryDepthInstrumentation;
89
import graphql.execution.instrumentation.tracing.TracingInstrumentation;
9-
import graphql.servlet.GraphQLWebsocketServlet;
1010
import io.micrometer.core.instrument.MeterRegistry;
1111
import org.springframework.beans.factory.annotation.Value;
1212
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLWebsocketAutoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import graphql.kickstart.execution.subscriptions.GraphQLSubscriptionInvocationInputFactory;
99
import graphql.kickstart.execution.subscriptions.SubscriptionConnectionListener;
1010
import graphql.kickstart.execution.subscriptions.apollo.KeepAliveSubscriptionConnectionListener;
11+
import graphql.kickstart.servlet.GraphQLWebsocketServlet;
1112
import graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration;
12-
import graphql.servlet.GraphQLWebsocketServlet;
1313
import java.time.Duration;
1414
import java.util.Collection;
1515
import java.util.HashSet;

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLWsServerEndpointRegistration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package graphql.kickstart.spring.web.boot;
22

3-
import graphql.servlet.GraphQLWebsocketServlet;
3+
import graphql.kickstart.servlet.GraphQLWebsocketServlet;
44
import org.springframework.context.Lifecycle;
55
import org.springframework.web.socket.server.standard.ServerEndpointRegistration;
66

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/metrics/WebsocketMetrics.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package graphql.kickstart.spring.web.boot.metrics;
22

3-
import graphql.servlet.GraphQLWebsocketServlet;
3+
import graphql.kickstart.servlet.GraphQLWebsocketServlet;
44
import io.micrometer.core.instrument.Gauge;
55
import io.micrometer.core.instrument.MeterRegistry;
66

77
public class WebsocketMetrics {
88

9-
public WebsocketMetrics(MeterRegistry meterRegistry, GraphQLWebsocketServlet websocketServlet) {
10-
Gauge.builder("graphql.websocket.sessions", websocketServlet, GraphQLWebsocketServlet::getSessionCount)
11-
.description("Active websocket sessions available for subscriptions")
12-
.register(meterRegistry);
13-
Gauge.builder("graphql.websocket.subscriptions", websocketServlet, GraphQLWebsocketServlet::getSubscriptionCount)
14-
.description("Active websocket subscriptions")
15-
.register(meterRegistry);
16-
}
9+
public WebsocketMetrics(MeterRegistry meterRegistry, GraphQLWebsocketServlet websocketServlet) {
10+
Gauge.builder("graphql.websocket.sessions", websocketServlet, GraphQLWebsocketServlet::getSessionCount)
11+
.description("Active websocket sessions available for subscriptions")
12+
.register(meterRegistry);
13+
Gauge.builder("graphql.websocket.subscriptions", websocketServlet, GraphQLWebsocketServlet::getSubscriptionCount)
14+
.description("Active websocket subscriptions")
15+
.register(meterRegistry);
16+
}
1717

1818
}

‎graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/spring/web/boot/test/web/GraphQLWebAutoConfigurationTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package graphql.kickstart.spring.web.boot.test.web;
22

3+
import graphql.kickstart.servlet.AbstractGraphQLHttpServlet;
4+
import graphql.kickstart.servlet.config.DefaultGraphQLSchemaServletProvider;
5+
import graphql.kickstart.servlet.config.GraphQLSchemaServletProvider;
36
import graphql.kickstart.spring.web.boot.GraphQLWebAutoConfiguration;
47
import graphql.kickstart.spring.web.boot.test.AbstractAutoConfigurationTest;
58
import graphql.analysis.MaxQueryComplexityInstrumentation;
@@ -9,9 +12,6 @@
912
import graphql.execution.instrumentation.tracing.TracingInstrumentation;
1013
import graphql.schema.GraphQLObjectType;
1114
import graphql.schema.GraphQLSchema;
12-
import graphql.servlet.AbstractGraphQLHttpServlet;
13-
import graphql.servlet.config.DefaultGraphQLSchemaServletProvider;
14-
import graphql.servlet.config.GraphQLSchemaServletProvider;
1515
import org.junit.Assert;
1616
import org.junit.Test;
1717
import org.springframework.context.annotation.Bean;

‎graphql-spring-boot-test-autoconfigure/src/main/java/com/graphql/spring/boot/test/GraphQLTest.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package com.graphql.spring.boot.test;
22

3-
import graphql.kickstart.tools.GraphQLResolver;
4-
import graphql.kickstart.tools.SchemaParserDictionary;
5-
import graphql.kickstart.tools.SchemaParserOptions;
6-
import graphql.kickstart.spring.web.boot.GraphQLInstrumentationAutoConfiguration;
7-
import graphql.kickstart.spring.web.boot.GraphQLWebAutoConfiguration;
3+
import static org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE;
4+
85
import graphql.execution.ExecutionStrategy;
96
import graphql.execution.instrumentation.Instrumentation;
107
import graphql.execution.preparsed.PreparsedDocumentProvider;
@@ -13,16 +10,27 @@
1310
import graphql.kickstart.execution.GraphQLRootObjectBuilder;
1411
import graphql.kickstart.execution.config.ExecutionStrategyProvider;
1512
import graphql.kickstart.execution.config.GraphQLSchemaProvider;
16-
import graphql.kickstart.execution.config.ObjectMapperConfigurer;
13+
import graphql.kickstart.execution.config.GraphQLServletObjectMapperConfigurer;
1714
import graphql.kickstart.execution.context.GraphQLContextBuilder;
1815
import graphql.kickstart.execution.error.GraphQLErrorHandler;
16+
import graphql.kickstart.servlet.GraphQLWebsocketServlet;
17+
import graphql.kickstart.servlet.SimpleGraphQLHttpServlet;
18+
import graphql.kickstart.servlet.core.GraphQLServletListener;
19+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
20+
import graphql.kickstart.spring.web.boot.GraphQLInstrumentationAutoConfiguration;
21+
import graphql.kickstart.spring.web.boot.GraphQLWebAutoConfiguration;
22+
import graphql.kickstart.tools.GraphQLResolver;
23+
import graphql.kickstart.tools.SchemaParserDictionary;
24+
import graphql.kickstart.tools.SchemaParserOptions;
1925
import graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration;
2026
import graphql.schema.GraphQLScalarType;
2127
import graphql.schema.GraphQLSchema;
2228
import graphql.schema.idl.SchemaParser;
23-
import graphql.servlet.*;
24-
import graphql.servlet.core.GraphQLServletListener;
25-
import graphql.servlet.input.GraphQLInvocationInputFactory;
29+
import java.lang.annotation.ElementType;
30+
import java.lang.annotation.Retention;
31+
import java.lang.annotation.RetentionPolicy;
32+
import java.lang.annotation.Target;
33+
import javax.servlet.MultipartConfigElement;
2634
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2735
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
2836
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -36,16 +44,8 @@
3644
import org.springframework.core.annotation.AliasFor;
3745
import org.springframework.test.context.ActiveProfiles;
3846
import org.springframework.web.filter.CorsFilter;
39-
40-
import javax.servlet.MultipartConfigElement;
41-
import java.lang.annotation.ElementType;
42-
import java.lang.annotation.Retention;
43-
import java.lang.annotation.RetentionPolicy;
44-
import java.lang.annotation.Target;
4547
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
4648

47-
import static org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE;
48-
4949
/**
5050
* Annotation that can be specified on a test class in combination with {@code @RunWith(SpringRunner.class)}
5151
* for running tests that focus <strong>only</strong> on GraphQL components.
@@ -134,7 +134,7 @@ ComponentScan.Filter[] includeFilters() default {
134134
ExecutionStrategy.class,
135135
GraphQLContextBuilder.class,
136136
GraphQLRootObjectBuilder.class,
137-
ObjectMapperConfigurer.class,
137+
GraphQLServletObjectMapperConfigurer.class,
138138
PreparsedDocumentProvider.class,
139139
CorsFilter.class,
140140
ExecutionStrategyProvider.class,

0 commit comments

Comments
 (0)