Merge pull request #630 from HubSpot/npe-doc-annotation

Fix NPE around code snippets documentation
HubSpot · Apr 2, 2021 · 463b1be · 463b1be
2 parents 83ead56 + 41298a7
commit 463b1be
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/doc/JinjavaDocFactory.java b/src/main/java/com/hubspot/jinjava/doc/JinjavaDocFactory.java
@@ -307,26 +307,28 @@ private String getTagSnippet(Tag tag) {
     StringBuilder snippet = new StringBuilder("{% ");
     snippet.append(tag.getName());
     int i = 1;
-    for (JinjavaParam param : docAnnotation.input()) {
-      String inputValue = "${" + i + ":" + param.value() + "}";
-      if (param.value().equalsIgnoreCase("path")) {
-        inputValue = "'" + inputValue + "'";
-      } else if (param.value().equalsIgnoreCase("argument_names")) {
-        inputValue = "(" + inputValue + ")";
+    if (docAnnotation != null) {
+      for (JinjavaParam param : docAnnotation.input()) {
+        String inputValue = "${" + i + ":" + param.value() + "}";
+        if (param.value().equalsIgnoreCase("path")) {
+          inputValue = "'" + inputValue + "'";
+        } else if (param.value().equalsIgnoreCase("argument_names")) {
+          inputValue = "(" + inputValue + ")";
+        }
+        snippet.append(" " + inputValue);
+        i++;
       }
-      snippet.append(" " + inputValue);
-      i++;
-    }
 
-    for (JinjavaParam param : docAnnotation.params()) {
-      String paramValue = "${" + i + ":" + param.value() + "}";
-      if (param.value().equalsIgnoreCase("path")) {
-        paramValue = "'" + paramValue + "'";
-      } else if (param.value().equalsIgnoreCase("argument_names")) {
-        paramValue = "(" + paramValue + ")";
+      for (JinjavaParam param : docAnnotation.params()) {
+        String paramValue = "${" + i + ":" + param.value() + "}";
+        if (param.value().equalsIgnoreCase("path")) {
+          paramValue = "'" + paramValue + "'";
+        } else if (param.value().equalsIgnoreCase("argument_names")) {
+          paramValue = "(" + paramValue + ")";
+        }
+        snippet.append(" " + paramValue);
+        i++;
       }
-      snippet.append(" " + paramValue);
-      i++;
     }
 
     snippet.append(" %}");