Fix NPE in BasicRestProjectGenerator when a resource is missing

Throw a dedicated IOException instead. Closes #3331
quarkusio · Aug 12, 2019 · 508de04 · 508de04
1 parent 0d98c45
commit 508de04
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/devtools/common/src/main/java/io/quarkus/generators/rest/BasicRestProjectGenerator.java b/devtools/common/src/main/java/io/quarkus/generators/rest/BasicRestProjectGenerator.java
@@ -2,10 +2,7 @@
 
 import static java.lang.String.format;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
@@ -111,8 +108,12 @@ private void generate(final String templateName, final Map<String, Object> conte
                 throws IOException {
             if (!writer.exists(outputFilePath)) {
                 String path = templateName.startsWith("/") ? templateName : "/" + templateName;
+                InputStream resourceStream = getClass().getResourceAsStream(path);
+                if (resourceStream == null) {
+                    throw new IOException("Template resource is missing: " + path);
+                }
                 try (final BufferedReader stream = new BufferedReader(
-                        new InputStreamReader(getClass().getResourceAsStream(path), StandardCharsets.UTF_8))) {
+                        new InputStreamReader(resourceStream, StandardCharsets.UTF_8))) {
                     String template = stream.lines().collect(Collectors.joining("\n"));
                     for (Entry<String, Object> e : context.entrySet()) {
                         if (e.getValue() != null) { // Exclude null values (classname and path can be null)