Tal Nisan has uploaded a new change for review. Change subject: core: Remove Path class from Compat module ......................................................................
core: Remove Path class from Compat module Removed the Path class from the Compat module Change-Id: I2a4a1e051050196de692ca76e1d1cd8e51b0c86d Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OVirtNodeUpgrade.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/NGuid.java D backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/Path.java D backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/PathTest.java 9 files changed, 32 insertions(+), 97 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/12429/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java index 631ffe2..d8e465f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java @@ -1,11 +1,12 @@ package org.ovirt.engine.core.bll; +import java.io.File; + import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters; import org.ovirt.engine.core.common.vdscommands.ChangeDiskVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; -import org.ovirt.engine.core.compat.backendcompat.Path; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @@ -20,7 +21,7 @@ } public String getDiskName() { - return Path.GetFileName(mCdImagePath); + return new File(mCdImagePath).getName(); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java index 261e531..dbd2834 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java @@ -1,10 +1,11 @@ package org.ovirt.engine.core.bll; +import java.io.File; + import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters; import org.ovirt.engine.core.common.vdscommands.ChangeDiskVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; -import org.ovirt.engine.core.compat.backendcompat.Path; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields; @@ -18,7 +19,7 @@ } public String getDiskName() { - return Path.GetFileName(mCdImagePath); + return new File(mCdImagePath).getName(); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java index 081fb3a..effdb53 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java @@ -1,5 +1,6 @@ package org.ovirt.engine.core.bll; +import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -23,6 +24,7 @@ import org.ovirt.engine.core.common.businessentities.ImageStatus; import org.ovirt.engine.core.common.businessentities.LUNs; import org.ovirt.engine.core.common.businessentities.LunDisk; +import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.businessentities.StorageType; @@ -32,7 +34,6 @@ import org.ovirt.engine.core.common.businessentities.VolumeFormat; import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.businessentities.image_storage_domain_map; -import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.utils.ListUtils; @@ -41,7 +42,6 @@ import org.ovirt.engine.core.common.vdscommands.IrsBaseVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.backendcompat.Path; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.log.Log; @@ -361,7 +361,7 @@ if (StringUtils.isEmpty(windowsPath)) { return windowsPath; // empty string is used for 'eject'. } - String fileName = Path.GetFileName(windowsPath); + String fileName = new File(windowsPath).getName(); return String.format("%1$s/%2$s", isoPrefix, fileName); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java index f408602..6e5009e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java @@ -1,5 +1,7 @@ package org.ovirt.engine.core.bll; +import java.io.File; + import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.common.AuditLogType; @@ -10,7 +12,6 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.RpmVersion; -import org.ovirt.engine.core.compat.backendcompat.Path; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.utils.FileUtil; import org.ovirt.engine.core.utils.log.Log; @@ -55,7 +56,7 @@ private boolean isIsoFileValid(String isoFile) { return StringUtils.isNotBlank(isoFile) - && FileUtil.fileExists(Path.Combine(Config.resolveOVirtISOsRepositoryPath(), isoFile)); + && FileUtil.fileExists(Config.resolveOVirtISOsRepositoryPath() + File.separator + isoFile); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OVirtNodeUpgrade.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OVirtNodeUpgrade.java index b19adfe..67f4eb0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OVirtNodeUpgrade.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OVirtNodeUpgrade.java @@ -6,13 +6,13 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.nio.charset.Charset; + import javax.naming.TimeLimitExceededException; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.compat.backendcompat.Path; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; @@ -96,7 +96,7 @@ */ public OVirtNodeUpgrade(VDS vds, String iso) { _vds = vds; - _iso = Path.Combine(Config.resolveOVirtISOsRepositoryPath(), iso); + _iso = Config.resolveOVirtISOsRepositoryPath() + File.separator + iso; _messages = new InstallerMessages(_vds); _dialog = new EngineSSHDialog(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 931cbf5..a1255eb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -1,5 +1,6 @@ package org.ovirt.engine.core.bll; +import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -57,7 +58,6 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.TransactionScopeOption; import org.ovirt.engine.core.compat.Version; -import org.ovirt.engine.core.compat.backendcompat.Path; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.job.ExecutionMessageDirector; @@ -640,7 +640,7 @@ String isoDir = (String) runVdsCommand(VDSCommandType.IsoDirectory, new IrsBaseVDSCommandParameters(getVm().getStoragePoolId())).getReturnValue(); - rhevToolsPath = Path.Combine(isoDir, rhevToolsPath); + rhevToolsPath = isoDir + File.separator + rhevToolsPath; getVm().setCdPath(ImagesHandler.cdPathWindowsToLinux(rhevToolsPath, getVm().getStoragePoolId())); } diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/NGuid.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/NGuid.java index 75b6af5..ba683ea 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/NGuid.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/NGuid.java @@ -130,26 +130,26 @@ // A GUID format looks like xxxx-xx-xx-xx-xxxxxx where each "x" // represents a byte in hexadecimal format - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[0 % length]] & 0xFF)); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[1 % length]] & 0xFF)); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[2 % length]] & 0xFF)); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[3 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[0 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[1 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[2 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[3 % length]] & 0xFF)); strGUID.append("-"); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[4 % length]] & 0xFF)); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[5 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[4 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[5 % length]] & 0xFF)); strGUID.append("-"); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[6 % length]] & 0xFF)); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[7 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[6 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[7 % length]] & 0xFF)); strGUID.append("-"); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[8 % length]] & 0xFF)); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[9 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[8 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[9 % length]] & 0xFF)); strGUID.append("-"); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[10 % length]] & 0xFF)); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[11 % length]] & 0xFF)); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[12 % length]] & 0xFF)); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[13 % length]] & 0xFF)); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[14 % length]] & 0xFF)); - strGUID.append(AddLeadingZero((int) inguid[byteOrderIndices[15 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[10 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[11 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[12 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[13 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[14 % length]] & 0xFF)); + strGUID.append(AddLeadingZero(inguid[byteOrderIndices[15 % length]] & 0xFF)); return strGUID.toString(); diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/Path.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/Path.java deleted file mode 100644 index 70f6ed4..0000000 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/Path.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.ovirt.engine.core.compat.backendcompat; - -import java.io.File; -import java.io.IOException; - -import org.ovirt.engine.core.compat.CompatException; - -public class Path { - // FIXME Probably needs to be smarter - public static String Combine(String getDirectoryName, String path) { - return getDirectoryName + File.separator + path; - } - - public static String GetDirectoryName(String baseDirectory) { - return (new File(baseDirectory)).getParent(); - } - - public static synchronized String GetTempFileName() { - try { - String prefix = "" + System.currentTimeMillis(); - return File.createTempFile(prefix, ".tmp").getPath(); - } catch (IOException e) { - throw new CompatException(e); - } - } - - public static String GetFileName(String path) { - return new File(path).getName(); - } - - public static boolean IsPathRooted(String path) { - return (new File(path)).isAbsolute(); - } -} diff --git a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/PathTest.java b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/PathTest.java deleted file mode 100644 index 6f1a37c..0000000 --- a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/PathTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.ovirt.engine.core.compat; - -import java.io.File; - -import org.ovirt.engine.core.compat.backendcompat.Path; - -import junit.framework.TestCase; - -public class PathTest extends TestCase { - public void testPathRooted() { - if (System.getProperty("os.name").startsWith("Win")) { - assertTrue("c:\\foo\\bar should be rooted", Path.IsPathRooted("c:\\foo\\bar")); - assertFalse("foo\\bar should not be rooted", Path.IsPathRooted("foo\\bar")); - } else { - assertTrue("/foo/bar should be rooted", Path.IsPathRooted("/foo/bar")); - assertFalse("foo/bar should not be rooted", Path.IsPathRooted("foo/bar")); - } - } - - public void testGetDirectoryName() { - String sep = File.separator; - String dir = sep + "Jar" + sep + "Jar"; - assertEquals("1", dir, Path.GetDirectoryName("/Jar/Jar/Binks.java")); - assertEquals("2", dir, Path.GetDirectoryName("/Jar/Jar/Binks")); - } - - public void testCombine() { - if (System.getProperty("os.name").startsWith("Win")) { - assertEquals("1", "c:\\Jar\\Jar\\Binks", Path.Combine("c:\\Jar\\Jar", "Binks")); - } else { - assertEquals("1", "/Jar/Jar/Binks", Path.Combine("/Jar/Jar", "Binks")); - } - } -} -- To view, visit http://gerrit.ovirt.org/12429 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a4a1e051050196de692ca76e1d1cd8e51b0c86d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
