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 d914135b480166d72c6c5ceeecd0d7c68301ed79
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Feb 13 10:14:00 2018 -0500

    CAMEL-12254: Add restart opertation to JMX route mbean
---
 .../api/management/mbean/ManagedRouteMBean.java    |   6 ++
 .../camel/management/mbean/ManagedRoute.java       |  19 ++++
 .../camel/management/ManagedRouteRestartTest.java  | 119 +++++++++++++++++++++
 3 files changed, 144 insertions(+)

diff --git 
a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
 
b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
index 409a654..51103e7 100644
--- 
a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
+++ 
b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
@@ -104,6 +104,12 @@ public interface ManagedRouteMBean extends 
ManagedPerformanceCounterMBean {
     @ManagedOperation(description = "Remove route (must be stopped)")
     boolean remove() throws Exception;
 
+    @ManagedOperation(description = "Restarts route (1 second delay before 
starting)")
+    void restart() throws Exception;
+
+    @ManagedOperation(description = "Restarts route (using delay in seconds 
before starting)")
+    void restart(long delay) throws Exception;
+
     @ManagedOperation(description = "Dumps the route as XML")
     String dumpRouteAsXml() throws Exception;
 
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
index da3bcdb..471194e 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
@@ -265,6 +265,25 @@ public class ManagedRoute extends 
ManagedPerformanceCounter implements TimerList
         return context.removeRoute(getRouteId());
     }
 
+    @Override
+    public void restart() throws Exception {
+        restart(1);
+    }
+
+    @Override
+    public void restart(long delay) throws Exception {
+        stop();
+        if (delay > 0) {
+            try {
+                LOG.debug("Sleeping {} seconds before starting route: {}", 
delay, getRouteId());
+                Thread.sleep(delay * 1000);
+            } catch (InterruptedException e) {
+                // ignore
+            }
+        }
+        start();
+    }
+
     public String dumpRouteAsXml() throws Exception {
         return dumpRouteAsXml(false);
     }
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java
new file mode 100644
index 0000000..471e596
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java
@@ -0,0 +1,119 @@
+/**
+ * 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.management;
+
+import java.util.Set;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.camel.Route;
+import org.apache.camel.ServiceStatus;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.RoutePolicySupport;
+
+public class ManagedRouteRestartTest extends ManagementTestSupport {
+
+    private MyRoutePolicy myRoutePolicy = new MyRoutePolicy();
+
+    public void testRestartRoute() throws Exception {
+        // JMX tests dont work well on AIX CI servers (hangs them)
+        if (isPlatform("aix")) {
+            return;
+        }
+
+        assertEquals(1, myRoutePolicy.getStart());
+        assertEquals(0, myRoutePolicy.getStop());
+
+        // fire a message to get it running
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+        template.sendBody("direct:start", "Hello World");
+        assertMockEndpointsSatisfied();
+
+        MBeanServer mbeanServer = getMBeanServer();
+
+        Set<ObjectName> set = mbeanServer.queryNames(new 
ObjectName("*:type=routes,*"), null);
+        assertEquals(1, set.size());
+
+        ObjectName on = set.iterator().next();
+
+        boolean registered = mbeanServer.isRegistered(on);
+        assertEquals("Should be registered", true, registered);
+
+        String uri = (String) mbeanServer.getAttribute(on, "EndpointUri");
+        // the route has this starting endpoint uri
+        assertEquals("direct://start", uri);
+
+        // should be started
+        String state = (String) mbeanServer.getAttribute(on, "State");
+        assertEquals("Should be started", ServiceStatus.Started.name(), state);
+
+        String uptime = (String) mbeanServer.getAttribute(on, "Uptime");
+        assertNotNull(uptime);
+        log.info("Uptime: {}", uptime);
+
+        long uptimeMillis = (Long) mbeanServer.getAttribute(on, 
"UptimeMillis");
+        assertTrue(uptimeMillis > 0);
+
+        mbeanServer.invoke(on, "restart", null, null);
+
+        registered = mbeanServer.isRegistered(on);
+        assertEquals("Should be registered", true, registered);
+
+        // should be started
+        state = (String) mbeanServer.getAttribute(on, "State");
+        assertEquals("Should be started", ServiceStatus.Started.name(), state);
+
+        assertEquals(2, myRoutePolicy.getStart());
+        assertEquals(1, myRoutePolicy.getStop());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").routePolicy(myRoutePolicy)
+                    .delayer(10).to("log:foo").to("mock:result");
+            }
+        };
+    }
+
+    private final class MyRoutePolicy extends RoutePolicySupport {
+
+        private int start;
+        private int stop;
+
+        @Override
+        public void onStart(Route route) {
+            start++;
+        }
+
+        @Override
+        public void onStop(Route route) {
+            stop++;
+        }
+
+        public int getStart() {
+            return start;
+        }
+
+        public int getStop() {
+            return stop;
+        }
+    }
+
+}
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

Reply via email to