CAMEL-7999: Added path kind option to explained options in endpoints.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/950b1fc7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/950b1fc7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/950b1fc7 Branch: refs/heads/master Commit: 950b1fc7a6b6b7f355ca8a97441a92f3167e991f Parents: a293de5 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Nov 12 15:20:48 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Nov 12 15:43:02 2014 +0100 ---------------------------------------------------------------------- .../BeanComponentConfigurationAndDocumentationTest.java | 4 ++-- .../BrowseComponentConfigurationAndDocumentationTest.java | 2 +- ...trolBusComponentConfigurationAndDocumentationTest.java | 4 ++-- ...aFormatComponentConfigurationAndDocumentationTest.java | 4 ++-- ...DataSetComponentConfigurationAndDocumentationTest.java | 6 +++--- .../DirectComponentConfigurationAndDocumentationTest.java | 6 +++--- ...irectVmComponentConfigurationAndDocumentationTest.java | 4 ++-- .../FileComponentConfigurationAndDocumentationTest.java | 4 ++-- ...anguageComponentConfigurationAndDocumentationTest.java | 4 ++-- .../LogComponentConfigurationAndDocumentationTest.java | 4 ++-- .../MockComponentConfigurationAndDocumentationTest.java | 4 ++-- .../SedaComponentConfigurationAndDocumentationTest.java | 4 ++-- .../TestComponentConfigurationAndDocumentationTest.java | 4 ++-- .../TimerComponentConfigurationAndDocumentationTest.java | 4 ++-- .../XsltComponentConfigurationAndDocumentationTest.java | 4 ++-- .../apache/camel/management/ManagedCamelContextTest.java | 10 ++++++---- .../camel/management/ManagedEndpointExplainTest.java | 8 ++++---- 17 files changed, 41 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentationTest.java index 66078fc..dce762c 100644 --- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class BeanComponentConfigurationAndDocumentationTest extends ContextTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"method\": { \"type\": \"string\"")); - assertTrue(json.contains("\"cache\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"method\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"cache\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/browse/BrowseComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/browse/BrowseComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/browse/BrowseComponentConfigurationAndDocumentationTest.java index 13518bf..ecfbcc4 100644 --- a/camel-core/src/test/java/org/apache/camel/component/browse/BrowseComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/browse/BrowseComponentConfigurationAndDocumentationTest.java @@ -41,7 +41,7 @@ public class BrowseComponentConfigurationAndDocumentationTest extends ContextTes String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"synchronous\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"synchronous\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentationTest.java index 477debe..1c36a61 100644 --- a/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class ControlBusComponentConfigurationAndDocumentationTest extends Contex String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"action\": { \"type\": \"string\"")); - assertTrue(json.contains("\"async\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"action\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"async\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java index 25e4f4d..e48ed30 100644 --- a/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class DataFormatComponentConfigurationAndDocumentationTest extends Contex String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"operation\": { \"type\": \"string\"")); - assertTrue(json.contains("\"synchronous\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"operation\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"synchronous\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentationTest.java index b410ce1..7e6e2ee 100644 --- a/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentationTest.java @@ -41,9 +41,9 @@ public class DataSetComponentConfigurationAndDocumentationTest extends ContextTe String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"preloadSize\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"minRate\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"exchangePattern\": { \"type\": \"string\", \"javaType\": \"org.apache.camel.ExchangePattern\"" + assertTrue(json.contains("\"preloadSize\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"minRate\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"exchangePattern\": { \"kind\": \"parameter\", \"type\": \"string\", \"javaType\": \"org.apache.camel.ExchangePattern\"" + ", \"enum\": [ \"InOnly\", \"RobustInOnly\", \"InOut\", \"InOptionalOut\", \"OutOnly\", \"RobustOutOnly\", \"OutIn\", \"OutOptionalIn\" ]")); assertTrue(json.contains("\"InOut\"")); } http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentationTest.java index 93bede2..60db3ec 100644 --- a/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class DirectComponentConfigurationAndDocumentationTest extends ContextTes String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"timeout\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"block\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"timeout\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"block\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test @@ -60,7 +60,7 @@ public class DirectComponentConfigurationAndDocumentationTest extends ContextTes log.info(json); // should include javadoc - assertTrue("Should include javadoc", json.contains("\"timeout\": { \"type\": \"integer\", \"javaType\": \"long\"," + assertTrue("Should include javadoc", json.contains("\"timeout\": { \"kind\": \"parameter\", \"type\": \"integer\", \"javaType\": \"long\"," + " \"defaultValue\": \"30000\"," + " \"description\": \"The timeout value to use if block is enabled. Is by default 30000.\"")); } http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentationTest.java index cd3f8dc..8cafb3e 100644 --- a/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class DirectVmComponentConfigurationAndDocumentationTest extends ContextT String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"timeout\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"block\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"timeout\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"block\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java index 93be957..7693c4b 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class FileComponentConfigurationAndDocumentationTest extends ContextTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"exclude\": { \"type\": \"string\"")); - assertTrue(json.contains("\"delete\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"exclude\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"delete\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentationTest.java index d19de92..4003753 100644 --- a/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class LanguageComponentConfigurationAndDocumentationTest extends ContextT String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"script\": { \"type\": \"string\"")); - assertTrue(json.contains("\"cacheScript\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"script\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"cacheScript\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentationTest.java index 3ff8029..64e3d81 100644 --- a/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class LogComponentConfigurationAndDocumentationTest extends ContextTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"level\": { \"type\": \"string\"")); - assertTrue(json.contains("\"groupInterval\": { \"type\": \"integer\"")); + assertTrue(json.contains("\"level\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"groupInterval\": { \"kind\": \"parameter\", \"type\": \"integer\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java index 9f0d2b7..ed790c5 100644 --- a/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class MockComponentConfigurationAndDocumentationTest extends ContextTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"expectedCount\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"retainFirst\": { \"type\": \"integer\"")); + assertTrue(json.contains("\"expectedCount\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"retainFirst\": { \"kind\": \"parameter\", \"type\": \"integer\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentationTest.java index ea4c2ff..b3fea69 100644 --- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class SedaComponentConfigurationAndDocumentationTest extends ContextTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"timeout\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"blockWhenFull\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"timeout\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"blockWhenFull\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentationTest.java index 55544ba..8fcebc7 100644 --- a/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class TestComponentConfigurationAndDocumentationTest extends ContextTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"retainFirst\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"timeout\": { \"type\": \"integer\"")); + assertTrue(json.contains("\"retainFirst\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"timeout\": { \"kind\": \"parameter\", \"type\": \"integer\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/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 0769411..e64d517 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,8 +41,8 @@ public class TimerComponentConfigurationAndDocumentationTest extends ContextTest String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"timerName\": { \"type\": \"string\", \"javaType\": \"java.lang.String\", \"description\": \"The name of the timer\" }")); - assertTrue(json.contains("\"delay\": { \"type\": \"integer\"")); + assertTrue(json.contains("\"timerName\": { \"kind\": \"path\", \"type\": \"string\", \"javaType\": \"java.lang.String\", \"description\": \"The name of the timer\" }")); + assertTrue(json.contains("\"delay\": { \"kind\": \"parameter\", \"type\": \"integer\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentationTest.java index ba6cfb0..794d16a 100644 --- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class XsltComponentConfigurationAndDocumentationTest extends ContextTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"contentCache\": { \"type\": \"boolean\", \"javaType\": \"boolean\", \"defaultValue\": \"true\" }")); - assertTrue(json.contains("\"synchronous\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"contentCache\": { \"kind\": \"parameter\", \"type\": \"boolean\", \"javaType\": \"boolean\", \"defaultValue\": \"true\" }")); + assertTrue(json.contains("\"synchronous\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java index 745d86e..5e74879 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java @@ -241,12 +241,14 @@ public class ManagedCamelContextTest extends ManagementTestSupport { new String[]{"java.lang.String", "boolean"}); assertNotNull(json); - assertEquals(4, StringHelper.countChar(json, '{')); - assertEquals(4, StringHelper.countChar(json, '}')); - assertTrue(json.contains("\"groupDelay\": { \"type\": \"integer\", \"javaType\": \"java.lang.Long\", \"value\": \"2000\"," + assertEquals(5, StringHelper.countChar(json, '{')); + assertEquals(5, StringHelper.countChar(json, '}')); + assertTrue(json.contains("\"groupDelay\": { \"kind\": \"parameter\", \"type\": \"integer\", \"javaType\": \"java.lang.Long\", \"value\": \"2000\"," + " \"description\": \"Set the initial delay for stats (in millis)\" },")); - assertTrue(json.contains("\"groupSize\": { \"type\": \"integer\", \"javaType\": \"java.lang.Integer\", \"value\": \"5\"," + assertTrue(json.contains("\"groupSize\": { \"kind\": \"parameter\", \"type\": \"integer\", \"javaType\": \"java.lang.Integer\", \"value\": \"5\"," + " \"description\": \"An integer that specifies a group size for throughput logging.\" }")); + assertTrue(json.contains("\"loggerName\": { \"kind\": \"path\", \"type\": \"string\", \"javaType\": \"java.lang.String\"," + + " \"value\": \"foo\", \"description\": \"The logger name to use\" }")); } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/950b1fc7/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 688f81d..4650a4c 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 @@ -44,13 +44,13 @@ public class ManagedEndpointExplainTest extends ManagementTestSupport { on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"log://foo\\?groupDelay=2000&groupSize=5&level=WARN\""); assertTrue(mbeanServer.isRegistered(on)); - // there should be 3 options + // there should be 3 parameters + 1 path = 4 TabularData data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{false}, new String[]{"boolean"}); - assertEquals(3, data.size()); + assertEquals(4, data.size()); - // there should be 8 options + // there should be 10 in total data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{true}, new String[]{"boolean"}); - assertEquals(9, data.size()); + assertEquals(10, data.size()); } @Override
