Updating to graphql-java 17.x and fixing the class constructors

Author: bbakerman

build.gradle

@@ -39,7 +39,7 @@ repositories {
 
 
 dependencies {
-    compile "com.graphql-java:graphql-java:16.1"
+    compile "com.graphql-java:graphql-java:0.0.0-2021-06-27T12-22-33-cd2bab76"
 
     testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
     testCompile 'org.codehaus.groovy:groovy-all:2.4.13'

src/main/java/graphql/scalars/ExtendedScalars.java

@@ -39,7 +39,7 @@ public class ExtendedScalars {
      * @see java.time.OffsetDateTime
      * @see java.time.ZonedDateTime
      */
-    public static GraphQLScalarType DateTime = new DateTimeScalar();
+    public static GraphQLScalarType DateTime = DateTimeScalar.INSTANCE;
 
     /**
      * An RFC-3339 compliant date scalar that accepts string values like `1996-12-19` and produces
@@ -52,7 +52,7 @@ public class ExtendedScalars {
      *
      * @see java.time.LocalDate
      */
-    public static GraphQLScalarType Date = new DateScalar();
+    public static GraphQLScalarType Date = DateScalar.INSTANCE;
     /**
      * An RFC-3339 compliant time scalar that accepts string values like `6:39:57-08:00` and produces
      * `java.time.OffsetTime` objects at runtime.
@@ -64,7 +64,7 @@ public class ExtendedScalars {
      *
      * @see java.time.OffsetTime
      */
-    public static GraphQLScalarType Time = new TimeScalar();
+    public static GraphQLScalarType Time = TimeScalar.INSTANCE;
 
     /**
      * An object scalar allows you to have a multi level data value without defining it in the graphql schema.
@@ -89,7 +89,7 @@ public class ExtendedScalars {
      *
      * @see #Json
      */
-    public static GraphQLScalarType Object = new ObjectScalar();
+    public static GraphQLScalarType Object = ObjectScalar.INSTANCE;
 
     /**
      * A synonym class for the {@link #Object} scalar, since some people prefer their SDL to look like the following :
@@ -106,68 +106,68 @@ public class ExtendedScalars {
      *
      * @see graphql.scalars.ExtendedScalars#Object
      */
-    public static GraphQLScalarType Json = new JsonScalar();
+    public static GraphQLScalarType Json = JsonScalar.INSTANCE;
 
     /**
      * A URL scalar that accepts URL strings and produces {@link java.net.URL} objects at runtime
      */
-    public static GraphQLScalarType Url = new UrlScalar();
+    public static GraphQLScalarType Url = UrlScalar.INSTANCE;
 
     /**
      * A Locale scalar that accepts a IETF BCP 47 language tag string and produces {@link
      * java.util.Locale} objects at runtime.
      */
-    public static GraphQLScalarType Locale = new LocaleScalar();
+    public static GraphQLScalarType Locale = LocaleScalar.INSTANCE;
 
     /**
      * An `Int` scalar that MUST be greater than zero
      *
      * @see graphql.Scalars#GraphQLInt
      */
-    public static GraphQLScalarType PositiveInt = new PositiveIntScalar();
+    public static GraphQLScalarType PositiveInt = PositiveIntScalar.INSTANCE;
     /**
      * An `Int` scalar that MUST be less than zero
      *
      * @see graphql.Scalars#GraphQLInt
      */
-    public static GraphQLScalarType NegativeInt = new NegativeIntScalar();
+    public static GraphQLScalarType NegativeInt = NegativeIntScalar.INSTANCE;
     /**
      * An `Int` scalar that MUST be less than or equal to zero
      *
      * @see graphql.Scalars#GraphQLInt
      */
-    public static GraphQLScalarType NonPositiveInt = new NonPositiveIntScalar();
+    public static GraphQLScalarType NonPositiveInt = NonPositiveIntScalar.INSTANCE;
     /**
      * An `Int` scalar that MUST be greater than or equal to zero
      *
      * @see graphql.Scalars#GraphQLInt
      */
-    public static GraphQLScalarType NonNegativeInt = new NonNegativeIntScalar();
+    public static GraphQLScalarType NonNegativeInt = NonNegativeIntScalar.INSTANCE;
 
     /**
      * An `Float` scalar that MUST be greater than zero
      *
      * @see graphql.Scalars#GraphQLFloat
      */
-    public static GraphQLScalarType PositiveFloat = new PositiveFloatScalar();
+    public static GraphQLScalarType PositiveFloat = PositiveFloatScalar.INSTANCE;
     /**
      * An `Float` scalar that MUST be less than zero
      *
      * @see graphql.Scalars#GraphQLFloat
      */
-    public static GraphQLScalarType NegativeFloat = new NegativeFloatScalar();
+    public static GraphQLScalarType NegativeFloat = NegativeFloatScalar.INSTANCE;
     /**
      * An `Float` scalar that MUST be less than or equal to zero
      *
      * @see graphql.Scalars#GraphQLFloat
      */
-    public static GraphQLScalarType NonPositiveFloat = new NonPositiveFloatScalar();
+    public static GraphQLScalarType NonPositiveFloat = NonPositiveFloatScalar.INSTANCE;
     /**
      * An `Float` scalar that MUST be greater than or equal to zero
      *
      * @see graphql.Scalars#GraphQLFloat
      */
-    public static GraphQLScalarType NonNegativeFloat = new NonNegativeFloatScalar();
+    public static GraphQLScalarType NonNegativeFloat = NonNegativeFloatScalar.INSTANCE;
 
 
     /**

src/main/java/graphql/scalars/alias/AliasedScalar.java

@@ -2,6 +2,7 @@
 
 import graphql.Assert;
 import graphql.Internal;
+import graphql.language.Value;
 import graphql.schema.Coercing;
 import graphql.schema.CoercingParseLiteralException;
 import graphql.schema.CoercingParseValueException;
@@ -14,7 +15,7 @@
  * Access this via {@link graphql.scalars.ExtendedScalars#newAliasedScalar(String)}
  */
 @Internal
-public class AliasedScalar extends GraphQLScalarType {
+public class AliasedScalar {
 
     /**
      * A builder for {@link graphql.scalars.alias.AliasedScalar}
@@ -63,20 +64,16 @@ public Builder aliasedScalar(GraphQLScalarType aliasedScalar) {
         /**
          * @return the built {@link AliasedScalar}
          */
-        public AliasedScalar build() {
+        public GraphQLScalarType build() {
             Assert.assertNotNull(name);
             return aliasedScalarImpl(name, description, aliasedScalar);
         }
     }
 
 
-    private AliasedScalar(String name, String description, Coercing coercing) {
-        super(name, description, coercing);
-    }
-
-    private static AliasedScalar aliasedScalarImpl(String name, String description, GraphQLScalarType aliasedScalar) {
+    private static GraphQLScalarType aliasedScalarImpl(String name, String description, GraphQLScalarType aliasedScalar) {
         Assert.assertNotNull(aliasedScalar);
-        return new AliasedScalar(name, description, new Coercing<Object, Object>() {
+        Coercing<Object, Object> coercing = new Coercing<Object, Object>() {
             @Override
             public Object serialize(Object input) throws CoercingSerializeException {
                 return aliasedScalar.getCoercing().serialize(input);
@@ -96,6 +93,16 @@ public Object parseLiteral(Object input) throws CoercingParseLiteralException {
             public Object parseLiteral(Object input, Map<String, Object> variables) throws CoercingParseLiteralException {
                 return aliasedScalar.getCoercing().parseLiteral(input, variables);
             }
-        });
+
+            @Override
+            public Value valueToLiteral(Object input) {
+                return aliasedScalar.getCoercing().valueToLiteral(input);
+            }
+        };
+        return GraphQLScalarType.newScalar()
+                .name(name)
+                .description(description)
+                .coercing(coercing)
+                .build();
     }
 }

src/main/java/graphql/scalars/datetime/DateScalar.java

@@ -21,12 +21,14 @@
  * Access this via {@link graphql.scalars.ExtendedScalars#Date}
  */
 @Internal
-public class DateScalar extends GraphQLScalarType {
+public class DateScalar  {
 
     private final static DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
-    public DateScalar() {
-        super("Date", "An RFC-3339 compliant Full Date Scalar", new Coercing<LocalDate, String>() {
+    public static GraphQLScalarType INSTANCE;
+
+    static {
+        Coercing<LocalDate, String> coercing = new Coercing<LocalDate, String>() {
             @Override
             public String serialize(Object input) throws CoercingSerializeException {
                 TemporalAccessor temporalAccessor;
@@ -87,7 +89,12 @@ private LocalDate parseLocalDate(String s, Function<String, RuntimeException> ex
                     throw exceptionMaker.apply("Invalid RFC3339 full date value : '" + s + "'. because of : '" + e.getMessage() + "'");
                 }
             }
-        });
-    }
+        };
 
+        INSTANCE = GraphQLScalarType.newScalar()
+                .name("Date")
+                .description("An RFC-3339 compliant Full Date Scalar")
+                .coercing(coercing)
+                .build();
+    }
 }

src/main/java/graphql/scalars/datetime/DateTimeScalar.java

@@ -21,10 +21,12 @@
  * Access this via {@link graphql.scalars.ExtendedScalars#DateTime}
  */
 @Internal
-public class DateTimeScalar extends GraphQLScalarType {
+public class DateTimeScalar {
 
-    public DateTimeScalar() {
-        super("DateTime", "An RFC-3339 compliant DateTime Scalar", new Coercing<OffsetDateTime, String>() {
+    public static GraphQLScalarType INSTANCE;
+
+    static {
+        Coercing<OffsetDateTime, String> coercing = new Coercing<OffsetDateTime, String>() {
             @Override
             public String serialize(Object input) throws CoercingSerializeException {
                 OffsetDateTime offsetDateTime;
@@ -82,7 +84,13 @@ private OffsetDateTime parseOffsetDateTime(String s, Function<String, RuntimeExc
                     throw exceptionMaker.apply("Invalid RFC3339 value : '" + s + "'. because of : '" + e.getMessage() + "'");
                 }
             }
-        });
+        };
+
+        INSTANCE = GraphQLScalarType.newScalar()
+                .name("DateTime")
+                .description("An RFC-3339 compliant DateTime Scalar")
+                .coercing(coercing)
+                .build();
     }
 
 }

src/main/java/graphql/scalars/datetime/TimeScalar.java

@@ -21,12 +21,14 @@
  * Access this via {@link graphql.scalars.ExtendedScalars#Time}
  */
 @Internal
-public class TimeScalar extends GraphQLScalarType {
+public class TimeScalar {
 
     private final static DateTimeFormatter dateFormatter = DateTimeFormatter.ISO_OFFSET_TIME;
 
-    public TimeScalar() {
-        super("Time", "An RFC-3339 compliant Full Time Scalar", new Coercing<OffsetTime, String>() {
+    public static GraphQLScalarType INSTANCE;
+
+    static {
+        Coercing<OffsetTime, String> coercing = new Coercing<OffsetTime, String>() {
             @Override
             public String serialize(Object input) throws CoercingSerializeException {
                 TemporalAccessor temporalAccessor;
@@ -87,7 +89,13 @@ private OffsetTime parseOffsetTime(String s, Function<String, RuntimeException>
                     throw exceptionMaker.apply("Invalid RFC3339 full time value : '" + s + "'. because of : '" + e.getMessage() + "'");
                 }
             }
-        });
+        };
+
+        INSTANCE = GraphQLScalarType.newScalar()
+                .name("Time")
+                .description("An RFC-3339 compliant Full Time Scalar")
+                .coercing(coercing)
+                .build();
     }
 
 }