style fixes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d3effc6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d3effc6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d3effc6 Branch: refs/heads/master Commit: 9d3effc61452ac4e1bcfc34ae313ffb897561299 Parents: 837e4c5 Author: sebi <s...@softvision.ro> Authored: Mon May 25 12:33:51 2015 +0300 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Jun 6 10:27:02 2015 +0200 ---------------------------------------------------------------------- .../apache/camel/model/rest/RestDefinition.java | 10 +++++----- .../RestOperationResponseMsgDefinition.java | 10 ++++++---- .../rest/FromRestConfigurationTest.java | 2 +- .../rest/FromRestExplicitComponentTest.java | 4 ++-- .../camel/component/rest/FromRestGetTest.java | 20 ++++++++++---------- .../rest/FromRestIdAndDescriptionTest.java | 4 ++-- .../management/ManagedFromRestGetTest.java | 10 ++++++---- 7 files changed, 32 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9d3effc6/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 b346a03..941860e 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 @@ -575,15 +575,15 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> if (a.startsWith("{") && a.endsWith("}")) { String key = a.substring(1, a.length() - 1); // merge if exists - boolean found=false; - for(RestOperationParamDefinition param: verb.getParams()){ - if(param.getName().equalsIgnoreCase(key)){ + boolean found = false; + for (RestOperationParamDefinition param : verb.getParams()) { + if (param.getName().equalsIgnoreCase(key)) { param.type(RestParamType.path); - found=true; + found = true; break; } } - if(!found) { + if (!found) { restParam(verb).name(key).type(RestParamType.path).endParam(); } } http://git-wip-us.apache.org/repos/asf/camel/blob/9d3effc6/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java index 1084093..3f44e03 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java @@ -16,11 +16,13 @@ */ package org.apache.camel.model.rest; -import org.apache.camel.spi.Metadata; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; +import org.apache.camel.spi.Metadata; /** * To specify the rest operation response messages using Swagger. http://git-wip-us.apache.org/repos/asf/camel/blob/9d3effc6/camel-core/src/test/java/org/apache/camel/component/rest/FromRestConfigurationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestConfigurationTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestConfigurationTest.java index d6fc1ff..59e5e93 100644 --- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestConfigurationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestConfigurationTest.java @@ -35,7 +35,7 @@ public class FromRestConfigurationTest extends FromRestGetTest { @Override protected RouteBuilder createRouteBuilder() throws Exception { - final RouteBuilder lowerR=super.createRouteBuilder(); + final RouteBuilder lowerR = super.createRouteBuilder(); return new RouteBuilder() { @Override public void configure() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/9d3effc6/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 51bb196..f2a55d2 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 @@ -16,11 +16,11 @@ */ package org.apache.camel.component.rest; +import java.util.Arrays; + import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.rest.RestParamType; -import java.util.Arrays; - public class FromRestExplicitComponentTest extends FromRestGetTest { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/9d3effc6/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 f7f5a6f..336f68d 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 @@ -16,6 +16,8 @@ */ package org.apache.camel.component.rest; +import java.util.Arrays; + import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.JndiRegistry; @@ -23,8 +25,6 @@ import org.apache.camel.model.ToDefinition; import org.apache.camel.model.rest.RestDefinition; import org.apache.camel.model.rest.RestParamType; -import java.util.Arrays; - public class FromRestGetTest extends ContextTestSupport { @Override @@ -64,8 +64,8 @@ public class FromRestGetTest extends ContextTestSupport { assertEquals("integer", rest.getVerbs().get(0).getParams().get(0).getDataType()); assertEquals("string", rest.getVerbs().get(0).getParams().get(1).getDataType()); - assertEquals(Arrays.asList("1","2","3","4"), rest.getVerbs().get(0).getParams().get(0).getAllowableValues()); - assertEquals(Arrays.asList("a","b","c","d"), rest.getVerbs().get(0).getParams().get(1).getAllowableValues()); + assertEquals(Arrays.asList("1", "2", "3", "4"), rest.getVerbs().get(0).getParams().get(0).getAllowableValues()); + assertEquals(Arrays.asList("a", "b", "c", "d"), rest.getVerbs().get(0).getParams().get(1).getAllowableValues()); assertEquals("1", rest.getVerbs().get(0).getParams().get(0).getDefaultValue()); assertEquals("b", rest.getVerbs().get(0).getParams().get(1).getDefaultValue()); @@ -107,16 +107,16 @@ public class FromRestGetTest extends ContextTestSupport { .get().to("direct:hello"); rest("/say/bye") - .get().consumes("application/json") - .restParam().type(RestParamType.header).description("header param description1").dataType("integer").allowableValues(Arrays.asList("1","2","3","4")) - .defaultValue("1").allowMultiple(false).name("header_count").required(true).paramAccess("acc1") + .get().consumes("application/json") + .restParam().type(RestParamType.header).description("header param description1").dataType("integer").allowableValues(Arrays.asList("1", "2", "3", "4")) + .defaultValue("1").allowMultiple(false).name("header_count").required(true).paramAccess("acc1") .endParam(). - restParam().type(RestParamType.query).description("header param description2").dataType("string").allowableValues(Arrays.asList("a","b","c","d")) - .defaultValue("b").allowMultiple(true).name("header_letter").required(false).paramAccess("acc2") + restParam().type(RestParamType.query).description("header param description2").dataType("string").allowableValues(Arrays.asList("a", "b", "c", "d")) + .defaultValue("b").allowMultiple(true).name("header_letter").required(false).paramAccess("acc2") .endParam() .restResponseMsg().code(300).message("test msg").responseModel(Integer.class).endResponseMsg() .to("direct:bye") - .post().to("mock:update"); + .post().to("mock:update"); from("direct:hello") .transform().constant("Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/9d3effc6/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java index e9bf64e..9d98168 100644 --- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java @@ -16,12 +16,12 @@ */ package org.apache.camel.component.rest; +import java.util.Arrays; + import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.rest.RestDefinition; import org.apache.camel.model.rest.RestParamType; -import java.util.Arrays; - public class FromRestIdAndDescriptionTest extends FromRestGetTest { public void testFromRestModel() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/9d3effc6/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java index d899c38..c2a5873 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java @@ -16,6 +16,8 @@ */ package org.apache.camel.management; +import java.util.Arrays; + import javax.management.MBeanServer; import javax.management.ObjectName; @@ -26,8 +28,6 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.SimpleRegistry; import org.apache.camel.model.rest.RestParamType; -import java.util.Arrays; - public class ManagedFromRestGetTest extends ManagementTestSupport { @Override @@ -61,8 +61,10 @@ public class ManagedFromRestGetTest extends ManagementTestSupport { assertTrue(xml.contains("application/json")); assertTrue(xml.contains("</rests>")); - assertTrue(xml.contains("<param paramType=\"query\" name=\"header_letter\" description=\"header param description2\" defaultValue=\"b\" required=\"false\" allowMultiple=\"true\" dataType=\"string\" paramAccess=\"acc2\">")); - assertTrue(xml.contains("<param paramType=\"header\" name=\"header_count\" description=\"header param description1\" defaultValue=\"1\" required=\"true\" allowMultiple=\"false\" dataType=\"integer\" paramAccess=\"acc1\">")); + assertTrue(xml.contains("<param paramType=\"query\" name=\"header_letter\" description=\"header param description2\"" + + " defaultValue=\"b\" required=\"false\" allowMultiple=\"true\" dataType=\"string\" paramAccess=\"acc2\">")); + assertTrue(xml.contains("<param paramType=\"header\" name=\"header_count\" description=\"header param description1\" " + + "defaultValue=\"1\" required=\"true\" allowMultiple=\"false\" dataType=\"integer\" paramAccess=\"acc1\">")); assertTrue(xml.contains("<value>1</value>")); assertTrue(xml.contains("<value>a</value>"));
