Lior Vernia has uploaded a new change for review.
Change subject: core: Move custom properties utils to Common package
......................................................................
core: Move custom properties utils to Common package
This to enable usage by the frontend as well.
Change-Id: I33f91dac432c40cb3a4d43fa55bf59e7b42638a0
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmCustomPropertiesQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupOperationCommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/RunVmValidatorTest.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/CustomPropertiesUtils.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/SimpleCustomPropertiesUtil.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/ValidationError.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/ValidationFailureReason.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/VmPropertiesUtils.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/exceptions/InitializationException.java
R
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/customprop/CustomPropertiesUtilsTest.java
R
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/customprop/PropertiesUtilsTestHelper.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtils.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtilsTest.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
M
backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/UserDefinedVMPropertiesValueHelper.java
M build-tools-root/checkstyles/src/main/resources/checkstyle-suppressions.xml
29 files changed, 53 insertions(+), 46 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/27385/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
index d5405a5..961a575 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
@@ -69,15 +69,15 @@
import org.ovirt.engine.core.common.osinfo.OsRepository;
import org.ovirt.engine.core.common.utils.Pair;
import org.ovirt.engine.core.common.utils.SimpleDependecyInjector;
+import org.ovirt.engine.core.common.utils.customprop.ValidationError;
+import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
+import
org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils.VMCustomProperties;
import org.ovirt.engine.core.common.validation.group.CreateVm;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dao.PermissionDAO;
import org.ovirt.engine.core.dao.VmDynamicDAO;
import org.ovirt.engine.core.dao.VmStaticDAO;
-import org.ovirt.engine.core.utils.customprop.ValidationError;
-import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
-import
org.ovirt.engine.core.utils.customprop.VmPropertiesUtils.VMCustomProperties;
import org.ovirt.engine.core.utils.linq.All;
import org.ovirt.engine.core.utils.linq.LinqUtils;
import org.ovirt.engine.core.utils.transaction.TransactionMethod;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmCustomPropertiesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmCustomPropertiesQuery.java
index d5edee5..85f8145 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmCustomPropertiesQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmCustomPropertiesQuery.java
@@ -3,8 +3,8 @@
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
+import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
import org.ovirt.engine.core.compat.Version;
-import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
public class GetVmCustomPropertiesQuery<P extends VdcQueryParametersBase>
extends QueriesCommandBase<P> {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
index c6f39a1..772c4e0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
@@ -30,11 +30,11 @@
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
+import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
+import org.ovirt.engine.core.common.utils.exceptions.InitializationException;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.extensions.mgr.ExtensionsManager;
import org.ovirt.engine.core.utils.customprop.DevicePropertiesUtils;
-import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
-import org.ovirt.engine.core.utils.exceptions.InitializationException;
import org.ovirt.engine.core.utils.threadpool.ThreadPoolUtil;
import org.ovirt.engine.core.vdsbroker.ResourceManager;
import org.slf4j.Logger;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
index fd7e711..1ff2888 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
@@ -48,15 +48,15 @@
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.common.utils.Pair;
import org.ovirt.engine.core.common.utils.VmDeviceType;
+import org.ovirt.engine.core.common.utils.customprop.ValidationError;
+import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
+import
org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils.VMCustomProperties;
import org.ovirt.engine.core.common.validation.group.UpdateVm;
import org.ovirt.engine.core.compat.DateTime;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
import org.ovirt.engine.core.dao.VmDeviceDAO;
-import org.ovirt.engine.core.utils.customprop.ValidationError;
-import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
-import
org.ovirt.engine.core.utils.customprop.VmPropertiesUtils.VMCustomProperties;
import org.ovirt.engine.core.utils.linq.LinqUtils;
import org.ovirt.engine.core.utils.linq.Predicate;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupOperationCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupOperationCommandBase.java
index 259f4f7..c139a1f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupOperationCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupOperationCommandBase.java
@@ -14,10 +14,10 @@
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.scheduling.ClusterPolicy;
+import
org.ovirt.engine.core.common.utils.customprop.SimpleCustomPropertiesUtil;
+import org.ovirt.engine.core.common.utils.customprop.ValidationError;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.VdsGroupDAO;
-import org.ovirt.engine.core.utils.customprop.SimpleCustomPropertiesUtil;
-import org.ovirt.engine.core.utils.customprop.ValidationError;
public abstract class VdsGroupOperationCommandBase<T extends
VdsGroupOperationParameters> extends
VdsGroupCommandBase<T> {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
index f02027f..3ddbda1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
@@ -28,6 +28,8 @@
import org.ovirt.engine.core.common.osinfo.OsRepository;
import org.ovirt.engine.core.common.utils.SimpleDependecyInjector;
import org.ovirt.engine.core.common.utils.VmDeviceType;
+import org.ovirt.engine.core.common.utils.customprop.ValidationError;
+import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
import
org.ovirt.engine.core.common.vdscommands.DeleteImageGroupVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
@@ -41,8 +43,6 @@
import org.ovirt.engine.core.dao.VmDynamicDAO;
import org.ovirt.engine.core.dao.network.VmNicDao;
import org.ovirt.engine.core.utils.GuidUtils;
-import org.ovirt.engine.core.utils.customprop.ValidationError;
-import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
import org.ovirt.engine.core.utils.linq.LinqUtils;
import org.ovirt.engine.core.utils.linq.Predicate;
import org.springframework.util.CollectionUtils;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
index e853f39..281d9ca 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
@@ -26,11 +26,11 @@
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
+import
org.ovirt.engine.core.common.utils.customprop.SimpleCustomPropertiesUtil;
+import org.ovirt.engine.core.common.utils.customprop.ValidationError;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dao.network.NetworkQoSDao;
import org.ovirt.engine.core.utils.NetworkUtils;
-import org.ovirt.engine.core.utils.customprop.SimpleCustomPropertiesUtil;
-import org.ovirt.engine.core.utils.customprop.ValidationError;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
index c8830bf..5b1efd6 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
@@ -14,9 +14,9 @@
import org.ovirt.engine.core.common.scheduling.PolicyUnitType;
import
org.ovirt.engine.core.common.scheduling.parameters.ClusterPolicyCRUDParameters;
import org.ovirt.engine.core.common.utils.Pair;
+import
org.ovirt.engine.core.common.utils.customprop.SimpleCustomPropertiesUtil;
+import org.ovirt.engine.core.common.utils.customprop.ValidationError;
import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.utils.customprop.SimpleCustomPropertiesUtil;
-import org.ovirt.engine.core.utils.customprop.ValidationError;
public abstract class ClusterPolicyCRUDCommand extends
CommandBase<ClusterPolicyCRUDParameters> {
private ClusterPolicy clusterPolicy;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java
index 8d8de10..6158091 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java
@@ -6,7 +6,7 @@
import java.util.Map;
import org.apache.commons.lang.StringUtils;
-import org.ovirt.engine.core.utils.customprop.SimpleCustomPropertiesUtil;
+import
org.ovirt.engine.core.common.utils.customprop.SimpleCustomPropertiesUtil;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
index cde7ad1..d354761 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
@@ -10,12 +10,12 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.scheduling.PolicyUnit;
import org.ovirt.engine.core.common.scheduling.PolicyUnitType;
+import
org.ovirt.engine.core.common.utils.customprop.SimpleCustomPropertiesUtil;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
import org.ovirt.engine.core.dao.scheduling.PolicyUnitDao;
-import org.ovirt.engine.core.utils.customprop.SimpleCustomPropertiesUtil;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
index 67c1bea..f1b327b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
@@ -42,6 +42,8 @@
import org.ovirt.engine.core.common.queries.GetImagesListParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
+import org.ovirt.engine.core.common.utils.customprop.ValidationError;
+import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
import
org.ovirt.engine.core.common.vdscommands.IsVmDuringInitiatingVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.compat.Guid;
@@ -52,8 +54,6 @@
import org.ovirt.engine.core.dao.network.NetworkDao;
import org.ovirt.engine.core.dao.network.VmNicDao;
import org.ovirt.engine.core.utils.NetworkUtils;
-import org.ovirt.engine.core.utils.customprop.ValidationError;
-import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
public class RunVmValidator {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java
index 005b23c..e7609aa 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java
@@ -12,10 +12,10 @@
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.common.businessentities.network.VnicProfile;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
+import org.ovirt.engine.core.common.utils.customprop.ValidationError;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.utils.ReplacementUtils;
import org.ovirt.engine.core.utils.customprop.DevicePropertiesUtils;
-import org.ovirt.engine.core.utils.customprop.ValidationError;
public class VnicProfileValidator {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
index 6132ea1..9902a70 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
@@ -43,6 +43,7 @@
import org.ovirt.engine.core.common.osinfo.OsRepository;
import org.ovirt.engine.core.common.utils.SimpleDependecyInjector;
import org.ovirt.engine.core.common.utils.VmDeviceType;
+import org.ovirt.engine.core.common.utils.customprop.ValidationError;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dao.DiskDao;
@@ -50,7 +51,6 @@
import org.ovirt.engine.core.dao.VmDAO;
import org.ovirt.engine.core.dao.VmDeviceDAO;
import org.ovirt.engine.core.utils.MockConfigRule;
-import org.ovirt.engine.core.utils.customprop.ValidationError;
/** A test case for the {@link UpdateVmCommand}. */
@RunWith(MockitoJUnitRunner.class)
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/RunVmValidatorTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/RunVmValidatorTest.java
index 3785419..e881a8f 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/RunVmValidatorTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/RunVmValidatorTest.java
@@ -31,12 +31,12 @@
import org.ovirt.engine.core.common.businessentities.network.VmNic;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
+import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
+import org.ovirt.engine.core.common.utils.exceptions.InitializationException;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dao.network.VmNicDao;
import org.ovirt.engine.core.utils.MockConfigRule;
-import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
-import org.ovirt.engine.core.utils.exceptions.InitializationException;
@RunWith(MockitoJUnitRunner.class)
public class RunVmValidatorTest {
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/CustomPropertiesUtils.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/CustomPropertiesUtils.java
similarity index 98%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/CustomPropertiesUtils.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/CustomPropertiesUtils.java
index fd6a3ff..2c277bd 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/CustomPropertiesUtils.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/CustomPropertiesUtils.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.customprop;
+package org.ovirt.engine.core.common.utils.customprop;
import java.util.ArrayList;
import java.util.Arrays;
@@ -72,7 +72,7 @@
/**
* Constructor has package access to enable testing, but class cannot be
instantiated outside package
*/
- CustomPropertiesUtils() {
+ protected CustomPropertiesUtils() {
invalidSyntaxValidationError = Arrays.asList(new
ValidationError(ValidationFailureReason.SYNTAX_ERROR, ""));
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/SimpleCustomPropertiesUtil.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/SimpleCustomPropertiesUtil.java
similarity index 82%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/SimpleCustomPropertiesUtil.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/SimpleCustomPropertiesUtil.java
index 61df789..3b349a6 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/SimpleCustomPropertiesUtil.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/SimpleCustomPropertiesUtil.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.customprop;
+package org.ovirt.engine.core.common.utils.customprop;
public class SimpleCustomPropertiesUtil extends CustomPropertiesUtils {
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/ValidationError.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/ValidationError.java
similarity index 96%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/ValidationError.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/ValidationError.java
index b82a8fc..3b9a0eb 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/ValidationError.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/ValidationError.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.customprop;
+package org.ovirt.engine.core.common.utils.customprop;
/**
* Class describing errors appear during custom properties validation
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/ValidationFailureReason.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/ValidationFailureReason.java
similarity index 96%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/ValidationFailureReason.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/ValidationFailureReason.java
index be5e44f..1bcbe0c 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/ValidationFailureReason.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/ValidationFailureReason.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.customprop;
+package org.ovirt.engine.core.common.utils.customprop;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/VmPropertiesUtils.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/VmPropertiesUtils.java
similarity index 98%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/VmPropertiesUtils.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/VmPropertiesUtils.java
index 896dbf0..607a1d1 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/VmPropertiesUtils.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/VmPropertiesUtils.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.customprop;
+package org.ovirt.engine.core.common.utils.customprop;
import java.util.HashMap;
import java.util.List;
@@ -9,9 +9,9 @@
import org.ovirt.engine.core.common.businessentities.VmStatic;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
+import org.ovirt.engine.core.common.utils.exceptions.InitializationException;
import org.ovirt.engine.core.compat.StringHelper;
import org.ovirt.engine.core.compat.Version;
-import org.ovirt.engine.core.utils.exceptions.InitializationException;
/**
* Helper methods to help parse and validate custom VM (predefined and user
defined) properties. These methods are used
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/exceptions/InitializationException.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/exceptions/InitializationException.java
similarity index 88%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/exceptions/InitializationException.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/exceptions/InitializationException.java
index ab58014..53e2091 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/exceptions/InitializationException.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/exceptions/InitializationException.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.exceptions;
+package org.ovirt.engine.core.common.utils.exceptions;
/**
* Exception marking failure in initialization flow
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/customprop/CustomPropertiesUtilsTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/customprop/CustomPropertiesUtilsTest.java
similarity index 90%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/customprop/CustomPropertiesUtilsTest.java
rename to
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/customprop/CustomPropertiesUtilsTest.java
index 8ebc88e..ea9d7dd 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/customprop/CustomPropertiesUtilsTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/customprop/CustomPropertiesUtilsTest.java
@@ -1,10 +1,10 @@
-package org.ovirt.engine.core.utils.customprop;
+package org.ovirt.engine.core.common.utils.customprop;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static
org.ovirt.engine.core.utils.customprop.PropertiesUtilsTestHelper.validatePropertyMap;
-import static
org.ovirt.engine.core.utils.customprop.PropertiesUtilsTestHelper.validatePropertyValue;
+import static
org.ovirt.engine.core.common.utils.customprop.PropertiesUtilsTestHelper.validatePropertyMap;
+import static
org.ovirt.engine.core.common.utils.customprop.PropertiesUtilsTestHelper.validatePropertyValue;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/customprop/PropertiesUtilsTestHelper.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/customprop/PropertiesUtilsTestHelper.java
similarity index 96%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/customprop/PropertiesUtilsTestHelper.java
rename to
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/customprop/PropertiesUtilsTestHelper.java
index 0b4b0f5..9d390aa 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/customprop/PropertiesUtilsTestHelper.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/customprop/PropertiesUtilsTestHelper.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.customprop;
+package org.ovirt.engine.core.common.utils.customprop;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
index ac1dca5..bceb649 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
@@ -26,11 +26,11 @@
import org.ovirt.engine.core.common.businessentities.VmPauseStatus;
import org.ovirt.engine.core.common.businessentities.VmType;
import org.ovirt.engine.core.common.utils.Pair;
+import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils;
import org.ovirt.engine.core.utils.collections.MultiValueMapUtils;
-import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
import org.springframework.jdbc.core.RowMapper;
/**
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
index 4bc1190..69041c4 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
@@ -9,9 +9,9 @@
import org.ovirt.engine.core.common.businessentities.DisplayType;
import org.ovirt.engine.core.common.businessentities.MigrationSupport;
import org.ovirt.engine.core.common.businessentities.VmStatic;
+import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.AbstractVmRowMapper;
-import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtils.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtils.java
index d112342..1df2418 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtils.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtils.java
@@ -17,8 +17,11 @@
import org.ovirt.engine.core.common.businessentities.VmDeviceGeneralType;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
+import org.ovirt.engine.core.common.utils.customprop.CustomPropertiesUtils;
+import org.ovirt.engine.core.common.utils.customprop.ValidationError;
+import org.ovirt.engine.core.common.utils.customprop.ValidationFailureReason;
+import org.ovirt.engine.core.common.utils.exceptions.InitializationException;
import org.ovirt.engine.core.compat.Version;
-import org.ovirt.engine.core.utils.exceptions.InitializationException;
/**
* A class providing helper methods to work with device custom properties
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtilsTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtilsTest.java
index 3f759d31..9cdb9bf 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtilsTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/customprop/DevicePropertiesUtilsTest.java
@@ -6,10 +6,10 @@
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import static
org.ovirt.engine.core.common.utils.customprop.PropertiesUtilsTestHelper.validateFailure;
+import static
org.ovirt.engine.core.common.utils.customprop.PropertiesUtilsTestHelper.validatePropertyMap;
+import static
org.ovirt.engine.core.common.utils.customprop.PropertiesUtilsTestHelper.validatePropertyValue;
import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig;
-import static
org.ovirt.engine.core.utils.customprop.PropertiesUtilsTestHelper.validateFailure;
-import static
org.ovirt.engine.core.utils.customprop.PropertiesUtilsTestHelper.validatePropertyMap;
-import static
org.ovirt.engine.core.utils.customprop.PropertiesUtilsTestHelper.validatePropertyValue;
import java.util.Arrays;
import java.util.HashMap;
@@ -23,9 +23,11 @@
import org.mockito.runners.MockitoJUnitRunner;
import org.ovirt.engine.core.common.businessentities.VmDeviceGeneralType;
import org.ovirt.engine.core.common.config.ConfigValues;
+import org.ovirt.engine.core.common.utils.customprop.ValidationError;
+import org.ovirt.engine.core.common.utils.customprop.ValidationFailureReason;
+import org.ovirt.engine.core.common.utils.exceptions.InitializationException;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.utils.MockConfigRule;
-import org.ovirt.engine.core.utils.exceptions.InitializationException;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
index 2183d42..f264165 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
@@ -28,12 +28,12 @@
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.osinfo.OsRepository;
import org.ovirt.engine.core.common.utils.SimpleDependecyInjector;
+import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.WindowsJavaTimezoneMapping;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
-import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/UserDefinedVMPropertiesValueHelper.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/UserDefinedVMPropertiesValueHelper.java
index f2b6901..d06547b 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/UserDefinedVMPropertiesValueHelper.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/UserDefinedVMPropertiesValueHelper.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.core.config.entity.helper;
+import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
import org.ovirt.engine.core.config.entity.ConfigKey;
-import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
/**
* Validates user defined VM properties definition entered through
engine-config tool
diff --git
a/build-tools-root/checkstyles/src/main/resources/checkstyle-suppressions.xml
b/build-tools-root/checkstyles/src/main/resources/checkstyle-suppressions.xml
index 710a348..7067cc7 100644
---
a/build-tools-root/checkstyles/src/main/resources/checkstyle-suppressions.xml
+++
b/build-tools-root/checkstyles/src/main/resources/checkstyle-suppressions.xml
@@ -21,4 +21,6 @@
field serializers to overcome the GWT serialization limitations. All
in all they don't need to have a no args constructor: -->
<suppress checks="checks.NoArgConstructorCheck"
files="org[\\/]ovirt[\\/]engine[\\/]core[\\/]aaa[\\/].*"/>
+ <!-- The customprop package only includes common logic, nothing to
serialize -->
+ <suppress checks="checks.NoArgConstructorCheck"
files="org[\\/]ovirt[\\/]engine[\\/]core[\\/]common[\\/]utils[\\/]customprop[\\/].*"/>
</suppressions>
--
To view, visit http://gerrit.ovirt.org/27385
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33f91dac432c40cb3a4d43fa55bf59e7b42638a0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <lver...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
