Merge pull request graphql-java#1529 from graphql-java/field-additional-data

andimarek · web-flow · commit 439e342e95a6 · 2019-05-08T10:31:57.000+10:00
add additional field data property
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,9 @@ def getDevelopmentVersion() {
         println "git hash is empty: error: ${error.toString()}"
         throw new IllegalStateException("git hash could not be determined")
     }
-    new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-" + gitHash
+    def version = new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-" + gitHash
+    println "created development version: $version"
+    version
 }
 
 
diff --git a/src/main/java/graphql/language/Field.java b/src/main/java/graphql/language/Field.java
@@ -7,9 +7,14 @@
 import graphql.util.TraverserContext;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Consumer;
 
+import static graphql.Assert.assertNotNull;
+import static java.util.Collections.emptyMap;
+
 /*
  * This is provided to a DataFetcher, therefore it is a public API.
  * This might change in the future.
@@ -22,11 +27,13 @@ public class Field extends AbstractNode<Field> implements Selection<Field>, Sele
     private final List<Argument> arguments;
     private final List<Directive> directives;
     private final SelectionSet selectionSet;
+    private final Map<String, String> additionalData;
 
     public static final String CHILD_ARGUMENTS = "arguments";
     public static final String CHILD_DIRECTIVES = "directives";
     public static final String CHILD_SELECTION_SET = "selectionSet";
 
+
     @Internal
     protected Field(String name,
                     String alias,
@@ -35,13 +42,15 @@ protected Field(String name,
                     SelectionSet selectionSet,
                     SourceLocation sourceLocation,
                     List<Comment> comments,
-                    IgnoredChars ignoredChars) {
+                    IgnoredChars ignoredChars,
+                    Map<String, String> additionalData) {
         super(sourceLocation, comments, ignoredChars);
         this.name = name;
         this.alias = alias;
         this.arguments = arguments;
         this.directives = directives;
         this.selectionSet = selectionSet;
+        this.additionalData = new LinkedHashMap<>(additionalData);
     }
 
 
@@ -51,7 +60,7 @@ protected Field(String name,
      * @param name of the field
      */
     public Field(String name) {
-        this(name, null, new ArrayList<>(), new ArrayList<>(), null, null, new ArrayList<>(), IgnoredChars.EMPTY);
+        this(name, null, new ArrayList<>(), new ArrayList<>(), null, null, new ArrayList<>(), IgnoredChars.EMPTY, emptyMap());
     }
 
     /**
@@ -61,7 +70,7 @@ public Field(String name) {
      * @param arguments to the field
      */
     public Field(String name, List<Argument> arguments) {
-        this(name, null, arguments, new ArrayList<>(), null, null, new ArrayList<>(), IgnoredChars.EMPTY);
+        this(name, null, arguments, new ArrayList<>(), null, null, new ArrayList<>(), IgnoredChars.EMPTY, emptyMap());
     }
 
     /**
@@ -72,7 +81,7 @@ public Field(String name, List<Argument> arguments) {
      * @param selectionSet of the field
      */
     public Field(String name, List<Argument> arguments, SelectionSet selectionSet) {
-        this(name, null, arguments, new ArrayList<>(), selectionSet, null, new ArrayList<>(), IgnoredChars.EMPTY);
+        this(name, null, arguments, new ArrayList<>(), selectionSet, null, new ArrayList<>(), IgnoredChars.EMPTY, emptyMap());
     }
 
     /**
@@ -82,7 +91,7 @@ public Field(String name, List<Argument> arguments, SelectionSet selectionSet) {
      * @param selectionSet of the field
      */
     public Field(String name, SelectionSet selectionSet) {
-        this(name, null, new ArrayList<>(), new ArrayList<>(), selectionSet, null, new ArrayList<>(), IgnoredChars.EMPTY);
+        this(name, null, new ArrayList<>(), new ArrayList<>(), selectionSet, null, new ArrayList<>(), IgnoredChars.EMPTY, emptyMap());
     }
 
     @Override
@@ -137,6 +146,10 @@ public SelectionSet getSelectionSet() {
         return selectionSet;
     }
 
+    public Map<String, String> getAdditionalData() {
+        return new LinkedHashMap<>(additionalData);
+    }
+
     @Override
     public boolean isEqualTo(Node o) {
         if (this == o) {
@@ -160,7 +173,8 @@ public Field deepCopy() {
                 deepCopy(selectionSet),
                 getSourceLocation(),
                 getComments(),
-                getIgnoredChars()
+                getIgnoredChars(),
+                additionalData
         );
     }
 
@@ -207,6 +221,7 @@ public static final class Builder implements NodeBuilder {
         private List<Directive> directives = new ArrayList<>();
         private SelectionSet selectionSet;
         private IgnoredChars ignoredChars = IgnoredChars.EMPTY;
+        private Map<String, String> additionalData = new LinkedHashMap<>();
 
         private Builder() {
         }
@@ -220,6 +235,7 @@ private Builder(Field existing) {
             this.directives = existing.getDirectives();
             this.selectionSet = existing.getSelectionSet();
             this.ignoredChars = existing.getIgnoredChars();
+            this.additionalData = existing.getAdditionalData();
         }
 
 
@@ -263,8 +279,19 @@ public Builder ignoredChars(IgnoredChars ignoredChars) {
             return this;
         }
 
+        public Builder additionalData(Map<String, String> additionalData) {
+            this.additionalData = assertNotNull(additionalData);
+            return this;
+        }
+
+        public Builder additionalData(String key, String value) {
+            this.additionalData.put(key, value);
+            return this;
+        }
+
+
         public Field build() {
-            Field field = new Field(name, alias, arguments, directives, selectionSet, sourceLocation, comments, ignoredChars);
+            Field field = new Field(name, alias, arguments, directives, selectionSet, sourceLocation, comments, ignoredChars, additionalData);
             return field;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@ def getDevelopmentVersion() {`
`20`	`20`	`println "git hash is empty: error: ${error.toString()}"`
`21`	`21`	`throw new IllegalStateException("git hash could not be determined")`
`22`	`22`	`}`
`23`		`- new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-" + gitHash`
	`23`	`+ def version = new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-" + gitHash`
	`24`	`+ println "created development version: $version"`
	`25`	`+ version`
`24`	`26`	`}`
`25`	`27`
`26`	`28`