diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java index ffc4599049ca2..1ef47d42a4d68 100644 --- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java +++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java @@ -19,22 +19,25 @@ import java.io.Serializable; import org.apache.camel.CamelContext; +import org.apache.camel.Route; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.quartz.SchedulerContext; import org.quartz.SchedulerException; +import static org.apache.camel.util.URISupport.normalizeUri; + /** - * @version + * @version */ public class CamelJob implements Job, Serializable { - private static final long serialVersionUID = 26L; + private static final long serialVersionUID = 27L; public void execute(JobExecutionContext context) throws JobExecutionException { String camelContextName = (String) context.getJobDetail().getJobDataMap().get(QuartzConstants.QUARTZ_CAMEL_CONTEXT_NAME); - String endpointUri = (String) context.getJobDetail().getJobDataMap().get(QuartzConstants.QUARTZ_ENDPOINT_URI); + String expectedQuartzEndpointUri = (String) context.getJobDetail().getJobDataMap().get(QuartzConstants.QUARTZ_ENDPOINT_URI); SchedulerContext schedulerContext; try { @@ -47,11 +50,26 @@ public void execute(JobExecutionContext context) throws JobExecutionException { if (camelContext == null) { throw new JobExecutionException("No CamelContext could be found with name: " + camelContextName); } - QuartzEndpoint endpoint = camelContext.getEndpoint(endpointUri, QuartzEndpoint.class); - if (endpoint == null) { - throw new JobExecutionException("No QuartzEndpoint could be found with uri: " + endpointUri); + + getExpectedQuartzEndpoint(expectedQuartzEndpointUri, camelContext).onJobExecute(context); + } + + private QuartzEndpoint getExpectedQuartzEndpoint(String expectedQuartzEndpointUri, CamelContext camelContext) throws JobExecutionException { + try { + for (Route route : camelContext.getRoutes()) { + if (route.getEndpoint() instanceof QuartzEndpoint) { + QuartzEndpoint quartzEndpoint = (QuartzEndpoint)route.getEndpoint(); + if (normalizeUri(quartzEndpoint.getEndpointUri()).equals(normalizeUri(expectedQuartzEndpointUri)) && quartzEndpoint.isStarted()) { + return quartzEndpoint; + } + } + } + } + catch (Exception e) { + throw new JobExecutionException(e); } - endpoint.onJobExecute(context); + + throw new JobExecutionException("No QuartzEndpoint could be found with uri: " + expectedQuartzEndpointUri); } } \ No newline at end of file diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithSmallCacheTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithSmallCacheTest.java new file mode 100644 index 0000000000000..d1fdda4f90de6 --- /dev/null +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithSmallCacheTest.java @@ -0,0 +1,104 @@ +/** + * 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.component.quartz; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +/** + * Endpoints are stored in a LRU list with a default capacity of 1000. If the list is full, + * then endpoints are removed and should be recreated. + * + * We simulate this behavior with a capacity of 1 element. + * + * @version + */ +public class QuartzCronRouteWithSmallCacheTest extends CamelTestSupport { + + private List list = new ArrayList(); + + @Test + public void testQuartzCronRouteWithSmallCache() throws Exception { + synchronized (this) { + for(int i = 0; i< 100; i++) { + wait(100); + if(list.size() > 4) { + break; + } + + } + } + + assertTrue("Cron was triggered only " + list.size() + " times", list.size() > 4); + } + + + @Override + protected CamelContext createCamelContext() throws Exception { + CamelContext context = new DefaultCamelContext(){ + @Override + public Map getProperties() { + Map res = super.getProperties(); + res.put(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE, "1"); + return res; + } + }; + + return context; + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + public void configure() { + // START SNIPPET: e1 + // triggers every 2th second at precise 00,02,04,06..58 + // notice we must use + as space when configured using URI parameter + try { + from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").process(new Processor() { + @Override + public void process(Exchange exchange) throws Exception { + context().createProducerTemplate().send("direct:a", exchange); + context().createProducerTemplate().send("direct:a", exchange); + list.add(new Object()); + } + }); + from("direct:a").process(new Processor() { + + @Override + public void process(Exchange arg0) throws Exception { + } + }); + } catch(Exception e) { + e.printStackTrace(); + } + // END SNIPPET: e1 + } + }; + } +} \ No newline at end of file