Repository: camel Updated Branches: refs/heads/master 34950ceee -> bbb7ff941
CAMEL-9482: Adjust the apt to make camel-core compile again, seems like we need to merge the core/spring into a single apt as the compiler cannot do both on camel-core for some odd reason. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bbb7ff94 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bbb7ff94 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bbb7ff94 Branch: refs/heads/master Commit: bbb7ff9416469a29913a5137f7962853d411790b Parents: 34950ce Author: Claus Ibsen <[email protected]> Authored: Thu Aug 11 08:24:06 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Thu Aug 11 08:24:06 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/tools/apt/AbstractAnnotationProcessor.java | 2 ++ .../org/apache/camel/tools/apt/EndpointAnnotationProcessor.java | 3 +++ .../META-INF/services/javax.annotation.processing.Processor | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bbb7ff94/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java index 8bf8334..6159602 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractAnnotationProcessor.java @@ -406,6 +406,8 @@ public abstract class AbstractAnnotationProcessor extends AbstractProcessor { StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); e.printStackTrace(pw); + fos.write(message.getBytes()); + fos.write("\n\n".getBytes()); fos.write(sw.toString().getBytes()); pw.close(); sw.close(); http://git-wip-us.apache.org/repos/asf/camel/blob/bbb7ff94/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java index 8f38906..79bf935 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java @@ -752,6 +752,9 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor { if (isNullOrEmpty(docComment)) { docComment = param.description(); } + if (isNullOrEmpty(docComment)) { + docComment = ""; + } // gather enums Set<String> enums = new LinkedHashSet<String>(); http://git-wip-us.apache.org/repos/asf/camel/blob/bbb7ff94/tooling/apt/src/main/resources/META-INF/services/javax.annotation.processing.Processor ---------------------------------------------------------------------- diff --git a/tooling/apt/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/tooling/apt/src/main/resources/META-INF/services/javax.annotation.processing.Processor index a1fa0cb..4e19db2 100644 --- a/tooling/apt/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/tooling/apt/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -14,6 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -org.apache.camel.tools.apt.CamelContextAnnotationProcessor org.apache.camel.tools.apt.EipAnnotationProcessor org.apache.camel.tools.apt.EndpointAnnotationProcessor +org.apache.camel.tools.apt.CamelContextAnnotationProcessor
