Repository: camel
Updated Branches:
  refs/heads/master 1e9ab5446 -> 223fa08c3


CAMEL-8278: Camel toolbox - more details about the eips


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/223fa08c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/223fa08c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/223fa08c

Branch: refs/heads/master
Commit: 223fa08c3f7f71f503b0320e1966fef73a67ce16
Parents: 1e9ab54
Author: Claus Ibsen <[email protected]>
Authored: Sat Jan 24 10:52:54 2015 +0100
Committer: Claus Ibsen <[email protected]>
Committed: Wed Jan 28 10:32:34 2015 +0100

----------------------------------------------------------------------
 .../dataformat/UniVocityTsvDataFormat.java      |  2 -
 .../camel/tools/apt/CollectionStringBuffer.java |  1 -
 .../camel/tools/apt/EipAnnotationProcessor.java | 63 +++++++++++++++++++-
 3 files changed, 62 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/223fa08c/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
index 52ed41d..b058f1e 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
@@ -45,8 +45,6 @@ public class UniVocityTsvDataFormat extends 
UniVocityAbstractDataFormat {
 
     /**
      * The escape character.
-     * <p/>
-     * The default value is \
      */
     public void setEscapeChar(String escapeChar) {
         this.escapeChar = escapeChar;

http://git-wip-us.apache.org/repos/asf/camel/blob/223fa08c/tooling/apt/src/main/java/org/apache/camel/tools/apt/CollectionStringBuffer.java
----------------------------------------------------------------------
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CollectionStringBuffer.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CollectionStringBuffer.java
index 50f846f..21daf95 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CollectionStringBuffer.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CollectionStringBuffer.java
@@ -17,7 +17,6 @@
 package org.apache.camel.tools.apt;
 
 /**
- /**
  * A little helper class for converting a collection of values to a (usually 
comma separated) string.
  */
 class CollectionStringBuffer {

http://git-wip-us.apache.org/repos/asf/camel/blob/223fa08c/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
----------------------------------------------------------------------
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index 6b98ac0..92a6993 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -58,6 +58,11 @@ public class EipAnnotationProcessor extends 
AbstractAnnotationProcessor {
     // special when using expression/predicates in the model
     private static final String ONE_OF_TYPE_NAME = 
"org.apache.camel.model.ExpressionSubElementDefinition";
     private static final String ONE_OF_LANGUAGES = 
"org.apache.camel.model.language.ExpressionDefinition";
+    // special for inputs (these classes have sub classes, so we use this to 
find all classes)
+    private static final String[] ONE_OF_INPUTS = new String[]{
+            "org.apache.camel.model.ProcessorDefinition",
+            "org.apache.camel.model.VerbDefinition"
+    };
     // special for outputs (these classes have sub classes, so we use this to 
find all classes)
     private static final String[] ONE_OF_OUTPUTS = new String[]{
         "org.apache.camel.model.ProcessorDefinition",
@@ -147,6 +152,10 @@ public class EipAnnotationProcessor extends 
AbstractAnnotationProcessor {
         Set<EipOption> eipOptions = new LinkedHashSet<EipOption>();
         findClassProperties(writer, roundEnv, eipOptions, classElement, 
classElement, "");
 
+        // after we have found all the options then figure out if the model 
accepts input/output
+        eipModel.setInput(hasInput(roundEnv, classElement));
+        eipModel.setOutput(hasOutput(eipModel, eipOptions));
+
         String json = createParameterJsonSchema(eipModel, eipOptions);
         writer.println(json);
     }
@@ -160,7 +169,9 @@ public class EipAnnotationProcessor extends 
AbstractAnnotationProcessor {
         buffer.append("\n    \"title\": 
\"").append(asTitle(eipModel.getName())).append("\",");
         buffer.append("\n    \"description\": 
\"").append(safeNull(eipModel.getDescription())).append("\",");
         buffer.append("\n    \"javaType\": 
\"").append(eipModel.getJavaType()).append("\",");
-        buffer.append("\n    \"label\": 
\"").append(safeNull(eipModel.getLabel())).append("\"");
+        buffer.append("\n    \"label\": 
\"").append(safeNull(eipModel.getLabel())).append("\",");
+        buffer.append("\n    \"input\": 
\"").append(eipModel.getInput()).append("\",");
+        buffer.append("\n    \"output\": 
\"").append(eipModel.getOutput()).append("\"");
         buffer.append("\n  },");
 
         buffer.append("\n  \"properties\": {");
@@ -734,12 +745,37 @@ public class EipAnnotationProcessor extends 
AbstractAnnotationProcessor {
         return sb.toString().trim();
     }
 
+    private boolean hasInput(RoundEnvironment roundEnv, TypeElement 
classElement) {
+        for (String name : ONE_OF_INPUTS) {
+            if (hasSuperClass(roundEnv, classElement, name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean hasOutput(EipModel model, Set<EipOption> options) {
+        // if we are from/rest then we accept output
+        if ("from".equals(model.getName()) || "rest".equals(model.getName())) {
+            return true;
+        }
+
+        for (EipOption option : options) {
+            if ("outputs".equals(option.getName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private static final class EipModel {
 
         private String name;
         private String javaType;
         private String label;
         private String description;
+        private boolean input;
+        private boolean output;
 
         public String getName() {
             return name;
@@ -772,6 +808,31 @@ public class EipAnnotationProcessor extends 
AbstractAnnotationProcessor {
         public void setDescription(String description) {
             this.description = description;
         }
+
+        public boolean isInput() {
+            return input;
+        }
+
+        public void setInput(boolean input) {
+            this.input = input;
+        }
+
+        public String getInput() {
+            return input ? "true" : "false";
+        }
+
+        public boolean isOutput() {
+            return output;
+        }
+
+        public void setOutput(boolean output) {
+            this.output = output;
+        }
+
+        public String getOutput() {
+            return output ? "true" : "false";
+        }
+
     }
 
     private static final class EipOption {

Reply via email to