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 2015/03/02 08:46:09 UTC

camel git commit: Fixed the CS errors

Repository: camel
Updated Branches:
  refs/heads/master af3af21de -> 419071ff0


Fixed the CS errors


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/419071ff
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/419071ff
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/419071ff

Branch: refs/heads/master
Commit: 419071ff07fd7334017354c8ac56cfc3ce8674e8
Parents: af3af21
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Mar 2 15:32:44 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Mar 2 15:39:20 2015 +0800

----------------------------------------------------------------------
 .../org/apache/camel/component/flatpack/FlatpackEndpoint.java  | 6 +++---
 .../apache/camel/component/validator/jing/JingEndpoint.java    | 5 ++++-
 .../main/java/org/apache/camel/jsonpath/JsonPathEngine.java    | 6 +++---
 .../org/apache/camel/component/sparkrest/SparkEndpoint.java    | 4 ++--
 .../java/org/apache/camel/component/stax/StAXEndpoint.java     | 2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/419071ff/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
index 3b00395..152f091 100644
--- a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
+++ b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
@@ -50,15 +50,15 @@ import org.apache.camel.util.ResourceHelper;
  */
 @UriEndpoint(scheme = "flatpack", syntax = "flatpack:type:resourceUri", consumerClass = FlatpackConsumer.class, label = "transformation")
 public class FlatpackEndpoint extends DefaultPollingEndpoint {
+    @UriPath @Metadata(required = "true")
+    protected String resourceUri;
 
     private LoadBalancer loadBalancer = new RoundRobinLoadBalancer();
     private ParserFactory parserFactory = DefaultParserFactory.getInstance();
    
     @UriPath @Metadata(required = "true")
     private FlatpackType type;
-    @UriPath @Metadata(required = "true")
-    protected String resourceUri;
-
+    
     @UriParam(defaultValue = "true")
     private boolean splitRows = true;
     @UriParam

http://git-wip-us.apache.org/repos/asf/camel/blob/419071ff/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java b/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
index 7b4682d..873b85e 100644
--- a/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
+++ b/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
@@ -18,23 +18,26 @@ package org.apache.camel.component.validator.jing;
 
 import java.io.InputStream;
 
-import org.apache.camel.spi.Metadata;
 import org.xml.sax.InputSource;
 
 import com.thaiopensource.relaxng.SchemaFactory;
 import com.thaiopensource.validate.Schema;
 import com.thaiopensource.xml.sax.Jaxp11XMLReaderCreator;
+
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.ResourceHelper;
 
+
+
 @UriEndpoint(scheme = "jing", syntax = "jing:resourceUri", producerOnly = true, label = "validation")
 public class JingEndpoint extends DefaultEndpoint {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/419071ff/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
index 9cccf9b..d1d6dae 100644
--- a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
+++ b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
@@ -22,6 +22,9 @@ import java.io.InputStream;
 import java.net.URL;
 import java.nio.charset.Charset;
 
+import com.jayway.jsonpath.Configuration;
+import com.jayway.jsonpath.JsonPath;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.NoTypeConversionAvailableException;
@@ -29,9 +32,6 @@ import org.apache.camel.WrappedFile;
 import org.apache.camel.component.file.GenericFile;
 import org.apache.camel.component.file.GenericFileConverter;
 
-import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.JsonPath;
-
 public class JsonPathEngine {
 
     private final JsonPath path;

http://git-wip-us.apache.org/repos/asf/camel/blob/419071ff/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java
index b91c2b3..e83b715 100644
--- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java
+++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java
@@ -30,13 +30,13 @@ import spark.route.HttpMethod;
 
 @UriEndpoint(scheme = "spark-rest", syntax = "spark-rest:verb:path", consumerOnly = true, consumerClass =  SparkConsumer.class, label = "rest")
 public class SparkEndpoint extends DefaultEndpoint {
+    @UriParam
+    SparkConfiguration sparkConfiguration;
     @UriPath @Metadata(required = "true")
     private String verb;
     @UriPath @Metadata(required = "true")
     private String path;
     @UriParam
-    SparkConfiguration sparkConfiguration;
-    @UriParam
     private SparkBinding sparkBinding;
     @UriParam
     private String accept;

http://git-wip-us.apache.org/repos/asf/camel/blob/419071ff/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXEndpoint.java b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXEndpoint.java
index 6cd0cb8..5a38dce 100644
--- a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXEndpoint.java
+++ b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXEndpoint.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.component.stax;
 
-import org.apache.camel.spi.Metadata;
 import org.xml.sax.ContentHandler;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.ProcessorEndpoint;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.util.EndpointHelper;