You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/06/19 11:57:02 UTC
[karaf] branch master updated: Switch StringBuffer to StringBuilder
instead
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 20e5dbb Switch StringBuffer to StringBuilder instead
new e3cdf56 Merge pull request #878 from coheigea/stringbuffer
20e5dbb is described below
commit 20e5dbb4ad99fceeae481ba07b77707fcb2282de
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jun 17 10:21:36 2019 +0100
Switch StringBuffer to StringBuilder instead
---
.../src/main/java/org/slf4j/impl/SimpleLogger.java | 2 +-
.../java/org/apache/karaf/docker/DockerClient.java | 2 +-
.../org/apache/karaf/docker/command/PsCommand.java | 2 +-
.../rest/client/http/ListBookingCommand.java | 2 +-
.../karaf/features/command/InfoFeatureCommand.java | 2 +-
.../karaf/features/internal/model/Conditional.java | 2 +-
.../org/apache/karaf/itests/KarafTestSupport.java | 2 +-
.../org/apache/karaf/itests/FelixHttpTest.java | 2 +-
.../test/java/org/apache/karaf/itests/WebTest.java | 4 +-
.../karaf/itests/examples/CamelExampleTest.java | 4 +-
.../itests/examples/HttpResourceExampleTest.java | 2 +-
.../karaf/itests/examples/RestExampleTest.java | 2 +-
.../karaf/itests/examples/ServletExampleTest.java | 2 +-
.../karaf/itests/examples/WarExampleTest.java | 2 +-
.../blueprint/config/impl/NamespaceHandler.java | 2 +-
.../blueprint/jasypt/handler/NamespaceHandler.java | 2 +-
...ryptableConfigAdminPropertyPlaceholderTest.java | 2 +-
.../EncryptablePropertyPlaceholderTest.java | 2 +-
.../properties/PropertiesBackingEngine.java | 4 +-
.../modules/publickey/PublickeyBackingEngine.java | 4 +-
.../log/core/internal/layout/PatternParser.java | 2 +-
.../java/org/apache/karaf/main/util/Utils.java | 6 +-
.../karaf/obr/command/ObrCommandSupport.java | 2 +-
.../karaf/obr/core/internal/ObrMBeanImpl.java | 2 +-
.../impl/adapter/BundleEventAdapter.java | 2 +-
.../commands/basic/DefaultActionPreparator.java | 2 +-
.../karaf/shell/commands/meta/ActionMetaData.java | 2 +-
.../karaf/shell/console/impl/Converters.java | 2 +-
.../action/command/DefaultActionPreparator.java | 2 +-
.../karaf/shell/impl/console/osgi/Converters.java | 2 +-
.../org/apache/karaf/tooling/DockerfileMojo.java | 2 +-
.../commands/AsciiDoctorCommandHelpPrinter.java | 2 +-
.../commands/DocBookCommandHelpPrinter.java | 2 +-
.../commands/UserConfCommandHelpPrinter.java | 2 +-
.../java/org/apache/karaf/util/DeployerUtils.java | 4 +-
.../org/apache/karaf/util/StringEscapeUtils.java | 6 +-
.../java/org/apache/karaf/util/TemplateUtils.java | 82 ----------------------
.../apache/karaf/util/config/PropertiesLoader.java | 4 +-
.../karaf/util/xml/IndentingXMLEventWriter.java | 2 +-
.../karaf/webconsole/features/FeaturesPlugin.java | 4 +-
.../karaf/webconsole/instance/InstancePlugin.java | 2 +-
41 files changed, 51 insertions(+), 133 deletions(-)
diff --git a/client/src/main/java/org/slf4j/impl/SimpleLogger.java b/client/src/main/java/org/slf4j/impl/SimpleLogger.java
index aa4e168..0d140eb 100644
--- a/client/src/main/java/org/slf4j/impl/SimpleLogger.java
+++ b/client/src/main/java/org/slf4j/impl/SimpleLogger.java
@@ -210,7 +210,7 @@ public class SimpleLogger extends MarkerIgnoringBase {
}
protected void doLog(int level, String msg, Throwable t) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
long millis = System.currentTimeMillis();
buf.append(millis - startTime);
buf.append(" [");
diff --git a/docker/src/main/java/org/apache/karaf/docker/DockerClient.java b/docker/src/main/java/org/apache/karaf/docker/DockerClient.java
index 95b4861..0856e1a 100644
--- a/docker/src/main/java/org/apache/karaf/docker/DockerClient.java
+++ b/docker/src/main/java/org/apache/karaf/docker/DockerClient.java
@@ -208,7 +208,7 @@ public class DockerClient {
HttpURLConnection connection = (HttpURLConnection) dockerUrl.openConnection();
connection.setRequestMethod("GET");
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String line;
while ((line = reader.readLine()) != null) {
diff --git a/docker/src/main/java/org/apache/karaf/docker/command/PsCommand.java b/docker/src/main/java/org/apache/karaf/docker/command/PsCommand.java
index 24f49ea..23306cc 100644
--- a/docker/src/main/java/org/apache/karaf/docker/command/PsCommand.java
+++ b/docker/src/main/java/org/apache/karaf/docker/command/PsCommand.java
@@ -45,7 +45,7 @@ public class PsCommand extends DockerCommandSupport {
table.column("Size");
table.column("Size Root");
for (Container container : getDockerService().ps(showAll, url)) {
- StringBuffer portBuffer = new StringBuffer();
+ StringBuilder portBuffer = new StringBuilder();
for (Port port : container.getPorts()) {
portBuffer.append(port.getType()).append(":").append(port.getPrivatePort()).append(":").append(port.getPublicPort()).append(" ");
}
diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/src/main/java/org/apache/karaf/examples/rest/client/http/ListBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/src/main/java/org/apache/karaf/examples/rest/client/http/ListBookingCommand.java
index e1b5359..38d9815 100644
--- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/src/main/java/org/apache/karaf/examples/rest/client/http/ListBookingCommand.java
+++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/src/main/java/org/apache/karaf/examples/rest/client/http/ListBookingCommand.java
@@ -44,7 +44,7 @@ public class ListBookingCommand implements Action {
if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
BufferedReader buffer = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String line;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
while ((line = buffer.readLine())!= null) {
sb.append(line);
}
diff --git a/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java b/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java
index 1640915..dd62f41 100644
--- a/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java
+++ b/features/command/src/main/java/org/apache/karaf/features/command/InfoFeatureCommand.java
@@ -342,7 +342,7 @@ public class InfoFeatureCommand extends FeaturesCommandSupport {
}
private String getConditionDescription(Conditional cond) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (String dep : cond.getCondition()) {
if (sb.length() > 0) {
sb.append(" ");
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java
index 8bbde76..c47d48e 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java
@@ -90,7 +90,7 @@ public class Conditional extends Content implements org.apache.karaf.features.Co
}
public String getConditionId() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (String cond : getCondition()) {
if (sb.length() > 0) {
sb.append("_");
diff --git a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
index b432e84..1ddf10c 100644
--- a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -546,7 +546,7 @@ public class KarafTestSupport {
@SuppressWarnings("rawtypes")
private static String explode(Dictionary dictionary) {
Enumeration keys = dictionary.keys();
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
while (keys.hasMoreElements()) {
Object key = keys.nextElement();
result.append(String.format("%s=%s", key, dictionary.get(key)));
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/FelixHttpTest.java b/itests/test/src/test/java/org/apache/karaf/itests/FelixHttpTest.java
index 64c013c..2dad1c7 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/FelixHttpTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/FelixHttpTest.java
@@ -50,7 +50,7 @@ public class FelixHttpTest extends KarafTestSupport {
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String line;
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
while ((line = reader.readLine()) != null) {
buffer.append(line);
}
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java b/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java
index 128b013..9e66a17 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java
@@ -73,7 +73,7 @@ public class WebTest extends KarafTestSupport {
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setDoInput(true);
connection.setRequestMethod("GET");
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
String line = null;
while ((line = reader.readLine()) != null) {
@@ -107,7 +107,7 @@ public class WebTest extends KarafTestSupport {
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setDoInput(true);
connection.setRequestMethod("GET");
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
String line = null;
while ((line = reader.readLine()) != null) {
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/examples/CamelExampleTest.java b/itests/test/src/test/java/org/apache/karaf/itests/examples/CamelExampleTest.java
index 66cbd6a..077398f 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/examples/CamelExampleTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/examples/CamelExampleTest.java
@@ -73,7 +73,7 @@ public class CamelExampleTest extends KarafTestSupport {
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String line;
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
while ((line = reader.readLine()) != null) {
buffer.append(line);
}
@@ -95,7 +95,7 @@ public class CamelExampleTest extends KarafTestSupport {
writer.close();
reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
- buffer = new StringBuffer();
+ buffer = new StringBuilder();
while ((line = reader.readLine()) != null) {
buffer.append(line);
}
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/examples/HttpResourceExampleTest.java b/itests/test/src/test/java/org/apache/karaf/itests/examples/HttpResourceExampleTest.java
index abbe883..aff8a49 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/examples/HttpResourceExampleTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/examples/HttpResourceExampleTest.java
@@ -49,7 +49,7 @@ public class HttpResourceExampleTest extends KarafTestSupport {
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String line;
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
while ((line = reader.readLine()) != null) {
buffer.append(line);
}
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java b/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java
index 0a700a7..5e4d9f4 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java
@@ -88,7 +88,7 @@ public class RestExampleTest extends KarafTestSupport {
URL url = new URL("http://localhost:" + getHttpPort() + "/booking");
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET");
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
String line;
while ((line = reader.readLine()) != null) {
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/examples/ServletExampleTest.java b/itests/test/src/test/java/org/apache/karaf/itests/examples/ServletExampleTest.java
index 99eb5dd..c90e3ee 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/examples/ServletExampleTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/examples/ServletExampleTest.java
@@ -51,7 +51,7 @@ public class ServletExampleTest extends KarafTestSupport {
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String line;
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
while ((line = reader.readLine()) != null) {
buffer.append(line);
}
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/examples/WarExampleTest.java b/itests/test/src/test/java/org/apache/karaf/itests/examples/WarExampleTest.java
index 101d777..9048cab 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/examples/WarExampleTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/examples/WarExampleTest.java
@@ -51,7 +51,7 @@ public class WarExampleTest extends KarafTestSupport {
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String line;
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
while ((line = reader.readLine()) != null) {
buffer.append(line);
}
diff --git a/jaas/blueprint/config/src/main/java/org/apache/karaf/jaas/blueprint/config/impl/NamespaceHandler.java b/jaas/blueprint/config/src/main/java/org/apache/karaf/jaas/blueprint/config/impl/NamespaceHandler.java
index 4f21d99..78681b3 100644
--- a/jaas/blueprint/config/src/main/java/org/apache/karaf/jaas/blueprint/config/impl/NamespaceHandler.java
+++ b/jaas/blueprint/config/src/main/java/org/apache/karaf/jaas/blueprint/config/impl/NamespaceHandler.java
@@ -167,7 +167,7 @@ public class NamespaceHandler implements org.apache.aries.blueprint.NamespaceHan
}
private static String getTextValue(Element element) {
- StringBuffer value = new StringBuffer();
+ StringBuilder value = new StringBuilder();
NodeList nl = element.getChildNodes();
for (int i = 0; i < nl.getLength(); i++) {
Node item = nl.item(i);
diff --git a/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/NamespaceHandler.java b/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/NamespaceHandler.java
index 894d358..fba912e 100644
--- a/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/NamespaceHandler.java
+++ b/jaas/blueprint/jasypt/src/main/java/org/apache/karaf/jaas/blueprint/jasypt/handler/NamespaceHandler.java
@@ -165,7 +165,7 @@ public class NamespaceHandler implements org.apache.aries.blueprint.NamespaceHan
}
private static String getTextValue(Element element) {
- StringBuffer value = new StringBuffer();
+ StringBuilder value = new StringBuilder();
NodeList nl = element.getChildNodes();
for (int i = 0; i < nl.getLength(); i++) {
Node item = nl.item(i);
diff --git a/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java b/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java
index 7e18832..e8caae2 100644
--- a/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java
+++ b/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java
@@ -210,7 +210,7 @@ public class EncryptableConfigAdminPropertyPlaceholderTest extends TestCase {
*/
private static String explode(Dictionary dictionary) {
Enumeration keys = dictionary.keys();
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
while (keys.hasMoreElements()) {
Object key = keys.nextElement();
result.append(String.format("%s=%s", key, dictionary.get(key)));
diff --git a/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholderTest.java b/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholderTest.java
index 8d442a3..f0be971 100644
--- a/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholderTest.java
+++ b/jaas/blueprint/jasypt/src/test/java/org/apache/karaf/jaas/blueprint/jasypt/handler/EncryptablePropertyPlaceholderTest.java
@@ -185,7 +185,7 @@ public class EncryptablePropertyPlaceholderTest extends TestCase {
*/
private static String explode(Dictionary dictionary) {
Enumeration keys = dictionary.keys();
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
while (keys.hasMoreElements()) {
Object key = keys.nextElement();
result.append(String.format("%s=%s", key, dictionary.get(key)));
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
index 260ffb1..9329a0a 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
@@ -57,7 +57,7 @@ public class PropertiesBackingEngine implements BackingEngine {
private void addUserInternal(String username, String password) {
String[] infos = null;
- StringBuffer userInfoBuffer = new StringBuffer();
+ StringBuilder userInfoBuffer = new StringBuilder();
String encPassword = encryptionSupport.encrypt(password);
String userInfos = users.get(username);
@@ -184,7 +184,7 @@ public class PropertiesBackingEngine implements BackingEngine {
@Override
public void deleteRole(String username, String role) {
String[] infos = null;
- StringBuffer userInfoBuffer = new StringBuffer();
+ StringBuilder userInfoBuffer = new StringBuilder();
String userInfos = users.get(username);
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngine.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngine.java
index 44b2ad7..503780a 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngine.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngine.java
@@ -49,7 +49,7 @@ public class PublickeyBackingEngine implements BackingEngine {
private void addUserInternal(String username, String publickey) {
String[] infos = null;
- StringBuffer userInfoBuffer = new StringBuffer();
+ StringBuilder userInfoBuffer = new StringBuilder();
String newPublickey = publickey;
@@ -172,7 +172,7 @@ public class PublickeyBackingEngine implements BackingEngine {
@Override
public void deleteRole(String username, String role) {
String[] infos = null;
- StringBuffer userInfoBuffer = new StringBuffer();
+ StringBuilder userInfoBuffer = new StringBuilder();
String userInfos = users.get(username);
diff --git a/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java b/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java
index 0079bc4..b69fa1d 100644
--- a/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java
+++ b/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java
@@ -688,7 +688,7 @@ public class PatternParser {
return null;
}
else if (key == null) {
- StringBuffer buf = new StringBuffer("{");
+ StringBuilder buf = new StringBuilder("{");
if (properties.size() > 0) {
Object[] keys = properties.keySet().toArray();
Arrays.sort(keys);
diff --git a/main/src/main/java/org/apache/karaf/main/util/Utils.java b/main/src/main/java/org/apache/karaf/main/util/Utils.java
index e265137..f7003fe 100644
--- a/main/src/main/java/org/apache/karaf/main/util/Utils.java
+++ b/main/src/main/java/org/apache/karaf/main/util/Utils.java
@@ -219,7 +219,7 @@ public class Utils {
String classifier;
String type;
String artifactIdVersion = artifactId + "-" + version;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (p[p.length - 1].charAt(artifactIdVersion.length()) == '-') {
classifier = p[p.length - 1].substring(
artifactIdVersion.length() + 1,
@@ -267,7 +267,7 @@ public class Utils {
if (st.countTokens() > 0) {
String tokenList = "\" ";
- StringBuffer tokBuf = new StringBuffer(10);
+ StringBuilder tokBuf = new StringBuilder(10);
String tok;
boolean inQuote = false;
boolean tokStarted = false;
@@ -286,7 +286,7 @@ public class Utils {
if (tokStarted) {
retVal = tokBuf.toString();
tokStarted = false;
- tokBuf = new StringBuffer(10);
+ tokBuf = new StringBuilder(10);
exit = true;
}
} else {
diff --git a/obr/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java b/obr/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java
index 874414d..55a71c2 100644
--- a/obr/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java
+++ b/obr/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java
@@ -72,7 +72,7 @@ public abstract class ObrCommandSupport implements Action {
// The targetId may be a bundle name or a bundle symbolic name,
// so create the appropriate LDAP query.
- StringBuffer sb = new StringBuffer("(|(presentationname=");
+ StringBuilder sb = new StringBuilder("(|(presentationname=");
sb.append(targetId);
sb.append(")(symbolicname=");
sb.append(targetId);
diff --git a/obr/src/main/java/org/apache/karaf/obr/core/internal/ObrMBeanImpl.java b/obr/src/main/java/org/apache/karaf/obr/core/internal/ObrMBeanImpl.java
index de01c47..ba7eb12 100644
--- a/obr/src/main/java/org/apache/karaf/obr/core/internal/ObrMBeanImpl.java
+++ b/obr/src/main/java/org/apache/karaf/obr/core/internal/ObrMBeanImpl.java
@@ -155,7 +155,7 @@ public class ObrMBeanImpl extends StandardMBean implements ObrMBean {
// The targetId may be a bundle name or a bundle symbolic name,
// so create the appropriate LDAP query.
- StringBuffer sb = new StringBuffer("(|(presentationname=");
+ StringBuilder sb = new StringBuilder("(|(presentationname=");
sb.append(targetId);
sb.append(")(symbolicname=");
sb.append(targetId);
diff --git a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java
index 9a47d9c..2368311 100644
--- a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java
+++ b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java
@@ -82,7 +82,7 @@ public class BundleEventAdapter extends AbstractAdapter implements SynchronousBu
properties.put("bundle", event.getBundle());
- final StringBuffer topic = new StringBuffer(BundleEvent.class
+ final StringBuilder topic = new StringBuilder(BundleEvent.class
.getName().replace('.', '/')).append('/');
switch (event.getType())
diff --git a/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java b/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
index c0930a1..d392909 100644
--- a/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
+++ b/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
@@ -382,7 +382,7 @@ public class DefaultActionPreparator implements ActionPreparator {
out.println(command.description());
out.println();
}
- StringBuffer syntax = new StringBuffer();
+ StringBuilder syntax = new StringBuilder();
if (command != null) {
if (globalScope) {
syntax.append(command.name());
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
index d0de87b..0db3026 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
@@ -109,7 +109,7 @@ public class ActionMetaData {
out.println(command.description());
out.println();
}
- StringBuffer syntax = new StringBuffer();
+ StringBuilder syntax = new StringBuilder();
if (command != null) {
if (globalScope) {
syntax.append(command.name());
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/Converters.java b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/Converters.java
index 7a9c9d0..fae03da 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/Converters.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/Converters.java
@@ -255,7 +255,7 @@ public class Converters implements Converter
private CharSequence read(InputStream in) throws IOException
{
int c;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
while ((c = in.read()) > 0)
{
if (c >= 32 && c <= 0x7F || c == '\n' || c == '\r')
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
index 22c79ee..a26b814 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
@@ -329,7 +329,7 @@ public class DefaultActionPreparator {
out.println(command.description());
out.println();
}
- StringBuffer syntax = new StringBuffer();
+ StringBuilder syntax = new StringBuilder();
if (command != null) {
if (globalScope) {
syntax.append(command.name());
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Converters.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Converters.java
index 8f5b14c..aa231a5 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Converters.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Converters.java
@@ -257,7 +257,7 @@ public class Converters implements Converter
private CharSequence read(InputStream in) throws IOException
{
int c;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
while ((c = in.read()) > 0)
{
if (c >= 32 && c <= 0x7F || c == '\n' || c == '\r')
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/DockerfileMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/DockerfileMojo.java
index f0edcd8..aeaa324 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/DockerfileMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/DockerfileMojo.java
@@ -45,7 +45,7 @@ public class DockerfileMojo extends MojoSupport {
getLog().info("Creating Dockerfile");
File dockerFile = new File(destDir, "Dockerfile");
try {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append("FROM openjdk:8-jre").append("\n");
buffer.append("ENV KARAF_INSTALL_PATH /opt").append("\n");
buffer.append("ENV KARAF_HOME $KARAF_INSTALL_PATH/apache-karaf").append("\n");
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/AsciiDoctorCommandHelpPrinter.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/AsciiDoctorCommandHelpPrinter.java
index a52bff6..1aecb99 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/AsciiDoctorCommandHelpPrinter.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/AsciiDoctorCommandHelpPrinter.java
@@ -73,7 +73,7 @@ public class AsciiDoctorCommandHelpPrinter extends AbstractCommandHelpPrinter {
out.println(command.description());
out.println();
- StringBuffer syntax = new StringBuffer();
+ StringBuilder syntax = new StringBuilder();
syntax.append(String.format("%s:%s", command.scope(), command.name()));
if (options.size() > 0) {
syntax.append(" [options]");
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/DocBookCommandHelpPrinter.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/DocBookCommandHelpPrinter.java
index cf0b9a8..2cdad99 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/DocBookCommandHelpPrinter.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/DocBookCommandHelpPrinter.java
@@ -79,7 +79,7 @@ public class DocBookCommandHelpPrinter extends AbstractCommandHelpPrinter {
out.println(" </para>");
out.println(" </section>");
- StringBuffer syntax = new StringBuffer();
+ StringBuilder syntax = new StringBuilder();
syntax.append(String.format("%s:%s", command.scope(), command.name()));
if (options.size() > 0) {
syntax.append(" [options]");
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/UserConfCommandHelpPrinter.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/UserConfCommandHelpPrinter.java
index 5cf2443..23af956 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/UserConfCommandHelpPrinter.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/UserConfCommandHelpPrinter.java
@@ -77,7 +77,7 @@ public class UserConfCommandHelpPrinter extends AbstractCommandHelpPrinter {
out.println(command.description());
out.println();
- StringBuffer syntax = new StringBuffer();
+ StringBuilder syntax = new StringBuilder();
syntax.append(String.format("%s:%s", command.scope(), command.name()));
if (options.size() > 0) {
syntax.append(" \\[options\\]");
diff --git a/util/src/main/java/org/apache/karaf/util/DeployerUtils.java b/util/src/main/java/org/apache/karaf/util/DeployerUtils.java
index 4a82e12..26171d3 100644
--- a/util/src/main/java/org/apache/karaf/util/DeployerUtils.java
+++ b/util/src/main/java/org/apache/karaf/util/DeployerUtils.java
@@ -44,7 +44,7 @@ public final class DeployerUtils {
return new String[] { url, DEFAULT_VERSION };
}
else {
- StringBuffer v = new StringBuffer();
+ StringBuilder v = new StringBuilder();
String d1 = m.group(1);
String d2 = m.group(2);
String d3 = m.group(3);
@@ -76,7 +76,7 @@ public final class DeployerUtils {
}
}
- private static void cleanupModifier(StringBuffer result, String modifier) {
+ private static void cleanupModifier(StringBuilder result, String modifier) {
Matcher m = FUZZY_MODIFIDER.matcher(modifier);
if (m.matches()) {
modifier = m.group(1);
diff --git a/util/src/main/java/org/apache/karaf/util/StringEscapeUtils.java b/util/src/main/java/org/apache/karaf/util/StringEscapeUtils.java
index f632a57..b7e7519 100644
--- a/util/src/main/java/org/apache/karaf/util/StringEscapeUtils.java
+++ b/util/src/main/java/org/apache/karaf/util/StringEscapeUtils.java
@@ -44,8 +44,8 @@ public class StringEscapeUtils {
return null;
}
int sz = str.length();
- StringBuffer out = new StringBuffer(sz);
- StringBuffer unicode = new StringBuffer(UNICODE_LEN);
+ StringBuilder out = new StringBuilder(sz);
+ StringBuilder unicode = new StringBuilder(UNICODE_LEN);
boolean hadSlash = false;
boolean inUnicode = false;
for (int i = 0; i < sz; i++) {
@@ -148,7 +148,7 @@ public class StringEscapeUtils {
return null;
}
int sz = str.length();
- StringBuffer out = new StringBuffer(sz * 2);
+ StringBuilder out = new StringBuilder(sz * 2);
for (int i = 0; i < sz; i++) {
char ch = str.charAt(i);
// handle unicode
diff --git a/util/src/main/java/org/apache/karaf/util/TemplateUtils.java b/util/src/main/java/org/apache/karaf/util/TemplateUtils.java
deleted file mode 100644
index cfc59c6..0000000
--- a/util/src/main/java/org/apache/karaf/util/TemplateUtils.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.util;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Scanner;
-
-public class TemplateUtils {
- private TemplateUtils() {
- }
-
- public static void createFromTemplate(File outFile, InputStream templateIs, HashMap<String, String> properties) {
- if (outFile.exists()) {
- throw new IllegalArgumentException("File " + outFile.getPath()
- + " already exists. Remove it if you wish to recreate it.");
- }
- PrintStream out = null;
- Scanner scanner = null;
- try {
- // read it line at a time so that we can use the platform line ending when we write it out
- out = new PrintStream(new FileOutputStream(outFile));
- scanner = new Scanner(templateIs);
-
- while (scanner.hasNextLine()) {
- String line = scanner.nextLine();
- line = filter(line, properties);
- out.println(line);
- }
- } catch (FileNotFoundException e) {
- throw new RuntimeException("Can not create " + outFile, e);
- } finally {
- safeClose(out);
- safeClose(templateIs);
- }
- }
-
- private static String filter(String line, HashMap<String, String> props) {
- for (Map.Entry<String, String> entry : props.entrySet()) {
- String key = "${" + entry.getKey() + "}";
- int p1 = line.indexOf(key);
- if (p1 >= 0) {
- String l1 = line.substring(0, p1);
- String l2 = line.substring(p1 + key.length());
- line = l1 + entry.getValue() + l2;
- }
- }
- return line;
- }
-
- private static void safeClose(Closeable cl) {
- if (cl == null) {
- return;
- }
- try {
- cl.close();
- } catch (Throwable ignore) {
- // nothing to do
- }
- }
-
-}
diff --git a/util/src/main/java/org/apache/karaf/util/config/PropertiesLoader.java b/util/src/main/java/org/apache/karaf/util/config/PropertiesLoader.java
index ab26ba7..cab78fb 100644
--- a/util/src/main/java/org/apache/karaf/util/config/PropertiesLoader.java
+++ b/util/src/main/java/org/apache/karaf/util/config/PropertiesLoader.java
@@ -197,7 +197,7 @@ public class PropertiesLoader {
if (st.countTokens() > 0) {
String tokenList = "\" ";
- StringBuffer tokBuf = new StringBuffer(10);
+ StringBuilder tokBuf = new StringBuilder(10);
String tok;
boolean inQuote = false;
boolean tokStarted = false;
@@ -217,7 +217,7 @@ public class PropertiesLoader {
if (tokStarted) {
retVal = tokBuf.toString();
tokStarted = false;
- tokBuf = new StringBuffer(10);
+ tokBuf = new StringBuilder(10);
exit = true;
}
break;
diff --git a/util/src/main/java/org/apache/karaf/util/xml/IndentingXMLEventWriter.java b/util/src/main/java/org/apache/karaf/util/xml/IndentingXMLEventWriter.java
index 35735f2..b99a8e1 100755
--- a/util/src/main/java/org/apache/karaf/util/xml/IndentingXMLEventWriter.java
+++ b/util/src/main/java/org/apache/karaf/util/xml/IndentingXMLEventWriter.java
@@ -95,7 +95,7 @@ public class IndentingXMLEventWriter implements XMLEventWriter {
*/
private void possiblyIndent() throws XMLStreamException {
if (this.depth > 0) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < this.depth; i++)
sb.append(this.indentationString);
this.wrappedWriter.add(factory.createCharacters(sb.toString()));
diff --git a/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java b/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java
index be8f72f..5c7d418 100644
--- a/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java
+++ b/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java
@@ -357,7 +357,7 @@ public class FeaturesPlugin extends AbstractWebConsolePlugin {
installed++;
}
}
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
buffer.append("Feature information: ");
appendFeatureInfoCount(buffer, "in total", features.size());
if (installed == features.size()) {
@@ -373,7 +373,7 @@ public class FeaturesPlugin extends AbstractWebConsolePlugin {
return buffer.toString();
}
- private void appendFeatureInfoCount(final StringBuffer buf, String msg, int count) {
+ private void appendFeatureInfoCount(final StringBuilder buf, String msg, int count) {
buf.append(count);
buf.append(" feature");
if (count != 1)
diff --git a/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java b/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
index 38975de..5de0de3 100644
--- a/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
+++ b/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
@@ -284,7 +284,7 @@ public class InstancePlugin extends AbstractWebConsolePlugin {
Logger.getLogger(InstancePlugin.class.getName()).log(Level.SEVERE, null, ex);
}
}
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
buffer.append("Instance information: ");
buffer.append(instances.length);
buffer.append(" instance");