You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2019/12/08 10:04:03 UTC
[camel] branch master updated (ce7e7fb -> f847f69)
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from ce7e7fb CAMEL-14263: camel-zookeeper should use source code generated configurer to avoid reflection configuration.
new 8b3d4f7 Remove unused import statements.
new f847f69 Camel 3 made Jackson the default JSON library. Update the Javadoc of DataFormatClause#json to reflect this.
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/builder/DataFormatClause.java | 4 ++--
.../src/main/java/org/apache/camel/model/LogDefinition.java | 1 -
.../src/main/java/org/apache/camel/model/OnFallbackDefinition.java | 1 -
.../src/main/java/org/apache/camel/model/OtherwiseDefinition.java | 1 -
.../src/main/java/org/apache/camel/model/SendDefinition.java | 1 -
.../main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java | 1 -
.../src/main/java/org/apache/camel/model/ThreadsDefinition.java | 1 -
.../model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java | 1 -
.../java/org/apache/camel/model/config/BatchResequencerConfig.java | 1 -
.../java/org/apache/camel/model/config/StreamResequencerConfig.java | 1 -
.../main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java | 1 -
.../java/org/apache/camel/model/dataformat/BarcodeDataFormat.java | 1 -
.../main/java/org/apache/camel/model/dataformat/Base64DataFormat.java | 1 -
.../main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java | 1 -
.../java/org/apache/camel/model/language/ExpressionDefinition.java | 1 -
.../main/java/org/apache/camel/model/language/JsonPathExpression.java | 1 -
.../java/org/apache/camel/model/language/TokenizerExpression.java | 1 -
.../java/org/apache/camel/model/language/XMLTokenizerExpression.java | 1 -
.../main/java/org/apache/camel/model/language/XPathExpression.java | 1 -
.../src/main/java/org/apache/camel/reifier/AggregateReifier.java | 1 -
.../src/main/java/org/apache/camel/reifier/ProcessorReifier.java | 1 -
21 files changed, 2 insertions(+), 22 deletions(-)
[camel] 01/02: Remove unused import statements.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8b3d4f7947bd1ab190adc81902886accffb0aa24
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Dec 8 10:51:47 2019 +0100
Remove unused import statements.
---
.../src/main/java/org/apache/camel/model/LogDefinition.java | 1 -
.../src/main/java/org/apache/camel/model/OnFallbackDefinition.java | 1 -
.../src/main/java/org/apache/camel/model/OtherwiseDefinition.java | 1 -
.../src/main/java/org/apache/camel/model/SendDefinition.java | 1 -
.../main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java | 1 -
.../src/main/java/org/apache/camel/model/ThreadsDefinition.java | 1 -
.../model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java | 1 -
.../main/java/org/apache/camel/model/config/BatchResequencerConfig.java | 1 -
.../main/java/org/apache/camel/model/config/StreamResequencerConfig.java | 1 -
.../src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java | 1 -
.../main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java | 1 -
.../main/java/org/apache/camel/model/dataformat/Base64DataFormat.java | 1 -
.../main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java | 1 -
.../main/java/org/apache/camel/model/language/ExpressionDefinition.java | 1 -
.../main/java/org/apache/camel/model/language/JsonPathExpression.java | 1 -
.../main/java/org/apache/camel/model/language/TokenizerExpression.java | 1 -
.../java/org/apache/camel/model/language/XMLTokenizerExpression.java | 1 -
.../src/main/java/org/apache/camel/model/language/XPathExpression.java | 1 -
.../src/main/java/org/apache/camel/reifier/AggregateReifier.java | 1 -
.../src/main/java/org/apache/camel/reifier/ProcessorReifier.java | 1 -
20 files changed, 20 deletions(-)
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/LogDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/LogDefinition.java
index 59597db..ad4c344 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/LogDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/LogDefinition.java
@@ -22,7 +22,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
-import org.apache.camel.LoggingLevel;
import org.apache.camel.spi.Metadata;
import org.slf4j.Logger;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OnFallbackDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
index 29e2f5e..ccec8a7 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.model;
-import java.util.List;
import java.util.stream.Collectors;
import javax.xml.bind.annotation.XmlAccessType;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OtherwiseDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
index e998ac7..573fd71 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.model;
-import java.util.List;
import java.util.stream.Collectors;
import javax.xml.bind.annotation.XmlAccessType;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SendDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SendDefinition.java
index e7e6242..f20696c 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/SendDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/SendDefinition.java
@@ -22,7 +22,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Endpoint;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.spi.Metadata;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
index a5e328b..ad2e6d1 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.model;
-import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.TimeUnit;
import javax.xml.bind.annotation.XmlAccessType;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java
index 2a45445..2da85e2 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java
@@ -24,7 +24,6 @@ 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.adapters.XmlJavaTypeAdapter;
import org.apache.camel.spi.Metadata;
import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
index fdb18a1..9763951 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.camel.CamelContext;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
index 0c6ac4e..d93691e 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
@@ -20,7 +20,6 @@ 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.XmlSchemaType;
import org.apache.camel.spi.Metadata;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
index 3f3e8fa..6700444 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
@@ -20,7 +20,6 @@ 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.XmlSchemaType;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.processor.resequencer.ExpressionResultComparator;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
index bb3eb77..f7c5ef5 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
@@ -20,7 +20,6 @@ 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.XmlSchemaType;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.spi.Metadata;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
index 93bf062..d37fcba 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
@@ -20,7 +20,6 @@ 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.XmlSchemaType;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.spi.Metadata;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
index 83c57d4..6164cd3 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
@@ -20,7 +20,6 @@ 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.XmlSchemaType;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.spi.Metadata;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
index 0ca7bff..084d1a1 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
@@ -20,7 +20,6 @@ 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.XmlSchemaType;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.spi.Metadata;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
index e81c4cf..85519c8 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlAnyAttribute;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/JsonPathExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
index 6c40c64..1596961 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
@@ -20,7 +20,6 @@ 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.XmlSchemaType;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.CamelContext;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
index ea1c1ea..3883f05 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
@@ -20,7 +20,6 @@ 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.XmlSchemaType;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
index 5c6e410..93a5997 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
@@ -20,7 +20,6 @@ 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.XmlSchemaType;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java
index 8e130df..4cad7f6 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java
@@ -20,7 +20,6 @@ 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.XmlSchemaType;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.xpath.XPathFactory;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java
index dcb5622..5fb0845 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java
@@ -35,7 +35,6 @@ import org.apache.camel.processor.aggregate.AggregationStrategyBeanAdapter;
import org.apache.camel.processor.aggregate.OptimisticLockRetryPolicy;
import org.apache.camel.spi.AggregationRepository;
import org.apache.camel.spi.RouteContext;
-import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.util.concurrent.SynchronousExecutorService;
public class AggregateReifier extends ProcessorReifier<AggregateDefinition> {
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
index c51f554..59e2587 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
@@ -106,7 +106,6 @@ import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.RouteContext;
-import org.apache.camel.support.CamelContextHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
[camel] 02/02: Camel 3 made Jackson the default JSON library.
Update the Javadoc of DataFormatClause#json to reflect this.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f847f691e83f75b80ab317e0b9ec6b743cfe3912
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Dec 8 11:03:36 2019 +0100
Camel 3 made Jackson the default JSON library. Update the Javadoc of DataFormatClause#json to reflect this.
---
.../src/main/java/org/apache/camel/builder/DataFormatClause.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/DataFormatClause.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/DataFormatClause.java
index f27850b..8072ea5 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -560,14 +560,14 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
}
/**
- * Uses the JSON data format using the XStream json library
+ * Uses the JSON data format using the Jackson library
*/
public T json() {
return dataFormat(new JsonDataFormat());
}
/**
- * Uses the JSON data format using the XStream json library turning pretty
+ * Uses the JSON data format using the Jackson library turning pretty
* printing on or off
*
* @param prettyPrint turn pretty printing on or off