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 2020/03/04 09:40:42 UTC
[camel] branch master updated (3bf4567 -> 864489c)
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 3bf4567 CS: Fix import order
new 186c920 CAMEL-14651: Added unit test
new 5d04799 CAMEL-14651: Fixed log message and property placeholders
new 864489c CAMEL-14640: Upgrade okhttp client
The 3 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:
.../java/org/apache/camel/reifier/LogReifier.java | 5 ++--
.../apache/camel/main/MainLogPlaceholderTest.java | 35 +++++++++++-----------
parent/pom.xml | 6 ++--
.../karaf/features/src/main/resources/features.xml | 13 +++-----
4 files changed, 27 insertions(+), 32 deletions(-)
copy components/camel-spring/src/test/java/org/apache/camel/spring/MainExampleTest.java => core/camel-main/src/test/java/org/apache/camel/main/MainLogPlaceholderTest.java (57%)
[camel] 01/03: CAMEL-14651: Added unit test
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 186c92075cbdccfc4364a4bf4556193182fca6e6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 4 09:38:48 2020 +0100
CAMEL-14651: Added unit test
---
.../apache/camel/main/MainLogPlaceholderTest.java | 54 ++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainLogPlaceholderTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainLogPlaceholderTest.java
new file mode 100644
index 0000000..399e778
--- /dev/null
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainLogPlaceholderTest.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.main;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class MainLogPlaceholderTest extends Assert {
+
+ @Test
+ public void testMain() throws Exception {
+ Main main = new Main();
+ main.addInitialProperty("camel.context.name", "test-ctx");
+ main.addInitialProperty("message", "test");
+ main.addInitialProperty("tap", "mock:tap");
+ main.addRoutesBuilder(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("timer:tick?period=10")
+ .log("{{message}}")
+ .transform().constant("Hello {{message}}")
+ .wireTap("{{tap}}");
+ }
+ });
+ main.start();
+
+ MockEndpoint tap = main.getCamelContext().getEndpoint("mock:tap", MockEndpoint.class);
+ tap.expectedMinimumMessageCount(3);
+ tap.allMessages().body().isEqualTo("Hello test");
+
+ assertEquals("test-ctx", main.getCamelContext().getName());
+
+ tap.assertIsSatisfied();
+
+ main.stop();
+ }
+
+}
[camel] 03/03: CAMEL-14640: Upgrade okhttp client
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 864489c0a5280ddcd9ed4fdc3b54c359cb4b4910
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 4 10:03:33 2020 +0100
CAMEL-14640: Upgrade okhttp client
---
parent/pom.xml | 6 +++---
platforms/karaf/features/src/main/resources/features.xml | 13 ++++---------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 0bc1bba..57309f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -506,8 +506,8 @@
<!-- should be in-sync with deltaspike -->
<openwebbeans1-version>1.2.7</openwebbeans1-version>
<openwebbeans-version>1.7.3</openwebbeans-version>
- <okclient-version>3.11.0</okclient-version>
- <okclient-bundle-version>3.11.0_1</okclient-bundle-version>
+ <okclient-version>3.14.7</okclient-version>
+ <okclient-bundle-version>3.14.1_1</okclient-bundle-version>
<olingo2-version>2.0.11</olingo2-version>
<olingo-odata2-core-bundle-version>2.0.11_1</olingo-odata2-core-bundle-version>
<olingo2-gson-version>2.4</olingo2-gson-version>
@@ -621,7 +621,7 @@
<spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! -->
<spymemcached-version>2.12.0</spymemcached-version>
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
- <squareup-okhttp-version>3.14.3</squareup-okhttp-version>
+ <squareup-okhttp-version>3.14.7</squareup-okhttp-version>
<squareup-okio-version>1.17.2</squareup-okio-version>
<squareup-okhttp-bundle-version>2.7.5_1</squareup-okhttp-bundle-version>
<squareup-okio-bundle-version>1.15.0_1</squareup-okio-bundle-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 3e12e0b..5975dd4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1585,6 +1585,7 @@
<feature name='camel-kafka' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/${kafka-bundle-version}</bundle>
+
<bundle dependency='true'>wrap:mvn:org.lz4/lz4-java/${lz4-version}</bundle>
<bundle>mvn:org.apache.camel/camel-kafka/${project.version}</bundle>
<feature dependency='true'>snappy</feature>
@@ -1606,6 +1607,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.automaton/${automaton-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}</bundle>
<bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle>
<bundle dependency='true'>mvn:io.fabric8/zjsonpatch/${zjsonpatch-version}</bundle>
<bundle dependency='true'>mvn:io.fabric8/kubernetes-model/${kubernetes-model-version}</bundle>
@@ -1962,6 +1964,7 @@
<bundle dependency='true'>mvn:org.ow2.asm/asm-tree/${asm-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}</bundle>
<bundle dependency='true'>mvn:org.pacesys/openstack4j-core/${openstack4j-version}</bundle>
<bundle dependency='true'>mvn:org.pacesys.openstack4j.connectors/openstack4j-okhttp/${openstack4j-version}</bundle>
<bundle>mvn:org.apache.camel/camel-openstack/${project.version}</bundle>
@@ -2285,40 +2288,32 @@
</feature>
<feature name='camel-soroush' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
-
<bundle dependency='true'>mvn:org.glassfish.jersey.core/jersey-client/${jersey-version}</bundle>
<bundle dependency='true'>mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jakarta-api-version}</bundle>
<bundle dependency='true'>mvn:org.glassfish.jersey.core/jersey-common/${jersey-version}</bundle>
<bundle dependency='true'>mvn:org.glassfish.hk2/osgi-resource-locator/${hk2-osgi-resource-version}</bundle>
<bundle dependency='true'>mvn:org.glassfish.hk2.external/jakarta.inject/${hk2-version}</bundle>
-
<bundle dependency='true'>mvn:org.glassfish.jersey.media/jersey-media-json-jackson/${jersey-version}</bundle>
<bundle dependency='true'>mvn:org.glassfish.jersey.ext/jersey-entity-filtering/${jersey-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>
-
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle>
-
+ <bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp-sse/${okclient-version}</bundle>
-
<bundle dependency='true'>mvn:org.glassfish.jersey.inject/jersey-hk2/${jersey-version}</bundle>
<bundle dependency='true'>mvn:org.glassfish.hk2/hk2-locator/${hk2-version}</bundle>
<bundle dependency='true'>mvn:org.glassfish.hk2.external/aopalliance-repackaged/${hk2-version}</bundle>
<bundle dependency='true'>mvn:org.glassfish.hk2/hk2-api/${hk2-version}</bundle>
<bundle dependency='true'>mvn:org.glassfish.hk2/hk2-utils/${hk2-version}</bundle>
<bundle dependency='true'>mvn:org.javassist/javassist/${javassist-version}</bundle>
-
<bundle dependency='true'>mvn:org.glassfish.jersey.media/jersey-media-sse/${jersey-version}</bundle>
-
<bundle dependency='true'>mvn:org.glassfish.jersey.media/jersey-media-multipart/${jersey-version}</bundle>
<bundle dependency='true'>mvn:org.jvnet.mimepull/mimepull/${mimepull-version}</bundle>
-
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle>
-
<bundle>mvn:org.apache.camel/camel-soroush/${project.version}</bundle>
</feature>
<feature name='camel-splunk' version='${project.version}' start-level='50'>
[camel] 02/03: CAMEL-14651: Fixed log message and property
placeholders
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 5d047991993e055f4a9383e1ca252a604216faef
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 4 09:43:32 2020 +0100
CAMEL-14651: Fixed log message and property placeholders
---
.../src/main/java/org/apache/camel/reifier/LogReifier.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/LogReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/LogReifier.java
index 7a3a223..26e3c20 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/LogReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/LogReifier.java
@@ -44,11 +44,12 @@ public class LogReifier extends ProcessorReifier<LogDefinition> {
@Override
public Processor createProcessor() throws Exception {
StringHelper.notEmpty(definition.getMessage(), "message", this);
+ String msg = parseString(definition.getMessage());
// use simple language for the message string to give it more power
- Expression exp = camelContext.resolveLanguage("simple").createExpression(definition.getMessage());
+ Expression exp = camelContext.resolveLanguage("simple").createExpression(msg);
- // get logger explicitely set in the definition
+ // get logger explicitly set in the definition
Logger logger = definition.getLogger();
// get logger which may be set in XML definition