CAMEL-7999: Add support for @UriPath in apt compiler plugin. Also fixed the camel-core components to have a @UriPath
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f3b10c55 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f3b10c55 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f3b10c55 Branch: refs/heads/master Commit: f3b10c5503b6c4ba50ced15da7fe64870f6c6ca6 Parents: 438700a Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Nov 12 09:16:01 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Nov 12 09:16:01 2014 +0100 ---------------------------------------------------------------------- .../timer/TimerComponentConfigurationAndDocumentationTest.java | 1 - .../org/apache/camel/management/ManagedEndpointExplainTest.java | 2 +- .../org/apache/camel/tools/apt/EndpointAnnotationProcessor.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f3b10c55/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java index ab41177..b6cdcaa 100644 --- a/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java @@ -41,7 +41,6 @@ public class TimerComponentConfigurationAndDocumentationTest extends ContextTest String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"timerName\": { \"type\": \"string\"")); assertTrue(json.contains("\"delay\": { \"type\": \"integer\"")); } http://git-wip-us.apache.org/repos/asf/camel/blob/f3b10c55/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java index 5ec4e66..688f81d 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java @@ -50,7 +50,7 @@ public class ManagedEndpointExplainTest extends ManagementTestSupport { // there should be 8 options data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{true}, new String[]{"boolean"}); - assertEquals(8, data.size()); + assertEquals(9, data.size()); } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/f3b10c55/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 362da84..908905d 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 @@ -191,7 +191,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor { buffer.append("\n "); buffer.append(JsonSchemaHelper.toJson(path.getName(), path.getType(), "", path.getDocumentation(), false, null)); } - buffer.append("\n }"); + buffer.append("\n },"); // endpoint properties was named properties at first, and hence we stick with that naming to be compatible buffer.append("\n \"properties\": {");
