Merge pull request #257 from Enigmatis/release-8.1

Release 8.1

Author: yarinvak

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.0.1"
+  compile "io.github.graphql-java:graphql-java-annotations:8.1"
 }
 ```
 
@@ -47,7 +47,7 @@ dependencies {
 <dependency>
     <groupId>io.github.graphql-java</groupId>
     <artifactId>graphql-java-annotations</artifactId>
-    <version>8.0.1</version>
+    <version>8.1</version>
 </dependency>
 ```
 
@@ -250,7 +250,7 @@ public String field(@GraphQLDefaultValue(DefaultValue.class) String value) {
 The `DefaultValue` class can define a `getInstance` method that will be called instead of the default constructor.
 
 `@GraphQLDeprecate` and Java's `@Deprecated` can be used to specify a deprecated
-field.
+field or method.
 
 ### Custom data fetcher
 

build.gradle

@@ -6,19 +6,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:3.1.0'
+        classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2'
     }
 }
 plugins {
-    id "com.jfrog.bintray" version "1.8.4"
-    id 'net.researchgate.release' version '2.3.4'
-    id "com.github.hierynomus.license" version "0.14.0"
+    id 'com.jfrog.bintray' version '1.8.5'
+    id 'net.researchgate.release' version '2.8.1'
+    id 'com.github.hierynomus.license' version '0.15.0'
 }
 
 apply plugin: 'java'
 apply plugin: 'idea'
 
-apply plugin: 'osgi'
 apply plugin: 'biz.aQute.bnd.builder'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'maven-publish'
@@ -43,12 +42,6 @@ release {
     failOnCommitNeeded = false
 }
 
-jar {
-    manifest {
-        instruction 'Import-Package', 'javax.validation.constraints', '*'
-    }
-}
-
 repositories {
     mavenCentral()
 }
@@ -182,7 +175,6 @@ task bundle(type: Bundle) {
     bndfile = file('bundle.bnd')
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.0'
+wrapper {
+    gradleVersion = '6.5.1'
 }
-

gradle.properties

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

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Thu Jun 22 22:50:08 AEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -19,7 +19,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target(ElementType.METHOD)
+@Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface GraphQLDeprecate {
     String value() default "";

gradlew

@@ -17,13 +17,22 @@
 import graphql.annotations.annotationTypes.GraphQLDeprecate;
 import org.testng.annotations.Test;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 
 public class DeprecateBuilderTest {
 
+    @GraphQLDeprecate("test field deprecated")
+    public String testField;
+
+    @GraphQLDeprecate
+    public String testField1;
+
+    public String testField2;
+
     @GraphQLDeprecate("test deprecated")
     public int testMethod() {
         return 1;
@@ -56,7 +65,6 @@ public void build_graphQLDeprecateAnnotationExistsWithValue_returnAnnotationValu
         assertEquals(deprecate, "test deprecated");
     }
 
-
     @Test
     public void build_graphQLDeprecateAnnotationExistsWithNoValue_returnEmptyString() throws NoSuchMethodException {
         // arrange
@@ -95,4 +103,43 @@ public void build_noDeprecatedAnnotation_returnNull() throws NoSuchMethodExcepti
         // assert
         assertNull(deprecate);
     }
+
+    @Test
+    public void build_deprecatedAnnotationDoesNotExistsOnField_returnNull() throws NoSuchFieldException {
+        // arrange
+        Field field = getClass().getField("testField2");
+        DeprecateBuilder deprecateBuilder = new DeprecateBuilder(field);
+
+        // act
+        String deprecate = deprecateBuilder.build();
+
+        // assert
+        assertNull(deprecate);
+    }
+
+    @Test
+    public void build_graphQLDeprecateAnnotationExistsOnFieldWithNoValue_returnEmptyString() throws NoSuchFieldException {
+        // arrange
+        Field field = getClass().getField("testField1");
+        DeprecateBuilder deprecateBuilder = new DeprecateBuilder(field);
+
+        // act
+        String deprecate = deprecateBuilder.build();
+
+        // assert
+        assertEquals(deprecate, "Deprecated");
+    }
+
+    @Test
+    public void build_graphQLDeprecateAnnotationExistsOnFieldWithValue_returnAnnotationValue() throws NoSuchFieldException {
+        // arrange
+        Field field = getClass().getField("testField");
+        DeprecateBuilder deprecateBuilder = new DeprecateBuilder(field);
+
+        // act
+        String deprecate = deprecateBuilder.build();
+
+        // assert
+        assertEquals(deprecate, "test field deprecated");
+    }
 }