CAMEL-7620: Rest DSL. Slight model change to have base path and uri template.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ff39d841 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff39d841 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff39d841 Branch: refs/heads/master Commit: ff39d84160caf349f11ed1270be7b952b0588ba8 Parents: 7ff4020 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 6 15:30:10 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Aug 6 15:30:10 2014 +0200 ---------------------------------------------------------------------- .../org/apache/camel/builder/RouteBuilder.java | 6 ++--- .../camel/component/rest/RestComponent.java | 6 ++--- .../camel/component/rest/RestEndpoint.java | 14 +++++------ .../apache/camel/model/rest/RestDefinition.java | 25 ++++++++++---------- .../camel/model/rest/RestsDefinition.java | 2 +- .../rest/FromRestExplicitComponentTest.java | 2 +- .../rest/FromRestGetEmbeddedRouteTest.java | 4 ++-- .../component/rest/FromRestGetEndPathTest.java | 4 ++-- .../camel/component/rest/FromRestGetTest.java | 4 ++-- .../component/rest/FromRestUriPrefixTest.java | 2 +- .../apache/camel/model/XmlRestParseTest.java | 2 +- .../camel/blueprint/BlueprintJaxbRestTest.java | 4 ++-- .../camel/component/rest/RestRefTest.java | 4 ++-- .../rest/FromRestGetEmbeddedRouteTest.java | 4 ++-- .../component/rest/FromRestGetTest.java | 4 ++-- .../component/rest/FromRestUriPrefixTest.java | 2 +- .../blueprint/component/rest/RestRefTest.java | 4 ++-- 17 files changed, 46 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java index c53979e..08c8abb 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java +++ b/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java @@ -100,12 +100,12 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild /** * Creates a new REST service * - * @param uri the path + * @param path the base path * @return the builder */ - public RestDefinition rest(String uri) { + public RestDefinition rest(String path) { getRestCollection().setCamelContext(getContext()); - RestDefinition answer = getRestCollection().rest(uri); + RestDefinition answer = getRestCollection().rest(path); configureRest(answer); return answer; } http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/camel-core/src/main/java/org/apache/camel/component/rest/RestComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestComponent.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestComponent.java index 687fb72..a39e722 100644 --- a/camel-core/src/main/java/org/apache/camel/component/rest/RestComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestComponent.java @@ -36,10 +36,10 @@ public class RestComponent extends UriEndpointComponent { answer.setParameters(parameters); if (!remaining.contains(":")) { - throw new IllegalArgumentException("Invalid syntax. Must be rest:verb:path"); + throw new IllegalArgumentException("Invalid syntax. Must be rest:method:path[:uriTemplate] where uriTemplate is optional"); } - String verb = ObjectHelper.before(remaining, ":"); + String method = ObjectHelper.before(remaining, ":"); String s = ObjectHelper.after(remaining, ":"); String path; @@ -56,7 +56,7 @@ public class RestComponent extends UriEndpointComponent { path = FileUtil.stripTrailingSeparator(path); uriTemplate = FileUtil.stripTrailingSeparator(uriTemplate); - answer.setVerb(verb); + answer.setMethod(method); answer.setPath(path); answer.setUriTemplate(uriTemplate); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java index 66001c5..7ce6564 100644 --- a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java @@ -36,7 +36,7 @@ import org.apache.camel.util.ObjectHelper; public class RestEndpoint extends DefaultEndpoint { @UriParam - private String verb; + private String method; @UriParam private String path; @UriParam @@ -59,12 +59,12 @@ public class RestEndpoint extends DefaultEndpoint { return (RestComponent) super.getComponent(); } - public String getVerb() { - return verb; + public String getMethod() { + return method; } - public void setVerb(String verb) { - this.verb = verb; + public void setMethod(String method) { + this.method = method; } public String getPath() { @@ -164,7 +164,7 @@ public class RestEndpoint extends DefaultEndpoint { } if (factory != null) { - Consumer consumer = factory.createConsumer(getCamelContext(), processor, getVerb(), getPath(), getUriTemplate(), getConsumes(), getProduces(), getParameters()); + Consumer consumer = factory.createConsumer(getCamelContext(), processor, getMethod(), getPath(), getUriTemplate(), getConsumes(), getProduces(), getParameters()); configureConsumer(consumer); // if no explicit port/host configured, then use port from rest configuration @@ -217,7 +217,7 @@ public class RestEndpoint extends DefaultEndpoint { // add to rest registry so we can keep track of them, we will remove from the registry when the consumer is removed // the rest registry will automatic keep track when the consumer is removed, // and un-register the REST service from the registry - getCamelContext().getRestRegistry().addRestService(consumer, url, baseUrl, getPath(), getUriTemplate(), getVerb(), getConsumes(), getProduces(), inType, outType); + getCamelContext().getRestRegistry().addRestService(consumer, url, baseUrl, getPath(), getUriTemplate(), getMethod(), getConsumes(), getProduces(), inType, outType); return consumer; } else { http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java index 2039328..cf322a9 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java @@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; import org.apache.camel.model.RouteDefinition; import org.apache.camel.model.ToDefinition; -import org.apache.camel.util.FileUtil; import org.apache.camel.util.URISupport; /** @@ -40,7 +39,7 @@ import org.apache.camel.util.URISupport; public class RestDefinition { @XmlAttribute - private String uri; + private String path; @XmlAttribute private String consumes; @@ -54,12 +53,12 @@ public class RestDefinition { @XmlElementRef private List<VerbDefinition> verbs = new ArrayList<VerbDefinition>(); - public String getUri() { - return uri; + public String getPath() { + return path; } - public void setUri(String uri) { - this.uri = uri; + public void setPath(String path) { + this.path = path; } public String getConsumes() { @@ -98,10 +97,10 @@ public class RestDefinition { //------------------------------------------------------------------------- /** - * To set the uri + * To set the base path of this REST service */ - public RestDefinition uri(String uri) { - setUri(uri); + public RestDefinition path(String path) { + setPath(path); return this; } @@ -386,10 +385,10 @@ public class RestDefinition { } private String buildUri(VerbDefinition verb) { - if (uri != null && verb.getUri() != null) { - return uri + ":" + verb.getUri(); - } else if (uri != null) { - return uri; + if (path != null && verb.getUri() != null) { + return path + ":" + verb.getUri(); + } else if (path != null) { + return path; } else if (verb.getUri() != null) { return verb.getUri(); } else { http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java index 3386903..a195c3e 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java @@ -92,7 +92,7 @@ public class RestsDefinition extends OptionalIdentifiedDefinition<RestsDefinitio */ public RestDefinition rest(String uri) { RestDefinition rest = createRest(); - rest.setUri(uri); + rest.setPath(uri); return rest(rest); } http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java index 3220f2e..0f98be2 100644 --- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java @@ -31,7 +31,7 @@ public class FromRestExplicitComponentTest extends FromRestGetTest { rest("/say/hello") .get().to("direct:hello"); - rest("dummy-rest").uri("/say/bye") + rest("dummy-rest").path("/say/bye") .get().consumes("application/json").to("direct:bye") .post().to("mock:update"); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEmbeddedRouteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEmbeddedRouteTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEmbeddedRouteTest.java index 0caf36a..071c22e 100644 --- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEmbeddedRouteTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEmbeddedRouteTest.java @@ -41,14 +41,14 @@ public class FromRestGetEmbeddedRouteTest extends ContextTestSupport { assertEquals(2, context.getRestDefinitions().size()); RestDefinition rest = context.getRestDefinitions().get(0); assertNotNull(rest); - assertEquals("/say/hello", rest.getUri()); + assertEquals("/say/hello", rest.getPath()); assertEquals(1, rest.getVerbs().size()); ToDefinition to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getRoute().getOutputs().get(1)); assertEquals("mock:hello", to.getUri()); rest = context.getRestDefinitions().get(1); assertNotNull(rest); - assertEquals("/say/bye", rest.getUri()); + assertEquals("/say/bye", rest.getPath()); assertEquals(2, rest.getVerbs().size()); assertEquals("application/json", rest.getVerbs().get(0).getConsumes()); to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getRoute().getOutputs().get(1)); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEndPathTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEndPathTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEndPathTest.java index 6ef4fb2..a3108c1 100644 --- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEndPathTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetEndPathTest.java @@ -28,14 +28,14 @@ public class FromRestGetEndPathTest extends FromRestGetTest { assertEquals(2, context.getRestDefinitions().size()); RestDefinition rest = context.getRestDefinitions().get(0); assertNotNull(rest); - assertEquals("/say/hello", rest.getUri()); + assertEquals("/say/hello", rest.getPath()); assertEquals(1, rest.getVerbs().size()); ToDefinition to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getTo()); assertEquals("direct:hello", to.getUri()); rest = context.getRestDefinitions().get(1); assertNotNull(rest); - assertEquals("/say/bye", rest.getUri()); + assertEquals("/say/bye", rest.getPath()); assertEquals(2, rest.getVerbs().size()); assertEquals("application/json", rest.getVerbs().get(0).getConsumes()); to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getRoute().getOutputs().get(1)); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java index 02864db..f6f73ec 100644 --- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java @@ -41,14 +41,14 @@ public class FromRestGetTest extends ContextTestSupport { assertEquals(2, context.getRestDefinitions().size()); RestDefinition rest = context.getRestDefinitions().get(0); assertNotNull(rest); - assertEquals("/say/hello", rest.getUri()); + assertEquals("/say/hello", rest.getPath()); assertEquals(1, rest.getVerbs().size()); ToDefinition to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getTo()); assertEquals("direct:hello", to.getUri()); rest = context.getRestDefinitions().get(1); assertNotNull(rest); - assertEquals("/say/bye", rest.getUri()); + assertEquals("/say/bye", rest.getPath()); assertEquals(2, rest.getVerbs().size()); assertEquals("application/json", rest.getVerbs().get(0).getConsumes()); to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getTo()); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java index 3a5da15..790226d 100644 --- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java @@ -28,7 +28,7 @@ public class FromRestUriPrefixTest extends FromRestGetTest { assertEquals(1, context.getRestDefinitions().size()); RestDefinition rest = context.getRestDefinitions().get(0); assertNotNull(rest); - assertEquals("/say/", rest.getUri()); + assertEquals("/say/", rest.getPath()); assertEquals(3, rest.getVerbs().size()); assertEquals("/hello", rest.getVerbs().get(0).getUri()); assertEquals("bye", rest.getVerbs().get(1).getUri()); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/camel-core/src/test/java/org/apache/camel/model/XmlRestParseTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/model/XmlRestParseTest.java b/camel-core/src/test/java/org/apache/camel/model/XmlRestParseTest.java index a9d7acc..e112369 100644 --- a/camel-core/src/test/java/org/apache/camel/model/XmlRestParseTest.java +++ b/camel-core/src/test/java/org/apache/camel/model/XmlRestParseTest.java @@ -26,7 +26,7 @@ public class XmlRestParseTest extends XmlTestSupport { public void testParseSimpleRestXml() throws Exception { RestDefinition rest = assertOneRest("simpleRest.xml"); - assertEquals("/users", rest.getUri()); + assertEquals("/users", rest.getPath()); assertEquals(1, rest.getVerbs().size()); GetVerbDefinition get = (GetVerbDefinition) rest.getVerbs().get(0); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbRestTest.java ---------------------------------------------------------------------- diff --git a/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbRestTest.java b/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbRestTest.java index a8fd5cf..bc38614 100644 --- a/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbRestTest.java +++ b/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbRestTest.java @@ -70,8 +70,8 @@ public class BlueprintJaxbRestTest extends TestSupport { CamelContextFactoryBean cfb = (CamelContextFactoryBean) object; assertEquals(2, cfb.getRests().size()); - assertEquals("/say/hello", cfb.getRests().get(0).getUri()); - assertEquals("/say/bye", cfb.getRests().get(1).getUri()); + assertEquals("/say/hello", cfb.getRests().get(0).getPath()); + assertEquals("/say/bye", cfb.getRests().get(1).getPath()); assertEquals(1, cfb.getRests().get(0).getVerbs().size()); assertEquals(2, cfb.getRests().get(1).getVerbs().size()); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java index 322107a..3d9af1b 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java @@ -33,14 +33,14 @@ public class RestRefTest extends SpringTestSupport { assertEquals(2, context.getRestDefinitions().size()); RestDefinition rest = context.getRestDefinitions().get(0); assertNotNull(rest); - assertEquals("/say/hello", rest.getUri()); + assertEquals("/say/hello", rest.getPath()); assertEquals(1, rest.getVerbs().size()); ToDefinition to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getTo()); assertEquals("direct:hello", to.getUri()); rest = context.getRestDefinitions().get(1); assertNotNull(rest); - assertEquals("/say/bye", rest.getUri()); + assertEquals("/say/bye", rest.getPath()); assertEquals(2, rest.getVerbs().size()); assertEquals("application/json", rest.getVerbs().get(0).getConsumes()); to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getTo()); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetEmbeddedRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetEmbeddedRouteTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetEmbeddedRouteTest.java index 3446f25..c9cafe8 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetEmbeddedRouteTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetEmbeddedRouteTest.java @@ -39,14 +39,14 @@ public class FromRestGetEmbeddedRouteTest extends CamelBlueprintTestSupport { assertEquals(2, context.getRestDefinitions().size()); RestDefinition rest = context.getRestDefinitions().get(0); assertNotNull(rest); - assertEquals("/say/hello", rest.getUri()); + assertEquals("/say/hello", rest.getPath()); assertEquals(1, rest.getVerbs().size()); ToDefinition to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getRoute().getOutputs().get(1)); assertEquals("mock:hello", to.getUri()); rest = context.getRestDefinitions().get(1); assertNotNull(rest); - assertEquals("/say/bye", rest.getUri()); + assertEquals("/say/bye", rest.getPath()); assertEquals(2, rest.getVerbs().size()); assertEquals("application/json", rest.getVerbs().get(0).getConsumes()); to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getRoute().getOutputs().get(1)); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java index 68f1547..8b97268 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java @@ -39,14 +39,14 @@ public class FromRestGetTest extends CamelBlueprintTestSupport { assertEquals(2, context.getRestDefinitions().size()); RestDefinition rest = context.getRestDefinitions().get(0); assertNotNull(rest); - assertEquals("/say/hello", rest.getUri()); + assertEquals("/say/hello", rest.getPath()); assertEquals(1, rest.getVerbs().size()); ToDefinition to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getTo()); assertEquals("direct:hello", to.getUri()); rest = context.getRestDefinitions().get(1); assertNotNull(rest); - assertEquals("/say/bye", rest.getUri()); + assertEquals("/say/bye", rest.getPath()); assertEquals(2, rest.getVerbs().size()); assertEquals("application/json", rest.getVerbs().get(0).getConsumes()); to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getTo()); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java index 1f22a26..2fd6d3e 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java @@ -39,7 +39,7 @@ public class FromRestUriPrefixTest extends CamelBlueprintTestSupport { assertEquals(1, context.getRestDefinitions().size()); RestDefinition rest = context.getRestDefinitions().get(0); assertNotNull(rest); - assertEquals("/say/", rest.getUri()); + assertEquals("/say/", rest.getPath()); assertEquals(3, rest.getVerbs().size()); assertEquals("/hello", rest.getVerbs().get(0).getUri()); assertEquals("bye", rest.getVerbs().get(1).getUri()); http://git-wip-us.apache.org/repos/asf/camel/blob/ff39d841/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/RestRefTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/RestRefTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/RestRefTest.java index 4d4d7b6..e25af30 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/RestRefTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/RestRefTest.java @@ -39,14 +39,14 @@ public class RestRefTest extends CamelBlueprintTestSupport { assertEquals(2, context.getRestDefinitions().size()); RestDefinition rest = context.getRestDefinitions().get(0); assertNotNull(rest); - assertEquals("/say/hello", rest.getUri()); + assertEquals("/say/hello", rest.getPath()); assertEquals(1, rest.getVerbs().size()); ToDefinition to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getTo()); assertEquals("direct:hello", to.getUri()); rest = context.getRestDefinitions().get(1); assertNotNull(rest); - assertEquals("/say/bye", rest.getUri()); + assertEquals("/say/bye", rest.getPath()); assertEquals(2, rest.getVerbs().size()); assertEquals("application/json", rest.getVerbs().get(0).getConsumes()); to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getTo());
