modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 13 ++++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java | 3 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java | 2 + 5 files changed, 22 insertions(+)
New commits: commit 91cd383c9b82499340009922e8ed6ba5db919760 Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Feb 5 08:51:30 2013 -0500
i)Update drift component criteria usage to use explicitly request resources as already assumed by the logic. ii)Updated one or two spots to explicitly request single result pagesets where already assumed by logic.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java index 35339cc..dcc08d8 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java @@ -208,6 +208,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { DriftDefinitionCriteria driftDefCriteria = new DriftDefinitionCriteria(); driftDefCriteria.addFilterResourceIds(resourceId); driftDefCriteria.addFilterName(driftDefName); + driftDefCriteria.clearPaging();//disable paging as the code assumes all the results will be returned.
PageList<DriftDefinition> defs = findDriftDefinitionsByCriteria(overlord, driftDefCriteria); if (defs.isEmpty()) { @@ -286,6 +287,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { criteria.setStrict(true); criteria.fetchDrifts(true); criteria.addSortVersion(PageOrdering.ASC); + criteria.setPageControl(PageControl.getUnlimitedInstance());//disable paging as the code assumes all the results will be returned.
PageList<? extends DriftChangeSet<?>> changeSets = findDriftChangeSetsByCriteria(subject, criteria); for (DriftChangeSet<? extends Drift<?, ?>> changeSet : changeSets) { @@ -303,6 +305,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { criteria.addFilterDriftDefinitionId(request.getDriftDefinitionId()); criteria.addFilterId(request.getTemplateChangeSetId()); criteria.fetchDrifts(true); + criteria.setPageControl(PageControl.getUnlimitedInstance());//disable paging as the code assumes all the results will be returned.
PageList<? extends DriftChangeSet<?>> changeSets = findDriftChangeSetsByCriteria(subject, criteria); if (changeSets.isEmpty()) { @@ -353,6 +356,8 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { criteria.addFilterName(driftDefName); criteria.addFilterResourceIds(resourceId); criteria.setStrict(true); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<DriftDefinition> results = driftManager.findDriftDefinitionsByCriteria(subject, criteria); DriftDefinition doomedDriftDef = null; if (results != null && results.size() == 1) { @@ -503,6 +508,8 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { DriftDefinitionCriteria criteria = new DriftDefinitionCriteria(); criteria.addFilterName(summary.getDriftDefinitionName()); criteria.addFilterResourceIds(resourceId); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<DriftDefinition> definitions = findDriftDefinitionsByCriteria(subject, criteria);
if (definitions.isEmpty()) { @@ -692,6 +699,8 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
GenericDriftCriteria criteria = new GenericDriftCriteria(); criteria.addFilterId(driftId1); + criteria.setPageControl(PageControl.getSingleRowInstance()); + List<? extends Drift<?, ?>> result = driftServerPlugin.findDriftsByCriteria(subject, criteria); if (result.size() != 1) { throw new IllegalArgumentException("Drift record not found: " + driftId1); @@ -699,6 +708,8 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { Drift drift1 = result.get(0);
criteria.addFilterId(driftId2); + criteria.setPageControl(PageControl.getSingleRowInstance()); + result = driftServerPlugin.findDriftsByCriteria(subject, criteria); if (result.size() != 1) { throw new IllegalArgumentException("Drift record not found: " + driftId2); @@ -889,6 +900,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { GenericDriftCriteria criteria = new GenericDriftCriteria(); criteria.addFilterId(driftId); criteria.fetchChangeSet(true); + criteria.setPageControl(PageControl.getSingleRowInstance());
DriftDetails driftDetails = new DriftDetails(); DriftServerPluginFacet driftServerPlugin = getServerPlugin(); @@ -946,6 +958,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { criteria.addFilterResourceId(drift.getChangeSet().getResourceId()); criteria.addFilterDriftDefinitionId(drift.getChangeSet().getDriftDefinitionId()); criteria.addFilterVersion(Integer.toString(drift.getChangeSet().getVersion() - 1)); + criteria.setPageControl(PageControl.getSingleRowInstance());
PageList<? extends DriftChangeSet<?>> results = findDriftChangeSetsByCriteria(subject, criteria); // TODO handle empty results diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java index b206b54..3eb83e0 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java @@ -80,6 +80,7 @@ public class DriftServerServiceImpl implements DriftServerService { DriftDefinitionCriteria criteria = new DriftDefinitionCriteria(); criteria.addFilterResourceIds(resourceIds.toArray(new Integer[resourceIds.size()])); criteria.fetchConfiguration(true); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
Subject overlord = getSubjectManager().getOverlord(); PageList<DriftDefinition> definitions = getDriftManager().findDriftDefinitionsByCriteria(overlord, criteria); @@ -119,6 +120,7 @@ public class DriftServerServiceImpl implements DriftServerService { DriftDefinitionCriteria criteria = new DriftDefinitionCriteria(); criteria.addFilterResourceIds(resourceId); criteria.addFilterName(drfitDefName); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
DriftManagerLocal driftMgr = getDriftManager(); SubjectManagerLocal subjectMgr = getSubjectManager(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java index 5d149a1..72eb3e4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java @@ -184,6 +184,8 @@ public class JPADriftServerBean implements JPADriftServerLocal { : new JPADriftCriteria(criteria);
jpaCriteria.fetchChangeSet(true); + jpaCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<JPADrift> drifts = findDriftsByCriteria(subject, jpaCriteria); PageList<DriftComposite> result = new PageList<DriftComposite>(); for (JPADrift drift : drifts) {
commit 7fd0b56fcaa9a506ad409d52636a8dbf8b405e7b Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Mon Feb 4 17:21:14 2013 -0500
Update criteria usage to explicitly support all or one search resource where applicable as already expected by the code.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java index 528fd7a..39bda2c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java @@ -41,6 +41,7 @@ import org.rhq.core.domain.drift.DriftSnapshot; import org.rhq.core.domain.drift.DriftSnapshotRequest; import org.rhq.core.domain.drift.dto.DriftChangeSetDTO; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.authz.RequiredPermission; @@ -125,6 +126,7 @@ public class DriftTemplateManagerBean implements DriftTemplateManagerLocal, Drif DriftDefinitionTemplateCriteria templateCriteria = new DriftDefinitionTemplateCriteria(); templateCriteria.addFilterId(templateId); templateCriteria.fetchDriftDefinitions(true); + templateCriteria.setPageControl(PageControl.getSingleRowInstance());
PageList<DriftDefinitionTemplate> templates = templateMgr.findTemplatesByCriteria(subject, templateCriteria); DriftDefinitionTemplate template = templates.get(0); @@ -133,6 +135,7 @@ public class DriftTemplateManagerBean implements DriftTemplateManagerLocal, Drif criteria.addFilterTemplateId(templateId); criteria.fetchConfiguration(true); criteria.fetchResource(true); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
PageList<DriftDefinition> definitions = driftMgr.findDriftDefinitionsByCriteria(subject, criteria); for (DriftDefinition def : definitions) {
commit f7e7b33e564c123750c5d40a7fbb4df2ab6e5a64 Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Mon Feb 4 17:12:33 2013 -0500
Update measurementSchedule default criteria usage to support larger then default result sets.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java index 934dcd1..9ca60bc 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java @@ -461,6 +461,8 @@ public class MeasurementChartsManagerBean implements MeasurementChartsManagerLoc criteria.addFilterAutoGroupResourceTypeId(context.resourceTypeId); } criteria.addFilterDefinitionIds(definitionId); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<MeasurementSchedule> theSchedules = scheduleManager.findSchedulesByCriteria(subject, criteria); int totalScheduleCount = theSchedules.getTotalSize();
rhq-commits@lists.fedorahosted.org