modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java
| 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java
| 5 +---
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/ResourceWithType.java
| 11 ++++++++++
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Resource.java
| 9 ++++++++
4 files changed, 23 insertions(+), 3 deletions(-)
New commits:
commit e77bb5ff279a23cbf2cfd91e6d8db29264cf3576
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Oct 29 21:37:01 2013 +0100
BZ 1024525 - Provide current availability with the resource.
(cherry picked from commit f63522842e6cf13cac40cc1137e9728e00cccf58)
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java
index 3d3fdf6..b043247 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java
@@ -276,6 +276,7 @@ public class AbstractRestBean {
rwt.setStatus(res.getInventoryStatus().name());
rwt.setLocation(res.getLocation());
rwt.setDescription(res.getDescription());
+
rwt.setAvailability(res.getCurrentAvailability().getAvailabilityType().toString());
Resource parent = res.getParentResource();
if (parent != null) {
rwt.setParentId(parent.getId());
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/ResourceWithType.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/ResourceWithType.java
index f802f35..ca9d8e2 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/ResourceWithType.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/ResourceWithType.java
@@ -45,6 +45,7 @@ public class ResourceWithType {
String pluginName;
Integer parentId;
String status;
+ String availability;
List<Link> links = new ArrayList<Link>();
private String ancestry;
private String location;
@@ -146,6 +147,16 @@ public class ResourceWithType {
return ancestry;
}
+ @ApiProperty("The availability of the resource at the time of retrieval. "
+
+ "Please note that when caching the resource, this value may become
outdated.")
+ public String getAvailability() {
+ return availability;
+ }
+
+ public void setAvailability(String availability) {
+ this.availability = availability;
+ }
+
@Override
public String toString() {
return "ResourceWithType{" +
diff --git
a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Resource.java
b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Resource.java
index 5eb33d2..d0fc10a 100644
---
a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Resource.java
+++
b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Resource.java
@@ -39,6 +39,7 @@ public class Resource {
String ancestry;
String location;
String description;
+ String availability;
public Resource() {
}
@@ -130,4 +131,12 @@ public class Resource {
public void setLocation(String location) {
this.location = location;
}
+
+ public String getAvailability() {
+ return availability;
+ }
+
+ public void setAvailability(String availability) {
+ this.availability = availability;
+ }
}
commit 5f29976fbd903c0269cd7f30e2e8d6ea226f75f0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Oct 29 21:38:00 2013 +0100
Remove outdated comment.
(cherry picked from commit afc0857fe3af9aacac50e4e133d77acb90679af6)
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java
index 070675e..ca46a43 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java
@@ -93,9 +93,8 @@ import org.rhq.enterprise.server.rest.helper.ConfigurationHelper;
@Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
@Stateless
@Interceptors(SetCallerInterceptor.class)
-@Api(value = "Endpoints for operations - EXPERIMENTAL",
- description = "These endpoints deal with scheduling of operations and retrieval
of operation results. " +
- "These are working, but may still change in the next RHQ release.")
+@Api(value = "Endpoints for operations.",
+ description = "These endpoints deal with scheduling of operations and retrieval
of operation results. ")
public class OperationsHandlerBean extends AbstractRestBean {
@EJB
Show replies by date