Arik Hadas has uploaded a new change for review. Change subject: core: genericSearch method which does not get filter ......................................................................
core: genericSearch method which does not get filter We used to have SearchQuery#genericSearch method that gets filter as a parameter and in case we didn't want to filter, we set the filter to null. A more standard way to do it is by adding a method that does not get filter and delegates to the method that gets a filter by passing null as the filter. Change-Id: Ib013b8eb2baa77b6adc01d70c3df0a87482dc296 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java 1 file changed, 18 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/25021/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java index d388a4d..d2f5636 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java @@ -232,11 +232,11 @@ } private List<DbUser> searchDbUsers() { - return genericSearch(getDbFacade().getDbUserDao(), true, null); + return genericSearch(getDbFacade().getDbUserDao(), true); } private List<DbGroup> searchDbGroups() { - return genericSearch(getDbFacade().getDbGroupDao(), true, null); + return genericSearch(getDbFacade().getDbGroupDao(), true); } private List<VmTemplate> searchVMTemplates() { @@ -252,7 +252,12 @@ }); } private List<VmTemplate> searchInstanceTypes() { - return genericSearch(getDbFacade().getVmTemplateDao(), true, null); + return genericSearch(getDbFacade().getVmTemplateDao(), true); + } + + private final <T extends IVdcQueryable> List<T> genericSearch(final SearchDAO<T> dao, + final boolean useCache) { + return genericSearch(dao, useCache, null); } private final <T extends IVdcQueryable> List<T> genericSearch(final SearchDAO<T> dao, @@ -268,45 +273,45 @@ } private List<AuditLog> searchAuditLogEvents() { - return genericSearch(getDbFacade().getAuditLogDao(), false, null); + return genericSearch(getDbFacade().getAuditLogDao(), false); } private List<VmPool> searchVmPools() { - return genericSearch(getDbFacade().getVmPoolDao(), true, null); + return genericSearch(getDbFacade().getVmPoolDao(), true); } private List<VDSGroup> searchClusters() { - return genericSearch(getDbFacade().getVdsGroupDao(), true, null); + return genericSearch(getDbFacade().getVdsGroupDao(), true); } private List<StoragePool> searchStoragePool() { - return genericSearch(getDbFacade().getStoragePoolDao(), true, null); + return genericSearch(getDbFacade().getStoragePoolDao(), true); } private List<StorageDomain> searchStorageDomain() { - return genericSearch(getDbFacade().getStorageDomainDao(), true, null); + return genericSearch(getDbFacade().getStorageDomainDao(), true); } private List<Quota> searchQuota() { - List<Quota> quotaList = genericSearch(getDbFacade().getQuotaDao(), true, null); + List<Quota> quotaList = genericSearch(getDbFacade().getQuotaDao(), true); QuotaManager.getInstance().updateUsage(quotaList); return quotaList; } private List<Disk> searchDisk() { - return genericSearch(getDbFacade().getDiskDao(), true, null); + return genericSearch(getDbFacade().getDiskDao(), true); } private List<GlusterVolumeEntity> searchGlusterVolumes() { - return genericSearch(getDbFacade().getGlusterVolumeDao(), true, null); + return genericSearch(getDbFacade().getGlusterVolumeDao(), true); } private List<NetworkView> searchNetworks() { - return genericSearch(getDbFacade().getNetworkViewDao(), true, null); + return genericSearch(getDbFacade().getNetworkViewDao(), true); } private List<Provider<?>> searchProviders() { - return genericSearch(getDbFacade().getProviderDao(), true, null); + return genericSearch(getDbFacade().getProviderDao(), true); } private QueryData initQueryData(boolean useCache) { -- To view, visit http://gerrit.ovirt.org/25021 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib013b8eb2baa77b6adc01d70c3df0a87482dc296 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
