Daniel Erez has uploaded a new change for review.
Change subject: webadmin: get LocalFSPath config value synchronously
......................................................................
webadmin: get LocalFSPath config value synchronously
Replacing the asynchronous fetch of LocalFSPath
configuration value with a synchronous one.
Change-Id: I66d2dbd6c795466107a533ee5f0423a9c76b2565
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
3 files changed, 10 insertions(+), 42 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/12511/1
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 f7dbd5d..7d6a6f3 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
@@ -1583,20 +1583,6 @@
path), aQuery);
}
- public static void GetLocalFSPath(AsyncQuery aQuery) {
- aQuery.converterCallback = new IAsyncConverter() {
- @Override
- public Object Convert(Object source, AsyncQuery _asyncQuery)
- {
- return source != null ? (String) source : ""; //$NON-NLS-1$
- }
- };
- GetConfigFromCache(
- new
GetConfigurationValueParameters(ConfigurationValues.RhevhLocalFSPath,
- getDefaultConfigurationVersion()),
- aQuery);
- }
-
public static void GetStorageDomainMaxNameLength(AsyncQuery aQuery) {
aQuery.converterCallback = new IAsyncConverter() {
@Override
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
index d6d0ea0..c8edb5e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
@@ -33,6 +33,7 @@
import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.mode.ApplicationMode;
+import org.ovirt.engine.core.common.queries.ConfigurationValues;
import
org.ovirt.engine.core.common.queries.MultilevelAdministrationByAdElementIdParameters;
import org.ovirt.engine.core.common.queries.SearchParameters;
import org.ovirt.engine.core.common.queries.ValueObjectMap;
@@ -1405,26 +1406,14 @@
}
private void configureLocalStorage2(ConfigureLocalStorageModel model) {
+ String prefix = (String)
AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.RhevhLocalFSPath);
+ if (!StringHelper.isNullOrEmpty(prefix)) {
+ EntityModel pathModel = model.getStorage().getPath();
+ pathModel.setEntity(prefix);
+ pathModel.setIsChangable(false);
+ }
- AsyncDataProvider.GetLocalFSPath(new AsyncQuery(model,
- new INewAsyncCallback() {
- @Override
- public void OnSuccess(Object target, Object returnValue) {
-
- String prefix = (String) returnValue;
- ConfigureLocalStorageModel model =
(ConfigureLocalStorageModel) target;
-
- if (!StringHelper.isNullOrEmpty(prefix)) {
-
- EntityModel pathModel =
model.getStorage().getPath();
- pathModel.setEntity(prefix);
- pathModel.setIsChangable(false);
- }
-
- configureLocalStorage3(model);
- }
- })
- );
+ configureLocalStorage3(model);
}
private void configureLocalStorage3(ConfigureLocalStorageModel model) {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
index 18ad5fc..313ff1c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
@@ -18,6 +18,7 @@
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.common.interfaces.SearchType;
+import org.ovirt.engine.core.common.queries.ConfigurationValues;
import org.ovirt.engine.core.common.queries.SearchParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -191,15 +192,7 @@
setAvailableStorageItems(new ListModel());
getAvailableStorageItems().getSelectedItemChangedEvent().addListener(this);
- AsyncDataProvider.GetLocalFSPath(new AsyncQuery(this,
- new INewAsyncCallback() {
- @Override
- public void OnSuccess(Object target, Object returnValue) {
- StorageModel storageModel = (StorageModel) target;
- storageModel.localFSPath = (String) returnValue;
- }
- },
- getHash()));
+ localFSPath = (String)
AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.RhevhLocalFSPath);
}
@Override
--
To view, visit http://gerrit.ovirt.org/12511
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I66d2dbd6c795466107a533ee5f0423a9c76b2565
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
