small fixes

Andy2003 · Andy2003 · commit 72e5c243992d · 2024-12-12T17:49:35.000+01:00
diff --git a/core/pom.xml b/core/pom.xml
@@ -160,4 +160,27 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+    <profiles>
+        <profile>
+            <id>create-test-file-diff</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>3.5.0</version>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <neo4j-graphql-java.generate-test-file-diff>true</neo4j-graphql-java.generate-test-file-diff>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/core/src/main/kotlin/org/neo4j/graphql/schema/model/outputs/BaseSelection.kt b/core/src/main/kotlin/org/neo4j/graphql/schema/model/outputs/BaseSelection.kt
@@ -37,13 +37,6 @@ open class BaseSelection<T : BaseSelection<T>>(
             prop.get(selection).forEach { field -> result[field.aliasOrName] = nestedProjection(field) }
         }
 
-//        fun <R: BaseSelection<R>> field(prop: KProperty1<R, List<BaseSelection<R>>>, value: BaseSelection<R>.() -> Unit) {
-//            prop.get(selection).forEach { field -> result[field.aliasOrName] = value() }
-//        }
-
-//        fun project(value: BaseSelection<*>.() -> Any?) {
-//            prop.get(selection).forEach { field -> result[field.aliasOrName] = value(BaseSelection()) }
-//        }
     }
 
 }
diff --git a/core/src/main/resources/lib_directives.graphql b/core/src/main/resources/lib_directives.graphql
@@ -39,14 +39,6 @@ directive @limit(
   max: Int
 ) on OBJECT | INTERFACE
 
-
-"Instructs neo4j-graphql-java to exclude create, delete or update operations from the mutation root type."
-directive @mutation(
-  "Describe operations available for this type"
-  operations: [MutationFields!]! = [ DELETE ]
-) on OBJECT | INTERFACE
-
-
 "Informs neo4j-graphql-java of node metadata"
 directive @node(
   "The labels to map this GraphQL type to in the Neo4j database",
@@ -118,7 +110,3 @@ input LimitInput {
   "Maximum limit to be used for queries."
   max: Int
 }
-
-enum MutationFields {
-  DELETE
-}
diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/AsciiDocTestSuite.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/AsciiDocTestSuite.kt
@@ -221,7 +221,7 @@ abstract class AsciiDocTestSuite<T>(
          * to find broken tests easy by its console output, enable this feature
          */
         val FLATTEN_TESTS = System.getProperty("neo4j-graphql-java.flatten-tests", "false") == "true"
-        val GENERATE_TEST_FILE_DIFF = System.getProperty("neo4j-graphql-java.generate-test-file-diff", "true") == "true"
+        val GENERATE_TEST_FILE_DIFF = System.getProperty("neo4j-graphql-java.generate-test-file-diff", "false") == "true"
         val REFORMAT_TEST_FILE = System.getProperty("neo4j-graphql-java.reformat", "false") == "true"
         val UPDATE_TEST_FILE = System.getProperty("neo4j-graphql-java.update-test-file", "false") == "true"
         val UPDATE_SEMANTIC_EQUALLY_BLOCKS =
diff --git a/core/src/test/resources/integration-test-files/directives/customResolver.adoc b/core/src/test/resources/integration-test-files/directives/customResolver.adoc
@@ -898,7 +898,7 @@ RETURN this {
 ----
 
 .GraphQL-Response
-[source,json,response=true]
+[source,json,response=true,ignore-order]
 ----
 {
   "users": [
diff --git a/core/src/test/resources/integration-test-files/filtering/advanced-filtering.adoc b/core/src/test/resources/integration-test-files/filtering/advanced-filtering.adoc
@@ -734,7 +734,7 @@ RETURN this {
 ----
 
 .GraphQL-Response
-[source,json,response=true]
+[source,json,response=true,ignore-order]
 ----
 {
   "movies": [
@@ -793,7 +793,7 @@ RETURN this {
 ----
 
 .GraphQL-Response
-[source,json,response=true]
+[source,json,response=true,ignore-order]
 ----
 {
   "movies": [
diff --git a/core/src/test/resources/integration-test-files/filtering/filter-union-relationship.adoc b/core/src/test/resources/integration-test-files/filtering/filter-union-relationship.adoc
@@ -231,7 +231,7 @@ RETURN this {
 ----
 
 .GraphQL-Response
-[source,json,response=true]
+[source,json,response=true,ignore-order]
 ----
 {
   "actors": [
diff --git a/core/src/test/resources/integration-test-files/filtering/operations.adoc b/core/src/test/resources/integration-test-files/filtering/operations.adoc
@@ -69,7 +69,7 @@ RETURN this {
 ----
 
 .GraphQL-Response
-[source,json,response=true]
+[source,json,response=true,ignore-order]
 ----
 {
   "movies": [
diff --git a/core/src/test/resources/integration-test-files/issues/360.adoc b/core/src/test/resources/integration-test-files/issues/360.adoc
@@ -112,7 +112,7 @@ RETURN this {
 ----
 
 .GraphQL-Response
-[source,json,response=true]
+[source,json,response=true,ignore-order]
 ----
 {
   "events": [
diff --git a/core/src/test/resources/integration-test-files/issues/4532.adoc b/core/src/test/resources/integration-test-files/issues/4532.adoc
@@ -273,7 +273,7 @@ RETURN this {
 ----
 
 .GraphQL-Response
-[source,json,response=true]
+[source,json,response=true,ignore-order]
 ----
 {
   "inventories": [
diff --git a/core/src/test/resources/integration-test-files/issues/5223-cartesian.adoc b/core/src/test/resources/integration-test-files/issues/5223-cartesian.adoc
@@ -166,7 +166,7 @@ RETURN {
 ----
 
 .GraphQL-Response
-[source,json,response=true]
+[source,json,response=true,ignore-order]
 ----
 {
   "locationsConnection": {
diff --git a/core/src/test/resources/integration-test-files/issues/5223-point.adoc b/core/src/test/resources/integration-test-files/issues/5223-point.adoc
@@ -166,7 +166,7 @@ RETURN {
 ----
 
 .GraphQL-Response
-[source,json,response=true]
+[source,json,response=true,ignore-order]
 ----
 {
   "locationsConnection": {
@@ -254,7 +254,7 @@ RETURN this {
 ----
 
 .GraphQL-Response
-[source,json,response=true]
+[source,json,response=true,ignore-order]
 ----
 {
   "locations": [
diff --git a/examples/dgs-spring-boot/src/test/kotlin/org/neo4j/graphql/examples/dgsspringboot/datafetcher/AdditionalDataFetcherTest.kt b/examples/dgs-spring-boot/src/test/kotlin/org/neo4j/graphql/examples/dgsspringboot/datafetcher/AdditionalDataFetcherTest.kt
@@ -145,6 +145,6 @@ internal class AdditionalDataFetcherTest(
 
     companion object {
         @Container
-        private val neo4jServer = Neo4jContainer<Nothing>("neo4j:5.24.0")
+        private val neo4jServer = Neo4jContainer<Nothing>("neo4j:5.24.1")
     }
 }
diff --git a/examples/graphql-kotlin-spring-boot/src/test/kotlin/org/neo4j/graphql/examples/graphqlspringboot/controller/QueriesIT.kt b/examples/graphql-kotlin-spring-boot/src/test/kotlin/org/neo4j/graphql/examples/graphqlspringboot/controller/QueriesIT.kt
@@ -111,7 +111,7 @@ internal class QueriesIT(
 
     companion object {
         @Container
-        private val neo4jServer = Neo4jContainer<Nothing>("neo4j:5.24.0")
+        private val neo4jServer = Neo4jContainer<Nothing>("neo4j:5.24.1")
 
     }
 
diff --git a/examples/graphql-spring-boot/src/test/java/org/neo4j/graphql/examples/graphqlspringboot/datafetcher/AdditionalDataFetcherTest.java b/examples/graphql-spring-boot/src/test/java/org/neo4j/graphql/examples/graphqlspringboot/datafetcher/AdditionalDataFetcherTest.java
@@ -33,7 +33,7 @@ class AdditionalDataFetcherTest {
     private Driver driver;
 
     @Container
-    private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>("neo4j:5.24.0");
+    private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>("neo4j:5.24.1");
 
 
     @BeforeEach

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,6 @@ open class BaseSelection<T : BaseSelection<T>>(`
`37`	`37`	`prop.get(selection).forEach { field -> result[field.aliasOrName] = nestedProjection(field) }`
`38`	`38`	`}`
`39`	`39`
`40`		`-// fun <R: BaseSelection<R>> field(prop: KProperty1<R, List<BaseSelection<R>>>, value: BaseSelection<R>.() -> Unit) {`
`41`		`-// prop.get(selection).forEach { field -> result[field.aliasOrName] = value() }`
`42`		`-// }`
`43`		`-`
`44`		`-// fun project(value: BaseSelection<*>.() -> Any?) {`
`45`		`-// prop.get(selection).forEach { field -> result[field.aliasOrName] = value(BaseSelection()) }`
`46`		`-// }`
`47`	`40`	`}`
`48`	`41`
`49`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -898,7 +898,7 @@ RETURN this {`
`898`	`898`	`----`
`899`	`899`
`900`	`900`	`.GraphQL-Response`
`901`		`-[source,json,response=true]`
	`901`	`+[source,json,response=true,ignore-order]`
`902`	`902`	`----`
`903`	`903`	`{`
`904`	`904`	`"users": [`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ RETURN this {`
`231`	`231`	`----`
`232`	`232`
`233`	`233`	`.GraphQL-Response`
`234`		`-[source,json,response=true]`
	`234`	`+[source,json,response=true,ignore-order]`
`235`	`235`	`----`
`236`	`236`	`{`
`237`	`237`	`"actors": [`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ RETURN this {`
`69`	`69`	`----`
`70`	`70`
`71`	`71`	`.GraphQL-Response`
`72`		`-[source,json,response=true]`
	`72`	`+[source,json,response=true,ignore-order]`
`73`	`73`	`----`
`74`	`74`	`{`
`75`	`75`	`"movies": [`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ RETURN this {`
`112`	`112`	`----`
`113`	`113`
`114`	`114`	`.GraphQL-Response`
`115`		`-[source,json,response=true]`
	`115`	`+[source,json,response=true,ignore-order]`
`116`	`116`	`----`
`117`	`117`	`{`
`118`	`118`	`"events": [`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ RETURN this {`
`273`	`273`	`----`
`274`	`274`
`275`	`275`	`.GraphQL-Response`
`276`		`-[source,json,response=true]`
	`276`	`+[source,json,response=true,ignore-order]`
`277`	`277`	`----`
`278`	`278`	`{`
`279`	`279`	`"inventories": [`