Alissa Bonas has uploaded a new change for review.
Change subject: core: findbugs cleanup
......................................................................
core: findbugs cleanup
Rename methods to start with lowercase, remove unused variables.
Change-Id: I10c5b9bbe1aec6454e35474eae3bf4a021adb95a
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSE.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/Config.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/IConfigUtilsInterface.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/generic/DBConfigUtils.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtilsTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.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/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapperTest.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
16 files changed, 48 insertions(+), 72 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/18603/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSE.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSE.java
index db9a681..3481e54 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSE.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/GetRootDSE.java
@@ -144,7 +144,7 @@
break;
}
}
-
Config.getConfigUtils().SetStringValue(ConfigValues.LDAPProviderTypes.name(),
StringUtils.join(types, ","));
+
Config.getConfigUtils().setStringValue(ConfigValues.LDAPProviderTypes.name(),
StringUtils.join(types, ","));
}
public Attributes getDomainAttributes(LdapProviderType general, String
domain) {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
index 9dfe592..e8bdc4f 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
@@ -151,10 +151,10 @@
// @Test
// public void UpdateVmGuestAgentVersionWithAppList() {
// PowerMockito.mockStatic(Config.class);
-//
Mockito.when(Config.GetValue(ConfigValues.AgentAppName)).thenReturn("oVirt-Agent");
+//
Mockito.when(Config.getValue(ConfigValues.AgentAppName)).thenReturn("oVirt-Agent");
// HashMap<String, String> drivers = new HashMap<String, String>();
// drivers.put("linux", "xorg-x11-drv-qxl");
-//
Mockito.when(Config.GetValue(ConfigValues.SpiceDriverNameInGuest)).thenReturn(drivers);
+//
Mockito.when(Config.getValue(ConfigValues.SpiceDriverNameInGuest)).thenReturn(drivers);
//
// VM vm = new VM();
// vm.getStaticData().setos(VmOsType.OtherLinux);
@@ -169,7 +169,7 @@
// vdsGroup.setcompatibility_version(version);
//
// PowerMockito.mockStatic(Config.class);
-// Mockito.when(Config.<Boolean>
GetValue(ConfigValues.NativeUSBEnabled, vdsGroup.getcompatibility_version()
+// Mockito.when(Config.<Boolean>
getValue(ConfigValues.NativeUSBEnabled, vdsGroup.getcompatibility_version()
// .getValue())).thenReturn(result);
//
// List<String> messages = new ArrayList<String>();
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 0fc5fc2..2472a98 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
@@ -19,7 +19,7 @@
}
public static <T> T GetValue(ConfigValues value, String version) {
- return getConfigUtils().<T> GetValue(value, version);
+ return getConfigUtils().<T>getValue(value, version);
}
/**
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/IConfigUtilsInterface.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/IConfigUtilsInterface.java
index fb0e689..bb9f892 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/IConfigUtilsInterface.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/IConfigUtilsInterface.java
@@ -94,9 +94,9 @@
* @param value
* The value.
*/
- void SetStringValue(String name, String value);
+ void setStringValue(String name, String value);
- <T> T GetValue(ConfigValues configValue, String version);
+ <T> T getValue(ConfigValues configValue, String version);
}
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 534163d..647982b 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
@@ -96,14 +96,14 @@
public void initConfiguredWithDefaultMinValue() {
IConfigUtilsInterface configUtils = initConfigUtils();
-
when(configUtils.GetValue(ConfigValues.ConnectToServerTimeoutInSeconds,
ConfigCommon.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,
ConfigCommon.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 10781e5..a2c457a 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
@@ -30,8 +30,8 @@
validator = ValidationUtils.getValidator();
IConfigUtilsInterface confUtils = mock(IConfigUtilsInterface.class);
- when(confUtils.GetValue(ConfigValues.MaxMTU,
ConfigCommon.defaultConfigurationVersion)).thenReturn(TEST_MAX_MTU);
- when(confUtils.GetValue(ConfigValues.ManagementNetwork,
ConfigCommon.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/generic/DBConfigUtils.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java
index 75d7497..066f92b 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
@@ -17,7 +17,6 @@
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dao.VdcOptionDAO;
import org.ovirt.engine.core.utils.ConfigUtilsBase;
-import org.ovirt.engine.core.utils.EngineLocalConfig;
import org.ovirt.engine.core.utils.crypt.EngineEncryptionUtils;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
@@ -82,9 +81,9 @@
* @param option
* @return
*/
- private static Object GetValue(VdcOption option) {
+ private static Object getValue(VdcOption option) {
Object result = option.getoption_value();
- EnumValue enumValue = ParseEnumValue(option.getoption_name());
+ EnumValue enumValue = parseEnumValue(option.getoption_name());
if (enumValue != null) {
final OptionBehaviourAttribute optionBehaviour =
enumValue.getOptionBehaviour();
final Class<?> fieldType = enumValue.getFieldType();
@@ -97,7 +96,6 @@
}
if (optionBehaviour != null) {
- EngineLocalConfig config = EngineLocalConfig.getInstance();
Map<String, Object> values = null;
switch (optionBehaviour.behaviour()) {
// split string by comma for List<string> constructor
@@ -178,13 +176,13 @@
* The value.
*/
@Override
- protected void SetValue(String name, String value, String version) {
+ protected void setValue(String name, String value, String version) {
VdcOption vdcOption =
dbfacade.getVdcOptionDao().getByNameAndVersion(name, version);
vdcOption.setoption_value(value);
dbfacade.getVdcOptionDao().update(vdcOption);
try {
// refresh the cache entry after update
- _vdcOptionCache.get(vdcOption.getoption_name()).put(version,
GetValue(vdcOption));
+ _vdcOptionCache.get(vdcOption.getoption_name()).put(version,
getValue(vdcOption));
} catch (java.lang.Exception e) {
log.errorFormat("Could not update option {0} in cache.", name);
}
@@ -208,17 +206,17 @@
}
@Override
- protected Object GetValue(DataType type, String name, String defaultValue)
{
+ protected Object getValue(DataType type, String name, String defaultValue)
{
// Note that the type parameter is useless, it should be removed (and
// maybe all the method) in a future refactoring.
- log.warnFormat("Using old GetValue for {0}.", name);
+ log.warnFormat("Using old getValue for {0}.", name);
ConfigValues value = ConfigValues.valueOf(name);
- return GetValue(value, ConfigCommon.defaultConfigurationVersion);
+ return getValue(value, ConfigCommon.defaultConfigurationVersion);
}
@SuppressWarnings("unchecked")
@Override
- public <T> T GetValue(ConfigValues name, String version) {
+ public <T> T getValue(ConfigValues name, String version) {
T returnValue;
Map<String, Object> values = null;
if ((values = _vdcOptionCache.get(name.toString())) != null &&
values.containsKey(version)) {
@@ -228,7 +226,7 @@
option.setoption_name(name.toString());
option.setoption_value(null);
// returns default value - version independent
- returnValue = (T) GetValue(option);
+ returnValue = (T) getValue(option);
// If just requested version is missing, add the default value
with the requested version.
if (values != null) {
@@ -274,7 +272,7 @@
values = new HashMap<String, Object>();
_vdcOptionCache.put(option.getoption_name(), values);
}
- values.put(option.getversion(), GetValue(option));
+ values.put(option.getversion(), getValue(option));
}
private static boolean isReloadable(String optionName) throws
NoSuchFieldException {
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 a8d06cc5..f72ae79 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
@@ -54,7 +54,7 @@
+ " annotation: " + curConfig.name(), typeAttr);
Class<?> c = typeAttr.value();
- Object obj = config.GetValue(curConfig,
ConfigCommon.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/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java
index 7fe65b3..34e53b1 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java
@@ -76,77 +76,66 @@
supportedVersions.add(new org.ovirt.engine.core.compat.Version(1, 5));
supportedVersions.add(new org.ovirt.engine.core.compat.Version(10, 3));
-
//expect(Config.GetValue(ConfigValues.SupportedClusterLevels)).andReturn(supportedVersions);
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "ConfigValue" },
new Object[] { ConfigurationValues.SupportedClusterLevels },
supportedVersions);
- //expect(Config.GetValue(ConfigValues.ServerCPUList,
"1.5")).andReturn("0:bar:0:foo");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "1.5", ConfigurationValues.ServerCPUList },
"0:bar:0:foo");
- //expect(Config.GetValue(ConfigValues.ServerCPUList,
"10.3")).andReturn("15:foo:1,2,3:bar");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "10.3", ConfigurationValues.ServerCPUList },
"15:foo:1,2,3:bar");
- //expect(Config.GetValue(ConfigValues.VdsFenceOptionMapping,
"1.5")).andReturn("foo:one=1,two=2");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "1.5",
ConfigurationValues.VdsFenceOptionMapping },
"foo:one=1,two=2");
- //expect(Config.GetValue(ConfigValues.VdsFenceOptionTypes,
"1.5")).andReturn("one=int,two=bool");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "1.5", ConfigurationValues.VdsFenceOptionTypes
},
"one=int,two=bool");
- //expect(Config.GetValue(ConfigValues.VdsFenceOptionMapping,
"10.3")).andReturn("foo:one=1,two=2");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "10.3",
ConfigurationValues.VdsFenceOptionMapping },
"foo:one=1,two=2");
- //expect(Config.GetValue(ConfigValues.VdsFenceOptionTypes,
"10.3")).andReturn("one=int,two=bool");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "10.3", ConfigurationValues.VdsFenceOptionTypes
},
"one=int,two=bool");
- //expect(Config.GetValue(ConfigValues.PredefinedVMProperties,
"1.5")).andReturn("");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "1.5",
ConfigurationValues.PredefinedVMProperties },
"");
- //expect(Config.GetValue(ConfigValues.UserDefinedVMProperties,
"1.5")).andReturn("");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "1.5",
ConfigurationValues.UserDefinedVMProperties },
"");
- //expect(Config.GetValue(ConfigValues.PredefinedVMProperties,
"10.3")).andReturn("foo=true|false");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "10.3",
ConfigurationValues.PredefinedVMProperties },
"foo=true|false");
- //expect(Config.GetValue(ConfigValues.UserDefinedVMProperties,
"10.3")).andReturn("bar=[a-z]");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java
index b56c24f..736e866 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java
@@ -79,77 +79,66 @@
supportedVersions.add(new org.ovirt.engine.core.compat.Version(1, 5));
supportedVersions.add(new org.ovirt.engine.core.compat.Version(10, 3));
-
//expect(Config.GetValue(ConfigValues.SupportedClusterLevels)).andReturn(supportedVersions);
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "ConfigValue" },
new Object[] { ConfigurationValues.SupportedClusterLevels },
supportedVersions);
- //expect(Config.GetValue(ConfigValues.ServerCPUList,
"1.5")).andReturn("0:bar:0:foo");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "1.5", ConfigurationValues.ServerCPUList },
"0:bar:0:foo");
- //expect(Config.GetValue(ConfigValues.ServerCPUList,
"10.3")).andReturn("15:foo:1,2,3:bar");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "10.3", ConfigurationValues.ServerCPUList },
"15:foo:1,2,3:bar");
- //expect(Config.GetValue(ConfigValues.VdsFenceOptionMapping,
"1.5")).andReturn("foo:one=1,two=2");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "1.5",
ConfigurationValues.VdsFenceOptionMapping },
"foo:one=1,two=2");
- //expect(Config.GetValue(ConfigValues.VdsFenceOptionTypes,
"1.5")).andReturn("one=int,two=bool");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "1.5", ConfigurationValues.VdsFenceOptionTypes
},
"one=int,two=bool");
- //expect(Config.GetValue(ConfigValues.VdsFenceOptionMapping,
"10.3")).andReturn("foo:one=1,two=2");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "10.3",
ConfigurationValues.VdsFenceOptionMapping },
"foo:one=1,two=2");
- //expect(Config.GetValue(ConfigValues.VdsFenceOptionTypes,
"10.3")).andReturn("one=int,two=bool");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "10.3", ConfigurationValues.VdsFenceOptionTypes
},
"one=int,two=bool");
- //expect(Config.GetValue(ConfigValues.PredefinedVMProperties,
"1.5")).andReturn("");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "1.5",
ConfigurationValues.PredefinedVMProperties },
"");
- //expect(Config.GetValue(ConfigValues.UserDefinedVMProperties,
"1.5")).andReturn("");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "1.5",
ConfigurationValues.UserDefinedVMProperties },
"");
- //expect(Config.GetValue(ConfigValues.PredefinedVMProperties,
"10.3")).andReturn("foo=true|false");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
new Object[] { "10.3",
ConfigurationValues.PredefinedVMProperties },
"foo=true|false");
- //expect(Config.GetValue(ConfigValues.UserDefinedVMProperties,
"10.3")).andReturn("bar=[a-z]");
setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue,
GetConfigurationValueParameters.class,
new String[] { "Version", "ConfigValue" },
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 1275ae6..474e279 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
@@ -39,7 +39,7 @@
@Before
public void setup() {
final IConfigUtilsInterface configUtils =
Mockito.mock(IConfigUtilsInterface.class);
- Mockito.when(configUtils.GetValue(ConfigValues.SearchResultsLimit,
ConfigCommon.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 b83b1e8..32d2fd4 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
@@ -26,20 +26,20 @@
@Override
public final boolean getBoolValue(String name, String defaultValue) {
- return ((Boolean) GetValue(DataType.Bool, name,
defaultValue)).booleanValue();
+ return ((Boolean) getValue(DataType.Bool, name,
defaultValue)).booleanValue();
}
@Override
public final int getIntValue(String name, String defaultValue) {
- return ((Integer) GetValue(DataType.Int, name,
defaultValue)).intValue();
+ return ((Integer) getValue(DataType.Int, name,
defaultValue)).intValue();
}
@Override
public final Date getDateTimeValue(String name, String defaultValue) {
Date dt = new java.util.Date(0);
- String dateString = GetValue(DataType.String, name,
defaultValue).toString();
+ String dateString = getValue(DataType.String, name,
defaultValue).toString();
try {
dt = (new SimpleDateFormat("k:m:s")).parse(dateString);
} catch (Exception e) {
@@ -51,36 +51,36 @@
@Override
public final TimeSpan getTimeSpanValue(String name, String defaultValue) {
- return (TimeSpan) GetValue(DataType.TimeSpan, name, defaultValue);
+ return (TimeSpan) getValue(DataType.TimeSpan, name, defaultValue);
}
@Override
public final Version getVersionValue(String name, String defaultValue) {
- return (Version) GetValue(DataType.Version, name, defaultValue);
+ return (Version) getValue(DataType.Version, name, defaultValue);
}
@Override
public final String getPathValue(String name, String defaultValue) {
- return (String) GetValue(DataType.String, name, defaultValue);
+ return (String) getValue(DataType.String, name, defaultValue);
}
@Override
- public final void SetStringValue(String name, String value) {
- SetValue(name, value, ConfigCommon.defaultConfigurationVersion);
+ public final void setStringValue(String name, String value) {
+ setValue(name, value, ConfigCommon.defaultConfigurationVersion);
}
- protected abstract void SetValue(String name, String value, String
version);
+ protected abstract void setValue(String name, String value, String
version);
- protected abstract Object GetValue(DataType type, String name, String
defaultValue);
+ protected abstract Object getValue(DataType type, String name, String
defaultValue);
@Override
- public abstract <T> T GetValue(ConfigValues configValue, String version);
+ public abstract <T> T getValue(ConfigValues configValue, String version);
public final static class EnumValue {
final Class<?> fieldType;
@@ -112,7 +112,7 @@
* @param name
* @return
*/
- protected static EnumValue ParseEnumValue(String name) {
+ protected static EnumValue parseEnumValue(String name) {
// get field from enum for its attributes
Field fi = null;
@@ -159,7 +159,7 @@
@SuppressWarnings("unchecked")
@Override
public Map<String, String> getMapValue(final String name, final String
defaultValue) {
- final String jsonString = (String) GetValue(DataType.String, name,
defaultValue);
+ final String jsonString = (String) getValue(DataType.String, name,
defaultValue);
if(jsonString != null) {
return new JsonObjectDeserializer().deserialize(jsonString,
HashMap.class);
} else {
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 fe3da03..1a3c63a 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
@@ -87,7 +87,7 @@
}
private static <T> void mockConfigValue(ConfigValues value, String
version, T returnValue) {
- when(Config.getConfigUtils().GetValue(value,
version)).thenReturn(returnValue);
+ when(Config.getConfigUtils().getValue(value,
version)).thenReturn(returnValue);
}
@Override
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapperTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapperTest.java
index 36c8043..d9f77ba 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapperTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapperTest.java
@@ -52,8 +52,8 @@
// // Mocking the Config class
// mockStatic(Config.class);
// when(Config.resolveSignScriptPath()).thenReturn(new String());
-// when(Config.GetValue(any(ConfigValues.class))).thenReturn(new
String());
-//
when(Config.GetValue(ConfigValues.SignCertTimeoutInSeconds)).thenReturn(defaultSignCertTimeoutInSeconds);
+// when(Config.getValue(any(ConfigValues.class))).thenReturn(new
String());
+//
when(Config.getValue(ConfigValues.SignCertTimeoutInSeconds)).thenReturn(defaultSignCertTimeoutInSeconds);
// when(Config.resolveCABasePath()).thenReturn(new String());
//
// // Mocking the org.ovirt.engine.core.utils FileUtil class
@@ -83,7 +83,7 @@
// public void signCertificateRequestTimeoutTest() {
// processSucceeds();
// // In order to cause a timeout, timeout is set to zero
-//
when(Config.GetValue(ConfigValues.SignCertTimeoutInSeconds)).thenReturn(0);
+//
when(Config.getValue(ConfigValues.SignCertTimeoutInSeconds)).thenReturn(0);
// assertFalse(execSignCertificateRequest());
// }
//
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 ac48f20..d4e3fa3 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,
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);
+// 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 e6c897b..c116f94 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
@@ -20,8 +20,8 @@
@Before
public void setup() {
IConfigUtilsInterface configUtils =
Mockito.mock(IConfigUtilsInterface.class);
- when(configUtils.GetValue(ConfigValues.AdUserPassword,
ConfigCommon.defaultConfigurationVersion)).thenReturn(new HashMap<String,
String>());
- when(configUtils.GetValue(ConfigValues.AdUserName,
ConfigCommon.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);
}
--
To view, visit http://gerrit.ovirt.org/18603
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10c5b9bbe1aec6454e35474eae3bf4a021adb95a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
