svn commit: r1213197 - in /camel/trunk/components/camel-quartz/src: main/java/org/apache/camel/component/quartz/QuartzComponent.java test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java

[da...@apache.org]

Author: davsclaus
Date: Mon Dec 12 12:00:44 2011
New Revision: 1213197

URL: http://svn.apache.org/viewvc?rev=1213197&view=rev
Log:
CAMEL-4769: Fixed issue configuring group name when using underscores, in camel-quartz.

Added:
    camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java   (contents, props changed)
      - copied, changed from r1213160, camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
Modified:
    camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java

Modified: camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java?rev=1213197&r1=1213196&r2=1213197&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java (original)
+++ camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java Mon Dec 12 12:00:44 2011
@@ -98,6 +98,11 @@ public class QuartzComponent extends Def
         String cron = getAndRemoveParameter(parameters, "cron", String.class);
         Boolean fireNow = getAndRemoveParameter(parameters, "fireNow", Boolean.class, Boolean.FALSE);
 
+        // host can be null if the uri did contain invalid host characters such as an underscore
+        if (host == null) {
+            host = ObjectHelper.before(remaining, "/");
+        }
+
         // group can be optional, if so set it to Camel
         String name;
         String group;

Copied: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java (from r1213160, camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java?p2=camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java&p1=camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java&r1=1213160&r2=1213197&rev=1213197&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java Mon Dec 12 12:00:44 2011
@@ -20,31 +20,33 @@ import org.apache.camel.builder.RouteBui
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
+import org.quartz.JobDetail;
 
 /**
  * @version 
  */
-public class QuartzRouteTest extends CamelTestSupport {
-    protected MockEndpoint resultEndpoint;
+public class QuartzJobRouteUnderscoreTest extends CamelTestSupport {
 
     @Test
     public void testQuartzRoute() throws Exception {
-        resultEndpoint = getMockEndpoint("mock:result");
-        resultEndpoint.expectedMessageCount(2);
-        resultEndpoint.message(0).header("triggerName").isEqualTo("myTimerName");
-        resultEndpoint.message(0).header("triggerGroup").isEqualTo("myGroup");
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(2);
+        mock.message(0).header("triggerGroup").isEqualTo("my_group");
+        mock.message(0).header("triggerName").isEqualTo("my_timer");
 
-        // lets test the receive worked
-        resultEndpoint.assertIsSatisfied();
+        assertMockEndpointsSatisfied();
+
+        JobDetail detail = mock.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class);
+        assertNotNull(detail);
+        assertEquals("my_job", detail.getName());
     }
 
     @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                // START SNIPPET: example
-                from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
-                // END SNIPPET: example
+                from("quartz://my_group/my_timer?trigger.repeatInterval=2&trigger.repeatCount=1&job.name=my_job")
+                        .to("mock:result");
             }
         };
     }

Propchange: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date