Skip to content

Commit 918b02f

Browse files
author
Dingane Hlaluku
committed
Revert back the deprecation messages in the custom StringUtils class to favour the use of the ApacheUtils
1 parent 4673035 commit 918b02f

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import javax.naming.ConfigurationException;
4545

4646
import org.apache.commons.lang.math.NumberUtils;
47+
import org.apache.commons.lang.StringUtils;
4748
import org.apache.log4j.Logger;
4849
import org.apache.log4j.NDC;
4950
import org.joda.time.Duration;
@@ -295,7 +296,6 @@
295296
import com.cloud.utils.ExecutionResult;
296297
import com.cloud.utils.NumbersUtil;
297298
import com.cloud.utils.Pair;
298-
import com.cloud.utils.StringUtils;
299299
import com.cloud.utils.Ternary;
300300
import com.cloud.utils.db.DB;
301301
import com.cloud.utils.exception.CloudRuntimeException;
@@ -4398,7 +4398,7 @@ private Answer execute(MigrateVolumeCommand cmd) {
43984398
VmwareHypervisorHost srcHyperHost = null;
43994399

44004400
// OfflineVmwareMigration: ifhost is null ???
4401-
if (StringUtils.isBlank(cmd.getAttachedVmName())) {
4401+
if (org.apache.commons.lang.StringUtils.isBlank(cmd.getAttachedVmName())) {
44024402
return migrateVolume(cmd);
44034403
}
44044404
ManagedObjectReference morDs = null;

utils/src/main/java/com/cloud/utils/StringUtils.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,20 @@ public static String join(final Iterable<? extends Object> iterable, final Strin
7373
public static String join(final String delimiter, final Object... components) {
7474
return org.apache.commons.lang.StringUtils.join(components, delimiter);
7575
}
76-
76+
/**
77+
* @deprecated
78+
* Please use org.apache.commons.lang.StringUtils.isBlank() as a replacement
79+
*/
80+
@Deprecated
7781
public static boolean isBlank(String str) {
7882
return org.apache.commons.lang.StringUtils.isBlank(str);
7983
}
8084

85+
/**
86+
* @deprecated
87+
* Please use org.apache.commons.lang.StringUtils.isNotBlank() as a replacement
88+
*/
89+
@Deprecated
8190
public static boolean isNotBlank(final String str) {
8291
return org.apache.commons.lang.StringUtils.isNotBlank(str);
8392
}

0 commit comments

Comments
 (0)