Arik Hadas has uploaded a new change for review. Change subject: frontend: set query's refresh property using fluent api ......................................................................
frontend: set query's refresh property using fluent api In addition, the patch contains minor refactoring in AsyncDataProvider. Change-Id: Id8dcd88a788cf06ae959b6e24ff34c0096392d6e Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IdQueryParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java 3 files changed, 25 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/25790/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IdQueryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IdQueryParameters.java index 59003aa..f05639a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IdQueryParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IdQueryParameters.java @@ -20,4 +20,10 @@ public Guid getId() { return id; } + + @Override + public IdQueryParameters withoutRefresh() { + super.withoutRefresh(); + return this; + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java index c16673d..25cc28a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java @@ -53,6 +53,11 @@ this.refresh = refresh; } + public VdcQueryParametersBase withoutRefresh() { + setRefresh(false); + return this; + } + public boolean isFiltered() { return isFiltered; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index cca725a..511c0d0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -55,7 +55,6 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.VM; -import org.ovirt.engine.core.common.businessentities.VmDevice; import org.ovirt.engine.core.common.businessentities.VmGuestAgentInterface; import org.ovirt.engine.core.common.businessentities.VmPool; import org.ovirt.engine.core.common.businessentities.VmTemplate; @@ -874,7 +873,7 @@ @Override public Object Convert(Object source, AsyncQuery _asyncQuery) { if (source != null) { - return ((List<String>) source).size() > 0; + return !((List<?>) source).isEmpty(); } return false; @@ -888,7 +887,7 @@ @Override public Object Convert(Object source, AsyncQuery _asyncQuery) { if (source != null) { - return ((List<VmDevice>) source).size() > 0; + return !((List<?>) source).isEmpty(); } return false; @@ -1358,9 +1357,8 @@ return source; } }; - IdQueryParameters params = new IdQueryParameters(dataCenterId); - params.setRefresh(false); - Frontend.getInstance().runQuery(VdcQueryType.GetStoragePoolById, params, aQuery); + Frontend.getInstance().runQuery(VdcQueryType.GetStoragePoolById, + new IdQueryParameters(dataCenterId).withoutRefresh(), aQuery); } public static void getNetworkLabelsByDataCenterId(Guid dataCenterId, AsyncQuery query) { @@ -1547,7 +1545,7 @@ @Override public Object Convert(Object source, AsyncQuery _asyncQuery) { - if (source != null && ((List) source).size() > 0) { + if (source != null && !((List<?>) source).isEmpty()) { return true; } return false; @@ -1734,9 +1732,8 @@ return retMap; } }; - VdcQueryParametersBase params = new VdcQueryParametersBase(); - params.setRefresh(false); - Frontend.getInstance().runQuery(VdcQueryType.GetVmCustomProperties, params, aQuery); + Frontend.getInstance().runQuery(VdcQueryType.GetVmCustomProperties, + new VdcQueryParametersBase().withoutRefresh(), aQuery); } public static void getPermissionsByAdElementId(AsyncQuery aQuery, Guid userId) { @@ -2377,9 +2374,9 @@ @Override public void onSuccess(Object model, Object returnValue) { - ArrayList<StoragePool> pools = - (ArrayList<StoragePool>) ((VdcQueryReturnValue) returnValue).getReturnValue(); - if (pools != null && pools.size() > 0) { + List<StoragePool> pools = + (List<StoragePool>) ((VdcQueryReturnValue) returnValue).getReturnValue(); + if (pools != null && !pools.isEmpty()) { StoragePool pool = pools.get(0); getClusterList((AsyncQuery) model, pool.getId()); } @@ -2548,10 +2545,8 @@ return source != null ? (VM) source : null; } }; - IdQueryParameters params = new IdQueryParameters(snapshotSourceId); - params.setRefresh(false); Frontend.getInstance().runQuery(VdcQueryType.GetVmConfigurationBySnapshot, - params, + new IdQueryParameters(snapshotSourceId).withoutRefresh(), aQuery); } @@ -2647,9 +2642,8 @@ if (cachedCommandsCompatibilityVersions != null) { aQuery.asyncCallback.onSuccess(aQuery.getModel(), isCommandCompatible(vdcActionType, cluster, dc)); } else { - VdcQueryParametersBase params = new VdcQueryParametersBase(); - params.setRefresh(false); - Frontend.getInstance().runQuery(VdcQueryType.GetCommandsCompatibilityVersions, params, aQuery); + Frontend.getInstance().runQuery(VdcQueryType.GetCommandsCompatibilityVersions, + new VdcQueryParametersBase().withoutRefresh(), aQuery); } } @@ -2980,13 +2974,7 @@ public Object Convert(Object source, AsyncQuery _asyncQuery) { ArrayList<VdsNetworkInterface> siblingVlanInterfaces = (ArrayList<VdsNetworkInterface>) source; - - if (siblingVlanInterfaces.size() > 0) - { - return true; - } - - return false; + return !siblingVlanInterfaces.isEmpty(); } }; Frontend.getInstance().runQuery(VdcQueryType.GetAllSiblingVlanInterfaces, -- To view, visit http://gerrit.ovirt.org/25790 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8dcd88a788cf06ae959b6e24ff34c0096392d6e 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
