Alon Bar-Lev has uploaded a new change for review. Change subject: utils: ovf: move compat xml to ovf as it is the only consumer ......................................................................
utils: ovf: move compat xml to ovf as it is the only consumer Related-To: https://bugzilla.redhat.com/show_bug.cgi?id=1139000 Change-Id: Iae2b6e697f82702cfb211c670a079f2da14994de Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/compat/exclude-filters.xml M backend/manager/modules/utils/exclude-filters.xml M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfManager.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfParser.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlAttribute.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlAttributeCollection.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlDocument.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNamespaceManager.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNode.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNodeList.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlTextWriter.java 15 files changed, 51 insertions(+), 50 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/32621/1 diff --git a/backend/manager/modules/compat/exclude-filters.xml b/backend/manager/modules/compat/exclude-filters.xml index 391742f..8335ce5 100644 --- a/backend/manager/modules/compat/exclude-filters.xml +++ b/backend/manager/modules/compat/exclude-filters.xml @@ -27,32 +27,6 @@ <Bug code="SF"/> </Match> - <!-- - findbugs complains that we don't use innerText in XmlNode - We do use that code for reading/writing xml from legacy code - - findbugs reason: - UrF: Unread public/protected field (URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD) - --> - <Match> - <Class name="org.ovirt.engine.core.compat.backendcompat.XmlNode" /> - <Field name="innerText"/> - <Bug code="UrF"/> - </Match> - - <!-- - findbugs complains that we don't use attributes in XmlNode - We do use that code for reading/writing xml from legacy code - - findbugs reason: - UrF: Unread public/protected field (URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD) - --> - <Match> - <Class name="org.ovirt.engine.core.compat.backendcompat.XmlNode" /> - <Field name="attributes"/> - <Bug code="UrF"/> - </Match> - <Match> <Class name="org.ovirt.engine.core.compat.Guid" /> <Bug pattern="SI_INSTANCE_BEFORE_FINALS_ASSIGNED"/> diff --git a/backend/manager/modules/utils/exclude-filters.xml b/backend/manager/modules/utils/exclude-filters.xml index 3b57b21..adb31bf 100644 --- a/backend/manager/modules/utils/exclude-filters.xml +++ b/backend/manager/modules/utils/exclude-filters.xml @@ -38,4 +38,31 @@ <Class name="org.ovirt.engine.core.utils.log.Log" /> <Bug code="Nm"/> </Match> + + <!-- + findbugs complains that we don't use innerText in XmlNode + We do use that code for reading/writing xml from legacy code + + findbugs reason: + UrF: Unread public/protected field (URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD) + --> + <Match> + <Class name="org.ovirt.engine.core.utils.ovf.xml.XmlNode" /> + <Field name="innerText"/> + <Bug code="UrF"/> + </Match> + + <!-- + findbugs complains that we don't use attributes in XmlNode + We do use that code for reading/writing xml from legacy code + + findbugs reason: + UrF: Unread public/protected field (URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD) + --> + <Match> + <Class name="org.ovirt.engine.core.utils.ovf.xml.XmlNode" /> + <Field name="attributes"/> + <Bug code="UrF"/> + </Match> + </FindBugsFilter> diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfManager.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfManager.java index 1cb9325..35cd1b3 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfManager.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfManager.java @@ -9,9 +9,9 @@ import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.Version; -import org.ovirt.engine.core.compat.backendcompat.XmlDocument; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; +import org.ovirt.engine.core.utils.ovf.xml.XmlDocument; public class OvfManager { diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfParser.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfParser.java index e9f5f87..7a32a82 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfParser.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfParser.java @@ -9,12 +9,12 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.backendcompat.XmlDocument; -import org.ovirt.engine.core.compat.backendcompat.XmlNamespaceManager; -import org.ovirt.engine.core.compat.backendcompat.XmlNode; -import org.ovirt.engine.core.compat.backendcompat.XmlNodeList; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; +import org.ovirt.engine.core.utils.ovf.xml.XmlDocument; +import org.ovirt.engine.core.utils.ovf.xml.XmlNamespaceManager; +import org.ovirt.engine.core.utils.ovf.xml.XmlNode; +import org.ovirt.engine.core.utils.ovf.xml.XmlNodeList; public class OvfParser { diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java index 89f54e4..5d6c706 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java @@ -29,15 +29,15 @@ import org.ovirt.engine.core.common.utils.SimpleDependecyInjector; import org.ovirt.engine.core.common.utils.VmDeviceType; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.backendcompat.XmlDocument; -import org.ovirt.engine.core.compat.backendcompat.XmlNamespaceManager; -import org.ovirt.engine.core.compat.backendcompat.XmlNode; -import org.ovirt.engine.core.compat.backendcompat.XmlNodeList; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.utils.VmInitUtils; import org.ovirt.engine.core.utils.customprop.DevicePropertiesUtils; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; +import org.ovirt.engine.core.utils.ovf.xml.XmlDocument; +import org.ovirt.engine.core.utils.ovf.xml.XmlNamespaceManager; +import org.ovirt.engine.core.utils.ovf.xml.XmlNode; +import org.ovirt.engine.core.utils.ovf.xml.XmlNodeList; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java index 48033f3..651e673 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java @@ -17,11 +17,11 @@ import org.ovirt.engine.core.common.utils.SimpleDependecyInjector; import org.ovirt.engine.core.common.utils.VmDeviceCommonUtils; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.backendcompat.XmlDocument; -import org.ovirt.engine.core.compat.backendcompat.XmlNode; -import org.ovirt.engine.core.compat.backendcompat.XmlNodeList; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; +import org.ovirt.engine.core.utils.ovf.xml.XmlDocument; +import org.ovirt.engine.core.utils.ovf.xml.XmlNode; +import org.ovirt.engine.core.utils.ovf.xml.XmlNodeList; public class OvfTemplateReader extends OvfReader { protected VmTemplate _vmTemplate; diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java index 160a2d1..23419b2 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java @@ -21,11 +21,11 @@ import org.ovirt.engine.core.common.utils.VmDeviceCommonUtils; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.Version; -import org.ovirt.engine.core.compat.backendcompat.XmlDocument; -import org.ovirt.engine.core.compat.backendcompat.XmlNode; -import org.ovirt.engine.core.compat.backendcompat.XmlNodeList; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; +import org.ovirt.engine.core.utils.ovf.xml.XmlDocument; +import org.ovirt.engine.core.utils.ovf.xml.XmlNode; +import org.ovirt.engine.core.utils.ovf.xml.XmlNodeList; public class OvfVmReader extends OvfReader { private static final String EXPORT_ONLY_PREFIX = "exportonly_"; diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java index 90dcbf1..651e34a 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java @@ -22,10 +22,10 @@ import org.ovirt.engine.core.common.utils.VmDeviceType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.Version; -import org.ovirt.engine.core.compat.backendcompat.XmlDocument; -import org.ovirt.engine.core.compat.backendcompat.XmlTextWriter; import org.ovirt.engine.core.utils.VmInitUtils; import org.ovirt.engine.core.utils.customprop.DevicePropertiesUtils; +import org.ovirt.engine.core.utils.ovf.xml.XmlDocument; +import org.ovirt.engine.core.utils.ovf.xml.XmlTextWriter; public abstract class OvfWriter implements IOvfBuilder { protected int _instanceId; diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlAttribute.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlAttribute.java similarity index 80% rename from backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlAttribute.java rename to backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlAttribute.java index d9161fa..a545cca 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlAttribute.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlAttribute.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.compat.backendcompat; +package org.ovirt.engine.core.utils.ovf.xml; import org.w3c.dom.Node; diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlAttributeCollection.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlAttributeCollection.java similarity index 90% rename from backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlAttributeCollection.java rename to backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlAttributeCollection.java index dce82f9..dd98fd9 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlAttributeCollection.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlAttributeCollection.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.compat.backendcompat; +package org.ovirt.engine.core.utils.ovf.xml; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlDocument.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlDocument.java similarity index 98% rename from backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlDocument.java rename to backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlDocument.java index 461e5dc..e0a09fe 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlDocument.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlDocument.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.compat.backendcompat; +package org.ovirt.engine.core.utils.ovf.xml; import java.io.StringReader; diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNamespaceManager.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNamespaceManager.java similarity index 95% rename from backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNamespaceManager.java rename to backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNamespaceManager.java index ed60780..51aba1a 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNamespaceManager.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNamespaceManager.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.compat.backendcompat; +package org.ovirt.engine.core.utils.ovf.xml; import java.util.HashMap; import java.util.Iterator; diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNode.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNode.java similarity index 97% rename from backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNode.java rename to backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNode.java index f47f8bd..38c5e55 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNode.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNode.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.compat.backendcompat; +package org.ovirt.engine.core.utils.ovf.xml; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNodeList.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNodeList.java similarity index 91% rename from backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNodeList.java rename to backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNodeList.java index 0f792bc..8a85b44 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNodeList.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlNodeList.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.compat.backendcompat; +package org.ovirt.engine.core.utils.ovf.xml; import org.w3c.dom.NodeList; diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlTextWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlTextWriter.java similarity index 98% rename from backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlTextWriter.java rename to backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlTextWriter.java index 8463b20..9cd3d2f 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlTextWriter.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/xml/XmlTextWriter.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.compat.backendcompat; +package org.ovirt.engine.core.utils.ovf.xml; import java.io.StringWriter; import java.util.Map; -- To view, visit http://gerrit.ovirt.org/32621 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae2b6e697f82702cfb211c670a079f2da14994de Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
