Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove StringHelper from utils package
......................................................................
core: Remove StringHelper from utils package
Remove the last leftovers of the deprecated StringHelper usages from the
utils package and replace them with standard JDK and apache commons'
StringUtils calls.
Change-Id: I16721000ed04f04a5c5ccb0651e83e523ac9f6c2
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.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/pm/VdsFenceOptions.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/vdshooks/VdsHooksParser.java
5 files changed, 60 insertions(+), 60 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/11609/1
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
index 466304d..8afa0ae 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
@@ -14,7 +14,6 @@
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.compat.IntegerCompat;
-import org.ovirt.engine.core.compat.StringHelper;
public final class NetworkUtils {
public static int MaxVmInterfaces = 8;
@@ -38,7 +37,7 @@
for (int i = 0; i < tokens.length - 1; i++) {
sb.append(tokens[i]).append(".");
}
- return StringHelper.trimEnd(sb.toString(), '.');
+ return StringUtils.stripEnd(sb.toString(), ".");
}
// method return interface name without vlan:
@@ -55,7 +54,7 @@
for (int i = 0; i < tokens.length - 1; i++) {
sb.append(tokens[i]).append(".");
}
- return StringHelper.trimEnd(sb.toString(), '.');
+ return StringUtils.stripEnd(sb.toString(), ".");
}
// method return the vlan part of the interface name (if exists),
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 36baa50..720d447 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
@@ -12,7 +12,6 @@
import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
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.XmlNode;
import org.ovirt.engine.core.compat.backendcompat.XmlNodeList;
@@ -74,18 +73,18 @@
});
image.setId(OvfParser.GetImageGrupIdFromImageFile(node.SelectSingleNode(
"rasd:HostResource", _xmlNS).InnerText));
- if
(!StringHelper.isNullOrEmpty(node.SelectSingleNode("rasd:Parent",
_xmlNS).InnerText)) {
+ if (!StringUtils.isBlank(node.SelectSingleNode("rasd:Parent",
_xmlNS).InnerText)) {
image.setParentId(new
Guid(node.SelectSingleNode("rasd:Parent", _xmlNS).InnerText));
}
- if
(!StringHelper.isNullOrEmpty(node.SelectSingleNode("rasd:Template",
_xmlNS).InnerText)) {
+ if
(!StringUtils.isBlank(node.SelectSingleNode("rasd:Template",
_xmlNS).InnerText)) {
image.setit_guid(new
Guid(node.SelectSingleNode("rasd:Template", _xmlNS).InnerText));
}
image.setappList(node.SelectSingleNode("rasd:ApplicationList",
_xmlNS).InnerText);
- if
(!StringHelper.isNullOrEmpty(node.SelectSingleNode("rasd:StorageId",
_xmlNS).InnerText)) {
+ if
(!StringUtils.isBlank(node.SelectSingleNode("rasd:StorageId",
_xmlNS).InnerText)) {
image.setstorage_ids(new ArrayList<Guid>(Arrays.asList(new
Guid(node.SelectSingleNode("rasd:StorageId",
_xmlNS).InnerText))));
}
- if
(!StringHelper.isNullOrEmpty(node.SelectSingleNode("rasd:StoragePoolId",
_xmlNS).InnerText)) {
+ if
(!StringUtils.isBlank(node.SelectSingleNode("rasd:StoragePoolId",
_xmlNS).InnerText)) {
image.setstorage_pool_id(new
Guid(node.SelectSingleNode("rasd:StoragePoolId", _xmlNS).InnerText));
}
final Date creationDate = OvfParser.UtcDateStringToLocaDate(
@@ -104,7 +103,7 @@
// Network
case 10:
VmNetworkInterface iface = getNetwotkInterface(node);
- if
(!StringHelper.isNullOrEmpty(node.SelectSingleNode("rasd:ResourceSubType",
_xmlNS).InnerText)) {
+ if
(!StringUtils.isBlank(node.SelectSingleNode("rasd:ResourceSubType",
_xmlNS).InnerText)) {
iface.setType(Integer.parseInt(node.SelectSingleNode("rasd:ResourceSubType",
_xmlNS).InnerText));
}
@@ -154,7 +153,7 @@
}
node = content.SelectSingleNode("TemplateId");
if (node != null) {
- if (!StringHelper.isNullOrEmpty(node.InnerText)) {
+ if (!StringUtils.isBlank(node.InnerText)) {
_vmTemplate.setId(new Guid(node.InnerText));
}
}
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 6f5fa09..fa066f1 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
@@ -6,18 +6,18 @@
import java.util.List;
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.Snapshot.SnapshotStatus;
import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType;
-import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.common.businessentities.UsbPolicy;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VmOsType;
import org.ovirt.engine.core.common.businessentities.VmStatic;
+import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.common.utils.VmDeviceCommonUtils;
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.XmlNode;
import org.ovirt.engine.core.compat.backendcompat.XmlNodeList;
@@ -54,15 +54,15 @@
for (XmlNode node : list) {
String resourceType = node.SelectSingleNode("rasd:ResourceType",
_xmlNS).InnerText;
- if (StringHelper.EqOp(resourceType, OvfHardware.CPU)) {
+ if (OvfHardware.CPU.equals(resourceType)) {
_vm.getStaticData().setNumOfSockets(
Integer.parseInt(node.SelectSingleNode("rasd:num_of_sockets",
_xmlNS).InnerText));
_vm.getStaticData().setCpuPerSocket(
Integer.parseInt(node.SelectSingleNode("rasd:cpu_per_socket",
_xmlNS).InnerText));
- } else if (StringHelper.EqOp(resourceType, OvfHardware.Memory)) {
+ } else if (OvfHardware.Memory.equals(resourceType)) {
_vm.getStaticData().setMemSizeMb(
Integer.parseInt(node.SelectSingleNode("rasd:VirtualQuantity",
_xmlNS).InnerText));
- } else if (StringHelper.EqOp(resourceType, OvfHardware.DiskImage))
{
+ } else if (OvfHardware.DiskImage.equals(resourceType)) {
final Guid guid = new
Guid(node.SelectSingleNode("rasd:InstanceId", _xmlNS).InnerText);
DiskImage image = LinqUtils.firstOrNull(_images, new
Predicate<DiskImage>() {
@@ -73,20 +73,20 @@
});
image.setId(OvfParser.GetImageGrupIdFromImageFile(node.SelectSingleNode(
"rasd:HostResource", _xmlNS).InnerText));
- if
(!StringHelper.isNullOrEmpty(node.SelectSingleNode("rasd:Parent",
_xmlNS).InnerText)) {
+ if (!StringUtils.isBlank(node.SelectSingleNode("rasd:Parent",
_xmlNS).InnerText)) {
image.setParentId(new
Guid(node.SelectSingleNode("rasd:Parent", _xmlNS).InnerText));
}
- if
(!StringHelper.isNullOrEmpty(node.SelectSingleNode("rasd:Template",
_xmlNS).InnerText)) {
+ if
(!StringUtils.isBlank(node.SelectSingleNode("rasd:Template",
_xmlNS).InnerText)) {
image.setit_guid(new
Guid(node.SelectSingleNode("rasd:Template", _xmlNS).InnerText));
}
image.setappList(node.SelectSingleNode("rasd:ApplicationList",
_xmlNS).InnerText);
XmlNode storageNode = node.SelectSingleNode("rasd:StorageId",
_xmlNS);
if (storageNode != null &&
- !StringHelper.isNullOrEmpty(storageNode.InnerText)) {
+ !StringUtils.isBlank(storageNode.InnerText)) {
image.setstorage_ids(new ArrayList<Guid>(Arrays.asList(new
Guid(storageNode.InnerText))));
}
- if
(!StringHelper.isNullOrEmpty(node.SelectSingleNode("rasd:StoragePoolId",
_xmlNS).InnerText)) {
+ if
(!StringUtils.isBlank(node.SelectSingleNode("rasd:StoragePoolId",
_xmlNS).InnerText)) {
image.setstorage_pool_id(new
Guid(node.SelectSingleNode("rasd:StoragePoolId", _xmlNS).InnerText));
}
final Date creationDate = OvfParser.UtcDateStringToLocaDate(
@@ -105,23 +105,23 @@
image.setlast_modified_date(last_modified_date);
}
readVmDevice(node, _vm.getStaticData(), image.getId(),
Boolean.TRUE);
- } else if (StringHelper.EqOp(resourceType, OvfHardware.Network)) {
+ } else if (OvfHardware.Network.equals(resourceType)) {
VmNetworkInterface iface = getNetwotkInterface(node);
updateSingleNic(node, iface);
_vm.getInterfaces().add(iface);
readVmDevice(node, _vm.getStaticData(), iface.getId(),
Boolean.TRUE);
- } else if (StringHelper.EqOp(resourceType, OvfHardware.USB)) {
+ } else if (OvfHardware.USB.equals(resourceType)) {
_vm.getStaticData().setUsbPolicy(
UsbPolicy.forStringValue(node.SelectSingleNode("rasd:UsbPolicy",
_xmlNS).InnerText));
- } else if (StringHelper.EqOp(resourceType, OvfHardware.Monitor)) {
+ } else if (OvfHardware.Monitor.equals(resourceType)) {
_vm.getStaticData().setNumOfMonitors(
Integer.parseInt(node.SelectSingleNode("rasd:VirtualQuantity",
_xmlNS).InnerText));
readVmDevice(node, _vm.getStaticData(), Guid.NewGuid(),
Boolean.TRUE);
- } else if (StringHelper.EqOp(resourceType, OvfHardware.CD)) {
+ } else if (OvfHardware.CD.equals(resourceType)) {
readVmDevice(node, _vm.getStaticData(), Guid.NewGuid(),
Boolean.TRUE);
- } else if (StringHelper.EqOp(resourceType, OvfHardware.OTHER)) {
+ } else if (OvfHardware.OTHER.equals(resourceType)) {
if (node.SelectSingleNode(OvfProperties.VMD_TYPE, _xmlNS) !=
null
- &&
!StringHelper.isNullOrEmpty(node.SelectSingleNode(OvfProperties.VMD_TYPE,
_xmlNS).InnerText)) {
+ &&
!StringUtils.isBlank(node.SelectSingleNode(OvfProperties.VMD_TYPE,
_xmlNS).InnerText)) {
String type =
String.valueOf(node.SelectSingleNode(OvfProperties.VMD_TYPE, _xmlNS).InnerText);
String device =
String.valueOf(node.SelectSingleNode(OvfProperties.VMD_DEVICE,
_xmlNS).InnerText);
// special devices are treated as managed devices but
still have the OTHER OVF ResourceType
@@ -147,13 +147,13 @@
}
node = content.SelectSingleNode("TemplateId");
if (node != null) {
- if (!StringHelper.isNullOrEmpty(node.InnerText)) {
+ if (!StringUtils.isBlank(node.InnerText)) {
_vm.getStaticData().setVmtGuid(new Guid(node.InnerText));
}
}
node = content.SelectSingleNode("TemplateName");
if (node != null) {
- if (!StringHelper.isNullOrEmpty(node.InnerText)) {
+ if (!StringUtils.isBlank(node.InnerText)) {
_vm.setVmtName(node.InnerText);
}
}
@@ -181,7 +181,7 @@
List<String> aliases = handler.getAliases();
for (String alias : aliases) {
String value = readEventLogValue(content, alias);
- if (!StringHelper.isNullOrEmpty(value)) {
+ if (!StringUtils.isBlank(value)) {
handler.addValueForAlias(alias, value);
}
@@ -189,7 +189,7 @@
node = content.SelectSingleNode("app_list");
if (node != null) {
- if (!StringHelper.isNullOrEmpty(node.InnerText)) {
+ if (!StringUtils.isBlank(node.InnerText)) {
_vm.setAppList(node.InnerText);
}
}
@@ -210,7 +210,7 @@
node = content.SelectSingleNode("MinAllocatedMem");
if (node != null) {
- if (!StringHelper.isNullOrEmpty(node.InnerText)) {
+ if (!StringUtils.isBlank(node.InnerText)) {
_vm.setMinAllocatedMem(Integer.parseInt(node.InnerText));
}
}
@@ -251,6 +251,7 @@
return null;
}
+ @Override
protected void readSnapshotsSection(XmlNode section) {
XmlNodeList list = section.SelectNodes("Snapshot");
ArrayList<Snapshot> snapshots = new ArrayList<Snapshot>();
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
index 76eec4c..ab848d9 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
@@ -5,14 +5,15 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.regex.Pattern;
+import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.queries.ValueObjectMap;
import org.ovirt.engine.core.compat.DoubleCompat;
import org.ovirt.engine.core.compat.IntegerCompat;
import org.ovirt.engine.core.compat.LongCompat;
-import org.ovirt.engine.core.compat.StringHelper;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
@@ -57,7 +58,7 @@
* The fencing options.
*/
public VdsFenceOptions(String agent, String fencingOptions) {
- if (!StringHelper.isNullOrEmpty(agent)) {
+ if (!StringUtils.isEmpty(agent)) {
this.fenceAgent = agent;
this.fencingOptions = fencingOptions;
}
@@ -110,17 +111,17 @@
*/
private void CacheFencingAgentsOptionMapping() {
String localfencingOptionMapping = Config.<String>
GetValue(ConfigValues.VdsFenceOptionMapping);
- String[] agentsOptionsStr =
localfencingOptionMapping.split(StringHelper.quote(SEMICOLON), -1);
+ String[] agentsOptionsStr =
localfencingOptionMapping.split(Pattern.quote(SEMICOLON), -1);
for (String agentOptionsStr : agentsOptionsStr) {
- String[] parts = agentOptionsStr.split(StringHelper.quote(COLON),
-1);
+ String[] parts = agentOptionsStr.split(Pattern.quote(COLON), -1);
if (parts.length == 2) {
String agent = parts[0];
HashMap<String, String> agentOptions = new HashMap<String,
String>();
// check for empty options
- if (!StringHelper.isNullOrEmpty(parts[1])) {
- String[] options =
parts[1].split(StringHelper.quote(COMMA), -1);
+ if (!StringUtils.isEmpty(parts[1])) {
+ String[] options = parts[1].split(Pattern.quote(COMMA),
-1);
for (String option : options) {
- String[] optionKeyVal =
option.split(StringHelper.quote(EQUAL), -1);
+ String[] optionKeyVal =
option.split(Pattern.quote(EQUAL), -1);
agentOptions.put(optionKeyVal[0], optionKeyVal[1]);
// add mapped keys to special params
fencingSpecialParams.add(optionKeyVal[1]);
@@ -140,9 +141,9 @@
*/
private void CacheFencingAgentsOptionTypes() {
String localfencingOptionTypes = Config.<String>
GetValue(ConfigValues.VdsFenceOptionTypes);
- String[] types =
localfencingOptionTypes.split(StringHelper.quote(COMMA), -1);
+ String[] types = localfencingOptionTypes.split(Pattern.quote(COMMA),
-1);
for (String entry : types) {
- String[] optionKeyVal = entry.split(StringHelper.quote(EQUAL), -1);
+ String[] optionKeyVal = entry.split(Pattern.quote(EQUAL), -1);
fencingOptionTypes.put(optionKeyVal[0], optionKeyVal[1]);
}
}
@@ -158,7 +159,7 @@
*/
private String GetRealKey(String agent, String displayedKey) {
String result = "";
- if (!StringHelper.isNullOrEmpty(agent) &&
!StringHelper.isNullOrEmpty(displayedKey)) {
+ if (!StringUtils.isEmpty(agent) && !StringUtils.isEmpty(displayedKey))
{
if (fencingOptionMapping.containsKey(agent)) {
HashMap<String, String> agentOptions =
fencingOptionMapping.get(agent);
result = agentOptions.containsKey(displayedKey) ?
agentOptions.get(displayedKey)
@@ -181,12 +182,12 @@
*/
private String GetDisplayedKey(String agent, String realKey) {
String result = "";
- if (!StringHelper.isNullOrEmpty(agent) &&
!StringHelper.isNullOrEmpty(realKey)) {
+ if (!StringUtils.isEmpty(agent) && !StringUtils.isEmpty(realKey)) {
if (fencingOptionMapping.containsKey(agent)) {
HashMap<String, String> agentOptions =
fencingOptionMapping.get(agent);
if (agentOptions.containsValue(realKey)) {
for (Map.Entry<String, String> pair :
agentOptions.entrySet()) {
- if (StringHelper.EqOp(pair.getValue(), realKey)) {
+ if (StringUtils.equals(pair.getValue(), realKey)) {
result = pair.getKey();
break;
}
@@ -212,7 +213,7 @@
*/
private String GetOptionType(String key) {
String result = "";
- if (!StringHelper.isNullOrEmpty(key) &&
fencingOptionTypes.containsKey(key)) {
+ if (!StringUtils.isEmpty(key) && fencingOptionTypes.containsKey(key)) {
result = fencingOptionTypes.get(key);
}
return result;
@@ -281,12 +282,12 @@
* Caches the fencing agent instance options.
*/
private void CacheFencingAgentInstanceOptions() {
- if (!StringHelper.isNullOrEmpty(getAgent())
- && !StringHelper.isNullOrEmpty(getFencingOptions())) {
- String[] options =
getFencingOptions().split(StringHelper.quote(COMMA), -1);
+ if (!StringUtils.isEmpty(getAgent())
+ && !StringUtils.isEmpty(getFencingOptions())) {
+ String[] options = getFencingOptions().split(Pattern.quote(COMMA),
-1);
fencingAgentInstanceOptions.clear();
for (String option : options) {
- String[] optionKeyVal =
option.split(StringHelper.quote(EQUAL), -1);
+ String[] optionKeyVal = option.split(Pattern.quote(EQUAL), -1);
if (optionKeyVal.length == 1) {
add(getAgent(), optionKeyVal[0], "");
} else {
@@ -307,11 +308,11 @@
String agentMapping = Config.<String>
GetValue(ConfigValues.FenceAgentMapping);
String realAgent = agent;
// result has the format [<agent>=<real agent>[,]]*
- String[] settings = agentMapping.split(StringHelper.quote(COMMA), -1);
+ String[] settings = agentMapping.split(Pattern.quote(COMMA), -1);
if (settings.length > 0) {
for (String setting : settings) {
// get the <agent>=<real agent> pair
- String[] pair = setting.split(StringHelper.quote(EQUAL), -1);
+ String[] pair = setting.split(Pattern.quote(EQUAL), -1);
if (pair.length == 2) {
if (agent.equalsIgnoreCase(pair[0])) {
realAgent = pair[1];
@@ -334,16 +335,16 @@
String agentdefaultParams = Config.<String>
GetValue(ConfigValues.FenceAgentDefaultParams);
StringBuilder realOptions = new StringBuilder(fenceOptions);
// result has the format [<agent>:param=value[,]...;]*
- String[] params =
agentdefaultParams.split(StringHelper.quote(SEMICOLON), -1);
+ String[] params = agentdefaultParams.split(Pattern.quote(SEMICOLON),
-1);
for (String agentOptionsStr : params) {
- String[] parts = agentOptionsStr.split(StringHelper.quote(COLON),
-1);
+ String[] parts = agentOptionsStr.split(Pattern.quote(COLON), -1);
if (parts.length == 2) {
if (agent.equalsIgnoreCase(parts[0])) {
// check for empty options
- if (!StringHelper.isNullOrEmpty(parts[1])) {
- String[] options =
parts[1].split(StringHelper.quote(COMMA), -1);
+ if (!StringUtils.isEmpty(parts[1])) {
+ String[] options =
parts[1].split(Pattern.quote(COMMA), -1);
for (String option : options) {
- String[] optionKeyVal =
option.split(StringHelper.quote(EQUAL), -1);
+ String[] optionKeyVal =
option.split(Pattern.quote(EQUAL), -1);
// if a value is set explicitly for a default param
// we respect that value and not use the default
value
if (!fenceOptions.contains(optionKeyVal[0])) {
@@ -436,7 +437,7 @@
public boolean IsSupported(String agent, String key) {
boolean result = false;
- if (!StringHelper.isNullOrEmpty(agent) &&
!StringHelper.isNullOrEmpty(key)
+ if (!StringUtils.isEmpty(agent) && !StringUtils.isEmpty(key)
&& fencingOptionMapping.containsKey(agent)) {
HashMap<String, String> agentOptions =
fencingOptionMapping.get(agent);
result = (agentOptions == null) ? false :
agentOptions.containsKey(key);
@@ -494,12 +495,12 @@
final String LONG = "long";
final String DOUBLE = "double";
Object result = null;
- if (!StringHelper.isNullOrEmpty(key)) {
+ if (!StringUtils.isEmpty(key)) {
String type = GetOptionType(key);
key = GetRealKey(getAgent(), key);
if (fencingAgentInstanceOptions != null
&& fencingAgentInstanceOptions.containsKey(key)) {
- if (!StringHelper.isNullOrEmpty(type)) {
+ if (!StringUtils.isEmpty(type)) {
// Convert to the suitable type according to metadata.
if (type.equalsIgnoreCase(BOOL)) {
result =
Boolean.parseBoolean(fencingAgentInstanceOptions.get(key));
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/vdshooks/VdsHooksParser.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/vdshooks/VdsHooksParser.java
index fddd6a8..05ac609 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/vdshooks/VdsHooksParser.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/vdshooks/VdsHooksParser.java
@@ -3,9 +3,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.common.queries.ValueObjectMap;
-import org.ovirt.engine.core.compat.StringHelper;
-import org.ovirt.engine.core.utils.vdshooks.VdsHooksParser.ParsingResult;
/**
* Parsers a hooks string to a ValueObjectMap of script directories/events to
a ValueObjectMap of script names to a
@@ -34,6 +33,7 @@
this.endIndex = endIndex;
}
+ @Override
public String toString() {
return map.toString();
}
@@ -154,7 +154,7 @@
public static ValueObjectMap parseHooks(String hooksStr) {
ValueObjectMap result = new ValueObjectMap();
// If the hooks string is null or empty an empty data structure will
be returned
- if (!StringHelper.isNullOrEmpty(hooksStr)) {
+ if (!StringUtils.isEmpty(hooksStr)) {
char[] chars = new char[hooksStr.length()];
hooksStr.getChars(0, hooksStr.length(), chars, 0);
ParsingResult parsingResult = parseMap(chars, 0);
--
To view, visit http://gerrit.ovirt.org/11609
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16721000ed04f04a5c5ccb0651e83e523ac9f6c2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
