[camel-k-runtime] 02/05: Support full yaml dsl #80 (definitions cleanup)

[lburgazzoli]

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

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git

commit 42fafb543388ca78dfb3b9f1582cabf5f38a6ee5
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Thu Jun 20 22:18:03 2019 +0200

    Support full yaml dsl #80 (definitions cleanup)
---
 .../org/apache/camel/k/yaml/model/Definitions.java | 23 ++++++++--------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git 
a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Definitions.java
 
b/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Definitions.java
index bf78fb9..cf8bdde 100644
--- 
a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Definitions.java
+++ 
b/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/model/Definitions.java
@@ -64,22 +64,15 @@ public final class Definitions {
             for (String name : IOUtils.readLines(is, StandardCharsets.UTF_8)) {
                 name = name.trim();
 
-                if (name.startsWith("#")) {
-                    continue;
+                if (!name.startsWith("#") && !name.isEmpty()) {
+                    ClassLoader cl = 
Thread.currentThread().getContextClassLoader();
+                    Class<?> clazz = cl.loadClass(packageName + "." + name);
+                    XmlRootElement root = 
clazz.getAnnotation(XmlRootElement.class);
+
+                    if (root != null) {
+                        definitions.put(root.name(), (Class<T>) clazz);
+                    }
                 }
-                if (name.isEmpty()) {
-                    continue;
-                }
-
-                ClassLoader cl = 
Thread.currentThread().getContextClassLoader();
-                Class<?> clazz = cl.loadClass(packageName + "." + name);
-                XmlRootElement root = 
clazz.getAnnotation(XmlRootElement.class);
-
-                if (root == null) {
-                    continue;
-                }
-
-                definitions.put(root.name(), (Class<T>)clazz);
             }
         } catch (IOException|NoClassDefFoundError|ClassNotFoundException e) {
             throw new IllegalArgumentException(e);