You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2018/07/16 06:53:06 UTC
[camel] branch master updated (1f22464 -> dbc6a24)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1f22464 CAMEL-12651 - Allow to override serializing and deserializing default mechanism for kafka headers
new 87dfb4a Fixed CS
new dbc6a24 Fixed CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 4 ++--
.../apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java | 4 +---
.../apache/camel/example/springboot/geocoder/ApplicationTest.java | 5 +----
3 files changed, 4 insertions(+), 9 deletions(-)
[camel] 01/02: Fixed CS
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 87dfb4abd3e5f58ff1b5a2c02daaac5351679276
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jul 16 08:49:02 2018 +0200
Fixed CS
---
.../apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java | 4 +---
.../apache/camel/example/springboot/geocoder/ApplicationTest.java | 5 +----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/examples/camel-example-spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java b/examples/camel-example-spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java
index 7210d75..177b842 100644
--- a/examples/camel-example-spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java
+++ b/examples/camel-example-spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java
@@ -16,12 +16,10 @@
*/
package org.apache.camel.example.springboot.geocoder;
-
+import com.google.maps.model.GeocodingResult;
import org.apache.camel.builder.RouteBuilder;
import org.springframework.stereotype.Component;
-import com.google.maps.model.GeocodingResult;
-
import static org.apache.camel.model.rest.RestParamType.query;
/**
diff --git a/examples/camel-example-spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java b/examples/camel-example-spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java
index ece24ce..1b2cb3a 100644
--- a/examples/camel-example-spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java
+++ b/examples/camel-example-spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java
@@ -16,8 +16,7 @@
*/
package org.apache.camel.example.springboot.geocoder;
-
-
+import com.google.maps.model.GeocodingResult;
import org.apache.camel.CamelContext;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,8 +30,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
-import com.google.maps.model.GeocodingResult;
-
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertNotNull;
[camel] 02/02: Fixed CS
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dbc6a241321215b6d52b86e58b7492d939256f3f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jul 16 08:51:34 2018 +0200
Fixed CS
---
.../src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index fdbdaa7..fa19414 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -132,8 +132,8 @@ public class XmlConverter {
throw new TransformerException("Could not create a transformer - JAXP is misconfigured!");
}
transformer.setOutputProperties(outputProperties);
- if (this.transformerFactory.getClass().getName().equals(XALAN_TRANSFORMER_FACTORY)
- && (source instanceof StAXSource)) {
+ if (this.transformerFactory.getClass().getName().equals(XALAN_TRANSFORMER_FACTORY)
+ && (source instanceof StAXSource)) {
//external xalan can't handle StAXSource, so convert StAXSource to SAXSource.
source = new StAX2SAXSource(((StAXSource) source).getXMLStreamReader());
}