Skip to content

Commit 8e260d0

Browse files
GutoVeroneziGutoVeronezi
authored
Merge branch 'apache:main' into main
2 parents 5f1382f + 86f6675 commit 8e260d0

File tree

768 files changed

+16683
-7294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

768 files changed

+16683
-7294
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ tools/cli/cloudmonkey/precache.py
4848
tools/marvin/marvin/cloudstackAPI/
4949
tools/marvin/build/
5050
tools/cli/build/
51+
tools/appliance/systemvmtemplate/packer_cache/
5152
*.jar
5253
*.war
5354
*.mar

‎agent/src/main/java/com/cloud/agent/Agent.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import org.apache.cloudstack.utils.security.KeyStoreUtils;
5252
import org.apache.commons.collections.CollectionUtils;
5353
import org.apache.commons.io.FileUtils;
54+
import org.apache.commons.lang3.StringUtils;
5455
import org.apache.log4j.Logger;
5556
import org.apache.log4j.MDC;
5657

@@ -72,7 +73,6 @@
7273
import com.cloud.host.Host;
7374
import com.cloud.resource.ServerResource;
7475
import com.cloud.utils.PropertiesUtil;
75-
import com.cloud.utils.StringUtils;
7676
import com.cloud.utils.backoff.BackoffAlgorithm;
7777
import com.cloud.utils.concurrency.NamedThreadFactory;
7878
import com.cloud.utils.exception.CloudRuntimeException;
@@ -85,7 +85,6 @@
8585
import com.cloud.utils.nio.Task;
8686
import com.cloud.utils.script.OutputInterpreter;
8787
import com.cloud.utils.script.Script;
88-
import com.google.common.base.Strings;
8988

9089
/**
9190
* @config
@@ -715,7 +714,7 @@ public Answer setupAgentKeystore(final SetupKeyStoreCommand cmd) {
715714
final String csrFile = agentFile.getParent() + "/" + KeyStoreUtils.CSR_FILENAME;
716715

717716
String storedPassword = _shell.getPersistentProperty(null, KeyStoreUtils.KS_PASSPHRASE_PROPERTY);
718-
if (Strings.isNullOrEmpty(storedPassword)) {
717+
if (StringUtils.isEmpty(storedPassword)) {
719718
storedPassword = keyStorePassword;
720719
_shell.setPersistentProperty(null, KeyStoreUtils.KS_PASSPHRASE_PROPERTY, storedPassword);
721720
}
@@ -782,9 +781,9 @@ private Answer setupAgentCertificate(final SetupCertificateCommand cmd) {
782781
}
783782

784783
private void processManagementServerList(final List<String> msList, final String lbAlgorithm, final Long lbCheckInterval) {
785-
if (CollectionUtils.isNotEmpty(msList) && !Strings.isNullOrEmpty(lbAlgorithm)) {
784+
if (CollectionUtils.isNotEmpty(msList) && StringUtils.isNotEmpty(lbAlgorithm)) {
786785
try {
787-
final String newMSHosts = String.format("%s%s%s", StringUtils.toCSVList(msList), IAgentShell.hostLbAlgorithmSeparator, lbAlgorithm);
786+
final String newMSHosts = String.format("%s%s%s", com.cloud.utils.StringUtils.toCSVList(msList), IAgentShell.hostLbAlgorithmSeparator, lbAlgorithm);
788787
_shell.setPersistentProperty(null, "host", newMSHosts);
789788
_shell.setHosts(newMSHosts);
790789
_shell.resetHostCounter();

‎agent/src/main/java/com/cloud/agent/AgentShell.java‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,26 @@
1616
// under the License.
1717
package com.cloud.agent;
1818

19+
import com.cloud.agent.Agent.ExitStatus;
20+
import com.cloud.agent.dao.StorageComponent;
21+
import com.cloud.agent.dao.impl.PropertiesStorage;
22+
import com.cloud.resource.ServerResource;
23+
import com.cloud.utils.LogUtils;
24+
import com.cloud.utils.NumbersUtil;
25+
import com.cloud.utils.ProcessUtil;
26+
import com.cloud.utils.PropertiesUtil;
27+
import com.cloud.utils.backoff.BackoffAlgorithm;
28+
import com.cloud.utils.backoff.impl.ConstantTimeBackoff;
29+
import com.cloud.utils.exception.CloudRuntimeException;
30+
import org.apache.commons.daemon.Daemon;
31+
import org.apache.commons.daemon.DaemonContext;
32+
import org.apache.commons.daemon.DaemonInitException;
33+
import org.apache.commons.lang.math.NumberUtils;
34+
import org.apache.commons.lang3.StringUtils;
35+
import org.apache.log4j.Logger;
36+
import org.apache.log4j.xml.DOMConfigurator;
37+
38+
import javax.naming.ConfigurationException;
1939
import java.io.File;
2040
import java.io.FileNotFoundException;
2141
import java.io.IOException;
@@ -30,28 +50,6 @@
3050
import java.util.Properties;
3151
import java.util.UUID;
3252

33-
import javax.naming.ConfigurationException;
34-
35-
import org.apache.commons.daemon.Daemon;
36-
import org.apache.commons.daemon.DaemonContext;
37-
import org.apache.commons.daemon.DaemonInitException;
38-
import org.apache.commons.lang.math.NumberUtils;
39-
import org.apache.log4j.Logger;
40-
import org.apache.log4j.xml.DOMConfigurator;
41-
42-
import com.cloud.agent.Agent.ExitStatus;
43-
import com.cloud.agent.dao.StorageComponent;
44-
import com.cloud.agent.dao.impl.PropertiesStorage;
45-
import com.cloud.resource.ServerResource;
46-
import com.cloud.utils.LogUtils;
47-
import com.cloud.utils.NumbersUtil;
48-
import com.cloud.utils.ProcessUtil;
49-
import com.cloud.utils.PropertiesUtil;
50-
import com.cloud.utils.backoff.BackoffAlgorithm;
51-
import com.cloud.utils.backoff.impl.ConstantTimeBackoff;
52-
import com.cloud.utils.exception.CloudRuntimeException;
53-
import com.google.common.base.Strings;
54-
5553
public class AgentShell implements IAgentShell, Daemon {
5654
private static final Logger s_logger = Logger.getLogger(AgentShell.class.getName());
5755

@@ -155,7 +153,7 @@ public String[] getHosts() {
155153

156154
@Override
157155
public void setHosts(final String host) {
158-
if (!Strings.isNullOrEmpty(host)) {
156+
if (StringUtils.isNotEmpty(host)) {
159157
_host = host.split(hostLbAlgorithmSeparator)[0];
160158
resetHostCounter();
161159
}
@@ -333,7 +331,7 @@ protected boolean parseCommand(final String[] args) throws ConfigurationExceptio
333331
}
334332

335333
String val = getProperty(null, preferredHostIntervalKey);
336-
preferredHostCheckInterval = (Strings.isNullOrEmpty(val) ? null : Long.valueOf(val));
334+
preferredHostCheckInterval = StringUtils.isEmpty(val) ? null : Long.valueOf(val);
337335

338336
return true;
339337
}
@@ -423,13 +421,13 @@ private void launchAgentFromClassInfo(String resourceClassNames) throws Configur
423421
} catch (final ClassNotFoundException e) {
424422
throw new ConfigurationException("Resource class not found: " + name + " due to: " + e.toString());
425423
} catch (final SecurityException e) {
426-
throw new ConfigurationException("Security excetion when loading resource: " + name + " due to: " + e.toString());
424+
throw new ConfigurationException("Security exception when loading resource: " + name + " due to: " + e.toString());
427425
} catch (final NoSuchMethodException e) {
428-
throw new ConfigurationException("Method not found excetion when loading resource: " + name + " due to: " + e.toString());
426+
throw new ConfigurationException("Method not found exception when loading resource: " + name + " due to: " + e.toString());
429427
} catch (final IllegalArgumentException e) {
430-
throw new ConfigurationException("Illegal argument excetion when loading resource: " + name + " due to: " + e.toString());
428+
throw new ConfigurationException("Illegal argument exception when loading resource: " + name + " due to: " + e.toString());
431429
} catch (final InstantiationException e) {
432-
throw new ConfigurationException("Instantiation excetion when loading resource: " + name + " due to: " + e.toString());
430+
throw new ConfigurationException("Instantiation exception when loading resource: " + name + " due to: " + e.toString());
433431
} catch (final IllegalAccessException e) {
434432
throw new ConfigurationException("Illegal access exception when loading resource: " + name + " due to: " + e.toString());
435433
} catch (final InvocationTargetException e) {

‎agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import com.cloud.utils.exception.CloudRuntimeException;
2222
import org.apache.cloudstack.utils.security.DigestHelper;
23-
import org.apache.commons.lang.StringUtils;
23+
import org.apache.commons.lang3.StringUtils;
2424
import org.apache.log4j.Logger;
2525

2626
import java.io.File;

‎agent/src/main/java/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.cloud.utils.UriUtils;
2323
import com.cloud.utils.exception.CloudRuntimeException;
2424
import org.apache.commons.collections.CollectionUtils;
25-
import org.apache.commons.lang.StringUtils;
25+
import org.apache.commons.lang3.StringUtils;
2626
import org.apache.log4j.Logger;
2727

2828
import java.io.File;

0 commit comments

Comments
 (0)