Merge branch 'master' into spring-boot-2.4-upgrade

Author: oliemansm

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/main/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsAutoConfiguration.java

@@ -1,6 +1,7 @@
 package graphql.kickstart.graphql.annotations;
 
 import static graphql.annotations.AnnotationsSchemaCreator.newAnnotationsSchema;
+import static java.util.Objects.nonNull;
 
 import graphql.annotations.AnnotationsSchemaCreator;
 import graphql.annotations.annotationTypes.GraphQLField;
@@ -54,7 +55,14 @@ public GraphQLInterfaceTypeResolver graphQLInterfaceTypeResolver() {
   @Bean
   @ConditionalOnMissingBean
   public GraphQLAnnotations graphQLAnnotations() {
-    return new GraphQLAnnotations();
+    GraphQLAnnotations graphQLAnnotations = new GraphQLAnnotations();
+    if (nonNull(graphQLAnnotationsProperties.getInputPrefix())) {
+      graphQLAnnotations.getContainer().setInputPrefix(graphQLAnnotationsProperties.getInputPrefix());
+    }
+    if (nonNull(graphQLAnnotationsProperties.getInputSuffix())) {
+      graphQLAnnotations.getContainer().setInputSuffix(graphQLAnnotationsProperties.getInputSuffix());
+    }
+    return graphQLAnnotations;
   }
 
   @Bean

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/main/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsProperties.java

@@ -28,10 +28,24 @@ public class GraphQLAnnotationsProperties {
   @Builder.Default
   private boolean alwaysPrettify = true;
 
+  /**
+   * The prefix to use for input type names.
+   * If not configured the default prefix of the GraphQL-Java Annotations library is used.
+   * Configure an empty prefix for clearing the library's default prefix.
+   */
+  private String inputPrefix;
+
+  /**
+   * The suffix to use for input type names.
+   * If not configured the default suffix of the GraphQL-Java Annotations library is used.
+   */
+  private String inputSuffix;
+
   /**
    * If set to <code>true</code> abstract classes implementing a GraphQL interface will not be added to the schema.
    * Defaults to <code>false</code> for backward compatibility.
    */
   @Builder.Default
   private boolean ignoreAbstractInterfaceImplementations = false;
+
 }

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsMutationInputPrefixTest.java

@@ -0,0 +1,31 @@
+package graphql.kickstart.graphql.annotations;
+
+import graphql.schema.GraphQLSchema;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("Testing input prefix")
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+  properties = {
+    "graphql.annotations.input-prefix=Prefix",
+    "graphql.annotations.input-suffix="
+  }
+)
+@ActiveProfiles({"test", "mutation-test"})
+class GraphQLAnnotationsMutationInputPrefixTest {
+
+  @Autowired
+  private GraphQLSchema graphQLSchema;
+
+  @Test
+  @DisplayName("Assert that input prefix is used.")
+  void testInputPrefix() {
+    // THEN
+    assertThat(graphQLSchema.getType("PrefixTestModel")).isNotNull();
+  }
+}

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsMutationInputSuffixTest.java

@@ -0,0 +1,31 @@
+package graphql.kickstart.graphql.annotations;
+
+import graphql.schema.GraphQLSchema;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("Testing input suffix")
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+  properties = {
+    "graphql.annotations.input-prefix=",
+    "graphql.annotations.input-suffix=Suffix"
+  }
+)
+@ActiveProfiles({"test", "mutation-test"})
+class GraphQLAnnotationsMutationInputSuffixTest {
+
+  @Autowired
+  private GraphQLSchema graphQLSchema;
+
+  @Test
+  @DisplayName("Assert that input suffix is used.")
+  void testInputSuffix() {
+    // THEN
+    assertThat(graphQLSchema.getType("TestModelSuffix")).isNotNull();
+  }
+}

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsMutationTest.java

@@ -5,6 +5,7 @@
 import com.graphql.spring.boot.test.GraphQLResponse;
 import com.graphql.spring.boot.test.GraphQLTestTemplate;
 import java.io.IOException;
+import graphql.schema.GraphQLSchema;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,9 @@ class GraphQLAnnotationsMutationTest {
   @Autowired
   private GraphQLTestTemplate graphQLTestTemplate;
 
+  @Autowired
+  private GraphQLSchema graphQLSchema;
+
   @Test
   @DisplayName("Assert that mutation resolver is properly registered.")
   void testMutationResolver() throws IOException {
@@ -28,4 +32,11 @@ void testMutationResolver() throws IOException {
     // THEN
     assertThat(actual.get("$.data.performSomeOperation.testField")).isEqualTo("Test value");
   }
+
+  @Test
+  @DisplayName("Assert that library's default input prefix and suffix are used.")
+  void testInputPrefix() {
+    // THEN
+    assertThat(graphQLSchema.getType("InputTestModel")).isNotNull();
+  }
 }

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/test/mutation/TestMutation.java

@@ -11,4 +11,9 @@ public class TestMutation {
   public static TestModel performSomeOperation() {
     return new TestModel("Test value");
   }
+
+  @GraphQLField
+  public static TestModel performSomeOperationWithArgument(TestModel input) {
+    return new TestModel("Test value");
+  }
 }

voyager-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -29,6 +29,11 @@
       "name": "voyager.cdn.version",
       "defaultValue": "v1.x",
       "type": "java.lang.String"
+    },
+    {
+      "name": "voyager.static.basePath",
+      "defaultValue": "/",
+      "type": "java.lang.String"
     }
   ]
-}
+}