Michael Kublin has uploaded a new change for review. Change subject: engine: Additional clean up of OvfParser ......................................................................
engine: Additional clean up of OvfParser The following patch is perfroming additional clean up of OvfParser, OvfVmWriter and OvfWriter Change-Id: I1c2e2d0a455694a4f9aa39e82f370d2085062019 Signed-off-by: Michael Kublin <[email protected]> --- 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/OvfVmWriter.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java 3 files changed, 22 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/11240/1 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 ed86432..1111d4a 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 @@ -1,12 +1,14 @@ package org.ovirt.engine.core.utils.ovf; import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; +import java.util.TimeZone; +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.NGuid; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.compat.backendcompat.XmlDocument; import org.ovirt.engine.core.compat.backendcompat.XmlNamespaceManager; import org.ovirt.engine.core.compat.backendcompat.XmlNode; @@ -33,7 +35,7 @@ String id2 = "2"; XmlNode node = _document.SelectSingleNode("//*/Content/TemplateId"); - if (!StringHelper.isNullOrEmpty(node.InnerText)) { + if (!StringUtils.isBlank(node.InnerText)) { id1 = node.InnerText; } @@ -41,20 +43,20 @@ for (XmlNode section : list) { String value = section.Attributes.get("xsi:type").getValue(); - if (StringHelper.EqOp(value, "ovf:OperatingSystemSection_Type")) { + if (StringUtils.equals(value, "ovf:OperatingSystemSection_Type")) { id2 = section.Attributes.get("ovf:id").getValue(); } } - return StringHelper.EqOp(id1, id2); + return StringUtils.equals(id1, id2); } // imageFile is: [image group id]/[image id] // 7D1FE0AA-A153-4AAF-95B3-3654A54443BE/7D1FE0AA-A153-4AAF-95B3-3654A54443BE public static String CreateImageFile(DiskImage image) { String retVal = ""; - if (image.getimage_group_id() != null) { - retVal += image.getimage_group_id().getValue().toString(); + if (image.getId() != null) { + retVal += image.getId().toString(); } else { retVal += Guid.Empty; } @@ -63,18 +65,8 @@ } public static Guid GetImageGrupIdFromImageFile(String imageFile) { - if (!StringHelper.isNullOrEmpty(imageFile)) { - return new Guid(imageFile.split("[/]", -1)[0]); - } - return null; - } - - public static NGuid GetImageIdFromImageFile(String imageFile) { - if (!StringHelper.isNullOrEmpty(imageFile)) { - String[] all = imageFile.split("[/]", -1); - if (all.length > 1) { - return new Guid(imageFile.split("[/]", -1)[1]); - } + if (!StringUtils.isBlank(imageFile)) { + return Guid.createGuidFromString(imageFile.split("[/]", -1)[0]); } return null; } @@ -84,8 +76,8 @@ } private static DateFormat getDateFormat(final String format) { - final DateFormat utcDateTimeFormat = new java.text.SimpleDateFormat(format); - utcDateTimeFormat.setTimeZone(java.util.TimeZone.getTimeZone("UTC")); + final DateFormat utcDateTimeFormat = new SimpleDateFormat(format); + utcDateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); return utcDateTimeFormat; } @@ -96,16 +88,16 @@ * @return the date or null if parse failed */ public static Date UtcDateStringToLocaDate(String str) { - if (StringHelper.isNullOrEmpty(str)) { + if (StringUtils.isBlank(str)) { return null; } try { return getDateFormat(utcDateFormatStr).parse(str); - } catch (java.text.ParseException e1) { + } catch (ParseException e1) { try { return getDateFormat(utcFallbackDateFormatStr).parse(str); - } catch (java.text.ParseException e) { + } catch (ParseException e) { log.error("OVF DateTime format Error, Expected: yyyy/M/dd hh:mm:ss", e); return null; } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java index 2991b93..6b61d42 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java @@ -4,6 +4,7 @@ import java.util.Map; import org.apache.commons.codec.binary.Base64; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.Snapshot; import org.ovirt.engine.core.common.businessentities.UsbPolicy; @@ -16,7 +17,6 @@ import org.ovirt.engine.core.compat.Match; import org.ovirt.engine.core.compat.Regex; import org.ovirt.engine.core.compat.RegexOptions; -import org.ovirt.engine.core.compat.StringHelper; public class OvfVmWriter extends OvfWriter { private static final String EXPORT_ONLY_PREFIX = "exportonly_"; @@ -47,7 +47,7 @@ _writer.WriteStartElement("Origin"); _writer.WriteRaw(String.valueOf(_vm.getOrigin().getValue())); _writer.WriteEndElement(); - if (!StringHelper.isNullOrEmpty(_vm.getAppList())) { + if (!StringUtils.isBlank(_vm.getAppList())) { _writer.WriteStartElement("app_list"); _writer.WriteRaw(_vm.getAppList()); _writer.WriteEndElement(); @@ -84,7 +84,7 @@ @Override protected void WriteAppList() { if (_images.size() > 0) { - if (StringHelper.isNullOrEmpty(_images.get(0).getappList())) { + if (StringUtils.isBlank(_images.get(0).getappList())) { return; } 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 d029e88..c5f7b6d 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 @@ -16,7 +16,6 @@ import org.ovirt.engine.core.common.utils.VmDeviceType; import org.ovirt.engine.core.compat.Encoding; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.compat.backendcompat.XmlDocument; import org.ovirt.engine.core.compat.backendcompat.XmlTextWriter; @@ -213,17 +212,17 @@ _writer.WriteRaw(String.valueOf(vmBase.getDefaultBootSequence().getValue())); _writer.WriteEndElement(); - if (!StringHelper.isNullOrEmpty(vmBase.getInitrdUrl())) { + if (!StringUtils.isBlank(vmBase.getInitrdUrl())) { _writer.WriteStartElement("initrd_url"); _writer.WriteRaw(vmBase.getInitrdUrl()); _writer.WriteEndElement(); } - if (!StringHelper.isNullOrEmpty(vmBase.getKernelUrl())) { + if (!StringUtils.isBlank(vmBase.getKernelUrl())) { _writer.WriteStartElement("kernel_url"); _writer.WriteRaw(vmBase.getKernelUrl()); _writer.WriteEndElement(); } - if (!StringHelper.isNullOrEmpty(vmBase.getKernelParams())) { + if (!StringUtils.isBlank(vmBase.getKernelParams())) { _writer.WriteStartElement("kernel_params"); _writer.WriteRaw(vmBase.getKernelParams()); _writer.WriteEndElement(); -- To view, visit http://gerrit.ovirt.org/11240 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c2e2d0a455694a4f9aa39e82f370d2085062019 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
