(deps) Updating to latest graphql-java:17.1

(deps) Adding graphql-java-extended-scalars 17.0 for non-standard scalars (BigInteger, BigDecimal, Char, Byte, Long, Short).
Removing GraphQLBatched as the deprecated `BatchedExecutionStrategy` was finally removed from graphql-java

Author: setchy

build.gradle

@@ -54,7 +54,9 @@ gradle.projectsEvaluated {
 
 dependencies {
     compile 'javax.validation:validation-api:1.1.0.Final'
-    compile 'com.graphql-java:graphql-java:17.0'
+    compile 'com.graphql-java:graphql-java:17.1'
+    compile 'com.graphql-java:graphql-java-extended-scalars:17.0'
+
 
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'

src/main/java/graphql/annotations/processor/typeFunctions/BigDecimalFunction.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.annotations.processor.typeFunctions;
+
+import graphql.annotations.processor.ProcessingElementsContainer;
+import graphql.scalars.ExtendedScalars;
+import graphql.schema.GraphQLType;
+import java.lang.reflect.AnnotatedType;
+import java.math.BigDecimal;
+
+public class BigDecimalFunction implements TypeFunction {
+    @Override
+    public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLBigDecimal.getName();
+    }
+
+    @Override
+    public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
+        return aClass == BigDecimal.class;
+    }
+
+    @Override
+    public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annotatedType, ProcessingElementsContainer container) {
+        return buildType(input, aClass, annotatedType);
+    }
+
+    private GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLBigDecimal;
+    }
+}

src/main/java/graphql/annotations/processor/typeFunctions/BigIntegerFunction.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.annotations.processor.typeFunctions;
+
+import graphql.annotations.processor.ProcessingElementsContainer;
+import graphql.scalars.ExtendedScalars;
+import graphql.schema.GraphQLType;
+import java.lang.reflect.AnnotatedType;
+import java.math.BigInteger;
+
+public class BigIntegerFunction implements TypeFunction {
+    @Override
+    public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLBigInteger.getName();
+    }
+
+    @Override
+    public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
+        return aClass == BigInteger.class;
+    }
+
+    @Override
+    public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annotatedType, ProcessingElementsContainer container) {
+        return buildType(input, aClass, annotatedType);
+    }
+
+    private GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLBigInteger;
+    }
+}

src/main/java/graphql/annotations/processor/typeFunctions/ByteFunction.java

@@ -0,0 +1,41 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.annotations.processor.typeFunctions;
+
+import graphql.annotations.processor.ProcessingElementsContainer;
+import graphql.scalars.ExtendedScalars;
+import graphql.schema.GraphQLType;
+import java.lang.reflect.AnnotatedType;
+
+public class ByteFunction implements TypeFunction {
+    @Override
+    public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLByte.getName();
+    }
+
+    @Override
+    public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
+        return aClass == Byte.class;
+    }
+
+    @Override
+    public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annotatedType, ProcessingElementsContainer container) {
+        return buildType(input, aClass, annotatedType);
+    }
+
+    private GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLByte;
+    }
+}

src/main/java/graphql/annotations/processor/typeFunctions/CharFunction.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.annotations.processor.typeFunctions;
+
+import graphql.annotations.processor.ProcessingElementsContainer;
+import graphql.scalars.ExtendedScalars;
+import graphql.schema.GraphQLType;
+import java.lang.reflect.AnnotatedType;
+
+public class CharFunction implements TypeFunction {
+
+    @Override
+    public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLChar.getName();
+    }
+
+    @Override
+    public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
+        return aClass == Character.class;
+    }
+
+    @Override
+    public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annotatedType, ProcessingElementsContainer container) {
+        return buildType(input, aClass, annotatedType);
+    }
+
+    private GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLChar;
+    }
+}

src/main/java/graphql/annotations/processor/typeFunctions/LongFunction.java

@@ -0,0 +1,44 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.annotations.processor.typeFunctions;
+
+import graphql.annotations.processor.ProcessingElementsContainer;
+import graphql.scalars.ExtendedScalars;
+import graphql.schema.GraphQLType;
+import java.lang.reflect.AnnotatedType;
+
+
+class LongFunction implements TypeFunction {
+
+    @Override
+    public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLLong.getName();
+    }
+
+    @Override
+    public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
+        return aClass == Long.class || aClass == long.class;
+    }
+
+    @Override
+    public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annotatedType, ProcessingElementsContainer container) {
+        return buildType(input,aClass,annotatedType);
+    }
+
+    private GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLLong;
+    }
+
+}

src/main/java/graphql/annotations/processor/typeFunctions/ShortFunction.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.annotations.processor.typeFunctions;
+
+import graphql.annotations.processor.ProcessingElementsContainer;
+import graphql.scalars.ExtendedScalars;
+import graphql.schema.GraphQLType;
+import java.lang.reflect.AnnotatedType;
+
+public class ShortFunction implements TypeFunction {
+    @Override
+    public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLShort.getName();
+    }
+
+    @Override
+    public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
+        return aClass == Short.class;
+    }
+
+    @Override
+    public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annotatedType, ProcessingElementsContainer container) {
+        return buildType(input, aClass, annotatedType);
+    }
+
+    private GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
+        return ExtendedScalars.GraphQLShort;
+    }
+}
+

src/test/java/graphql/annotations/processor/typeFunctions/BigDecimalFunctionTests.java

@@ -0,0 +1,34 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.annotations.processor.typeFunctions;
+
+import org.testng.annotations.Test;
+
+import java.math.BigDecimal;
+
+import static graphql.annotations.processor.typeFunctions.DefaultTypeFunctionTestHelper.testedDefaultTypeFunction;
+import static graphql.scalars.ExtendedScalars.GraphQLBigDecimal;
+import static org.testng.Assert.assertEquals;
+
+public class BigDecimalFunctionTests {
+    @Test
+    public void buildType_bigDecimalType_returnsGraphQLBigDecimal() {
+        //arrange
+        DefaultTypeFunction instance = testedDefaultTypeFunction();
+
+        //act+assert
+        assertEquals(instance.buildType(BigDecimal.class, null, null), GraphQLBigDecimal);
+    }
+}

src/test/java/graphql/annotations/processor/typeFunctions/BigIntegerFunctionTests.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.annotations.processor.typeFunctions;
+
+import static graphql.annotations.processor.typeFunctions.DefaultTypeFunctionTestHelper.testedDefaultTypeFunction;
+import static graphql.scalars.ExtendedScalars.GraphQLBigInteger;
+import static org.testng.Assert.assertEquals;
+
+import java.math.BigInteger;
+import org.testng.annotations.Test;
+
+public class BigIntegerFunctionTests {
+    @Test
+    public void buildType_bigIntegerType_returnsGraphQLBigInteger() {
+        //arrange
+        DefaultTypeFunction instance = testedDefaultTypeFunction();
+
+        //act+assert
+        assertEquals(instance.buildType(BigInteger.class, null, null), GraphQLBigInteger);
+    }
+}

src/test/java/graphql/annotations/processor/typeFunctions/ByteFunctionTests.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.annotations.processor.typeFunctions;
+
+import static graphql.annotations.processor.typeFunctions.DefaultTypeFunctionTestHelper.testedDefaultTypeFunction;
+import static graphql.scalars.ExtendedScalars.GraphQLByte;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
+public class ByteFunctionTests {
+    @Test
+    public void buildType_byteType_returnsGraphQLByte() {
+        //arrange
+        DefaultTypeFunction instance = testedDefaultTypeFunction();
+
+        //act+assert
+        assertEquals(instance.buildType(Byte.class, null,null), GraphQLByte);
+    }
+}