Alon Bar-Lev has uploaded a new change for review. Change subject: common: remove Config dependency from front-end. ......................................................................
common: remove Config dependency from front-end. The only use of class org.ovirt.engine.core.common.config.Config is to get the default configuration version. Move it out to own class removing the dependency of implementation class. Config.DefaultConfigurationVersion -> ConfigCommon.defaultConfigurationVersion Change-Id: Ibcbf08fd77d61a07c83e1e32f0cd67c40ab4cde0 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValueQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValuesQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/Config.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigCommon.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/ConfiguredRangeValidator.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ConfiguredRangeValidatorTest.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtilsTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ConfigUtilsBase.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigRule.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandlerTest.java M backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java M frontend/wars/rmw-war/src/main/java/org/ovirt/engine/core/redirect/RedirectServlet.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebadminDynamicHostingServlet.java 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 24 files changed, 108 insertions(+), 92 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/10263/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index 474eb03..1372555 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -35,6 +35,7 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.interfaces.BackendLocal; import org.ovirt.engine.core.common.interfaces.ErrorTranslator; @@ -301,7 +302,7 @@ private VdcReturnValueBase notAllowToRunAction(VdcActionType actionType) { // Since reload of configuration values is not fully supported, we have to get this value from DB // and can not use the cached configuration. - String mode = (DbFacade.getInstance().getVdcOptionDao().getByNameAndVersion(ConfigValues.EngineMode.name(),Config.DefaultConfigurationVersion)).getoption_value(); + String mode = (DbFacade.getInstance().getVdcOptionDao().getByNameAndVersion(ConfigValues.EngineMode.name(),ConfigCommon.defaultConfigurationVersion)).getoption_value(); if (EngineWorkingMode.MAINTENANCE.name().equalsIgnoreCase(mode)) { return getErrorCommandReturnValue(VdcBllMessages.ENGINE_IS_RUNNING_IN_MAINTENANCE_MODE); } @@ -392,7 +393,7 @@ CommandsFactory.getQueryClass(actionType.name()); if (clazz.isAnnotationPresent(DisableInMaintenanceMode.class)) { String mode = (DbFacade.getInstance().getVdcOptionDao().getByNameAndVersion - (ConfigValues.EngineMode.name(),Config.DefaultConfigurationVersion)).getoption_value(); + (ConfigValues.EngineMode.name(),ConfigCommon.defaultConfigurationVersion)).getoption_value(); if (EngineWorkingMode.MAINTENANCE.name().equalsIgnoreCase(mode)) { return getErrorQueryReturnValue(VdcBllMessages.ENGINE_IS_RUNNING_IN_MAINTENANCE_MODE); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValueQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValueQuery.java index de7b1b5..1fe1e88 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValueQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValueQuery.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.bll; import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.queries.GetConfigurationValueParameters; @@ -19,8 +20,8 @@ String version = params.getVersion(); if (version == null) { log.warnFormat("calling {0} ({2}) with null version, using default {1} for version", - GetConfigurationValueQuery.class.getSimpleName(), Config.DefaultConfigurationVersion, value); - version = Config.DefaultConfigurationVersion; + GetConfigurationValueQuery.class.getSimpleName(), ConfigCommon.defaultConfigurationVersion, value); + version = ConfigCommon.defaultConfigurationVersion; } returnValue = Config.<Object> GetValue(value, version); } catch (Exception e) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValuesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValuesQuery.java index 4b20617..a76629a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValuesQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetConfigurationValuesQuery.java @@ -6,6 +6,7 @@ import java.util.Map; import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; @@ -21,7 +22,7 @@ private static List<String> getVersionsList() { List<String> versions = new ArrayList<String>(); - versions.add(Config.DefaultConfigurationVersion); + versions.add(ConfigCommon.defaultConfigurationVersion); for (Version version : Version.ALL) { versions.add(version.toString()); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/Config.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/Config.java index d6825c7..e440fee 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/Config.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/Config.java @@ -17,7 +17,7 @@ } public static <T> T GetValue(ConfigValues value) { - return Config.<T> GetValue(value, Config.DefaultConfigurationVersion); + return Config.<T> GetValue(value, ConfigCommon.defaultConfigurationVersion); } public static <T> T GetValue(ConfigValues value, String version) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigCommon.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigCommon.java new file mode 100644 index 0000000..062d86e --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigCommon.java @@ -0,0 +1,5 @@ +package org.ovirt.engine.core.common.config; + +public final class ConfigCommon { + public static final String defaultConfigurationVersion = "general"; +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/ConfiguredRangeValidator.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/ConfiguredRangeValidator.java index c16f5d4..4e18469 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/ConfiguredRangeValidator.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/ConfiguredRangeValidator.java @@ -4,6 +4,7 @@ import javax.validation.ConstraintValidatorContext; import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.validation.annotation.ConfiguredRange; @@ -15,12 +16,12 @@ @Override public void initialize(ConfiguredRange constraintAnnotation) { if (constraintAnnotation.minConfigValue() != ConfigValues.Invalid) { - min = Config.<Integer> GetValue(constraintAnnotation.minConfigValue(), Config.DefaultConfigurationVersion); + min = Config.<Integer> GetValue(constraintAnnotation.minConfigValue(), ConfigCommon.defaultConfigurationVersion); } else { min = constraintAnnotation.min(); } - max = Config.<Integer> GetValue(constraintAnnotation.maxConfigValue(), Config.DefaultConfigurationVersion); + max = Config.<Integer> GetValue(constraintAnnotation.maxConfigValue(), ConfigCommon.defaultConfigurationVersion); } @Override diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ConfiguredRangeValidatorTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ConfiguredRangeValidatorTest.java index 7f63cbd..534163d 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ConfiguredRangeValidatorTest.java +++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ConfiguredRangeValidatorTest.java @@ -13,6 +13,7 @@ import org.junit.After; import org.junit.Test; import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.config.IConfigUtilsInterface; import org.ovirt.engine.core.common.validation.annotation.ConfiguredRange; @@ -95,14 +96,14 @@ public void initConfiguredWithDefaultMinValue() { IConfigUtilsInterface configUtils = initConfigUtils(); - when(configUtils.GetValue(ConfigValues.ConnectToServerTimeoutInSeconds, Config.DefaultConfigurationVersion)).thenReturn(TEST_MIN_RANGE); + when(configUtils.GetValue(ConfigValues.ConnectToServerTimeoutInSeconds, ConfigCommon.defaultConfigurationVersion)).thenReturn(TEST_MIN_RANGE); Config.setConfigUtils(configUtils); } private IConfigUtilsInterface initConfigUtils() { validator = ValidationUtils.getValidator(); IConfigUtilsInterface configUtils = mock(IConfigUtilsInterface.class); - when(configUtils.GetValue(ConfigValues.vdsTimeout, Config.DefaultConfigurationVersion)).thenReturn(TEST_MAX_RANGE); + when(configUtils.GetValue(ConfigValues.vdsTimeout, ConfigCommon.defaultConfigurationVersion)).thenReturn(TEST_MAX_RANGE); return configUtils; } diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java index a2c9b7d..9d65e61 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java +++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java @@ -14,6 +14,7 @@ import org.junit.Before; import org.junit.Test; import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.config.IConfigUtilsInterface; import org.ovirt.engine.core.common.validation.annotation.MTU; @@ -29,8 +30,8 @@ validator = ValidationUtils.getValidator(); IConfigUtilsInterface confUtils = mock(IConfigUtilsInterface.class); - when(confUtils.GetValue(ConfigValues.MaxMTU, Config.DefaultConfigurationVersion)).thenReturn(TEST_MAX_MTU); - when(confUtils.GetValue(ConfigValues.ManagementNetwork, Config.DefaultConfigurationVersion)).thenReturn(TEST_MANAGEMENT_NETWORK); + when(confUtils.GetValue(ConfigValues.MaxMTU, ConfigCommon.defaultConfigurationVersion)).thenReturn(TEST_MAX_MTU); + when(confUtils.GetValue(ConfigValues.ManagementNetwork, ConfigCommon.defaultConfigurationVersion)).thenReturn(TEST_MANAGEMENT_NETWORK); Config.setConfigUtils(confUtils); } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java index 5609cc8..7042f2a 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java @@ -6,6 +6,7 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.engineencryptutils.EncryptionUtils; import org.ovirt.engine.core.utils.log.Log; @@ -33,8 +34,8 @@ return password; } String keyFile = Config.resolveKeyStorePath(); - String passwd = Config.<String> GetValue(ConfigValues.keystorePass, Config.DefaultConfigurationVersion); - String alias = Config.<String> GetValue(ConfigValues.CertAlias, Config.DefaultConfigurationVersion); + String passwd = Config.<String> GetValue(ConfigValues.keystorePass, ConfigCommon.defaultConfigurationVersion); + String alias = Config.<String> GetValue(ConfigValues.CertAlias, ConfigCommon.defaultConfigurationVersion); try { return EncryptionUtils.encrypt(password, keyFile, passwd, alias); } catch (Exception e) { @@ -47,8 +48,8 @@ return password; } String keyFile = Config.resolveKeyStorePath(); - String passwd = Config.<String> GetValue(ConfigValues.keystorePass, Config.DefaultConfigurationVersion); - String alias = Config.<String> GetValue(ConfigValues.CertAlias, Config.DefaultConfigurationVersion); + String passwd = Config.<String> GetValue(ConfigValues.keystorePass, ConfigCommon.defaultConfigurationVersion); + String alias = Config.<String> GetValue(ConfigValues.CertAlias, ConfigCommon.defaultConfigurationVersion); try { return EncryptionUtils.decrypt(password, keyFile, passwd, alias); } catch (Exception e) { diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java index 48cd789..7fa8cc1 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java @@ -8,7 +8,7 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.businessentities.VdcOption; -import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.config.DataType; import org.ovirt.engine.core.common.config.OptionBehaviourAttribute; @@ -123,13 +123,13 @@ // get the config that this value depends on if ((values = _vdcOptionCache.get(optionBehaviour.dependentOn().toString())) != null) { // its value is this value's prefix - String prefix = (String) values.get(Config.DefaultConfigurationVersion); + String prefix = (String) values.get(ConfigCommon.defaultConfigurationVersion); // combine the prefix with the 'real value' if ((values = _vdcOptionCache .get(String.format("%1$s%2$s", prefix, optionBehaviour.realValue()))) != null) { // get value of the wanted config - assuming // default!! - result = values.get(Config.DefaultConfigurationVersion); + result = values.get(ConfigCommon.defaultConfigurationVersion); } } break; @@ -198,11 +198,11 @@ String returnValue = null; Map<String, Object> values = null; if ((values = _vdcOptionCache.get(name.toString())) != null - && values.containsKey(Config.DefaultConfigurationVersion)) { - returnValue = (String) values.get(Config.DefaultConfigurationVersion); + && values.containsKey(ConfigCommon.defaultConfigurationVersion)) { + returnValue = (String) values.get(ConfigCommon.defaultConfigurationVersion); } else { VdcOption option = DbFacade.getInstance().getVdcOptionDao().getByNameAndVersion(name.name(), - Config.DefaultConfigurationVersion); + ConfigCommon.defaultConfigurationVersion); if (option != null) { returnValue = option.getoption_value(); } @@ -217,7 +217,7 @@ // maybe all the method) in a future refactoring. log.warnFormat("Using old GetValue for {0}.", name); ConfigValues value = ConfigValues.valueOf(name); - return GetValue(value, Config.DefaultConfigurationVersion); + return GetValue(value, ConfigCommon.defaultConfigurationVersion); } @SuppressWarnings("unchecked") diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtilsTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtilsTest.java index dbaf411..ba57dfb 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtilsTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtilsTest.java @@ -7,7 +7,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.config.OptionBehaviour; import org.ovirt.engine.core.common.config.OptionBehaviourAttribute; @@ -49,7 +49,7 @@ + " annotation: " + curConfig.name(), typeAttr); Class<?> c = typeAttr.value(); - Object obj = config.GetValue(curConfig, Config.DefaultConfigurationVersion); + Object obj = config.GetValue(curConfig, ConfigCommon.defaultConfigurationVersion); Assert.assertTrue("null return for " + curConfig.name(), obj != null); Assert.assertTrue( diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java index e8ea17f..1275ae6 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java @@ -6,6 +6,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.config.IConfigUtilsInterface; @@ -38,7 +39,7 @@ @Before public void setup() { final IConfigUtilsInterface configUtils = Mockito.mock(IConfigUtilsInterface.class); - Mockito.when(configUtils.GetValue(ConfigValues.SearchResultsLimit, Config.DefaultConfigurationVersion)) + Mockito.when(configUtils.GetValue(ConfigValues.SearchResultsLimit, ConfigCommon.defaultConfigurationVersion)) .thenReturn(100); Config.setConfigUtils(configUtils); } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ConfigUtilsBase.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ConfigUtilsBase.java index 63de95e..b83b1e8 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ConfigUtilsBase.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ConfigUtilsBase.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; -import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.config.DataType; import org.ovirt.engine.core.common.config.DefaultValueAttribute; @@ -69,7 +69,7 @@ @Override public final void SetStringValue(String name, String value) { - SetValue(name, value, Config.DefaultConfigurationVersion); + SetValue(name, value, ConfigCommon.defaultConfigurationVersion); } diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigRule.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigRule.java index b36def2..9779185 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigRule.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigRule.java @@ -11,6 +11,7 @@ import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.config.IConfigUtilsInterface; @@ -73,11 +74,11 @@ /** Mock the default version configuration of a single value - this can be given as an argument to the rule's constructor */ public static <T> MockConfigDescriptor<T> mockConfig(ConfigValues value, T returnValue) { - return new MockConfigDescriptor<T>(value, Config.DefaultConfigurationVersion, returnValue); + return new MockConfigDescriptor<T>(value, ConfigCommon.defaultConfigurationVersion, returnValue); } public <T> void mockConfigValue(ConfigValues value, T returnValue) { - mockConfigValue(value, Config.DefaultConfigurationVersion, returnValue); + mockConfigValue(value, ConfigCommon.defaultConfigurationVersion, returnValue); } public <T> void mockConfigValue(ConfigValues value, String version, T returnValue) { diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java index 2e67198..ac48f20 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java @@ -70,12 +70,12 @@ // IConfigUtilsInterface mockConfigUtils = mock(IConfigUtilsInterface.class); // Config.setConfigUtils(mockConfigUtils); // -// when(mockConfigUtils.<Integer> GetValue(ConfigValues.VdsRefreshRate, Config.DefaultConfigurationVersion)).thenReturn(60); -// when(mockConfigUtils.<Integer> GetValue(ConfigValues.TimeToReduceFailedRunOnVdsInMinutes, Config.DefaultConfigurationVersion)).thenReturn(60); -// when(mockConfigUtils.<Integer> GetValue(ConfigValues.VdsRecoveryTimeoutInMintues, Config.DefaultConfigurationVersion)).thenReturn(60); -// when(mockConfigUtils.<Integer> GetValue(ConfigValues.NumberVmRefreshesBeforeSave, Config.DefaultConfigurationVersion)).thenReturn(1); -// when(mockConfigUtils.<Integer> GetValue(ConfigValues.vdsTimeout, Config.DefaultConfigurationVersion)).thenReturn(60); -// when(mockConfigUtils.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers, Config.DefaultConfigurationVersion)).thenReturn(false); +// when(mockConfigUtils.<Integer> GetValue(ConfigValues.VdsRefreshRate, ConfigCommon.defaultConfigurationVersion)).thenReturn(60); +// when(mockConfigUtils.<Integer> GetValue(ConfigValues.TimeToReduceFailedRunOnVdsInMinutes, ConfigCommon.defaultConfigurationVersion)).thenReturn(60); +// when(mockConfigUtils.<Integer> GetValue(ConfigValues.VdsRecoveryTimeoutInMintues, ConfigCommon.defaultConfigurationVersion)).thenReturn(60); +// when(mockConfigUtils.<Integer> GetValue(ConfigValues.NumberVmRefreshesBeforeSave, ConfigCommon.defaultConfigurationVersion)).thenReturn(1); +// when(mockConfigUtils.<Integer> GetValue(ConfigValues.vdsTimeout, ConfigCommon.defaultConfigurationVersion)).thenReturn(60); +// when(mockConfigUtils.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers, ConfigCommon.defaultConfigurationVersion)).thenReturn(false); // } // // public void setMockups() { diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandlerTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandlerTest.java index 15a701d..e6c897b 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandlerTest.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandlerTest.java @@ -11,6 +11,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.config.IConfigUtilsInterface; @@ -19,8 +20,8 @@ @Before public void setup() { IConfigUtilsInterface configUtils = Mockito.mock(IConfigUtilsInterface.class); - when(configUtils.GetValue(ConfigValues.AdUserPassword, Config.DefaultConfigurationVersion)).thenReturn(new HashMap<String, String>()); - when(configUtils.GetValue(ConfigValues.AdUserName, Config.DefaultConfigurationVersion)).thenReturn(""); + when(configUtils.GetValue(ConfigValues.AdUserPassword, ConfigCommon.defaultConfigurationVersion)).thenReturn(new HashMap<String, String>()); + when(configUtils.GetValue(ConfigValues.AdUserName, ConfigCommon.defaultConfigurationVersion)).thenReturn(""); Config.setConfigUtils(configUtils); } diff --git a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java index 0b64053..d949c11 100644 --- a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java +++ b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java @@ -35,6 +35,7 @@ import org.ovirt.engine.core.common.AuditLogSeverity; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.engineencryptutils.EncryptionUtils; import org.ovirt.engine.core.notifier.utils.NotificationConfigurator; @@ -478,7 +479,7 @@ ResultSet rs = null; if (StringUtils.isEmpty(propertyVersion)) { - propertyVersion = Config.DefaultConfigurationVersion; + propertyVersion = ConfigCommon.defaultConfigurationVersion; } try { @@ -490,10 +491,10 @@ if (rs.next()) { propertyValue = rs.getString(1); } - if (propertyValue == null && !Config.DefaultConfigurationVersion.equals(propertyVersion)) { + if (propertyValue == null && !ConfigCommon.defaultConfigurationVersion.equals(propertyVersion)) { rs.close(); pStmt.setString(1, propertyName); - pStmt.setString(2, Config.DefaultConfigurationVersion); + pStmt.setString(2, ConfigCommon.defaultConfigurationVersion); rs = pStmt.executeQuery(); if (rs.next()) { propertyValue = rs.getString(1); diff --git a/frontend/wars/rmw-war/src/main/java/org/ovirt/engine/core/redirect/RedirectServlet.java b/frontend/wars/rmw-war/src/main/java/org/ovirt/engine/core/redirect/RedirectServlet.java index 30f38f6..63bf82e 100644 --- a/frontend/wars/rmw-war/src/main/java/org/ovirt/engine/core/redirect/RedirectServlet.java +++ b/frontend/wars/rmw-war/src/main/java/org/ovirt/engine/core/redirect/RedirectServlet.java @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse; import org.ovirt.engine.core.bll.interfaces.BackendInternal; -import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.queries.GetConfigurationValueParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -45,7 +45,7 @@ try { backend = (BackendInternal) EjbUtils.findBean(BeanType.BACKEND, BeanProxyType.LOCAL); - params = new GetConfigurationValueParameters(conf, Config.DefaultConfigurationVersion); + params = new GetConfigurationValueParameters(conf, ConfigCommon.defaultConfigurationVersion); v = backend.runInternalQuery(VdcQueryType.GetConfigurationValue, params); if (v != null) { diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebadminDynamicHostingServlet.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebadminDynamicHostingServlet.java index bb7a42e..898b06f 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebadminDynamicHostingServlet.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebadminDynamicHostingServlet.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletRequest; import org.codehaus.jackson.node.ObjectNode; -import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.common.queries.GetConfigurationValueParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -54,7 +54,7 @@ private Integer getApplicationMode(HttpServletRequest request) { return (Integer) runPublicQuery(VdcQueryType.GetConfigurationValue, new GetConfigurationValueParameters(ConfigurationValues.ApplicationMode, - Config.DefaultConfigurationVersion), request); + ConfigCommon.defaultConfigurationVersion), request); } private void writePluginDefinitions(PrintWriter writer) { 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 a8855bd..37a4d8a 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 @@ -51,7 +51,7 @@ import org.ovirt.engine.core.common.businessentities.vm_pools; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeOptionInfo; -import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.CommandVersionsInfo; @@ -374,7 +374,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.VMMinMemorySizeInMB, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.VMMinMemorySizeInMB, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -387,7 +387,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.SpiceUsbAutoShare, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.SpiceUsbAutoShare, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -399,7 +399,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.WANColorDepth, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.WANColorDepth, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -432,7 +432,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.WANDisableEffects, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.WANDisableEffects, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -459,7 +459,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.VM32BitMaxMemorySizeInMB, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.VM32BitMaxMemorySizeInMB, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -472,7 +472,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.MaxVmsInPool, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.MaxVmsInPool, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -655,7 +655,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.ValidNumOfMonitors, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.ValidNumOfMonitors, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -706,7 +706,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.VmPriorityMaxValue, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.VmPriorityMaxValue, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -850,7 +850,7 @@ }; GetConfigFromCache( new GetConfigurationValueParameters(is64 ? ConfigurationValues.VM64BitMaxMemorySizeInMB - : ConfigurationValues.VM32BitMaxMemorySizeInMB, Config.DefaultConfigurationVersion), + : ConfigurationValues.VM32BitMaxMemorySizeInMB, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1132,7 +1132,7 @@ } }; Frontend.RunPublicQuery(VdcQueryType.GetConfigurationValue, - new GetConfigurationValueParameters(ConfigurationValues.ProductRPMVersion, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.ProductRPMVersion, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1145,7 +1145,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.SearchResultsLimit, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.SearchResultsLimit, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1158,7 +1158,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.SANWipeAfterDelete, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.SANWipeAfterDelete, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1293,7 +1293,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.EnableUSBAsDefault, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.EnableUSBAsDefault, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1355,7 +1355,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.StoragePoolNameSizeLimit, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.StoragePoolNameSizeLimit, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1368,7 +1368,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.MaxVdsMemOverCommitForServers, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.MaxVdsMemOverCommitForServers, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1381,7 +1381,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.MaxVdsMemOverCommit, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.MaxVdsMemOverCommit, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1395,7 +1395,7 @@ }; GetConfigFromCache( new GetConfigurationValueParameters(ConfigurationValues.AllowClusterWithVirtGlusterEnabled, - Config.DefaultConfigurationVersion), + ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1428,7 +1428,7 @@ } }; GetConfigurationValueParameters tempVar = new GetConfigurationValueParameters(ConfigurationValues.VdsFenceType); - tempVar.setVersion(version != null ? version.toString() : Config.DefaultConfigurationVersion); + tempVar.setVersion(version != null ? version.toString() : ConfigCommon.defaultConfigurationVersion); GetConfigFromCache(tempVar, aQuery); } @@ -1581,7 +1581,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.RhevhLocalFSPath, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.RhevhLocalFSPath, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1594,7 +1594,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.StorageDomainNameSizeLimit, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.StorageDomainNameSizeLimit, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1625,7 +1625,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForEvenlyDistribute, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForEvenlyDistribute, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1638,7 +1638,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.LowUtilizationForPowerSave, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.LowUtilizationForPowerSave, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1651,7 +1651,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1665,7 +1665,7 @@ }; GetConfigFromCache( new GetConfigurationValueParameters(ConfigurationValues.NetworkConnectivityCheckTimeoutInSeconds, - Config.DefaultConfigurationVersion), + ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -1678,7 +1678,7 @@ }; // GetConfigFromCache( - // new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, Config.DefaultConfigurationVersion), + // new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, ConfigCommon.defaultConfigurationVersion), // aQuery); aQuery.asyncCallback.OnSuccess(aQuery.getModel(), 10); @@ -1693,7 +1693,7 @@ }; // GetConfigFromCache( - // new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, Config.DefaultConfigurationVersion), + // new GetConfigurationValueParameters(ConfigurationValues.HighUtilizationForPowerSave, ConfigCommon.defaultConfigurationVersion), // aQuery); aQuery.asyncCallback.OnSuccess(aQuery.getModel(), 5); @@ -1877,7 +1877,7 @@ }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.MaxBlockDiskSize, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.MaxBlockDiskSize, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -2011,7 +2011,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.DocsURL, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.DocsURL, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -2116,7 +2116,7 @@ } }; GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.RedirectServletReportsPage, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.RedirectServletReportsPage, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -2172,7 +2172,7 @@ */ public static void GetManagementNetworkName(AsyncQuery aQuery) { GetConfigFromCache( - new GetConfigurationValueParameters(ConfigurationValues.ManagementNetwork, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.ManagementNetwork, ConfigCommon.defaultConfigurationVersion), aQuery); } @@ -2214,7 +2214,7 @@ */ public static Object GetConfigValuePreConverted(ConfigurationValues configValue) { KeyValuePairCompat<ConfigurationValues, String> key = - new KeyValuePairCompat<ConfigurationValues, String>(configValue, Config.DefaultConfigurationVersion); + new KeyValuePairCompat<ConfigurationValues, String>(configValue, ConfigCommon.defaultConfigurationVersion); return cachedConfigValuesPreConvert.get(key); } @@ -2872,7 +2872,7 @@ public static int GetMaxVmPriority() { return (Integer) GetConfigValuePreConverted(ConfigurationValues.VmPriorityMaxValue, - Config.DefaultConfigurationVersion); + ConfigCommon.defaultConfigurationVersion); } 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..264af76 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,7 @@ 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.config.ConfigCommon; 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 +283,15 @@ 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, ConfigCommon.defaultConfigurationVersion)); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.CipherSuite, ConfigCommon.defaultConfigurationVersion)); parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceSecureChannels, thisVm.getVdsGroupCompatibilityVersion().toString())); - parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.EnableSpiceRootCertificateValidation, Config.DefaultConfigurationVersion)); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.EnableSpiceRootCertificateValidation, ConfigCommon.defaultConfigurationVersion)); 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, ConfigCommon.defaultConfigurationVersion)); + parametersList.add(new GetConfigurationValueParameters(ConfigurationValues.SpiceReleaseCursorKeys, ConfigCommon.defaultConfigurationVersion)); 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..9ed4239 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,7 @@ 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.config.ConfigCommon; 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 +466,17 @@ }; AsyncDataProvider.GetConfigFromCache(new GetConfigurationValueParameters(ConfigurationValues.GlusterVolumeOptionOwnerGroupVirtValue, - Config.DefaultConfigurationVersion), + ConfigCommon.defaultConfigurationVersion), aQueryInner1); } }; AsyncDataProvider.GetConfigFromCache(new GetConfigurationValueParameters(ConfigurationValues.GlusterVolumeOptionOwnerUserVirtValue, - Config.DefaultConfigurationVersion), + ConfigCommon.defaultConfigurationVersion), aQueryInner); } }; AsyncDataProvider.GetConfigFromCache(new GetConfigurationValueParameters(ConfigurationValues.GlusterVolumeOptionGroupVirtValue, - Config.DefaultConfigurationVersion), + ConfigCommon.defaultConfigurationVersion), 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..564c680 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,6 @@ package org.ovirt.engine.ui.userportal.section.main.presenter; -import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; 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 +51,7 @@ AsyncQuery aQuery = new AsyncQuery(); Frontend.RunPublicQuery(VdcQueryType.GetConfigurationValue, - new GetConfigurationValueParameters(ConfigurationValues.VdcVersion, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.VdcVersion, ConfigCommon.defaultConfigurationVersion), 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..7bc4b8f 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,6 @@ package org.ovirt.engine.ui.webadmin.section.main.presenter; -import org.ovirt.engine.core.common.config.Config; +import org.ovirt.engine.core.common.config.ConfigCommon; 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 +70,7 @@ AsyncQuery aQuery = new AsyncQuery(); Frontend.RunPublicQuery(VdcQueryType.GetConfigurationValue, - new GetConfigurationValueParameters(ConfigurationValues.VdcVersion, Config.DefaultConfigurationVersion), + new GetConfigurationValueParameters(ConfigurationValues.VdcVersion, ConfigCommon.defaultConfigurationVersion), aQuery); AsyncQuery _asyncQuery = new AsyncQuery(); -- To view, visit http://gerrit.ovirt.org/10263 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibcbf08fd77d61a07c83e1e32f0cd67c40ab4cde0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
