modules/enterprise/binding/src/main/java/org/rhq/bindings/script/RepoScriptSourceProvider.java | 1 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptUtil.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 12 ++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 3 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 4 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 4 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/inventory/InventoryManagerBean.java | 7 --- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java | 18 +++++----- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 6 +++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java | 4 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBean.java | 15 ++++---- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java | 5 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java | 4 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java | 15 ++++++-- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentProviderSyncJob.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java | 2 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/tagging/TagManagerBean.java | 2 + 27 files changed, 97 insertions(+), 27 deletions(-)
New commits: commit a782494672c097804bedbee316bd42a75f033975 Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Feb 5 16:43:11 2013 -0500
Update default criteria usages for i)ScriptUtil and ii)for ContentManagerBean.findPackagesWithLatestVersion usages as is a criteria search but does not include 'Criteria' in the method name as all the other criteria methods.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/RepoScriptSourceProvider.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/RepoScriptSourceProvider.java index 607263a..b9ca613 100644 --- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/RepoScriptSourceProvider.java +++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/RepoScriptSourceProvider.java @@ -103,6 +103,7 @@ public class RepoScriptSourceProvider extends BaseRhqSchemeScriptSourceProvider PackageCriteria pCrit = new PackageCriteria(); pCrit.addFilterName(scriptName); pCrit.addFilterRepoId(repo.getId()); + pCrit.clearPaging();//disable paging as the code assumes all the results will be returned.
List<PackageAndLatestVersionComposite> pvs = contentManager.findPackagesWithLatestVersion( rhqFacade.getSubject(), pCrit); diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptUtil.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptUtil.java index bd121e7..6b86b61 100644 --- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptUtil.java +++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptUtil.java @@ -79,6 +79,8 @@ public class ScriptUtil {
ResourceCriteria criteria = new ResourceCriteria(); criteria.addFilterName(string); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + return resourceManager.findResourcesByCriteria(getSubjectFromEngine(), criteria); }
commit b5983f41c53750286601a16e2fca0eb17d31366e Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Feb 5 16:34:28 2013 -0500
Update default criteria usages for ConfigurationMangerBean.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java index 50e5fd4..141b910 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java @@ -89,7 +89,6 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceError; import org.rhq.core.domain.resource.ResourceErrorType; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.resource.composite.ResourceComposite; import org.rhq.core.domain.resource.group.GroupCategory; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; @@ -2576,6 +2575,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf if (tt == PropertyOptionsSource.TargetType.RESOURCE || tt == PropertyOptionsSource.TargetType.CONFIGURATION) { List<Resource> resources = null; ResourceCriteria criteria = new ResourceCriteria(); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
if (tt == PropertyOptionsSource.TargetType.CONFIGURATION) { // split out expression part for target=configuration @@ -2631,6 +2631,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf // for groups we need to talk to the group manager ResourceGroupCriteria criteria = new ResourceGroupCriteria(); criteria.setSearchExpression(expression); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
resourceGroupManager.findResourceGroupCompositesByCriteria(subject, criteria); }
commit 4655782edfffe9706abe97948002d35b71d5d624 Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Feb 5 16:29:06 2013 -0500
Update more default criteria usages by SubjectManager bean and for Bundles as that logic already assumes as much.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java index c9002ba..efe86fb 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java @@ -216,6 +216,8 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe if (newLdapRoles != null) { RoleCriteria subjectLdapRolesCriteria = new RoleCriteria(); subjectLdapRolesCriteria.addFilterLdapSubjectId(subjectToModify.getId()); + subjectLdapRolesCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<Role> currentLdapRoles = roleManager.findRolesByCriteria(whoami, subjectLdapRolesCriteria);
ldapRolesModified = !(currentLdapRoles.containsAll(newLdapRoles) && newLdapRoles diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java index a6302de..4fabe9a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java @@ -376,6 +376,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot criteria.addFilterDestinationId(bundleDestination.getId()); criteria.addFilterIsLive(true); criteria.fetchBundleVersion(true); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<BundleDeployment> liveDeployments = bundleManager.findBundleDeploymentsByCriteria(subject, criteria); BundleDeployment liveDeployment = (liveDeployments.isEmpty()) ? null : liveDeployments.get(0);
@@ -450,6 +452,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot BundleCriteria criteria = new BundleCriteria(); criteria.addFilterBundleTypeId(Integer.valueOf(bundleTypeId)); criteria.addFilterName(bundleName); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<Bundle> bundles = findBundlesByCriteria(subject, criteria); Bundle bundle; if (bundles.getTotalSize() == 0) { @@ -630,6 +634,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot criteria.setStrict(true); criteria.addFilterBundleTypeId(bundleType.getId()); criteria.addFilterName(bundleName); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<Bundle> bundles = bundleManager.findBundlesByCriteria(subject, criteria); Bundle bundle; if (bundles.getTotalSize() == 0) { @@ -699,6 +705,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot BundleFileCriteria bfCriteria = new BundleFileCriteria(); bfCriteria.addFilterBundleVersionId(bundleVersion.getId()); bfCriteria.fetchPackageVersion(true); + bfCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<BundleFile> bfs = bundleManager.findBundleFilesByCriteria(subjectManager.getOverlord(), bfCriteria); bundleFiles.clear(); @@ -1477,6 +1485,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot Bundle bundle = version.getBundle(); BundleDestinationCriteria destinationCriteria = new BundleDestinationCriteria(); destinationCriteria.addFilterBundleId(bundle.getId()); + destinationCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject,destinationCriteria); List<BundleDeployment> resultingDeployments = new ArrayList<BundleDeployment>(version.getBundleDeployments().size()); // We now have visible destinations - go over the resultingDeployments and only include the ones with vis. destinations @@ -1534,6 +1544,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot for (Bundle bundle : bundles.getValues()) { // TODO clone the bundle and return the modified clones BundleDestinationCriteria destinationCriteria = new BundleDestinationCriteria(); destinationCriteria.addFilterBundleId(bundle.getId()); + destinationCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject,destinationCriteria); bundle.setDestinations(destinations); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java index 65a1209..0ca5b82 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java @@ -71,6 +71,8 @@ public class BundleServerServiceImpl implements BundleServerService {
bfc.addFilterBundleVersionId(bundleVersionId); bfc.fetchPackageVersion(true); + bfc.clearPaging();//disable paging as the code assumes all the results will be returned. + List<BundleFile> bundleFiles = bm.findBundleFilesByCriteria(subject, bfc); List<PackageVersion> packageVersions = new ArrayList<PackageVersion>(bundleFiles.size()); PackageVersion packageVersion = null;
commit 12dca890e6f2d53405a3f440f214d4020a315982 Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Feb 5 12:46:40 2013 -0500
i)Update several more instances of default criteria where logic assumed all results returned. ii)small cosmetic fix in rest description.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java index c75246f..a957d00 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java @@ -1593,7 +1593,9 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe throw new IllegalArgumentException("The criteria query has to have a filter for a specific repo."); }
- criteria.fetchVersions(true); + criteria.fetchVersions(true); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<Package> packages = findPackagesByCriteria(subject, criteria);
PageList<PackageAndLatestVersionComposite> ret = new PageList<PackageAndLatestVersionComposite>(packages.getTotalSize(), packages.getPageControl()); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java index 775a1e8..e6bdf1b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java @@ -749,6 +749,8 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal { RepoCriteria reposForContentSource = new RepoCriteria(); reposForContentSource.addFilterContentSourceIds(contentSourceId); reposForContentSource.addFilterCandidate(false); // Don't sync distributions for candidates + reposForContentSource.clearPaging();//disable paging as the code assumes all the results will be returned. + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); List<Repo> repos = repoManager.findReposByCriteria(overlord, reposForContentSource); log.debug("downloadDistributionBits found " + repos.size() + " repos associated with this contentSourceId " diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java index c8234bb..64dde49 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java @@ -582,6 +582,7 @@ public class RepoManagerBean implements RepoManagerLocal, RepoManagerRemote { RepoCriteria candidateReposCriteria = new RepoCriteria(); candidateReposCriteria.addFilterContentSourceIds(contentSourceId); candidateReposCriteria.addFilterCandidate(true); + candidateReposCriteria.clearPaging();//disable paging as the code assumes all the results will be returned.
PageList<Repo> candidatesForThisProvider = findReposByCriteria(subject, candidateReposCriteria);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java index f9143ce..ebaf451 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java @@ -54,7 +54,6 @@ import com.wordnik.swagger.annotations.ApiParam; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;
-import org.jboss.resteasy.annotations.Form; import org.jboss.resteasy.annotations.GZIP; import org.jboss.resteasy.annotations.cache.Cache;
@@ -115,6 +114,8 @@ public class GroupHandlerBean extends AbstractRestBean { if (q!=null) { criteria.addFilterName(q); } + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<ResourceGroup> groups = resourceGroupManager.findResourceGroupsByCriteria(caller, criteria);
List<GroupRest> list = new ArrayList<GroupRest>(groups.size()); @@ -372,6 +373,8 @@ public class GroupHandlerBean extends AbstractRestBean { if (q!=null) { criteria.addFilterName(q); } + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<GroupDefinition> gdlist = definitionManager.findGroupDefinitionsByCriteria(caller, criteria); List<GroupDefinitionRest> list = new ArrayList<GroupDefinitionRest>(gdlist.getTotalSize()); for (GroupDefinition def: gdlist) { 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 92287d5..fbf81fb 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 @@ -343,6 +343,7 @@ public class OperationsHandlerBean extends AbstractRestBean { ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria(); JobId jobId = new JobId(jobName); criteria.addFilterJobId(jobId); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
ResourceOperationHistory history ;//= opsManager.getOperationHistoryByJobId(caller,jobName); List<ResourceOperationHistory> list = opsManager.findResourceOperationHistoriesByCriteria(caller,criteria); @@ -386,6 +387,7 @@ public class OperationsHandlerBean extends AbstractRestBean { criteria.addFilterResourceIds(resourceId);
criteria.addSortEndTime(PageOrdering.DESC); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
List<ResourceOperationHistory> list = opsManager.findResourceOperationHistoriesByCriteria(caller,criteria);
@@ -413,6 +415,8 @@ public class OperationsHandlerBean extends AbstractRestBean {
ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria(); criteria.addFilterJobId(new JobId(jobName)); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<ResourceOperationHistory> list = opsManager.findResourceOperationHistoriesByCriteria(caller,criteria); if ((list != null && !list.isEmpty())) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java index 8142f17..b748833 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java @@ -88,7 +88,12 @@ import org.rhq.enterprise.server.measurement.AvailabilityManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal; import org.rhq.enterprise.server.resource.ResourceAlreadyExistsException; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; -import org.rhq.enterprise.server.rest.domain.*; +import org.rhq.enterprise.server.rest.domain.AvailabilityRest; +import org.rhq.enterprise.server.rest.domain.Link; +import org.rhq.enterprise.server.rest.domain.MetricSchedule; +import org.rhq.enterprise.server.rest.domain.ResourceWithChildren; +import org.rhq.enterprise.server.rest.domain.ResourceWithType; +import org.rhq.enterprise.server.rest.domain.StringValue;
/** * Class that deals with getting data about resources @@ -324,6 +329,8 @@ public class ResourceHandlerBean extends AbstractRestBean { criteria.addFilterInterval(start,end); criteria.addFilterResourceId(resourceId); criteria.addSortStartTime(PageOrdering.DESC); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<Availability> points = availMgr.findAvailabilityByCriteria(caller,criteria); List<AvailabilityRest> ret = new ArrayList<AvailabilityRest>(points.size()); for (Availability avail : points) { @@ -517,6 +524,8 @@ public class ResourceHandlerBean extends AbstractRestBean { public List<Link> getAlertsForResource(@ApiParam("Id of the resource to query") @PathParam("id") int resourceId) { AlertCriteria criteria = new AlertCriteria(); criteria.addFilterResourceIds(resourceId); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<Alert> alerts = alertManager.findAlertsByCriteria(caller, criteria); List<Link> links = new ArrayList<Link>(alerts.size()); for (Alert al : alerts) { @@ -638,9 +647,9 @@ public class ResourceHandlerBean extends AbstractRestBean {
@POST @Path("/") - @ApiOperation("Create a new resource as a child of an existing resource¡") + @ApiOperation("Create a new resource as a child of an existing resource<A1>") public Response createResource( - @ApiParam("THe info about the resource. You need to supply resource name, resource type name, plugin name, id of the parent") ResourceWithType resource, + @ApiParam("The info about the resource. You need to supply resource name, resource type name, plugin name, id of the parent") ResourceWithType resource, @Context UriInfo uriInfo) { return createResourceInternal(resource.getResourceName(),resource.getPluginName(),resource.getParentId(),resource.getTypeName(),uriInfo);
commit 5b4db0d3246d9e43da722d4dd6a679481e17023a Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Feb 5 10:29:58 2013 -0500
Update some more default criteria usages to disable paging where logic already assumes it.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java index b59ca8b..134dedf 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java @@ -140,6 +140,8 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { // Make sure there's not an existing role with the same name. RoleCriteria criteria = new RoleCriteria(); criteria.addFilterName(newRole.getName()); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<Role> roles = findRolesByCriteria(whoami, criteria); if (!roles.isEmpty()) { throw new EntityExistsException("A user role [" + newRole.getName() + "] already exists."); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index d5d7128..63cb44d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -1080,6 +1080,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot ResourceTypeCriteria criteria = new ResourceTypeCriteria(); criteria.addFilterPluginName(plugin); criteria.addFilterName(name); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<ResourceType> result = resourceTypeManager.findResourceTypesByCriteria( subjectManager.getOverlord(), criteria);
@@ -1266,6 +1268,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot ResourceCriteria resourceCriteria = new ResourceCriteria(); resourceCriteria.addFilterParentResourceId(parentResource.getId()); resourceCriteria.addFilterResourceTypeId(resourceType.getId()); + resourceCriteria.clearPaging();//Doc: disable paging as the code assumes all the results will be returned. + PageList<Resource> childResourcesOfType = resourceManager.findResourcesByCriteria( subjectManager.getOverlord(), resourceCriteria); if (childResourcesOfType.size() >= 1) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/inventory/InventoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/inventory/InventoryManagerBean.java index c159275..9f7fc00 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/inventory/InventoryManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/inventory/InventoryManagerBean.java @@ -1,10 +1,6 @@ package org.rhq.enterprise.server.inventory;
-import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedSet;
import javax.ejb.EJB; import javax.ejb.Stateless; @@ -14,9 +10,7 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.Query;
-import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.criteria.ResourceTypeCriteria; -import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.auth.SubjectManagerLocal; @@ -78,6 +72,7 @@ public class InventoryManagerBean implements InventoryManagerLocal { public List<ResourceType> getDeletedTypes() { ResourceTypeCriteria criteria = new ResourceTypeCriteria(); criteria.addFilterDeleted(true); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
return resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(), criteria); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java index bfc2164..1629926 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java @@ -606,6 +606,7 @@ public class SearchAssistManager {
criteria.setCaseSensitive(false); criteria.addSortName(PageOrdering.ASC); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
List<SavedSearch> savedSearchResults = savedSearchManager.findSavedSearchesByCriteria(subject, criteria);
@@ -636,6 +637,7 @@ public class SearchAssistManager {
criteria.setCaseSensitive(false); criteria.addSortName(PageOrdering.ASC); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
List<SavedSearch> savedSearchResults = savedSearchManager.findSavedSearchesByCriteria(subject, criteria);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/tagging/TagManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/tagging/TagManagerBean.java index a7e05a2..944f799 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/tagging/TagManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/tagging/TagManagerBean.java @@ -84,6 +84,8 @@ public class TagManagerBean implements TagManagerLocal, TagManagerRemote { criteria.addFilterSemantic(tag.getSemantic()); criteria.addFilterName(tag.getName()); criteria.setStrict(true); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<Tag> found = findTagsByCriteria(subject, criteria); if (!found.isEmpty()) { assert found.size() == 1; // should never be more than one
commit 9b0f4a401362baed1e1a0b0d171195403b31a554 Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Feb 5 09:36:09 2013 -0500
Update criteria usage by job to explicitly return all the results and not the default.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentProviderSyncJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentProviderSyncJob.java index 574dea2..08a4775 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentProviderSyncJob.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentProviderSyncJob.java @@ -117,6 +117,8 @@ public class ContentProviderSyncJob implements StatefulJob { RepoCriteria repoCriteria = new RepoCriteria(); repoCriteria.addFilterContentSourceIds(contentSource.getId()); repoCriteria.addFilterCandidate(false); + repoCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. + RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal(); PageList<Repo> repos = repoManager.findReposByCriteria(overlord, repoCriteria); Integer[] repoIds = new Integer[repos.size()];
commit 122db27657ac9b66573c2695cd38de76b42045c6 Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Feb 5 09:19:56 2013 -0500
Update Resource type and metadata default usages of criteria to return all results as assumed by logic.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java index 0e4c2c9..a7bd5c3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java @@ -21,6 +21,11 @@
package org.rhq.enterprise.server.resource;
+import static java.util.Arrays.asList; +import static javax.ejb.TransactionAttributeType.REQUIRES_NEW; +import static org.rhq.core.domain.resource.InventoryStatus.COMMITTED; +import static org.rhq.core.domain.resource.ResourceCategory.PLATFORM; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -39,18 +44,13 @@ import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.composite.PlatformMetricsSummary; +import org.rhq.core.domain.resource.composite.PlatformMetricsSummary.CPUMetric; +import org.rhq.core.domain.resource.composite.PlatformMetricsSummary.MemoryMetric; +import org.rhq.core.domain.resource.composite.PlatformMetricsSummary.SwapMetric; import org.rhq.core.domain.util.PageList; import org.rhq.core.util.collection.ArrayUtils; import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal;
-import static java.util.Arrays.asList; -import static javax.ejb.TransactionAttributeType.REQUIRES_NEW; -import static org.rhq.core.domain.resource.InventoryStatus.COMMITTED; -import static org.rhq.core.domain.resource.ResourceCategory.PLATFORM; -import static org.rhq.core.domain.resource.composite.PlatformMetricsSummary.CPUMetric; -import static org.rhq.core.domain.resource.composite.PlatformMetricsSummary.MemoryMetric; -import static org.rhq.core.domain.resource.composite.PlatformMetricsSummary.SwapMetric; - /** * @author jsanda */ @@ -74,6 +74,7 @@ public class PlatformUtilizationManagerBean implements PlatformUtilizationManage ResourceTypeCriteria typeCriteria = new ResourceTypeCriteria(); typeCriteria.addFilterCategory(PLATFORM); typeCriteria.fetchMetricDefinitions(true); + typeCriteria.clearPaging();//disable paging as the code assumes all the results will be returned.
PageList<ResourceType> resourceTypes = resourceTypeMgr.findResourceTypesByCriteria(subject, typeCriteria); Map<Integer, Set<Integer>> platformMetricDefs = new HashMap<Integer, Set<Integer>>(); @@ -84,6 +85,7 @@ public class PlatformUtilizationManagerBean implements PlatformUtilizationManage ResourceCriteria resourceCriteria = new ResourceCriteria(); resourceCriteria.addFilterResourceCategories(PLATFORM); resourceCriteria.addFilterInventoryStatus(COMMITTED); + resourceCriteria.clearPaging();//disable paging as the code assumes all the results will be returned.
PageList<Resource> platforms = resourceMgr.findResourcesByCriteria(subject, resourceCriteria); PageList<PlatformMetricsSummary> summaries = new PageList<PlatformMetricsSummary>(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java index ad81fb1..a7f7433 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java @@ -717,6 +717,8 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal, ResourceCriteria resourceCriteria = new ResourceCriteria(); resourceCriteria.addFilterParentResourceId(parentResource.getId()); resourceCriteria.addFilterResourceTypeId(resourceType.getId()); + resourceCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. + PageList<Resource> childResourcesOfType = resourceManager.findResourcesByCriteria( subjectManager.getOverlord(), resourceCriteria); if (childResourcesOfType.size() >= 1) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java index 0b06d92..205252d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java @@ -814,6 +814,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage ResourceCriteria criteria = new ResourceCriteria(); criteria.addFilterParentResourceId(ancestor.getResource().getId()); criteria.addSortName(PageOrdering.ASC); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<Resource> children = findResourcesByCriteriaBounded(subject, criteria, 0, 0); // Remove any that are in the lineage to avoid repeated handling. children.removeAll(rawResourceLineage); @@ -862,6 +864,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage ResourceCriteria resourceCriteria = new ResourceCriteria(); resourceCriteria.addFilterIds(resourceIds); resourceCriteria.fetchResourceType(true); + resourceCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<Resource> resources = findResourcesByCriteria(subject, resourceCriteria);
if (ResourceAncestryFormat.RAW == format) { @@ -886,6 +890,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
ResourceTypeCriteria resourceTypeCriteria = new ResourceTypeCriteria(); resourceTypeCriteria.addFilterIds(typesSet.toArray(new Integer[typesSet.size()])); + resourceCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<ResourceType> types = typeManager.findResourceTypesByCriteria(subject, resourceTypeCriteria);
for (Resource resource : resources) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java index f93a935..d4f9bb9 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java @@ -525,6 +525,8 @@ public class ResourceTypeManagerBean implements ResourceTypeManagerLocal, Resour if (sawTopLevelServer) { ResourceTypeCriteria criteria = new ResourceTypeCriteria(); criteria.addFilterCategory(ResourceCategory.PLATFORM); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<ResourceType> platforms = findResourceTypesByCriteria(subject, criteria); results.addAll(platforms); } @@ -539,6 +541,8 @@ public class ResourceTypeManagerBean implements ResourceTypeManagerLocal, Resour
if (first.getCategory() == ResourceCategory.PLATFORM) { ResourceTypeCriteria criteria = new ResourceTypeCriteria(); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<ResourceType> allResourceTypes = findResourceTypesByCriteria(subject, criteria);
List<ResourceType> results = new ArrayList<ResourceType>(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBean.java index 25ea666..a52c4c2 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/AlertMetadataManagerBean.java @@ -1,21 +1,20 @@ package org.rhq.enterprise.server.resource.metadata;
+import java.util.List; + +import javax.ejb.EJB; +import javax.ejb.Stateless; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.AlertDefinitionCriteria; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.alert.AlertDefinitionManagerLocal; import org.rhq.enterprise.server.alert.AlertTemplateManagerLocal;
-import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import java.util.List; - @Stateless public class AlertMetadataManagerBean implements AlertMetadataManagerLocal {
@@ -33,6 +32,8 @@ public class AlertMetadataManagerBean implements AlertMetadataManagerLocal {
AlertDefinitionCriteria criteria = new AlertDefinitionCriteria(); criteria.addFilterAlertTemplateResourceTypeId(resourceType.getId()); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<AlertDefinition> templates = alertDefinitionMgr.findAlertDefinitionsByCriteria(subject, criteria);
Integer[] templateIds = new Integer[templates.size()]; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java index 6fc58d6..cd54bf0 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java @@ -239,6 +239,7 @@ public class ContentMetadataManagerBean implements ContentMetadataManagerLocal {
BundleCriteria criteria = new BundleCriteria(); criteria.addFilterBundleTypeId(bundleType.getId()); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
List<Bundle> bundles = bundleMgr.findBundlesByCriteria(subject, criteria); for (Bundle bundle : bundles) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java index 7b03d73..0ab7dee 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java @@ -216,6 +216,8 @@ public class MeasurementMetadataManagerBean implements MeasurementMetadataManage
MeasurementDefinitionCriteria criteria = new MeasurementDefinitionCriteria(); criteria.addFilterResourceTypeId(existingType.getId()); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<MeasurementDefinition> definitions = measurementDefinitionMgr.findMeasurementDefinitionsByCriteria( subjectMgr.getOverlord(), criteria);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java index 841fe03..f833bc5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java @@ -76,6 +76,8 @@ public class PluginConfigurationMetadataManagerBean implements PluginConfigurati Subject overlord = subjectMgr.getOverlord(); ResourceCriteria criteria = new ResourceCriteria(); criteria.addFilterResourceTypeId(existingType.getId()); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<Resource> resources = resourceMgr.findResourcesByCriteria(overlord, criteria);
for (Resource resource : resources) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java index f3c7158..6f0c9df 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java @@ -682,6 +682,8 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal ResourceCriteria criteria = new ResourceCriteria(); criteria.addFilterResourceTypeId(existingType.getId()); criteria.addFilterParentResourceTypeId(obsoleteParentType.getId()); + criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + List<Resource> resources = resourceManager.findResourcesByCriteria(overlord, criteria); for (Resource resource : resources) { Resource newParent = null;
rhq-commits@lists.fedorahosted.org
-
Simeon Pinder