You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/06/15 09:46:08 UTC
[08/11] incubator-brooklyn git commit: Simplify ServerResource logic
Simplify ServerResource logic
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f1870739
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f1870739
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f1870739
Branch: refs/heads/master
Commit: f18707395b85601a3023e003b5af1757508a52bc
Parents: 570436d
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Jun 2 13:16:28 2015 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Tue Jun 2 18:07:41 2015 +0100
----------------------------------------------------------------------
.../java/brooklyn/rest/resources/ServerResource.java | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f1870739/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
index abfb864..cc1c312 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
@@ -289,11 +289,7 @@ public class ServerResource extends AbstractBrooklynRestResource implements Serv
throw WebResourceUtils.unauthorized("User '%s' is not authorized for this operation", Entitlements.getEntitlementContext().user());
Maybe<ManagementContext> mm = mgmtMaybe();
- if (mm.isAbsent()) return false;
- ManagementContext m = mm.get();
- if (!m.isStartupComplete()) return false;
- if (!m.isRunning()) return false;
- return true;
+ return !mm.isAbsent() && mm.get().isStartupComplete() && mm.get().isRunning();
}
@Override
@@ -301,16 +297,12 @@ public class ServerResource extends AbstractBrooklynRestResource implements Serv
if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.SERVER_STATUS, null))
throw WebResourceUtils.unauthorized("User '%s' is not authorized for this operation", Entitlements.getEntitlementContext().user());
Maybe<ManagementContext> mm = mgmtMaybe();
- if (mm.isAbsent()) return false;
- ManagementContext m = mm.get();
- return (m.isStartupComplete() && !m.isRunning());
+ return !mm.isAbsent() && mm.get().isStartupComplete() && !mm.get().isRunning();
}
@Override
public boolean isHealthy() {
- if (!isUp()) return false;
- if (!((ManagementContextInternal)mgmt()).errors().isEmpty()) return false;
- return true;
+ return isUp() && ((ManagementContextInternal) mgmt()).errors().isEmpty();
}
@Override