You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/03/31 23:15:56 UTC
[camel] branch master updated: Fixed Check Styles issues
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new b25884a Fixed Check Styles issues
b25884a is described below
commit b25884ac355697e1e4963ab445e3d0110a632f89
Author: aldettinger <al...@gmail.com>
AuthorDate: Mon Apr 1 01:12:29 2019 +0200
Fixed Check Styles issues
---
.../salesforce/internal/client/SalesforceHttpRequest.java | 2 +-
.../apache/camel/dataformat/xstream/XStreamDataFormat.java | 13 +++++++------
.../java/org/apache/camel/core/osgi/OsgiTypeConverter.java | 4 +++-
.../camel/tools/apt/AbstractTypeConverterGenerator.java | 4 +++-
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceHttpRequest.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceHttpRequest.java
index 4802a69..16bdae7 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceHttpRequest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceHttpRequest.java
@@ -32,7 +32,7 @@ public class SalesforceHttpRequest extends HttpRequest {
}
@Override
- public HttpConversation getConversation() {
+ public HttpConversation getConversation() {
return super.getConversation();
}
}
diff --git a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
index acbdf3c..107ba9c 100644
--- a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
+++ b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
@@ -16,6 +16,13 @@
*/
package org.apache.camel.dataformat.xstream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
@@ -28,12 +35,6 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.annotations.Dataformat;
import org.apache.camel.util.IOHelper;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-import java.io.InputStream;
-import java.io.OutputStream;
-
/**
* A <a href="http://camel.apache.org/data-format.html">data format</a>
* ({@link DataFormat}) using XStream to marshal to and from XML
diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index 7f0f98b..eb3dce8 100644
--- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -280,7 +280,9 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
return e.hasMoreElements();
}
public void forEachRemaining(Consumer<? super T> action) {
- while(e.hasMoreElements()) action.accept(e.nextElement());
+ while (e.hasMoreElements()) {
+ action.accept(e.nextElement());
+ }
}
},
Spliterator.ORDERED), false);
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractTypeConverterGenerator.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractTypeConverterGenerator.java
index 23c9bee..d4941ab 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractTypeConverterGenerator.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/AbstractTypeConverterGenerator.java
@@ -257,7 +257,9 @@ public abstract class AbstractTypeConverterGenerator extends AbstractCamelAnnota
writer.append(" }\n");
writer.append("\n");
- writer.append(" private void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { \n");
+ writer.append(
+ " private void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method)"
+ + " { \n");
writer.append(" registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));\n");
writer.append(" }\n");
writer.append("\n");