modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
| 5 ++++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
| 2 ++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/MetricSchedule.java
| 8 ++++----
modules/enterprise/server/jar/src/main/resources/rest_templates/metricSchedule.ftl
| 2 +-
4 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 34e74b6fbb6dc128698d9e3faca008ae5357c793
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Sep 22 11:38:56 2011 -0400
Start support for updating of schedules.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index b6271bb..3ff403d 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -154,11 +154,14 @@ public class MetricHandlerBean extends AbstractRestBean implements
MetricHandle
if (in==null)
throw new StuffNotFoundException("Input is null"); // TODO other
type of exception
+ if (in.getScheduleId()==null)
+ throw new StuffNotFoundException("Invalid input data");
+
MeasurementSchedule schedule = scheduleManager.getScheduleById(caller,
scheduleId);
if (schedule==null)
throw new StuffNotFoundException("Schedule with id " +
scheduleId);
- schedule.setEnabled(in.isEnabled());
+ schedule.setEnabled(in.getEnabled());
schedule.setInterval(in.getCollectionInterval());
scheduleManager.updateSchedule(caller, schedule);
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
index 572f341..572fe5b 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.server.rest;
import java.util.List;
import javax.ejb.Local;
+import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@@ -75,6 +76,7 @@ public interface MetricHandlerLocal {
@PUT
@Path("/schedule/{id}")
+ @Consumes("application/json")
MetricSchedule updateSchedule(@PathParam("id") int scheduleId,
MetricSchedule in);
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/MetricSchedule.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/MetricSchedule.java
index 02a1cba..efa6361 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/MetricSchedule.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/MetricSchedule.java
@@ -75,7 +75,7 @@ public class MetricSchedule {
this.scheduleName = scheduleName;
}
- public Boolean isEnabled() {
+ public Boolean getEnabled() {
return enabled;
}
@@ -115,7 +115,7 @@ public class MetricSchedule {
this.type = type;
}
- public String getEnabled() {
- return String.valueOf(enabled);
- }
+// public String getEnabled() {
+// return String.valueOf(enabled);
+// }
}
diff --git
a/modules/enterprise/server/jar/src/main/resources/rest_templates/metricSchedule.ftl
b/modules/enterprise/server/jar/src/main/resources/rest_templates/metricSchedule.ftl
index 30c8be0..26360e5 100644
--- a/modules/enterprise/server/jar/src/main/resources/rest_templates/metricSchedule.ftl
+++ b/modules/enterprise/server/jar/src/main/resources/rest_templates/metricSchedule.ftl
@@ -37,7 +37,7 @@
<td>Name</td><td>${var.displayName}</td>
</tr>
<tr>
- <td>Enabled</td><td>${var.enabled}</td>
+
<td>Enabled</td><td>${var.enabled?string("Yes","No")}</td>
</tr>
<tr>
<td>Collection interval
(ms)</td><td>${var.collectionInterval}</td>
Show replies by date