From 95034ba2de5bd4bb670a8f57875f7a0db85d5904 Mon Sep 17 00:00:00 2001
From: Munish Mehta <munish.mehta@bigswitch.com>
Date: Fri, 22 Jun 2012 13:08:49 -0700
Subject: [PATCH] minor syntax change in the REST return value
---
.../core/web/SystemUptimeResource.java | 21 ++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java b/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java
index 17d7b1490..fe4b9676a 100644
--- a/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java
@@ -4,13 +4,28 @@ import net.floodlightcontroller.core.IFloodlightProviderService;
import org.restlet.resource.Get;
import org.restlet.resource.ServerResource;
+
+
public class SystemUptimeResource extends ServerResource {
+
+ public class UptimeRest {
+ long systemUptimeMsec;
+
+ public long getSystemUptimeMsec() {
+ return systemUptimeMsec;
+ }
+ }
+
@Get("json")
- public long retrieve() {
+ public UptimeRest retrieve() {
IFloodlightProviderService floodlightProvider =
(IFloodlightProviderService)getContext().getAttributes().
get(IFloodlightProviderService.class.getCanonicalName());
- return (System.currentTimeMillis() -
- floodlightProvider.getSystemStartTime());
+
+ UptimeRest uptime = new UptimeRest();
+ uptime.systemUptimeMsec =
+ System.currentTimeMillis() - floodlightProvider.getSystemStartTime();
+
+ return (uptime);
}
}
--
GitLab