[myfaces-tobago] branch master updated: refactor: better code

[lo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new fedace2  refactor: better code
fedace2 is described below

commit fedace2bf166e861acdd33624d3dbe5edd7377ab
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Feb 2 15:52:51 2022 +0100

    refactor: better code
    
    * No NPE
    * define charset
---
 .../apache/myfaces/tobago/apt/processor/ClassesGenerator.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
index ed7b19f..4686728 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
@@ -49,6 +49,7 @@ import java.io.Reader;
 import java.io.Writer;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -66,6 +67,8 @@ import java.util.Set;
     "org.apache.myfaces.tobago.apt.annotation.SimpleTag"})
 public class ClassesGenerator extends AbstractGenerator {
 
+  private static final String COMPONENT_STG = "org/apache/myfaces/tobago/apt/component.stg";
+
   private StringTemplateGroup componentStringTemplateGroup;
   private Set<String> ignoredProperties;
 
@@ -75,8 +78,12 @@ public class ClassesGenerator extends AbstractGenerator {
     info("Generating the classes *Component");
 
     final InputStream componentStream
-        = getClass().getClassLoader().getResourceAsStream("org/apache/myfaces/tobago/apt/component.stg");
-    final Reader componentReader = new InputStreamReader(componentStream);
+        = getClass().getClassLoader().getResourceAsStream(COMPONENT_STG);
+    if (componentStream == null) {
+      throw new TobagoGeneratorException("Resource not found:" + COMPONENT_STG);
+    }
+
+    final Reader componentReader = new InputStreamReader(componentStream, StandardCharsets.UTF_8);
     componentStringTemplateGroup = new StringTemplateGroup(componentReader);
 
     ignoredProperties = new HashSet<>();