Upmerge fix

gentics · Dec 20, 2023 · 70e27d6 · 70e27d6
1 parent 24e8f58
commit 70e27d6
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/verticles/graphql/src/main/java/com/gentics/mesh/graphql/type/QueryTypeProvider.java b/verticles/graphql/src/main/java/com/gentics/mesh/graphql/type/QueryTypeProvider.java
@@ -635,9 +635,6 @@ public GraphQLSchema getRootSchema(GraphQLContext context) {
 			additionalTypes.add(schemaTypeProvider.createType(context));
 			additionalTypes.add(newPageType(SCHEMA_PAGE_TYPE_NAME, SCHEMA_TYPE_NAME));
 
-			additionalTypes.add(schemaTypeProvider.createType(context));
-			additionalTypes.add(newPageType(SCHEMA_PAGE_TYPE_NAME, SCHEMA_TYPE_NAME));
-
 			additionalTypes.add(microschemaTypeProvider.createType());
 			additionalTypes.add(newPageType(MICROSCHEMA_PAGE_TYPE_NAME, MICROSCHEMA_TYPE_NAME));
 
@@ -676,11 +673,6 @@ public GraphQLSchema getRootSchema(GraphQLContext context) {
 			additionalTypes.add(pluginProvider.createType());
 			additionalTypes.add(newPageType(PLUGIN_PAGE_TYPE_NAME, PLUGIN_TYPE_NAME));
 
-			// Shared argument types
-			additionalTypes.add(createLinkEnumType());
-			additionalTypes.add(createNodeEnumType());
-			additionalTypes.add(createNativeFilterEnumType());
-			additionalTypes.add(Sorting.getSortingEnumType());
 			additionalTypes.add(meshTypeProvider.createType());
 			additionalTypes.add(interfaceTypeProvider.createPermInfoType());
 			additionalTypes.add(fieldDefProvider.createBinaryFieldType());
@@ -689,6 +681,8 @@ public GraphQLSchema getRootSchema(GraphQLContext context) {
 			// Shared argument types
 			additionalTypes.add(createLinkEnumType());
 			additionalTypes.add(createNodeEnumType());
+			additionalTypes.add(createNativeFilterEnumType());
+			additionalTypes.add(Sorting.getSortingEnumType());
 
 			Versioned.doSince(2, context, () -> {
 				additionalTypes.addAll(nodeTypeProvider.generateSchemaFieldTypes(context).forVersion(context));