Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: graphql-java-kickstart/graphql-java-servlet
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v7.0.1
Choose a base ref
...
head repository: graphql-java-kickstart/graphql-java-servlet
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 12,254 additions and 5,740 deletions.
  1. +32 −0 .github/ISSUE_TEMPLATE/bug_report.md
  2. +5 −0 .github/ISSUE_TEMPLATE/config.yml
  3. +20 −0 .github/ISSUE_TEMPLATE/feature_request.md
  4. +37 −0 .github/add-javax-suffix.sh
  5. +17 −0 .github/release.sh
  6. +28 −0 .github/replaceJakartaWithJavax.sh
  7. +48 −0 .github/tag-release.sh
  8. +88 −0 .github/workflows/pull-request.yml
  9. +170 −0 .github/workflows/release.yml
  10. +171 −0 .github/workflows/snapshot.yml
  11. +5 −1 .gitignore
  12. +592 −0 .idea/codeStyles/Project.xml
  13. +5 −0 .idea/codeStyles/codeStyleConfig.xml
  14. +0 −5 .travis.yml
  15. +46 −0 CONTRIBUTING.md
  16. +52 −267 README.md
  17. +158 −171 build.gradle
  18. +107 −103 examples/osgi/apache-karaf-feature/pom.xml
  19. +8 −5 examples/osgi/apache-karaf-feature/src/main/feature/feature.xml
  20. +108 −108 examples/osgi/apache-karaf-package/pom.xml
  21. +4 −4 examples/osgi/buildAndRun.sh
  22. +20 −18 examples/osgi/pom.xml
  23. +50 −52 examples/osgi/providers/pom.xml
  24. +27 −26 examples/osgi/providers/src/main/java/graphql/servlet/examples/osgi/ExampleGraphQLProvider.java
  25. +21 −5 gradle.properties
  26. BIN gradle/wrapper/gradle-wrapper.jar
  27. +3 −2 gradle/wrapper/gradle-wrapper.properties
  28. +192 −112 gradlew
  29. +94 −84 gradlew.bat
  30. +2 −0 graphql-java-kickstart/bnd.bnd
  31. +19 −0 graphql-java-kickstart/build.gradle
  32. +20 −0 ...hql-java-kickstart/src/main/java/graphql/kickstart/execution/BatchedDataLoaderGraphQLBuilder.java
  33. +43 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/DecoratedExecutionResult.java
  34. +8 −0 ...hql-java-kickstart/src/main/java/graphql/kickstart/execution/DefaultGraphQLRootObjectBuilder.java
  35. +23 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/ExtensionsDeserializer.java
  36. +26 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureBatchedExecutionResult.java
  37. +26 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureErrorExecutionResult.java
  38. +29 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureExecutionResult.java
  39. +25 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/FutureSingleExecutionResult.java
  40. +22 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLBatchedQueryResult.java
  41. +27 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLErrorQueryResult.java
  42. +78 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLInvoker.java
  43. +11 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLInvokerProxy.java
  44. +222 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLObjectMapper.java
  45. +100 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLQueryInvoker.java
  46. +45 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLQueryResult.java
  47. +89 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLRequest.java
  48. +7 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLRootObjectBuilder.java
  49. +20 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLSingleQueryResult.java
  50. +12 −0 ...l-java-kickstart/src/main/java/graphql/kickstart/execution/ObjectMapDeserializationException.java
  51. +30 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/ObjectMapDeserializeHelper.java
  52. +43 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/OperationNameExtractor.java
  53. +19 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/StaticGraphQLRootObjectBuilder.java
  54. +16 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/StringUtils.java
  55. +23 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/VariablesDeserializer.java
  56. +42 −0 ...a-kickstart/src/main/java/graphql/kickstart/execution/config/ConfiguringObjectMapperProvider.java
  57. +43 −0 ...-kickstart/src/main/java/graphql/kickstart/execution/config/DefaultExecutionStrategyProvider.java
  58. +29 −0 ...java-kickstart/src/main/java/graphql/kickstart/execution/config/DefaultGraphQLSchemaProvider.java
  59. +12 −0 ...ql-java-kickstart/src/main/java/graphql/kickstart/execution/config/ExecutionStrategyProvider.java
  60. +93 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/GraphQLBuilder.java
  61. +8 −0 ...hql-java-kickstart/src/main/java/graphql/kickstart/execution/config/GraphQLBuilderConfigurer.java
  62. +16 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/config/GraphQLSchemaProvider.java
  63. +9 −0 ...kstart/src/main/java/graphql/kickstart/execution/config/GraphQLServletObjectMapperConfigurer.java
  64. +3 −2 ...hql-java-kickstart/src/main/java/graphql/kickstart/execution/config}/InstrumentationProvider.java
  65. +3 −2 ...raphql-java-kickstart/src/main/java/graphql/kickstart/execution/config}/ObjectMapperProvider.java
  66. +48 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/context/ContextSetting.java
  67. +8 −0 ...start/src/main/java/graphql/kickstart/execution/context/ContextSettingNotConfiguredException.java
  68. +48 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/context/DefaultGraphQLContext.java
  69. +10 −0 ...ava-kickstart/src/main/java/graphql/kickstart/execution/context/DefaultGraphQLContextBuilder.java
  70. +7 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/context/GraphQLContextBuilder.java
  71. +28 −0 ...hql-java-kickstart/src/main/java/graphql/kickstart/execution/context/GraphQLKickstartContext.java
  72. +63 −0 ...ql-java-kickstart/src/main/java/graphql/kickstart/execution/error/DefaultGraphQLErrorHandler.java
  73. +17 −0 .../src/main/java/graphql/kickstart/execution/error/DefaultGraphQLServletObjectMapperConfigurer.java
  74. +36 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/GenericGraphQLError.java
  75. +14 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/error/GraphQLErrorHandler.java
  76. +51 −0 ...start/src/main/java/graphql/kickstart/execution/error/RenderableNonNullableFieldWasNullError.java
  77. +23 −0 ...java-kickstart/src/main/java/graphql/kickstart/execution/input/GraphQLBatchedInvocationInput.java
  78. +7 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/input/GraphQLInvocationInput.java
  79. +53 −0 ...-java-kickstart/src/main/java/graphql/kickstart/execution/input/GraphQLSingleInvocationInput.java
  80. +43 −0 ...ava-kickstart/src/main/java/graphql/kickstart/execution/input/PerQueryBatchedInvocationInput.java
  81. +41 −0 ...a-kickstart/src/main/java/graphql/kickstart/execution/input/PerRequestBatchedInvocationInput.java
  82. +177 −0 ...kickstart/src/main/java/graphql/kickstart/execution/instrumentation/AbstractTrackingApproach.java
  83. +43 −0 ...in/java/graphql/kickstart/execution/instrumentation/DataLoaderDispatcherInstrumentationState.java
  84. +30 −0 ...ckstart/src/main/java/graphql/kickstart/execution/instrumentation/FieldLevelTrackingApproach.java
  85. +13 −0 ...kstart/src/main/java/graphql/kickstart/execution/instrumentation/NoOpInstrumentationProvider.java
  86. +26 −0 ...start/src/main/java/graphql/kickstart/execution/instrumentation/RequestLevelTrackingApproach.java
  87. +347 −0 graphql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/RequestStack.java
  88. +46 −0 ...ql-java-kickstart/src/main/java/graphql/kickstart/execution/instrumentation/TrackingApproach.java
  89. +8 −0 ...ickstart/src/main/java/graphql/kickstart/execution/instrumentation/TrackingApproachException.java
  90. +26 −0 ...start/src/main/java/graphql/kickstart/execution/subscriptions/AtomicSubscriptionSubscription.java
  91. +105 −0 ...kickstart/src/main/java/graphql/kickstart/execution/subscriptions/DefaultSubscriptionSession.java
  92. +9 −0 ...ain/java/graphql/kickstart/execution/subscriptions/GraphQLSubscriptionInvocationInputFactory.java
  93. +50 −0 ...-kickstart/src/main/java/graphql/kickstart/execution/subscriptions/GraphQLSubscriptionMapper.java
  94. +66 −0 ...hql-java-kickstart/src/main/java/graphql/kickstart/execution/subscriptions/SessionSubscriber.java
  95. +54 −0 ...-java-kickstart/src/main/java/graphql/kickstart/execution/subscriptions/SessionSubscriptions.java
  96. +4 −0 ...start/src/main/java/graphql/kickstart/execution/subscriptions/SubscriptionConnectionListener.java
  97. +18 −0 ...java-kickstart/src/main/java/graphql/kickstart/execution/subscriptions/SubscriptionException.java
  98. +23 −0 ...ickstart/src/main/java/graphql/kickstart/execution/subscriptions/SubscriptionProtocolFactory.java
  99. +50 −0 ...l-java-kickstart/src/main/java/graphql/kickstart/execution/subscriptions/SubscriptionSession.java
  100. +37 −0 ...ckstart/src/main/java/graphql/kickstart/execution/subscriptions/apollo/ApolloCommandProvider.java
  101. +27 −0 ...n/java/graphql/kickstart/execution/subscriptions/apollo/ApolloSubscriptionConnectionListener.java
  102. +31 −0 ...rt/src/main/java/graphql/kickstart/execution/subscriptions/apollo/ApolloSubscriptionConsumer.java
  103. +68 −0 ...main/java/graphql/kickstart/execution/subscriptions/apollo/ApolloSubscriptionKeepAliveRunner.java
  104. +93 −0 ...main/java/graphql/kickstart/execution/subscriptions/apollo/ApolloSubscriptionProtocolFactory.java
  105. +29 −0 ...art/src/main/java/graphql/kickstart/execution/subscriptions/apollo/ApolloSubscriptionSession.java
  106. +44 −0 ...ava/graphql/kickstart/execution/subscriptions/apollo/KeepAliveSubscriptionConnectionListener.java
  107. +76 −0 ...va-kickstart/src/main/java/graphql/kickstart/execution/subscriptions/apollo/OperationMessage.java
  108. +8 −0 ...kickstart/src/main/java/graphql/kickstart/execution/subscriptions/apollo/SubscriptionCommand.java
  109. +27 −0 ...main/java/graphql/kickstart/execution/subscriptions/apollo/SubscriptionConnectionInitCommand.java
  110. +21 −0 ...java/graphql/kickstart/execution/subscriptions/apollo/SubscriptionConnectionTerminateCommand.java
  111. +56 −0 ...tart/src/main/java/graphql/kickstart/execution/subscriptions/apollo/SubscriptionStartCommand.java
  112. +17 −0 ...start/src/main/java/graphql/kickstart/execution/subscriptions/apollo/SubscriptionStopCommand.java
  113. +4 −0 graphql-java-servlet/bnd.bnd
  114. +46 −0 graphql-java-servlet/build.gradle
  115. +89 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AbstractGraphQLHttpServlet.java
  116. +22 −0 ...ql-java-servlet/src/main/java/graphql/kickstart/servlet/AbstractGraphQLInvocationInputParser.java
  117. +7 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AsyncTaskDecorator.java
  118. +22 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AsyncTaskExecutor.java
  119. +14 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AsyncTimeoutListener.java
  120. +60 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/BatchedQueryResponseWriter.java
  121. +17 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/ConfiguredGraphQLHttpServlet.java
  122. +18 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/ErrorQueryResponseWriter.java
  123. +64 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/ExecutionResultSubscriber.java
  124. +285 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLConfiguration.java
  125. +73 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLGetInvocationInputParser.java
  126. +18 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLHttpServlet.java
  127. +43 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLInvocationInputParser.java
  128. +182 −0 ...l-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLMultipartInvocationInputParser.java
  129. +49 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLPostInvocationInputParser.java
  130. +290 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLWebsocketServlet.java
  131. +17 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/HttpRequestHandler.java
  132. +75 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/HttpRequestHandlerImpl.java
  133. +14 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/HttpRequestInvoker.java
  134. +222 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/HttpRequestInvokerImpl.java
  135. +8 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/InvocationInputParseException.java
  136. +82 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/ListenerHandler.java
  137. +258 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/OsgiGraphQLHttpServlet.java
  138. +16 −0 ...hql-java-servlet/src/main/java/graphql/kickstart/servlet/OsgiGraphQLHttpServletConfiguration.java
  139. +251 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/OsgiSchemaBuilder.java
  140. +8 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/PartIOException.java
  141. +10 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/QueryResponseWriter.java
  142. +12 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/QueryResponseWriterFactory.java
  143. +31 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/QueryResponseWriterFactoryImpl.java
  144. +56 −0 ...l-java-servlet/src/main/java/graphql/kickstart/servlet/SingleAsynchronousQueryResponseWriter.java
  145. +28 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/SingleQueryResponseWriter.java
  146. +13 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/StaticDataPublisher.java
  147. +33 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/SubscriptionAsyncListener.java
  148. +48 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/apollo/ApolloScalars.java
  149. +60 −0 ...et/src/main/java/graphql/kickstart/servlet/apollo/ApolloWebSocketSubscriptionProtocolFactory.java
  150. +37 −0 ...va-servlet/src/main/java/graphql/kickstart/servlet/apollo/ApolloWebSocketSubscriptionSession.java
  151. +142 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/cache/BufferedHttpServletResponse.java
  152. +52 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/cache/CacheReader.java
  153. +67 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/cache/CachedResponse.java
  154. +52 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/cache/CachingHttpRequestInvoker.java
  155. +59 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/cache/CachingQueryResponseWriter.java
  156. +28 −0 ...java-servlet/src/main/java/graphql/kickstart/servlet/cache/CachingQueryResponseWriterFactory.java
  157. +38 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/cache/GraphQLResponseCacheManager.java
  158. +30 −0 ...a-servlet/src/main/java/graphql/kickstart/servlet/config/DefaultGraphQLSchemaServletProvider.java
  159. +29 −0 ...hql-java-servlet/src/main/java/graphql/kickstart/servlet/config/GraphQLSchemaServletProvider.java
  160. +113 −0 ...ql-java-servlet/src/main/java/graphql/kickstart/servlet/context/DefaultGraphQLServletContext.java
  161. +31 −0 ...-servlet/src/main/java/graphql/kickstart/servlet/context/DefaultGraphQLServletContextBuilder.java
  162. +77 −0 ...-java-servlet/src/main/java/graphql/kickstart/servlet/context/DefaultGraphQLWebSocketContext.java
  163. +20 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/context/GraphQLServletContext.java
  164. +16 −0 ...ql-java-servlet/src/main/java/graphql/kickstart/servlet/context/GraphQLServletContextBuilder.java
  165. +13 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/context/GraphQLWebSocketContext.java
  166. +23 −0 ...ql-java-servlet/src/main/java/graphql/kickstart/servlet/core/DefaultGraphQLRootObjectBuilder.java
  167. +10 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/core/GraphQLMBean.java
  168. +63 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/core/GraphQLServletListener.java
  169. +12 −0 ...ql-java-servlet/src/main/java/graphql/kickstart/servlet/core/GraphQLServletRootObjectBuilder.java
  170. +24 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/core/internal/GraphQLThreadFactory.java
  171. +8 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/core/internal/VariableMapException.java
  172. +84 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/core/internal/VariableMapper.java
  173. +52 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/input/BatchInputPreProcessResult.java
  174. +22 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/input/BatchInputPreProcessor.java
  175. +183 −0 ...hql-java-servlet/src/main/java/graphql/kickstart/servlet/input/GraphQLInvocationInputFactory.java
  176. +17 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/input/NoOpBatchInputPreProcessor.java
  177. +8 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/osgi/GraphQLCodeRegistryProvider.java
  178. +12 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/osgi/GraphQLDirectiveProvider.java
  179. +9 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/osgi/GraphQLFieldProvider.java
  180. +13 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/osgi/GraphQLMutationProvider.java
  181. +3 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/osgi/GraphQLProvider.java
  182. +11 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/osgi/GraphQLQueryProvider.java
  183. +13 −0 graphql-java-servlet/src/main/java/graphql/kickstart/servlet/osgi/GraphQLSubscriptionProvider.java
  184. +3 −3 ...et → graphql-java-servlet/src/main/java/graphql/kickstart/servlet/osgi}/GraphQLTypesProvider.java
  185. +52 −0 ...a-servlet/src/main/java/graphql/kickstart/servlet/subscriptions/FallbackSubscriptionConsumer.java
  186. +39 −0 ...et/src/main/java/graphql/kickstart/servlet/subscriptions/FallbackSubscriptionProtocolFactory.java
  187. +54 −0 ...l-java-servlet/src/main/java/graphql/kickstart/servlet/subscriptions/WebSocketSendSubscriber.java
  188. +12 −0 ...t/src/main/java/graphql/kickstart/servlet/subscriptions/WebSocketSubscriptionProtocolFactory.java
  189. +36 −0 ...a-servlet/src/main/java/graphql/kickstart/servlet/subscriptions/WebSocketSubscriptionSession.java
  190. +1,229 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/AbstractGraphQLHttpServletSpec.groovy
  191. +55 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/BatchedQueryResponseWriterTest.groovy
  192. +171 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/DataLoaderDispatchingSpec.groovy
  193. +44 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/GraphQLServletListenerSpec.groovy
  194. +409 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/OsgiGraphQLHttpServletSpec.groovy
  195. +13 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/PartIOExceptionTest.groovy
  196. +72 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/RequestTester.groovy
  197. +34 −0 ...ervlet/src/test/groovy/graphql/kickstart/servlet/SingleAsynchronousQueryResponseWriterTest.groovy
  198. +39 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/SingleQueryResponseWriterTest.groovy
  199. +26 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/TestBatchInputPreProcessor.java
  200. +1 −1 ...vy/graphql → graphql-java-servlet/src/test/groovy/graphql/kickstart}/servlet/TestException.groovy
  201. +32 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/TestGraphQLErrorException.groovy
  202. +74 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/TestMultipartPart.groovy
  203. +271 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/TestUtils.groovy
  204. +84 −0 graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/cache/CacheReaderTest.groovy
  205. +102 −0 ...java-servlet/src/test/groovy/graphql/kickstart/servlet/cache/CachingHttpRequestInvokerTest.groovy
  206. +1 −0 lombok.config
  207. +5 −0 renovate.json
  208. +3 −0 settings.gradle
  209. +0 −440 src/main/java/graphql/servlet/AbstractGraphQLHttpServlet.java
  210. +0 −41 src/main/java/graphql/servlet/ApolloScalars.java
  211. +0 −42 src/main/java/graphql/servlet/ApolloSubscriptionConnectionListener.java
  212. +0 −18 src/main/java/graphql/servlet/ConfiguredGraphQLHttpServlet.java
  213. +0 −32 src/main/java/graphql/servlet/ConfiguringObjectMapperProvider.java
  214. +0 −49 src/main/java/graphql/servlet/DefaultExecutionStrategyProvider.java
  215. +0 −24 src/main/java/graphql/servlet/DefaultGraphQLContextBuilder.java
  216. +0 −64 src/main/java/graphql/servlet/DefaultGraphQLErrorHandler.java
  217. +0 −7 src/main/java/graphql/servlet/DefaultGraphQLRootObjectBuilder.java
  218. +0 −45 src/main/java/graphql/servlet/DefaultGraphQLSchemaProvider.java
  219. +0 −33 src/main/java/graphql/servlet/DefaultGraphQLServlet.java
  220. +0 −13 src/main/java/graphql/servlet/DefaultObjectMapperConfigurer.java
  221. +0 −9 src/main/java/graphql/servlet/ExecutionStrategyProvider.java
  222. +0 −37 src/main/java/graphql/servlet/GenericGraphQLError.java
  223. +0 −30 src/main/java/graphql/servlet/GraphQLBatchedInvocationInput.java
  224. +0 −124 src/main/java/graphql/servlet/GraphQLConfiguration.java
  225. +0 −122 src/main/java/graphql/servlet/GraphQLContext.java
  226. +0 −19 src/main/java/graphql/servlet/GraphQLContextBuilder.java
  227. +0 −16 src/main/java/graphql/servlet/GraphQLErrorHandler.java
  228. +0 −45 src/main/java/graphql/servlet/GraphQLHttpServlet.java
  229. +0 −54 src/main/java/graphql/servlet/GraphQLInvocationInput.java
  230. +0 −139 src/main/java/graphql/servlet/GraphQLInvocationInputFactory.java
  231. +0 −7 src/main/java/graphql/servlet/GraphQLMBean.java
  232. +0 −9 src/main/java/graphql/servlet/GraphQLMutationProvider.java
  233. +0 −195 src/main/java/graphql/servlet/GraphQLObjectMapper.java
  234. +0 −4 src/main/java/graphql/servlet/GraphQLProvider.java
  235. +0 −148 src/main/java/graphql/servlet/GraphQLQueryInvoker.java
  236. +0 −17 src/main/java/graphql/servlet/GraphQLQueryProvider.java
  237. +0 −17 src/main/java/graphql/servlet/GraphQLRootObjectBuilder.java
  238. +0 −41 src/main/java/graphql/servlet/GraphQLSchemaProvider.java
  239. +0 −19 src/main/java/graphql/servlet/GraphQLServletListener.java
  240. +0 −23 src/main/java/graphql/servlet/GraphQLSingleInvocationInput.java
  241. +0 −184 src/main/java/graphql/servlet/GraphQLWebsocketServlet.java
  242. +0 −12 src/main/java/graphql/servlet/NoOpInstrumentationProvider.java
  243. +0 −10 src/main/java/graphql/servlet/ObjectMapperConfigurer.java
  244. +0 −299 src/main/java/graphql/servlet/OsgiGraphQLHttpServlet.java
  245. +0 −52 src/main/java/graphql/servlet/RenderableNonNullableFieldWasNullError.java
  246. +0 −121 src/main/java/graphql/servlet/SimpleGraphQLHttpServlet.java
  247. +0 −28 src/main/java/graphql/servlet/StaticGraphQLRootObjectBuilder.java
  248. +0 −7 src/main/java/graphql/servlet/SubscriptionConnectionListener.java
  249. +0 −18 src/main/java/graphql/servlet/SubscriptionException.java
  250. +0 −64 src/main/java/graphql/servlet/internal/ApolloSubscriptionKeepAliveRunner.java
  251. +0 −30 src/main/java/graphql/servlet/internal/ApolloSubscriptionProtocolFactory.java
  252. +0 −227 src/main/java/graphql/servlet/internal/ApolloSubscriptionProtocolHandler.java
  253. +0 −23 src/main/java/graphql/servlet/internal/ExecutionResultHandler.java
  254. +0 −18 src/main/java/graphql/servlet/internal/FallbackSubscriptionProtocolFactory.java
  255. +0 −49 src/main/java/graphql/servlet/internal/FallbackSubscriptionProtocolHandler.java
  256. +0 −57 src/main/java/graphql/servlet/internal/GraphQLRequest.java
  257. +0 −39 src/main/java/graphql/servlet/internal/SubscriptionHandlerInput.java
  258. +0 −18 src/main/java/graphql/servlet/internal/SubscriptionProtocolFactory.java
  259. +0 −95 src/main/java/graphql/servlet/internal/SubscriptionProtocolHandler.java
  260. +0 −24 src/main/java/graphql/servlet/internal/SubscriptionSender.java
  261. +0 −76 src/main/java/graphql/servlet/internal/VariableMapper.java
  262. +0 −38 src/main/java/graphql/servlet/internal/VariablesDeserializer.java
  263. +0 −53 src/main/java/graphql/servlet/internal/WsSessionSubscriptions.java
  264. +0 −1,056 src/test/groovy/graphql/servlet/AbstractGraphQLHttpServletSpec.groovy
  265. +0 −82 src/test/groovy/graphql/servlet/OsgiGraphQLHttpServletSpec.groovy
  266. +0 −32 src/test/groovy/graphql/servlet/TestGraphQLErrorException.groovy
  267. +0 −73 src/test/groovy/graphql/servlet/TestMultipartPart.groovy
  268. +0 −74 src/test/groovy/graphql/servlet/TestUtils.groovy
  269. +0 −27 travis-build.sh
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Question
url: https://github.com/graphql-java-kickstart/graphql-java-servlet/discussions
about: Anything you are not sure about? Ask the community in Discussions!
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
37 changes: 37 additions & 0 deletions .github/add-javax-suffix.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/bash

addSuffix() {
local result
result=$(grep include settings.gradle | awk '{print $2}' | tr -d "'" | tr -d ':')
readarray -t <<<"$result"
modules=("${MAPFILE[@]}")

updateLocalDependencies
}

updateLocalDependencies() {
for module in "${modules[@]}"; do
cp -rf "$module" "$module"-javax
rm -rf "$module"

for dependency in "${modules[@]}"; do
sed -i -E "s/project\(('|\"):${dependency}('|\")\)/project\(':${dependency}-javax'\)/" "$module"-"javax"/build.gradle
done
done

updateGradleSettings
}

updateGradleSettings() {
for module in "${modules[@]}"; do
echo "Replace ${module} with ${module}-javax in settings.gradle"
sed -i -E "s/('|\"):${module}('|\")/':${module}-javax'/" settings.gradle
done

cat settings.gradle
}

echo "Add suffix -javax to modules"
addSuffix

ls -lh
17 changes: 17 additions & 0 deletions .github/release.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash
set -ev

FLAVOUR="${1}"

removeSnapshots() {
sed -i 's/-SNAPSHOT//' gradle.properties
}

echo "Publishing release to Maven Central"
removeSnapshots

if [ "${FLAVOUR}" == 'javax' ]; then
.github/add-javax-suffix.sh
fi

./gradlew clean build publishToSonatype closeAndReleaseSonatypeStagingRepository
28 changes: 28 additions & 0 deletions .github/replaceJakartaWithJavax.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/bash

# Set jdk11 as source and target
sed -i 's/SOURCE_COMPATIBILITY=.*/SOURCE_COMPATIBILITY=11/' gradle.properties
sed -i 's/TARGET_COMPATIBILITY=.*/TARGET_COMPATIBILITY=11/' gradle.properties

# Replace jakarta imports and dependencies with javax
grep -rl 'import jakarta' ./graphql-java-servlet | xargs sed -i 's/import jakarta/import javax/g'
sed -i 's/.*jakarta.websocket:jakarta.websocket-client-api.*//' graphql-java-servlet/build.gradle
sed -i \
's/jakarta.servlet:jakarta.servlet-api.*/javax.servlet:javax.servlet-api:$LIB_JAVAX_SERVLET"/' \
graphql-java-servlet/build.gradle
sed -i \
's/jakarta.websocket.*/javax.websocket:javax.websocket-api:$LIB_JAVAX_WEBSOCKET"/' \
graphql-java-servlet/build.gradle

# Final check if there are something else to replace
grep -rl 'jakarta' ./graphql-java-servlet | xargs sed -i 's/jakarta/javax/g'

# Set the version 5 for spring framework
sed -i \
's/org.springframework:spring-test.*/org.springframework:spring-test:$LIB_SPRINGFRAMEWORK_5"/' \
graphql-java-servlet/build.gradle
sed -i \
's/org.springframework:spring-web.*/org.springframework:spring-web:$LIB_SPRINGFRAMEWORK_5"/' \
graphql-java-servlet/build.gradle

echo "Replaced jakarta occurrences with javax"
48 changes: 48 additions & 0 deletions .github/tag-release.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/bin/bash
set -ev

getVersion() {
./gradlew properties -q | grep -E "^version" | awk '{print $2}' | tr -d '[:space:]'
}

removeSnapshots() {
sed -i 's/-SNAPSHOT//' gradle.properties
}

commitRelease() {
local APP_VERSION
APP_VERSION=$(getVersion)
git commit -a -m "Update version for release"
git tag -a "v${APP_VERSION}" -m "Tag release version"
}

bumpVersion() {
echo "Bump version number"
local APP_VERSION
APP_VERSION=$(getVersion | xargs)
local SEMANTIC_REGEX='^([0-9]+)\.([0-9]+)(\.([0-9]+))?$'
if [[ ${APP_VERSION} =~ ${SEMANTIC_REGEX} ]]; then
if [[ ${BASH_REMATCH[4]} ]]; then
nextVersion=$((BASH_REMATCH[4] + 1))
nextVersion="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${nextVersion}-SNAPSHOT"
else
nextVersion=$((BASH_REMATCH[2] + 1))
nextVersion="${BASH_REMATCH[1]}.${nextVersion}-SNAPSHOT"
fi

echo "Next version: ${nextVersion}"
sed -i -E "s/^version(\s)?=.*/version=${nextVersion}/" gradle.properties
git commit -a -m "Bumped version for next release"
else
echo "No semantic version and therefore cannot publish to maven repository: '${APP_VERSION}'"
fi
}

git config --global user.email "actions@github.com"
git config --global user.name "GitHub Actions"

echo "Deploying release to Maven Central"
removeSnapshots
commitRelease
bumpVersion
git push --follow-tags
88 changes: 88 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: "Pull request"
on:
pull_request:
types: [ opened, synchronize, reopened ]

jobs:
validation:
name: Gradle Wrapper Validation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v3

test:
name: Test run
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
java: [ 17, 19 ]
needs: validation
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
- name: Cache Gradle
uses: actions/cache@v4
env:
java-version: ${{ matrix.java }}
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
- name: Make gradlew executable (non-Windows only)
if: matrix.os != 'windows-latest'
run: chmod +x ./gradlew
- name: Gradle Check (non-Windows)
if: matrix.os != 'windows-latest'
run: ./gradlew --info check
- name: Gradle Check (Windows)
if: matrix.os == 'windows-latest'
shell: cmd
run: gradlew --info check

build:
name: Sonar analysis
needs: validation
runs-on: ubuntu-latest
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
steps:
- uses: actions/checkout@v4
if: env.SONAR_TOKEN != null
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 17
if: env.SONAR_TOKEN != null
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: Cache SonarCloud packages
if: env.SONAR_TOKEN != null
uses: actions/cache@v4
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Gradle packages
if: env.SONAR_TOKEN != null
uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- name: Build and analyze
if: env.SONAR_TOKEN != null
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: ./gradlew build jacocoTestReport sonarqube --info
Loading