Skip to content

Commit 99ad71d

Browse files
dariuszkucdariuszkuc
committed
rename to graphql-kotlin-spring-server
1 parent 4b51f6b commit 99ad71d

File tree

21 files changed

+52
-44
lines changed

21 files changed

+52
-44
lines changed

‎graphql-kotlin-schema-generator/src/test/kotlin/com/expediagroup/graphql/generator/extensions/KClassExtensionsTest.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,9 @@ open class KClassExtensionsTest {
227227
assertFalse(InvalidFunctionUnionInterface::class.isUnion())
228228
}
229229

230-
// with Kotlin 1.3.40+ there is bug on JRE 1.8 that results in incorrect simple name of the anonymous classes
231-
// https://youtrack.jetbrains.com/issue/KT-23072
230+
// TODO remove JUnit condition once we only build artifacts using Java 11
231+
// BLOCKED: in order to publish to Maven Central we need to generate javadoc jar, blocked until Dokka https://github.com/Kotlin/dokka/issues/294 is resolved
232+
// ISSUE: with Kotlin 1.3.40+ there is bug on JRE 1.8 that results in incorrect simple name of the anonymous classes, see https://youtrack.jetbrains.com/issue/KT-23072
232233
@Test
233234
@EnabledOnJre(JRE.JAVA_11)
234235
fun `test class simple name`() {
@@ -238,6 +239,9 @@ open class KClassExtensionsTest {
238239
}
239240
}
240241

242+
// TODO remove this JUnit once we only build artifacts using Java 11
243+
// BLOCKED: in order to publish to Maven Central we need to generate javadoc jar, blocked until Dokka https://github.com/Kotlin/dokka/issues/294 is resolved
244+
// ISSUE: with Kotlin 1.3.40+ there is bug on JRE 1.8 that results in incorrect simple name of the anonymous classes, see https://youtrack.jetbrains.com/issue/KT-23072
241245
@Test
242246
@EnabledOnJre(JRE.JAVA_8)
243247
fun `test class simple name on JRE 8`() {

‎graphql-kotlin-schema-generator/src/test/kotlin/com/expediagroup/graphql/generator/extensions/KTypeExtensionsKtTest.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ internal class KTypeExtensionsKtTest {
9090
}
9191
}
9292

93-
// with Kotlin 1.3.40+ there is bug on JRE 1.8 that results in incorrect simple name of the anonymous classes
94-
// https://youtrack.jetbrains.com/issue/KT-23072
93+
// TODO remove JUnit condition once we only build artifacts using Java 11
94+
// BLOCKED: in order to publish to Maven Central we need to generate javadoc jar, blocked until Dokka https://github.com/Kotlin/dokka/issues/294 is resolved
95+
// ISSUE: with Kotlin 1.3.40+ there is bug on JRE 1.8 that results in incorrect simple name of the anonymous classes, see https://youtrack.jetbrains.com/issue/KT-23072
9596
@Test
9697
@EnabledOnJre(JRE.JAVA_11)
9798
fun getSimpleName() {
@@ -102,6 +103,9 @@ internal class KTypeExtensionsKtTest {
102103
}
103104
}
104105

106+
// TODO remove this JUnit once we only build artifacts using Java 11
107+
// BLOCKED: in order to publish to Maven Central we need to generate javadoc jar, blocked until Dokka https://github.com/Kotlin/dokka/issues/294 is resolved
108+
// ISSUE: with Kotlin 1.3.40+ there is bug on JRE 1.8 that results in incorrect simple name of the anonymous classes, see https://youtrack.jetbrains.com/issue/KT-23072
105109
@Test
106110
@EnabledOnJre(JRE.JAVA_8)
107111
fun getSimpleNameJava8() {

‎graphql-kotlin-boot-server/pom.xml renamed to ‎graphql-kotlin-spring-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<relativePath>..</relativePath>
99
</parent>
1010

11-
<artifactId>graphql-kotlin-boot-server</artifactId>
11+
<artifactId>graphql-kotlin-spring-server</artifactId>
1212
<packaging>jar</packaging>
1313

1414
<properties>
15-
<spring-boot.version>2.2.0.M5</spring-boot.version>
15+
<spring-boot.version>2.2.0.M6</spring-boot.version>
1616
</properties>
1717

1818
<dependencies>

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/FederationAutoConfiguration.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/FederationAutoConfiguration.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server
17+
package com.expediagroup.graphql.spring.server
1818

19-
import com.expediagroup.graphql.boot.server.annotation.Mutation
20-
import com.expediagroup.graphql.boot.server.annotation.Query
21-
import com.expediagroup.graphql.boot.server.annotation.Subscription
2219
import com.expediagroup.graphql.extensions.print
2320
import com.expediagroup.graphql.federation.FederatedSchemaGeneratorConfig
2421
import com.expediagroup.graphql.federation.FederatedSchemaGeneratorHooks
2522
import com.expediagroup.graphql.federation.execution.FederatedTypeRegistry
2623
import com.expediagroup.graphql.federation.toFederatedSchema
24+
import com.expediagroup.graphql.spring.server.annotation.Mutation
25+
import com.expediagroup.graphql.spring.server.annotation.Query
26+
import com.expediagroup.graphql.spring.server.annotation.Subscription
2727
import graphql.schema.GraphQLSchema
2828
import org.slf4j.LoggerFactory
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/GraphQLAutoConfiguration.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/GraphQLAutoConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server
17+
package com.expediagroup.graphql.spring.server
1818

19-
import com.expediagroup.graphql.boot.server.exception.KotlinDataFetcherExceptionHandler
19+
import com.expediagroup.graphql.spring.server.exception.KotlinDataFetcherExceptionHandler
2020
import graphql.GraphQL
2121
import graphql.execution.AsyncExecutionStrategy
2222
import graphql.execution.AsyncSerialExecutionStrategy

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/GraphQLConfigurationProperties.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/GraphQLConfigurationProperties.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server
17+
package com.expediagroup.graphql.spring.server
1818

1919
import org.springframework.boot.context.properties.ConfigurationProperties
2020

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/QueryHandler.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/QueryHandler.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server
17+
package com.expediagroup.graphql.spring.server
1818

19-
import com.expediagroup.graphql.boot.server.exception.SimpleKotlinGraphQLError
20-
import com.expediagroup.graphql.boot.server.model.GraphQLRequest
21-
import com.expediagroup.graphql.boot.server.model.GraphQLResponse
22-
import com.expediagroup.graphql.boot.server.model.toExecutionInput
23-
import com.expediagroup.graphql.boot.server.model.toGraphQLResponse
19+
import com.expediagroup.graphql.spring.server.exception.SimpleKotlinGraphQLError
20+
import com.expediagroup.graphql.spring.server.model.GraphQLRequest
21+
import com.expediagroup.graphql.spring.server.model.GraphQLResponse
22+
import com.expediagroup.graphql.spring.server.model.toExecutionInput
23+
import com.expediagroup.graphql.spring.server.model.toGraphQLResponse
2424
import graphql.ErrorType
2525
import graphql.GraphQL
2626
import kotlinx.coroutines.ExperimentalCoroutinesApi

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/RoutesConfiguration.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/RoutesConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server
17+
package com.expediagroup.graphql.spring.server
1818

19-
import com.expediagroup.graphql.boot.server.model.GraphQLRequest
2019
import com.expediagroup.graphql.extensions.print
20+
import com.expediagroup.graphql.spring.server.model.GraphQLRequest
2121
import com.fasterxml.jackson.databind.ObjectMapper
2222
import com.fasterxml.jackson.databind.type.MapType
2323
import com.fasterxml.jackson.databind.type.TypeFactory

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/SchemaAutoConfiguration.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/SchemaAutoConfiguration.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server
17+
package com.expediagroup.graphql.spring.server
1818

1919
import com.expediagroup.graphql.SchemaGeneratorConfig
2020
import com.expediagroup.graphql.TopLevelObject
21-
import com.expediagroup.graphql.boot.server.annotation.Mutation
22-
import com.expediagroup.graphql.boot.server.annotation.Query
23-
import com.expediagroup.graphql.boot.server.annotation.Subscription
2421
import com.expediagroup.graphql.extensions.print
22+
import com.expediagroup.graphql.spring.server.annotation.Mutation
23+
import com.expediagroup.graphql.spring.server.annotation.Query
24+
import com.expediagroup.graphql.spring.server.annotation.Subscription
2525
import com.expediagroup.graphql.toSchema
2626
import graphql.schema.GraphQLSchema
2727
import org.slf4j.LoggerFactory

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/SubscriptionAutoConfiguration.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/SubscriptionAutoConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server
17+
package com.expediagroup.graphql.spring.server
1818

19-
import com.expediagroup.graphql.boot.server.annotation.Subscription
19+
import com.expediagroup.graphql.spring.server.annotation.Subscription
2020
import com.fasterxml.jackson.databind.ObjectMapper
2121
import graphql.GraphQL
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/SubscriptionHandler.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/SubscriptionHandler.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server
17+
package com.expediagroup.graphql.spring.server
1818

19-
import com.expediagroup.graphql.boot.server.model.GraphQLRequest
20-
import com.expediagroup.graphql.boot.server.model.toExecutionInput
21-
import com.expediagroup.graphql.boot.server.model.toGraphQLResponse
19+
import com.expediagroup.graphql.spring.server.model.GraphQLRequest
20+
import com.expediagroup.graphql.spring.server.model.toExecutionInput
21+
import com.expediagroup.graphql.spring.server.model.toGraphQLResponse
2222
import com.fasterxml.jackson.databind.ObjectMapper
2323
import com.fasterxml.jackson.module.kotlin.readValue
2424
import graphql.ExecutionResult

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/annotation/Mutation.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/annotation/Mutation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server.annotation
17+
package com.expediagroup.graphql.spring.server.annotation
1818

1919
/**
2020
* Marker interface to easily autowire all GraphQL mutations.

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/annotation/Query.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/annotation/Query.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server.annotation
17+
package com.expediagroup.graphql.spring.server.annotation
1818

1919
/**
2020
* Marker interface to easily autowire all GraphQL queries.

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/annotation/Subscription.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/annotation/Subscription.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server.annotation
17+
package com.expediagroup.graphql.spring.server.annotation
1818

1919
/**
2020
* Marker interface to easily autowire all GraphQL subscriptions.

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/exception/KotlinDataFetcherExceptionHandler.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/exception/KotlinDataFetcherExceptionHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server.exception
17+
package com.expediagroup.graphql.spring.server.exception
1818

1919
import graphql.ExceptionWhileDataFetching
2020
import graphql.GraphQLError

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/exception/SimpleKotlinGraphQLError.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/exception/SimpleKotlinGraphQLError.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server.exception
17+
package com.expediagroup.graphql.spring.server.exception
1818

1919
import graphql.ErrorClassification
2020
import graphql.ErrorType

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/model/GraphQLRequest.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/model/GraphQLRequest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server.model
17+
package com.expediagroup.graphql.spring.server.model
1818

1919
import graphql.ExecutionInput
2020

‎graphql-kotlin-boot-server/src/main/kotlin/com/expediagroup/graphql/boot/server/model/GraphQLResponse.kt renamed to ‎graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/server/model/GraphQLResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.expediagroup.graphql.boot.server.model
17+
package com.expediagroup.graphql.spring.server.model
1818

1919
import com.fasterxml.jackson.annotation.JsonInclude
2020
import com.fasterxml.jackson.annotation.JsonInclude.Include

‎graphql-kotlin-boot-server/src/main/resources/META-INF/spring-configuration-metadata.json renamed to ‎graphql-kotlin-spring-server/src/main/resources/META-INF/spring-configuration-metadata.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
"name": "graphql.endpoint",
55
"type": "java.lang.String",
66
"defaultValue": "graphql",
7-
"sourceType": "com.expediagroup.graphql.boot.server.FederationConfigurationProperties"
7+
"sourceType": "com.expediagroup.graphql.spring.server.FederationConfigurationProperties"
88
},
99
{
1010
"name": "graphql.packages",
1111
"type": "java.util.List<java.lang.String>",
12-
"sourceType": "com.expediagroup.graphql.boot.server.FederationConfigurationProperties"
12+
"sourceType": "com.expediagroup.graphql.spring.server.FederationConfigurationProperties"
1313
},
1414
{
1515
"name": "graphql.federation.enabled",
1616
"type": "java.lang.Boolean",
17-
"sourceType": "com.expediagroup.graphql.boot.server.FederationConfigurationProperties"
17+
"sourceType": "com.expediagroup.graphql.spring.server.FederationConfigurationProperties"
1818
},
1919
{
2020
"name": "graphql.subscriptions.endpoint",
2121
"type": "java.lang.String",
2222
"defaultValue": "subscriptions",
23-
"sourceType": "com.expediagroup.graphql.boot.server.FederationConfigurationProperties"
23+
"sourceType": "com.expediagroup.graphql.spring.server.FederationConfigurationProperties"
2424
}
2525
]
2626
}

‎graphql-kotlin-boot-server/src/main/resources/META-INF/spring.factories renamed to ‎graphql-kotlin-spring-server/src/main/resources/META-INF/spring.factories

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.expediagroup.graphql.boot.server.GraphQLAutoConfiguration
1+
org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.expediagroup.graphql.spring.server.GraphQLAutoConfiguration

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<modules>
5353
<module>graphql-kotlin-schema-generator</module>
5454
<module>graphql-kotlin-federation</module>
55-
<module>graphql-kotlin-boot-server</module>
55+
<module>graphql-kotlin-spring-server</module>
5656
</modules>
5757

5858
<properties>

0 commit comments

Comments
 (0)