Gilad Chaplik has uploaded a new change for review. Change subject: frontend: remove Config dependency from frontend ......................................................................
frontend: remove Config dependency from frontend The only use of class org.ovirt.engine.core.common.config.Config is to get the default configuration version. Replacing it with a static const in the client; Note: this can be a series of patches, if later decided to fetch it from server side. Change-Id: I47e6f47bff95ca630f192c0b3197688c5caf2948 Signed-off-by: Gilad Chaplik <gchap...@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/vms/SpiceConsoleModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AboutPopupPresenterWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AboutPopupPresenterWidget.java 5 files changed, 72 insertions(+), 47 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/10330/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 656ceca..b4d02b1 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 @@ -50,7 +50,6 @@ import org.ovirt.engine.core.common.businessentities.tags; import org.ovirt.engine.core.common.businessentities.vm_pools; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; -import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.CommandVersionsInfo; @@ -131,12 +130,19 @@ public final class AsyncDataProvider { + private static final String GENERAL = "general"; //$NON-NLS-1$ + // dictionary to hold cache of all config values (per version) queried by client, if the request for them succeeded. private static HashMap<KeyValuePairCompat<ConfigurationValues, String>, Object> cachedConfigValues = new HashMap<KeyValuePairCompat<ConfigurationValues, String>, Object>(); private static HashMap<KeyValuePairCompat<ConfigurationValues, String>, Object> cachedConfigValuesPreConvert = new HashMap<KeyValuePairCompat<ConfigurationValues, String>, Object>(); + + public static String getDefaultConfigurationVersion() { + //TODO: get from query, or from cofigValues + return GENERAL; + } public static void GetDomainListViaPublic(AsyncQuery aQuery, boolean filterInternalDomain) { aQuery.converterCallback = new IAsyncConverter() { @@ -374,7 +380,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.VMMinMemorySizeInMB, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.VMMinMemorySizeInMB, + getDefaultConfigurationVersion()), aQuery); } @@ -387,7 +394,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.SpiceUsbAutoShare, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.SpiceUsbAutoShare, + getDefaultConfigurationVersion()), aQuery); } @@ -399,7 +407,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.WANColorDepth, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.WANColorDepth, getDefaultConfigurationVersion()), aQuery); } @@ -432,7 +440,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.WANDisableEffects, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.WANDisableEffects, + getDefaultConfigurationVersion()), aQuery); } @@ -459,7 +468,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.VM32BitMaxMemorySizeInMB, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.VM32BitMaxMemorySizeInMB, + getDefaultConfigurationVersion()), aQuery); } @@ -472,7 +482,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.MaxVmsInPool, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.MaxVmsInPool, getDefaultConfigurationVersion()), aQuery); } @@ -655,7 +665,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.ValidNumOfMonitors, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.ValidNumOfMonitors, + getDefaultConfigurationVersion()), aQuery); } @@ -706,7 +717,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.VmPriorityMaxValue, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.VmPriorityMaxValue, + getDefaultConfigurationVersion()), aQuery); } @@ -850,7 +862,7 @@ }; GetConfigFromCache( new GetConfigurationValueParameters(is64 ? ConfigurationValues.VM64BitMaxMemorySizeInMB - : ConfigurationValues.VM32BitMaxMemorySizeInMB, Config.DefaultConfigurationVersion), + : ConfigurationValues.VM32BitMaxMemorySizeInMB, getDefaultConfigurationVersion()), aQuery); } @@ -1107,7 +1119,8 @@ } }; Frontend.RunPublicQuery(VdcQueryType.GetConfigurationValue, - new GetConfigurationValueParameters(ConfigurationValues.ProductRPMVersion, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.ProductRPMVersion, + getDefaultConfigurationVersion()), aQuery); } @@ -1120,7 +1133,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.SearchResultsLimit, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.SearchResultsLimit, + getDefaultConfigurationVersion()), aQuery); } @@ -1133,7 +1147,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.SANWipeAfterDelete, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.SANWipeAfterDelete, + getDefaultConfigurationVersion()), aQuery); } @@ -1268,7 +1283,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.EnableUSBAsDefault, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.EnableUSBAsDefault, + getDefaultConfigurationVersion()), aQuery); } @@ -1330,7 +1346,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.StoragePoolNameSizeLimit, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.StoragePoolNameSizeLimit, + getDefaultConfigurationVersion()), aQuery); } @@ -1343,7 +1360,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.MaxVdsMemOverCommitForServers, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.MaxVdsMemOverCommitForServers, + getDefaultConfigurationVersion()), aQuery); } @@ -1356,7 +1374,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.MaxVdsMemOverCommit, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.MaxVdsMemOverCommit, + getDefaultConfigurationVersion()), aQuery); } @@ -1370,7 +1389,7 @@ }; GetConfigFromCache( new GetConfigurationValueParameters(ConfigurationValues.AllowClusterWithVirtGlusterEnabled, - Config.DefaultConfigurationVersion), + getDefaultConfigurationVersion()), aQuery); } @@ -1403,7 +1422,7 @@ } }; GetConfigurationValueParameters tempVar = new GetConfigurationValueParameters(ConfigurationValues.VdsFenceType); - tempVar.setVersion(version != null ? version.toString() : Config.DefaultConfigurationVersion); + tempVar.setVersion(version != null ? version.toString() : getDefaultConfigurationVersion()); GetConfigFromCache(tempVar, aQuery); } @@ -1556,7 +1575,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.RhevhLocalFSPath, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.RhevhLocalFSPath, + getDefaultConfigurationVersion()), aQuery); } @@ -1569,7 +1589,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.StorageDomainNameSizeLimit, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.StorageDomainNameSizeLimit, + getDefaultConfigurationVersion()), aQuery); } @@ -1600,7 +1621,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForEvenlyDistribute, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForEvenlyDistribute, + getDefaultConfigurationVersion()), aQuery); } @@ -1613,7 +1635,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.LowUtilizationForPowerSave, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.LowUtilizationForPowerSave, + getDefaultConfigurationVersion()), aQuery); } @@ -1626,7 +1649,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, + getDefaultConfigurationVersion()), aQuery); } @@ -1640,7 +1664,7 @@ }; GetConfigFromCache( new GetConfigurationValueParameters(ConfigurationValues.NetworkConnectivityCheckTimeoutInSeconds, - Config.DefaultConfigurationVersion), + getDefaultConfigurationVersion()), aQuery); } @@ -1653,7 +1677,7 @@ }; // GetConfigFromCache( - // new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, Config.DefaultConfigurationVersion), + // new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, getDefaultConfigurationVersion()), // aQuery); aQuery.asyncCallback.OnSuccess(aQuery.getModel(), 10); @@ -1668,7 +1692,7 @@ }; // GetConfigFromCache( - // new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, Config.DefaultConfigurationVersion), + // new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, getDefaultConfigurationVersion()), // aQuery); aQuery.asyncCallback.OnSuccess(aQuery.getModel(), 5); @@ -1852,7 +1876,8 @@ }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.MaxBlockDiskSize, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.MaxBlockDiskSize, + getDefaultConfigurationVersion()), aQuery); } @@ -1986,7 +2011,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.DocsURL, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.DocsURL, getDefaultConfigurationVersion()), aQuery); } @@ -2091,7 +2116,8 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.RedirectServletReportsPage, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.RedirectServletReportsPage, + getDefaultConfigurationVersion()), aQuery); } @@ -2147,7 +2173,8 @@ */ public static void GetManagementNetworkName(AsyncQuery aQuery) { GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.ManagementNetwork, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.ManagementNetwork, + getDefaultConfigurationVersion()), aQuery); } @@ -2189,7 +2216,7 @@ */ public static Object GetConfigValuePreConverted(ConfigurationValues configValue) { KeyValuePairCompat<ConfigurationValues, String> key = - new KeyValuePairCompat<ConfigurationValues, String>(configValue, Config.DefaultConfigurationVersion); + new KeyValuePairCompat<ConfigurationValues, String>(configValue, getDefaultConfigurationVersion()); return cachedConfigValuesPreConvert.get(key); } @@ -2852,7 +2879,7 @@ public static int GetMaxVmPriority() { return (Integer) GetConfigValuePreConverted(ConfigurationValues.VmPriorityMaxValue, - Config.DefaultConfigurationVersion); + getDefaultConfigurationVersion()); } public static int RoundPriority(int priority) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java index 561014c..6d97e4f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java @@ -20,7 +20,6 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.storage_domains; -import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.common.queries.GetAllImagesListByStoragePoolIdParameters; @@ -283,15 +282,16 @@ ArrayList<VdcQueryParametersBase> parametersList = new ArrayList<VdcQueryParametersBase>(); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SSLEnabled, Config.DefaultConfigurationVersion)); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.CipherSuite, Config.DefaultConfigurationVersion)); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SSLEnabled, AsyncDataProvider.getDefaultConfigurationVersion())); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.CipherSuite, AsyncDataProvider.getDefaultConfigurationVersion())); parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceSecureChannels, thisVm.getVdsGroupCompatibilityVersion().toString())); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.EnableSpiceRootCertificateValidation, Config.DefaultConfigurationVersion)); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.EnableSpiceRootCertificateValidation, AsyncDataProvider.getDefaultConfigurationVersion())); parametersList.add(new GetVmByVmIdParameters(thisVm.getId())); parametersList.add(new VdcQueryParametersBase()); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceToggleFullScreenKeys, Config.DefaultConfigurationVersion)); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceReleaseCursorKeys, Config.DefaultConfigurationVersion)); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceToggleFullScreenKeys, AsyncDataProvider.getDefaultConfigurationVersion())); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceReleaseCursorKeys, + AsyncDataProvider.getDefaultConfigurationVersion())); if (isoDomain != null) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java index ce8354b..a0c23ba 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java @@ -18,7 +18,6 @@ import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeOptionEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeType; import org.ovirt.engine.core.common.businessentities.gluster.TransportType; -import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.ConfigurationValues; @@ -466,17 +465,17 @@ }; AsyncDataProvider.GetConfigFromCache(new GetConfigurationValueParameters(ConfigurationValues.GlusterVolumeOptionOwnerGroupVirtValue, - Config.DefaultConfigurationVersion), + AsyncDataProvider.getDefaultConfigurationVersion()), aQueryInner1); } }; AsyncDataProvider.GetConfigFromCache(new GetConfigurationValueParameters(ConfigurationValues.GlusterVolumeOptionOwnerUserVirtValue, - Config.DefaultConfigurationVersion), + AsyncDataProvider.getDefaultConfigurationVersion()), aQueryInner); } }; AsyncDataProvider.GetConfigFromCache(new GetConfigurationValueParameters(ConfigurationValues.GlusterVolumeOptionGroupVirtValue, - Config.DefaultConfigurationVersion), + AsyncDataProvider.getDefaultConfigurationVersion()), aQuery); } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AboutPopupPresenterWidget.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AboutPopupPresenterWidget.java index b08745f..6587507 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AboutPopupPresenterWidget.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AboutPopupPresenterWidget.java @@ -1,6 +1,5 @@ package org.ovirt.engine.ui.userportal.section.main.presenter; -import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.common.queries.GetConfigurationValueParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -51,7 +50,7 @@ AsyncQuery aQuery = new AsyncQuery(); Frontend.RunPublicQuery(VdcQueryType.GetConfigurationValue, - new GetConfigurationValueParameters(ConfigurationValues.VdcVersion, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.VdcVersion, AsyncDataProvider.getDefaultConfigurationVersion()), aQuery); AsyncQuery _asyncQuery = new AsyncQuery(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AboutPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AboutPopupPresenterWidget.java index 3b1377a..e41972d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AboutPopupPresenterWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AboutPopupPresenterWidget.java @@ -1,6 +1,5 @@ package org.ovirt.engine.ui.webadmin.section.main.presenter; -import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.common.queries.GetConfigurationValueParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -70,7 +69,8 @@ AsyncQuery aQuery = new AsyncQuery(); Frontend.RunPublicQuery(VdcQueryType.GetConfigurationValue, - new GetConfigurationValueParameters(ConfigurationValues.VdcVersion, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.VdcVersion, + AsyncDataProvider.getDefaultConfigurationVersion()), aQuery); AsyncQuery _asyncQuery = new AsyncQuery(); -- To view, visit http://gerrit.ovirt.org/10330 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47e6f47bff95ca630f192c0b3197688c5caf2948 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches