From 394c00e56f724a83ca714a0f5ef1396327a39475 Mon Sep 17 00:00:00 2001 From: Gregor Zurowski Date: Wed, 31 May 2017 07:10:06 +0200 Subject: [PATCH 1/3] CAMEL-11335: Add route state details Signed-off-by: Gregor Zurowski --- .../actuate/endpoint/CamelRoutesEndpoint.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java index 3f44320d49100..3cce647a68c8d 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java @@ -24,6 +24,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Route; +import org.apache.camel.StatefulService; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.RouteEndpointInfo; import org.springframework.boot.actuate.endpoint.AbstractEndpoint; import org.springframework.boot.actuate.endpoint.Endpoint; @@ -66,11 +67,33 @@ public static class RouteEndpointInfo { private final long uptimeMillis; + private Boolean started; + + private Boolean starting; + + private Boolean stopped; + + private Boolean stopping; + + private Boolean suspended; + + private Boolean suspending; + public RouteEndpointInfo(Route route) { this.id = route.getId(); this.description = route.getDescription(); this.uptime = route.getUptime(); this.uptimeMillis = route.getUptimeMillis(); + + if (route instanceof StatefulService) { + StatefulService statefulService = (StatefulService) route; + this.started = statefulService.isStarted(); + this.starting = statefulService.isStarting(); + this.stopped = statefulService.isStopped(); + this.stopping = statefulService.isStopping(); + this.suspended = statefulService.isSuspended(); + this.suspending = statefulService.isSuspending(); + } } public String getId() { @@ -89,6 +112,30 @@ public long getUptimeMillis() { return uptimeMillis; } + public Boolean getStarted() { + return started; + } + + public Boolean getStarting() { + return starting; + } + + public Boolean getStopped() { + return stopped; + } + + public Boolean getStopping() { + return stopping; + } + + public Boolean getSuspended() { + return suspended; + } + + public Boolean getSuspending() { + return suspending; + } + } } From 8bd0c59429e24be0ca5a33b81f5b5de68ad77a05 Mon Sep 17 00:00:00 2001 From: Gregor Zurowski Date: Wed, 31 May 2017 09:25:55 +0200 Subject: [PATCH 2/3] CAMEL-11335: Retrieve status from ServiceStatus enum Signed-off-by: Gregor Zurowski --- .../actuate/endpoint/CamelRoutesEndpoint.java | 45 ++----------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java index 3cce647a68c8d..0ccab97c2990b 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java @@ -67,17 +67,7 @@ public static class RouteEndpointInfo { private final long uptimeMillis; - private Boolean started; - - private Boolean starting; - - private Boolean stopped; - - private Boolean stopping; - - private Boolean suspended; - - private Boolean suspending; + private String serviceStatus; public RouteEndpointInfo(Route route) { this.id = route.getId(); @@ -86,13 +76,7 @@ public RouteEndpointInfo(Route route) { this.uptimeMillis = route.getUptimeMillis(); if (route instanceof StatefulService) { - StatefulService statefulService = (StatefulService) route; - this.started = statefulService.isStarted(); - this.starting = statefulService.isStarting(); - this.stopped = statefulService.isStopped(); - this.stopping = statefulService.isStopping(); - this.suspended = statefulService.isSuspended(); - this.suspending = statefulService.isSuspending(); + this.serviceStatus = ((StatefulService) route).getStatus().name(); } } @@ -112,30 +96,9 @@ public long getUptimeMillis() { return uptimeMillis; } - public Boolean getStarted() { - return started; - } - - public Boolean getStarting() { - return starting; - } - - public Boolean getStopped() { - return stopped; - } - - public Boolean getStopping() { - return stopping; - } - - public Boolean getSuspended() { - return suspended; - } - - public Boolean getSuspending() { - return suspending; + public String getServiceStatus() { + return serviceStatus; } - } } From a229f53d0ebae6e26fd76c83202f77cf62e80efb Mon Sep 17 00:00:00 2001 From: Gregor Zurowski Date: Wed, 31 May 2017 09:32:41 +0200 Subject: [PATCH 3/3] CAMEL-11335: Rename status field Signed-off-by: Gregor Zurowski --- .../spring/boot/actuate/endpoint/CamelRoutesEndpoint.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java index 0ccab97c2990b..a2a8b06355b98 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java @@ -67,7 +67,7 @@ public static class RouteEndpointInfo { private final long uptimeMillis; - private String serviceStatus; + private String status; public RouteEndpointInfo(Route route) { this.id = route.getId(); @@ -76,7 +76,7 @@ public RouteEndpointInfo(Route route) { this.uptimeMillis = route.getUptimeMillis(); if (route instanceof StatefulService) { - this.serviceStatus = ((StatefulService) route).getStatus().name(); + this.status = ((StatefulService) route).getStatus().name(); } } @@ -96,8 +96,8 @@ public long getUptimeMillis() { return uptimeMillis; } - public String getServiceStatus() { - return serviceStatus; + public String getStatus() { + return status; } }