.mailmap | 2 ++ modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/CanonicalResourceKey.java | 6 +++--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java | 6 ++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java | 4 ++++ 4 files changed, 15 insertions(+), 3 deletions(-)
New commits: commit bcd495227d4e09eb7f8609c21b753f967d623753 Author: Heiko W. Rupp hwr@redhat.com Date: Sat Dec 7 23:22:30 2013 +0100
BZ 1039107 - Allow to limit alert definitions display by resource id.
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 b043247..739e358 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 @@ -315,6 +315,12 @@ public class AbstractRestBean { uri = uriBuilder.build(res.getId()); link = new Link("alerts", uri.toString()); rwt.addLink(link); + uriBuilder = uriInfo.getBaseUriBuilder(); + uriBuilder.path("/alert/definitions"); + uriBuilder.queryParam("resourceId",res.getId()); + uri = uriBuilder.build(res.getId()); + link = new Link("alertDefinitions", uri.toString()); + rwt.addLink(link); if (parent != null) { uriBuilder = uriInfo.getBaseUriBuilder(); uriBuilder.path("/resource/{id}/"); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java index 3b43bee..d42dade 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java @@ -155,6 +155,7 @@ public class AlertDefinitionHandlerBean extends AbstractRestBean { @ApiParam("Should conditions and notifications be returned too?") @QueryParam("full") @DefaultValue("false") boolean full, @ApiParam(value = "Page number") @QueryParam("page") Integer page, @ApiParam(value = "Page size") @DefaultValue("20") @QueryParam("ps") int pageSize, + @ApiParam(value = "Resource id") @QueryParam("resourceId") Integer resourceId, @Context HttpHeaders headers, @Context UriInfo uriInfo) {
@@ -163,6 +164,9 @@ public class AlertDefinitionHandlerBean extends AbstractRestBean { if (page!=null) { criteria.setPaging(page,pageSize); } + if (resourceId!=null) { + criteria.addFilterResourceIds(resourceId); + }
PageList<AlertDefinition> defs = alertDefinitionManager.findAlertDefinitionsByCriteria(caller, criteria); List<AlertDefinitionRest> ret = new ArrayList<AlertDefinitionRest>(defs.size());
commit 679f1f840296a9f1e4af6756263444d3cd13801a Author: Heiko W. Rupp hwr@redhat.com Date: Fri Dec 6 17:06:46 2013 +0100
Add some more aliases for Jean-Frederic
diff --git a/.mailmap b/.mailmap index 663fd9c..4ddd3a9 100644 --- a/.mailmap +++ b/.mailmap @@ -35,6 +35,8 @@ Jay Shaughnessy jshaughn@redhat.com jshaughn@jshaughn.csb Jay Shaughnessy jshaughn@redhat.com Jay Shaughnessy jshaughn@jshaughn.csb Jean-Frederic Clere jclere@redhat.com Jean-Frederic Clere jclere@redhat.com jfclere@neo2.gva.redhat.com +Jean-Frederic Clere jclere@redhat.com jfclere@gmail.com +Jean-Frederic Clere jclere@redhat.com jfclere@redhat.com Jeff Ortel jortel@redhat.com Jérémie Lagarde jer@printstacktrace.org Jessica Sant jsant@redhat.com
commit 9f5d168e0564038ace82e60fa9be657de8d5da50 Author: Heiko W. Rupp hwr@redhat.com Date: Fri Dec 6 11:14:38 2013 +0100
Intern the strings in the KeyType, as they tend to contain the same things over and over again.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/CanonicalResourceKey.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/CanonicalResourceKey.java index 18c6987..d59c373 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/CanonicalResourceKey.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/CanonicalResourceKey.java @@ -136,9 +136,9 @@ public class CanonicalResourceKey implements Serializable { if (type.getPlugin() == null) { throw new PluginContainerException("plugin must not be null"); } - this.key = key; - this.type = type.getName(); - this.plugin = type.getPlugin(); + this.key = key.intern(); + this.type = type.getName().intern(); + this.plugin = type.getPlugin().intern(); }
@Override