Some minor tweaks to allow extension plus @experimental annotation

bbakerman · bbakerman · commit 55660335381c · 2018-03-14T21:41:45.000+11:00
diff --git a/src/main/java/graphql/ExperimentalApi.java b/src/main/java/graphql/ExperimentalApi.java
@@ -0,0 +1,24 @@
+package graphql;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+
+/**
+ * This represents code that the graphql-java project considers experimental API and may not be stable between
+ * releases.
+ *
+ * In general unnecessary changes will be avoided and the code is aiming to be public one day but you should be aware that things
+ * might change.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(value = {CONSTRUCTOR, METHOD, TYPE, FIELD})
+@Documented
+public @interface ExperimentalApi {
+}
diff --git a/src/main/java/graphql/Internal.java b/src/main/java/graphql/Internal.java
@@ -12,7 +12,7 @@
  * This represents code that the graphql-java project considers internal code that MAY not be stable within
  * major releases.
  *
- * In general unecessary changes will be avoided but you should not depend on internal classes being stable
+ * In general unnecessary changes will be avoided but you should not depend on internal classes being stable
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(value = {CONSTRUCTOR, METHOD, TYPE})
diff --git a/src/main/java/graphql/schema/GraphQLSchema.java b/src/main/java/graphql/schema/GraphQLSchema.java
@@ -12,6 +12,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -202,8 +203,8 @@ public static class Builder {
         private GraphQLObjectType mutationType;
         private GraphQLObjectType subscriptionType;
         private GraphqlFieldVisibility fieldVisibility = DEFAULT_FIELD_VISIBILITY;
-        private Set<GraphQLType> additionalTypes = Collections.emptySet();
-        private Set<GraphQLDirective> additionalDirectives = Collections.emptySet();
+        private Set<GraphQLType> additionalTypes = new HashSet<>();
+        private Set<GraphQLDirective> additionalDirectives = new HashSet<>();
 
         public Builder query(GraphQLObjectType.Builder builder) {
             return query(builder.build());
@@ -238,12 +239,21 @@ public Builder fieldVisibility(GraphqlFieldVisibility fieldVisibility) {
         }
 
         public Builder additionalTypes(Set<GraphQLType> additionalTypes) {
-            this.additionalTypes = additionalTypes;
+            this.additionalTypes.addAll(additionalTypes);
+            return this;
+        }
+        public Builder additionalType(GraphQLType additionalType) {
+            this.additionalTypes.add(additionalType);
             return this;
         }
 
         public Builder additionalDirectives(Set<GraphQLDirective> additionalDirectives) {
-            this.additionalDirectives = additionalDirectives;
+            this.additionalDirectives.addAll(additionalDirectives);
+            return this;
+        }
+
+        public Builder additionalDirective(GraphQLDirective additionalDirective) {
+            this.additionalDirectives.add(additionalDirective);
             return this;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* This represents code that the graphql-java project considers internal code that MAY not be stable within`
`13`	`13`	`* major releases.`
`14`	`14`	`*`
`15`		`- * In general unecessary changes will be avoided but you should not depend on internal classes being stable`
	`15`	`+ * In general unnecessary changes will be avoided but you should not depend on internal classes being stable`
`16`	`16`	`*/`
`17`	`17`	`@Retention(RetentionPolicy.RUNTIME)`
`18`	`18`	`@Target(value = {CONSTRUCTOR, METHOD, TYPE})`