[camel] 01/03: CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Quartz2

[acosentino]

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 <anco...@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 {