Merge pull request #278 from Enigmatis/gql-java-7

Gql java 17.1 - Version 9.0

Author: yarinvak

.github/workflows/build.yml

@@ -3,12 +3,11 @@
 
 name: Build
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment: prod
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 8
@@ -20,8 +19,6 @@ jobs:
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew build
-      - name: Test with Gradle
-        run: ./gradlew test
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v2
         if: always() # always run even if the previous step fails

README.md

@@ -37,7 +37,7 @@ If you would like to use a tool that creates a graphql spring boot server using
 
 ```groovy
 dependencies {
-  compile "io.github.graphql-java:graphql-java-annotations:8.5"
+  compile "io.github.graphql-java:graphql-java-annotations:9.0"
 }
 ```
 
@@ -47,7 +47,7 @@ dependencies {
 <dependency>
     <groupId>io.github.graphql-java</groupId>
     <artifactId>graphql-java-annotations</artifactId>
-    <version>8.5</version>
+    <version>9.0</version>
 </dependency>
 ```
 

build.gradle

@@ -54,7 +54,9 @@ gradle.projectsEvaluated {
 
 dependencies {
     compile 'javax.validation:validation-api:1.1.0.Final'
-    compile 'com.graphql-java:graphql-java:16.2'
+    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'

gradle.properties

@@ -5,4 +5,4 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
 
-version = 8.5
+version = 9.0

src/main/java/graphql/annotations/annotationTypes/GraphQLBatched.java

@@ -12,7 +12,6 @@
  */
 package graphql.annotations.dataFetchers;
 
-import graphql.annotations.annotationTypes.GraphQLBatched;
 import graphql.annotations.annotationTypes.GraphQLConstructor;
 import graphql.annotations.annotationTypes.GraphQLInvokeDetached;
 import graphql.annotations.annotationTypes.GraphQLName;
@@ -69,7 +68,7 @@ public T get(DataFetchingEnvironment environment) {
             T obj;
             if (Modifier.isStatic(method.getModifiers())) {
                 return (T) method.invoke(null, invocationArgs(environment, container));
-            } else if (method.isAnnotationPresent(GraphQLBatched.class) || method.isAnnotationPresent(GraphQLInvokeDetached.class)) {
+            } else if (method.isAnnotationPresent(GraphQLInvokeDetached.class)) {
                 obj = newInstance((Class<T>) method.getDeclaringClass());
             } else if (!method.getDeclaringClass().isInstance(environment.getSource())) {
                 obj = newInstance((Class<T>) method.getDeclaringClass(), environment.getSource());

src/main/java/graphql/annotations/dataFetchers/BatchedMethodDataFetcher.java

@@ -97,7 +97,7 @@ private GraphQLDirective transformArgs(GraphQLDirective graphQLDirective, Annota
 
         for (int i = annotation.annotationType().getDeclaredMethods().length; i < arguments.size(); i++) {
             int finalI = i;
-            directiveBuilder.argument(arguments.get(i).transform(builder -> builder.value(arguments.get(finalI).getDefaultValue())));
+            directiveBuilder.argument(arguments.get(i).transform(builder -> builder.value(arguments.get(finalI).getArgumentDefaultValue().getValue())));
         }
         return directiveBuilder.build();
     }
@@ -118,7 +118,7 @@ private GraphQLDirective transformArgs(GraphQLDirective graphQLDirective, String
 
         for (int i = argumentValues.length; i < arguments.size(); i++) {
             int finalI = i;
-            directiveBuilder.argument(arguments.get(i).transform(builder -> builder.value(arguments.get(finalI).getDefaultValue())));
+            directiveBuilder.argument(arguments.get(i).transform(builder -> builder.value(arguments.get(finalI).getArgumentDefaultValue().getValue())));
         }
         return directiveBuilder.build();
     }

src/main/java/graphql/annotations/dataFetchers/MethodDataFetcher.java

@@ -14,11 +14,9 @@
  */
 package graphql.annotations.processor.retrievers.fieldBuilders.method;
 
-import graphql.annotations.annotationTypes.GraphQLBatched;
 import graphql.annotations.annotationTypes.GraphQLDataFetcher;
 import graphql.annotations.annotationTypes.GraphQLRelayMutation;
 import graphql.annotations.connection.GraphQLConnection;
-import graphql.annotations.dataFetchers.BatchedMethodDataFetcher;
 import graphql.annotations.dataFetchers.MethodDataFetcher;
 import graphql.annotations.dataFetchers.RelayMutationMethodDataFetcher;
 import graphql.annotations.processor.ProcessingElementsContainer;
@@ -62,9 +60,7 @@ public MethodDataFetcherBuilder(Method method, GraphQLOutputType outputType, Typ
     public DataFetcher build() {
         GraphQLDataFetcher dataFetcher = method.getAnnotation(GraphQLDataFetcher.class);
         DataFetcher actualDataFetcher;
-        if (dataFetcher == null && method.getAnnotation(GraphQLBatched.class) != null) {
-            actualDataFetcher = new BatchedMethodDataFetcher(method, typeFunction, container);
-        } else if (dataFetcher == null) {
+        if (dataFetcher == null) {
             actualDataFetcher = new MethodDataFetcher(method, typeFunction, container);
         } else {
             actualDataFetcher = dataFetcherConstructor.constructDataFetcher(method.getName(), dataFetcher);

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DirectivesBuilder.java

@@ -14,10 +14,8 @@
  */
 package graphql.annotations.processor.retrievers.fieldBuilders.method;
 
-import graphql.annotations.annotationTypes.GraphQLBatched;
 import graphql.annotations.processor.ProcessingElementsContainer;
 import graphql.annotations.processor.retrievers.fieldBuilders.Builder;
-import graphql.annotations.processor.typeFunctions.BatchedTypeFunction;
 import graphql.annotations.processor.typeFunctions.TypeFunction;
 import graphql.schema.GraphQLOutputType;
 import graphql.schema.GraphQLType;
@@ -42,14 +40,7 @@ public MethodTypeBuilder(Method method, TypeFunction typeFunction, ProcessingEle
     public GraphQLType build() {
         AnnotatedType annotatedReturnType = method.getAnnotatedReturnType();
 
-        TypeFunction typeFunction;
-        if (method.getAnnotation(GraphQLBatched.class) != null) {
-            typeFunction = new BatchedTypeFunction(this.typeFunction);
-        } else {
-            typeFunction = this.typeFunction;
-        }
-
-        return typeFunction.buildType(isInput,method.getReturnType(), annotatedReturnType, container);
+        return this.typeFunction.buildType(isInput,method.getReturnType(), annotatedReturnType, container);
     }
 
 }

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/MethodDataFetcherBuilder.java

@@ -14,17 +14,16 @@
  */
 package graphql.annotations.processor.typeFunctions;
 
-import graphql.Scalars;
 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 Scalars.GraphQLBigDecimal.getName();
+        return ExtendedScalars.GraphQLBigDecimal.getName();
     }
 
     @Override
@@ -38,6 +37,6 @@ public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annot
     }
 
     private GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
-        return Scalars.GraphQLBigDecimal;
+        return ExtendedScalars.GraphQLBigDecimal;
     }
 }

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/MethodTypeBuilder.java

@@ -14,17 +14,16 @@
  */
 package graphql.annotations.processor.typeFunctions;
 
-import graphql.Scalars;
 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 Scalars.GraphQLBigInteger.getName();
+        return ExtendedScalars.GraphQLBigInteger.getName();
     }
 
     @Override
@@ -38,6 +37,6 @@ public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annot
     }
 
     private GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
-        return Scalars.GraphQLBigInteger;
+        return ExtendedScalars.GraphQLBigInteger;
     }
 }

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

@@ -14,16 +14,15 @@
  */
 package graphql.annotations.processor.typeFunctions;
 
-import graphql.Scalars;
 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 Scalars.GraphQLByte.getName();
+        return ExtendedScalars.GraphQLByte.getName();
     }
 
     @Override
@@ -37,6 +36,6 @@ public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annot
     }
 
     private GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
-        return Scalars.GraphQLByte;
+        return ExtendedScalars.GraphQLByte;
     }
 }

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

@@ -14,17 +14,16 @@
  */
 package graphql.annotations.processor.typeFunctions;
 
-import graphql.Scalars;
 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 Scalars.GraphQLChar.getName();
+        return ExtendedScalars.GraphQLChar.getName();
     }
 
     @Override
@@ -38,6 +37,6 @@ public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annot
     }
 
     private GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
-        return Scalars.GraphQLChar;
+        return ExtendedScalars.GraphQLChar;
     }
 }