You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/08/11 09:29:38 UTC
git commit: Fixed bunch of CS errors
Repository: camel
Updated Branches:
refs/heads/master 14cd8d6b3 -> 4a2feba36
Fixed bunch of CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a2feba3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a2feba3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a2feba3
Branch: refs/heads/master
Commit: 4a2feba36892c5f41ecfce0f2715919381152e7f
Parents: 14cd8d6
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Aug 11 15:28:11 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Aug 11 15:28:53 2014 +0800
----------------------------------------------------------------------
.../camel/management/mbean/ManagedRestRegistry.java | 2 +-
.../camel/blueprint/handler/CamelNamespaceHandler.java | 11 +++++++----
.../apache/camel/component/jetty/JettyHttpComponent.java | 3 +--
.../camel/component/netty/http/NettyHttpComponent.java | 2 +-
...QuartzComponentConfigurationAndDocumentationTest.java | 4 ++--
5 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4a2feba3/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRestRegistry.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRestRegistry.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRestRegistry.java
index dfc9c19..b2264d2 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRestRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRestRegistry.java
@@ -71,7 +71,7 @@ public class ManagedRestRegistry extends ManagedService implements ManagedRestRe
String outType = entry.getOutType();
CompositeData data = new CompositeDataSupport(ct, new String[]
- {"url", "baseUrl", "basePath", "uriTemplate", "method", "consumes", "produces", "inType", "outType", "state"},
+ {"url", "baseUrl", "basePath", "uriTemplate", "method", "consumes", "produces", "inType", "outType", "state"},
new Object[]{url, baseUrl, basePath, uriTemplate, method, consumes, produces, inType, outType, state});
answer.put(data);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4a2feba3/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index b29d5c0..4985abc 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -28,19 +28,17 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
+
import javax.xml.bind.Binder;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
-import org.apache.camel.blueprint.CamelRestContextFactoryBean;
-import org.apache.camel.model.ToDefinition;
-import org.apache.camel.model.rest.RestDefinition;
-import org.apache.camel.model.rest.VerbDefinition;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import org.apache.aries.blueprint.BeanProcessor;
import org.apache.aries.blueprint.ComponentDefinitionRegistry;
import org.apache.aries.blueprint.ComponentDefinitionRegistryProcessor;
@@ -58,6 +56,7 @@ import org.apache.camel.Produce;
import org.apache.camel.PropertyInject;
import org.apache.camel.blueprint.BlueprintCamelContext;
import org.apache.camel.blueprint.CamelContextFactoryBean;
+import org.apache.camel.blueprint.CamelRestContextFactoryBean;
import org.apache.camel.blueprint.CamelRouteContextFactoryBean;
import org.apache.camel.builder.xml.Namespaces;
import org.apache.camel.core.xml.AbstractCamelContextFactoryBean;
@@ -77,9 +76,12 @@ import org.apache.camel.model.ResequenceDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.SendDefinition;
import org.apache.camel.model.SortDefinition;
+import org.apache.camel.model.ToDefinition;
import org.apache.camel.model.UnmarshalDefinition;
import org.apache.camel.model.WireTapDefinition;
import org.apache.camel.model.language.ExpressionDefinition;
+import org.apache.camel.model.rest.RestDefinition;
+import org.apache.camel.model.rest.VerbDefinition;
import org.apache.camel.spi.CamelContextNameStrategy;
import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.spi.DataFormatResolver;
@@ -107,6 +109,7 @@ import static org.osgi.service.blueprint.reflect.ComponentMetadata.ACTIVATION_LA
import static org.osgi.service.blueprint.reflect.ServiceReferenceMetadata.AVAILABILITY_MANDATORY;
import static org.osgi.service.blueprint.reflect.ServiceReferenceMetadata.AVAILABILITY_OPTIONAL;
+
/**
* Camel {@link NamespaceHandler} to parse the Camel related namespaces.
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/4a2feba3/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 48f4441..4f0e5b8 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -21,7 +21,6 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URI;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -952,7 +951,7 @@ public class JettyHttpComponent extends HttpComponent implements RestConsumerFac
} else {
path = path + "/" + uriTemplate;
}
- }
+ }
path = FileUtil.stripLeadingSeparator(path);
String scheme = "http";
http://git-wip-us.apache.org/repos/asf/camel/blob/4a2feba3/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index cff2f1e..31240c0 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -246,7 +246,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
if (num > 0) {
port = num;
}
- }
+ }
// if no explicit hostname set then resolve the hostname
if (ObjectHelper.isEmpty(host)) {
http://git-wip-us.apache.org/repos/asf/camel/blob/4a2feba3/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentConfigurationAndDocumentationTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentConfigurationAndDocumentationTest.java
index 98e38e6..d540089 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentConfigurationAndDocumentationTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentConfigurationAndDocumentationTest.java
@@ -33,8 +33,8 @@ public class QuartzComponentConfigurationAndDocumentationTest extends CamelTestS
@Test
public void testComponentConfiguration() throws Exception {
QuartzComponent comp = context.getComponent("quartz", QuartzComponent.class);
- EndpointConfiguration conf = comp.createConfiguration("quartz://myGroup/myName?trigger.repeatCount=3" +
- "&stateful=true&deleteJob=false");
+ EndpointConfiguration conf = comp.createConfiguration("quartz://myGroup/myName?trigger.repeatCount=3"
+ + "&stateful=true&deleteJob=false");
assertEquals("true", conf.getParameter("stateful"));
assertEquals("false", conf.getParameter("deleteJob"));