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/08/13 06:46:54 UTC
[camel] branch master updated (310bf7c -> 2039ed1)
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 310bf7c Merge branch 'master' of github.com:apache/camel
new 9bde88f Update resources maven plugin
new 4a5c7f7 Fixed deprecated warning with maven mojo api
new fa5b1cb Regen
new 2039ed1 CAMEL-15381: Avoid use of reflection in CronComponent.
The 4 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:
camel-dependencies/pom.xml | 2 +-
.../apache/camel/component/cron/CronComponent.java | 9 ++++
.../apache/camel/component/cron/CronEndpoint.java | 51 +++++-----------------
.../camel/component/cron/CronPatternsTest.java | 2 +
.../quartz/cron/QuartzCronMappingTest.java | 2 -
parent/pom.xml | 2 +-
.../camel/maven/resources/CopyResources.java | 2 +-
7 files changed, 25 insertions(+), 45 deletions(-)
[camel] 03/04: Regen
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 fa5b1cbfefbdcec4895632d84d7f24c83b219fd1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Aug 13 07:44:45 2020 +0200
Regen
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index f0f142a..7ce490c 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -414,7 +414,7 @@
<maven-remote-resources-plugin-version>1.5</maven-remote-resources-plugin-version>
<maven-reporting-api-version>2.2.1</maven-reporting-api-version>
<maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
- <maven-resources-plugin-version>3.1.0</maven-resources-plugin-version>
+ <maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
<maven-shade-plugin-version>3.2.1</maven-shade-plugin-version>
<maven-surefire-report-plugin-version>3.0.0-M4</maven-surefire-report-plugin-version>
<maven-war-plugin-version>3.2.3</maven-war-plugin-version>
[camel] 02/04: Fixed deprecated warning with maven mojo api
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 4a5c7f7d40e440e72d22c3214e22fa622a1b027b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 12 22:26:20 2020 +0200
Fixed deprecated warning with maven mojo api
---
.../src/main/java/org/apache/camel/maven/resources/CopyResources.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tooling/maven/camel-resources-plugin/src/main/java/org/apache/camel/maven/resources/CopyResources.java b/tooling/maven/camel-resources-plugin/src/main/java/org/apache/camel/maven/resources/CopyResources.java
index 249e170..9aa69b0 100644
--- a/tooling/maven/camel-resources-plugin/src/main/java/org/apache/camel/maven/resources/CopyResources.java
+++ b/tooling/maven/camel-resources-plugin/src/main/java/org/apache/camel/maven/resources/CopyResources.java
@@ -65,7 +65,7 @@ public class CopyResources extends AbstractMojo {
@Parameter(required = true)
private List<Resource> resources;
- @Component
+ @Parameter(defaultValue = "${session}", readonly = true)
private MavenSession session;
@Component
[camel] 04/04: CAMEL-15381: Avoid use of reflection in
CronComponent.
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 2039ed10f1a18a62c91bbcb773e88c72fe28af7e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Aug 13 08:45:26 2020 +0200
CAMEL-15381: Avoid use of reflection in CronComponent.
---
.../apache/camel/component/cron/CronComponent.java | 9 ++++
.../apache/camel/component/cron/CronEndpoint.java | 51 +++++-----------------
.../camel/component/cron/CronPatternsTest.java | 2 +
.../quartz/cron/QuartzCronMappingTest.java | 2 -
4 files changed, 22 insertions(+), 42 deletions(-)
diff --git a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
index 80933001..dc2ab80 100644
--- a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
+++ b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.cron.api.CamelCronService;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
+import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.util.ObjectHelper;
/**
@@ -55,6 +56,14 @@ public class CronComponent extends DefaultComponent {
// create delegate and set on endpoint
Endpoint delegate = this.service.createEndpoint(configuration);
answer.setDelegate(delegate);
+ if (delegate instanceof DefaultEndpoint) {
+ DefaultEndpoint de = (DefaultEndpoint) delegate;
+ de.setBasicPropertyBinding(answer.isBasicPropertyBinding());
+ de.setBridgeErrorHandler(answer.isBridgeErrorHandler());
+ de.setExceptionHandler(answer.getExceptionHandler());
+ de.setExchangePattern(answer.getExchangePattern());
+ de.setSynchronous(answer.isSynchronous());
+ }
return answer;
}
diff --git a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java
index a809a86..f63849c 100644
--- a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java
+++ b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java
@@ -17,18 +17,16 @@
package org.apache.camel.component.cron;
import org.apache.camel.Category;
-import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.DelegateEndpoint;
import org.apache.camel.Endpoint;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.cron.api.CamelCronConfiguration;
-import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.DefaultEndpoint;
+import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
/**
@@ -73,49 +71,22 @@ public class CronEndpoint extends DefaultEndpoint implements DelegateEndpoint {
}
@Override
- public void setSynchronous(boolean synchronous) {
- super.setSynchronous(synchronous);
- if (delegate instanceof DefaultEndpoint) {
- ((DefaultEndpoint) delegate).setSynchronous(synchronous);
- }
- }
-
- @Override
- public void setBasicPropertyBinding(boolean basicPropertyBinding) {
- super.setBasicPropertyBinding(basicPropertyBinding);
- if (delegate instanceof DefaultEndpoint) {
- ((DefaultEndpoint) delegate).setBasicPropertyBinding(basicPropertyBinding);
- }
- }
-
- @Override
- public void setExchangePattern(ExchangePattern exchangePattern) {
- super.setExchangePattern(exchangePattern);
- if (delegate instanceof DefaultEndpoint) {
- ((DefaultEndpoint) delegate).setExchangePattern(exchangePattern);
- }
- }
+ protected void doStart() throws Exception {
+ super.doStart();
- @Override
- public void setExceptionHandler(ExceptionHandler exceptionHandler) {
- super.setExceptionHandler(exceptionHandler);
- if (delegate instanceof DefaultEndpoint) {
- ((DefaultEndpoint) delegate).setExceptionHandler(exceptionHandler);
- }
+ ObjectHelper.notNull(delegate, "delegate endpoint");
+ ServiceHelper.startService(delegate);
}
@Override
- public void setBridgeErrorHandler(boolean bridgeErrorHandler) {
- super.setBridgeErrorHandler(bridgeErrorHandler);
- if (delegate instanceof DefaultEndpoint) {
- ((DefaultEndpoint) delegate).setBridgeErrorHandler(bridgeErrorHandler);
- }
+ protected void doStop() throws Exception {
+ super.doStop();
+ ServiceHelper.stopService(delegate);
}
@Override
- protected void doStart() throws Exception {
- super.doStart();
-
- ObjectHelper.notNull(delegate, "delegate endpoint");
+ protected void doShutdown() throws Exception {
+ super.doShutdown();
+ ServiceHelper.stopAndShutdownService(delegate);
}
}
diff --git a/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronPatternsTest.java b/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronPatternsTest.java
index 451258f..6932942 100644
--- a/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronPatternsTest.java
+++ b/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronPatternsTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cron;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.FailedToCreateRouteException;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -60,6 +61,7 @@ public class CronPatternsTest extends CamelTestSupport {
void testPlusInURI() throws Exception {
BeanIntrospection bi = context.adapt(ExtendedCamelContext.class).getBeanIntrospection();
bi.setExtendedStatistics(true);
+ bi.setLoggingLevel(LoggingLevel.INFO);
context.addRoutes(new RouteBuilder() {
@Override
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronMappingTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronMappingTest.java
index 73c31f7..5a9f07e 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronMappingTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronMappingTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.DelegateEndpoint;
import org.apache.camel.Endpoint;
import org.apache.camel.Route;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.quartz.BaseQuartzTest;
import org.apache.camel.component.quartz.QuartzEndpoint;
import org.junit.jupiter.api.Test;
@@ -29,7 +28,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class QuartzCronMappingTest extends BaseQuartzTest {
- protected MockEndpoint resultEndpoint;
@Test
public void test5PartsCronPattern() throws Exception {
[camel] 01/04: Update resources maven plugin
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 9bde88f245087410fea89b756b8bae4bac34f4bb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 12 22:23:32 2020 +0200
Update resources maven plugin
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 27801a8..6750fec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -397,7 +397,7 @@
<maven-plugin-testing-harness-version>3.3.0</maven-plugin-testing-harness-version>
<maven-remote-resources-plugin-version>1.5</maven-remote-resources-plugin-version>
<!-- resources plugin needed by Camel maven archetypes -->
- <maven-resources-plugin-version>3.1.0</maven-resources-plugin-version>
+ <maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
<maven-reporting-api-version>2.2.1</maven-reporting-api-version>
<maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
<maven-shade-plugin-version>3.2.1</maven-shade-plugin-version>