Merge pull request #11 from Jahia/initial-types-support

Added support for initial types dictionnary

Author: yrashk

src/main/java/graphql/servlet/GraphQLServlet.java

@@ -26,6 +26,7 @@
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
+import graphql.schema.GraphQLType;
 import graphql.validation.ValidationError;
 import lombok.Getter;
 import lombok.Setter;
@@ -64,6 +65,7 @@ public class GraphQLServlet extends HttpServlet implements Servlet, GraphQLMBean
 
     private List<GraphQLQueryProvider> queryProviders = new ArrayList<>();
     private List<GraphQLMutationProvider> mutationProviders = new ArrayList<>();
+    private List<GraphQLTypesProvider> typesProviders = new ArrayList<>();
 
     @Getter
     GraphQLSchema schema;
@@ -83,7 +85,12 @@ protected void updateSchema() {
                     build());
         }
 
-        readOnlySchema = newSchema().query(object.build()).build();
+        Set<GraphQLType> types = new HashSet<>();
+        for (GraphQLTypesProvider typesProvider : typesProviders) {
+            types.addAll(typesProvider.getTypes());
+        }
+
+        readOnlySchema = newSchema().query(object.build()).build(types);
 
         if (mutationProviders.isEmpty()) {
             schema = readOnlySchema;
@@ -127,6 +134,16 @@ public void unbindMutationProvider(GraphQLMutationProvider mutationProvider) {
         updateSchema();
     }
 
+    @Reference(cardinality = ReferenceCardinality.MULTIPLE, policyOption = ReferencePolicyOption.GREEDY)
+    public void typesProviders(GraphQLTypesProvider typesProvider) {
+        typesProviders.add(typesProvider);
+        updateSchema();
+    }
+    public void unbindTypesProvider(GraphQLTypesProvider typesProvider) {
+        typesProviders.remove(typesProvider);
+        updateSchema();
+    }
+
     @Override
     public String[] getQueries() {
         return schema.getQueryType().getFieldDefinitions().stream().map(GraphQLFieldDefinition::getName).toArray(String[]::new);

src/main/java/graphql/servlet/GraphQLTypesProvider.java

@@ -0,0 +1,23 @@
+/**
+ * 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.servlet;
+
+import graphql.schema.GraphQLType;
+
+import java.util.Collection;
+
+public interface GraphQLTypesProvider {
+    Collection<GraphQLType> getTypes();
+}