Merge branch 'graphql-java-kickstart:master' into add-ability-to-pass-strings-to-graphqltesttemplate

Author: bsara

commitlint/package-lock.json

@@ -9,8 +9,8 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@commitlint/cli": "16.2.3",
-    "@commitlint/config-conventional": "16.2.1",
-    "husky": "7.0.4"
+    "@commitlint/cli": "17.0.2",
+    "@commitlint/config-conventional": "17.0.2",
+    "husky": "8.0.1"
   }
 }

commitlint/package.json

@@ -29,18 +29,18 @@ VCS=Git
 SOURCE_COMPATIBILITY=1.8
 TARGET_COMPATIBILITY=1.8
 ### Dependencies
-LIB_GRAPHQL_JAVA_VER=18.0
-LIB_EXTENDED_SCALARS_VER=17.0
-LIB_SPRING_BOOT_VER=2.6.6
+LIB_GRAPHQL_JAVA_VER=18.1
+LIB_EXTENDED_SCALARS_VER=18.1
+LIB_SPRING_BOOT_VER=2.7.0
 LIB_GRAPHQL_SERVLET_VER=13.0.0-SNAPSHOT
-LIB_GRAPHQL_JAVA_TOOLS_VER=12.0.2
+LIB_GRAPHQL_JAVA_TOOLS_VER=12.1.0
 LIB_GRAPHQL_ANNOTATIONS_VER=9.1
 LIB_REFLECTIONS_VER=0.10.2
 LIB_APACHE_COMMONS_TEXT_VER=1.9
 LIB_AWAITILITY_VER=4.2.0
-LIB_JSOUP_VER=1.14.3
+LIB_JSOUP_VER=1.15.1
 ### Plugins
 PLUGIN_JACOCO_VER=0.8.7
-PLUGIN_SONARQUBE_VER=3.3
+PLUGIN_SONARQUBE_VER=3.4.0.2513
 PLUGIN_NEXUS_STAGING_VER=0.30.0
 PLUGIN_GOOGLE_JAVA_FORMAT_VER=0.9

gradle.properties

@@ -15,6 +15,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.regex.Pattern;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -195,7 +196,7 @@ private String constructGraphQlEndpoint(
       String contextPath, @RequestParam Map<String, String> params) {
     String endpoint = graphiQLProperties.getEndpoint().getGraphql();
     for (Map.Entry<String, String> param : params.entrySet()) {
-      endpoint = endpoint.replaceAll("\\{" + param.getKey() + "}", param.getValue());
+      endpoint = endpoint.replaceAll("\\{" + Pattern.quote(param.getKey()) + "}", param.getValue());
     }
     if (StringUtils.isNotBlank(contextPath) && !endpoint.startsWith(contextPath)) {
       return contextPath + endpoint;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/graphiql/GraphiQLController.java

@@ -7,6 +7,7 @@
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Pattern;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringSubstitutor;
@@ -112,7 +113,7 @@ private String constructGraphQlEndpoint(
       String contextPath, @RequestParam Map<String, String> params) {
     String endpoint = voyagerConfiguration.getEndpoint();
     for (Map.Entry<String, String> param : params.entrySet()) {
-      endpoint = endpoint.replaceAll("\\{" + param.getKey() + "}", param.getValue());
+      endpoint = endpoint.replaceAll("\\{" + Pattern.quote(param.getKey()) + "}", param.getValue());
     }
     if (StringUtils.isNotBlank(contextPath) && !endpoint.startsWith(contextPath)) {
       return contextPath + endpoint;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/VoyagerIndexHtmlTemplate.java

@@ -34,9 +34,9 @@ void shouldThrowErrorOnStartupIfScalarDoesNotExists() {
             "Scalar(s) 'BugDecimal' cannot be aliased."
                 + " Only the following scalars can be aliased by configuration: BigDecimal,"
                 + " BigInteger, Boolean, Byte, Char, Date, DateTime, Float, ID, Int, JSON,"
-                + " Locale, Long, NegativeFloat, NegativeInt, NonNegativeFloat, NonNegativeInt,"
+                + " LocalTime, Locale, Long, NegativeFloat, NegativeInt, NonNegativeFloat, NonNegativeInt,"
                 + " NonPositiveFloat, NonPositiveInt, Object, PositiveFloat, PositiveInt, Short,"
-                + " String, Time, Url. Note that custom scalar beans cannot be aliased this way.");
+                + " String, Time, UUID, Url. Note that custom scalar beans cannot be aliased this way.");
   }
 
   @Test

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/test/aliasedscalars/AliasedScalarsIncorrectConfigurationTest.java

@@ -31,9 +31,9 @@ void shouldThrowErrorOnStartupIfExtendedScalarDoesNotExists() {
         .isThrownBy(application::run)
         .withMessage(
             "Invalid extended scalar name(s) found: BadDecimal, Datee. Valid names are: BigDecimal, "
-                + "BigInteger, Byte, Char, Date, DateTime, JSON, Locale, Long, NegativeFloat, NegativeInt, "
+                + "BigInteger, Byte, Char, Date, DateTime, JSON, LocalTime, Locale, Long, NegativeFloat, NegativeInt, "
                 + "NonNegativeFloat, NonNegativeInt, NonPositiveFloat, NonPositiveInt, Object, PositiveFloat, "
-                + "PositiveInt, Short, Time, Url.");
+                + "PositiveInt, Short, Time, UUID, Url.");
   }
 
   @Test