Handle null cases

gflores-jahia · gflores-jahia · commit b282721a46b1 · 2024-02-11T11:36:39.000-05:00
diff --git a/graphql-dxm-provider/src/main/java/org/jahia/modules/graphql/provider/dxm/sdl/parsing/SDLSchemaService.java b/graphql-dxm-provider/src/main/java/org/jahia/modules/graphql/provider/dxm/sdl/parsing/SDLSchemaService.java
@@ -258,14 +258,18 @@ public List<GraphQLType> getSDLTypes() {
     }
 
     public Set<GraphQLDirective> getDirectives() {
+        Set<GraphQLDirective> result = new HashSet<>();
         if (graphQLSchema == null) {
             generateSchema();
         }
 
         if (graphQLSchema != null) {
-            return new HashSet<>(graphQLSchema.getDirectives());
+            List<GraphQLDirective> directives = graphQLSchema.getDirectives();
+            if (directives != null) {
+                result.addAll(directives);
+            }
         }
-        return null;
+        return result;
     }
 
     public GraphQLSchema getGraphQLSchema() {

Original file line number	Diff line number	Diff line change
`@@ -258,14 +258,18 @@ public List<GraphQLType> getSDLTypes() {`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`public Set<GraphQLDirective> getDirectives() {`
	`261`	`+ Set<GraphQLDirective> result = new HashSet<>();`
`261`	`262`	`if (graphQLSchema == null) {`
`262`	`263`	`generateSchema();`
`263`	`264`	`}`
`264`	`265`
`265`	`266`	`if (graphQLSchema != null) {`
`266`		`- return new HashSet<>(graphQLSchema.getDirectives());`
	`267`	`+ List<GraphQLDirective> directives = graphQLSchema.getDirectives();`
	`268`	`+ if (directives != null) {`
	`269`	`+ result.addAll(directives);`
	`270`	`+ }`
`267`	`271`	`}`
`268`		`- return null;`
	`272`	`+ return result;`
`269`	`273`	`}`
`270`	`274`
`271`	`275`	`public GraphQLSchema getGraphQLSchema() {`