You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/07/30 14:39:01 UTC
[camel] branch master updated (bf5ef47 -> b85578e)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from bf5ef47 Removed unused imports
new f2c3fe6 CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Quartz2
new f56eead CAMEL-13801 - Fixed CS for Camel-Quartz2
new b85578e Removed unused imports
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:
.../quartz2/QuartzCustomCalendarFireTest.java | 18 ++++++++----------
.../quartz2/QuartzCustomCalendarNoFireTest.java | 18 ++++++++----------
.../quartz2/QuartzStartDelayedWithReferenceTest.java | 19 ++++++++-----------
3 files changed, 24 insertions(+), 31 deletions(-)
[camel] 02/03: CAMEL-13801 - Fixed CS for Camel-Quartz2
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f56eeadc7a7500f96a3e0911b6e3f458821852b0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 30 16:36:43 2019 +0200
CAMEL-13801 - Fixed CS for Camel-Quartz2
---
.../component/quartz2/QuartzCustomCalendarFireTest.java | 8 ++++----
.../component/quartz2/QuartzCustomCalendarNoFireTest.java | 8 ++++----
.../quartz2/QuartzStartDelayedWithReferenceTest.java | 14 +++++++-------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
index 572c423..29825b5 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
@@ -39,7 +39,7 @@ public class QuartzCustomCalendarFireTest extends BaseQuartzTest {
QuartzComponent component = context.getComponent("quartz2", QuartzComponent.class);
Scheduler scheduler = component.getScheduler();
-
+
Calendar c = scheduler.getCalendar(QuartzConstants.QUARTZ_CAMEL_CUSTOM_CALENDAR);
Date now = new Date();
java.util.Calendar tomorrow = java.util.Calendar.getInstance();
@@ -49,7 +49,7 @@ public class QuartzCustomCalendarFireTest extends BaseQuartzTest {
assertEquals(true, c.isTimeIncluded(now.getTime()));
assertMockEndpointsSatisfied();
}
-
+
@BindToRegistry("calendar")
public HolidayCalendar loadCalendar() throws Exception {
@@ -61,7 +61,7 @@ public class QuartzCustomCalendarFireTest extends BaseQuartzTest {
return cal;
}
-
+
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@@ -70,4 +70,4 @@ public class QuartzCustomCalendarFireTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
index e8c3d57..c308dff 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
@@ -39,7 +39,7 @@ public class QuartzCustomCalendarNoFireTest extends BaseQuartzTest {
QuartzComponent component = context.getComponent("quartz2", QuartzComponent.class);
Scheduler scheduler = component.getScheduler();
-
+
Calendar c = scheduler.getCalendar(QuartzConstants.QUARTZ_CAMEL_CUSTOM_CALENDAR);
Date now = new Date();
java.util.Calendar tomorrow = java.util.Calendar.getInstance();
@@ -49,7 +49,7 @@ public class QuartzCustomCalendarNoFireTest extends BaseQuartzTest {
assertEquals(false, c.isTimeIncluded(now.getTime()));
assertMockEndpointsSatisfied();
}
-
+
@BindToRegistry("calendar")
public HolidayCalendar loadCalendar() throws Exception {
@@ -58,7 +58,7 @@ public class QuartzCustomCalendarNoFireTest extends BaseQuartzTest {
return cal;
}
-
+
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@@ -67,4 +67,4 @@ public class QuartzCustomCalendarNoFireTest extends BaseQuartzTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
index b1833a0..3141e1e 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
@@ -21,13 +21,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
public class QuartzStartDelayedWithReferenceTest extends QuartzStartDelayedTest {
-
- @BindToRegistry("interval")
- private Long interval = new Long(2);
-
- @BindToRegistry("count")
- private Integer count = new Integer(1);
-
+
+ @BindToRegistry("interval")
+ private Long interval = new Long(2);
+
+ @BindToRegistry("count")
+ private Integer count = new Integer(1);
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
[camel] 03/03: Removed unused imports
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b85578ee60f2f739b9288e11c7766c57f37eeed1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 30 16:38:41 2019 +0200
Removed unused imports
---
.../org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java | 1 -
.../apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java | 1 -
.../camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java | 1 -
3 files changed, 3 deletions(-)
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
index 29825b5..b305cc1 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
@@ -21,7 +21,6 @@ import java.util.Date;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Test;
import org.quartz.Calendar;
import org.quartz.Scheduler;
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
index c308dff..ae71728 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
@@ -21,7 +21,6 @@ import java.util.Date;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Test;
import org.quartz.Calendar;
import org.quartz.Scheduler;
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
index 3141e1e..251878f 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.quartz2;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
public class QuartzStartDelayedWithReferenceTest extends QuartzStartDelayedTest {
[camel] 01/03: CAMEL-13801 - camel3 - Use @BindToRegistry wherever
possible, Camel-Quartz2
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f2c3fe6842faf1939f3f3af0af804227c5e5f201
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 30 16:35:43 2019 +0200
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Quartz2
---
.../component/quartz2/QuartzCustomCalendarFireTest.java | 9 ++++-----
.../component/quartz2/QuartzCustomCalendarNoFireTest.java | 9 ++++-----
.../quartz2/QuartzStartDelayedWithReferenceTest.java | 14 ++++++--------
3 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
index 91e2c6c..572c423 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.quartz2;
import java.util.Date;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -49,9 +50,8 @@ public class QuartzCustomCalendarFireTest extends BaseQuartzTest {
assertMockEndpointsSatisfied();
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("calendar")
+ public HolidayCalendar loadCalendar() throws Exception {
HolidayCalendar cal = new HolidayCalendar();
java.util.Calendar tomorrow = java.util.Calendar.getInstance();
@@ -59,8 +59,7 @@ public class QuartzCustomCalendarFireTest extends BaseQuartzTest {
tomorrow.add(java.util.Calendar.DAY_OF_MONTH, 1);
cal.addExcludedDate(tomorrow.getTime());
- jndi.bind("calendar", cal);
- return jndi;
+ return cal;
}
@Override
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
index 783cd72..e8c3d57 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.quartz2;
import java.util.Date;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -49,15 +50,13 @@ public class QuartzCustomCalendarNoFireTest extends BaseQuartzTest {
assertMockEndpointsSatisfied();
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("calendar")
+ public HolidayCalendar loadCalendar() throws Exception {
HolidayCalendar cal = new HolidayCalendar();
cal.addExcludedDate(new Date());
- jndi.bind("calendar", cal);
- return jndi;
+ return cal;
}
@Override
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
index 09bbf17..b1833a0 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
@@ -16,19 +16,17 @@
*/
package org.apache.camel.component.quartz2;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
public class QuartzStartDelayedWithReferenceTest extends QuartzStartDelayedTest {
- // just bind the reference value here
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("interval", new Long(2));
- registry.bind("count", new Integer(1));
- return registry;
- }
-
+ @BindToRegistry("interval")
+ private Long interval = new Long(2);
+
+ @BindToRegistry("count")
+ private Integer count = new Integer(1);
@Override
protected RouteBuilder createRouteBuilder() throws Exception {