From 1e75ec162f392dcfe6eb9e3cfad6dfef6ea3d1c0 Mon Sep 17 00:00:00 2001 From: Carsten Hammer Date: Sat, 14 Sep 2019 22:15:13 +0200 Subject: Use StringBuilder instead of StringBuffer where possible. Change-Id: Ie756b6925b7dfc3471659764990c85d0e17eb1df Signed-off-by: Carsten Hammer --- .../src/org/eclipse/equinox/p2/tests/GenerateTestData.java | 10 +++++----- .../repository/BatchExecuteArtifactRepositoryTest.java | 2 +- .../org/eclipse/equinox/p2/tests/core/StringHelperTest.java | 2 +- .../org/eclipse/equinox/p2/tests/full/AbstractEnd2EndTest.java | 2 +- .../equinox/p2/tests/full/InstallCurrentFromPrevious.java | 2 +- .../repository/BatchExecuteMetadataRepositoryTest.java | 2 +- .../tests/metadata/repository/SPIMetadataRepositoryTest.java | 2 +- .../org/eclipse/equinox/p2/tests/omniVersion/FormatDTest.java | 4 ++-- .../eclipse/equinox/p2/tests/omniVersion/PerformanceTest.java | 2 +- .../p2/tests/reconciler/dropins/AbstractReconcilerTest.java | 2 +- .../simpleconfigurator/AbstractSimpleConfiguratorTest.java | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2') diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/GenerateTestData.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/GenerateTestData.java index 5e0e182ba..edf894e57 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/GenerateTestData.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/GenerateTestData.java @@ -71,7 +71,7 @@ public class GenerateTestData { @Override String getManifest() { - StringBuffer manifest = new StringBuffer(); + StringBuilder manifest = new StringBuilder(); manifest.append("Manifest-Version: 1.0\n"); manifest.append("Bundle-RequiredExecutionEnvironment: J2SE-1.4\n"); manifest.append("Bundle-ManifestVersion: 2\n"); @@ -79,7 +79,7 @@ public class GenerateTestData { manifest.append("Bundle-SymbolicName: " + id + '\n'); manifest.append("Bundle-Version: " + version + '\n'); if (!requires.isEmpty()) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); buffer.append("Require-Bundle: "); for (Iterator iter = requires.iterator(); iter.hasNext();) { TestObject req = iter.next(); @@ -98,7 +98,7 @@ public class GenerateTestData { @Override String getManifest() { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); buffer.append("\n"); buffer.append(" \n"); @@ -154,7 +154,7 @@ public class GenerateTestData { * Verify setup before starting. Ensure all required parameters have been set. */ static boolean validate() { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); if (outputFile == null) buffer.append("Need to set an output directory.\n"); if (numFeatures < 0 || numBundles <= 0) diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/BatchExecuteArtifactRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/BatchExecuteArtifactRepositoryTest.java index 20b73d396..e1b9f6661 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/BatchExecuteArtifactRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/BatchExecuteArtifactRepositoryTest.java @@ -181,7 +181,7 @@ public class BatchExecuteArtifactRepositoryTest extends AbstractProvisioningTest } boolean fileContainsString(URI location, String string) throws IOException { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); try (BufferedReader reader = new BufferedReader(new FileReader(new File(location)))) { while (reader.ready()) diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/StringHelperTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/StringHelperTest.java index 0b366afff..2b876b4eb 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/StringHelperTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/StringHelperTest.java @@ -40,7 +40,7 @@ public class StringHelperTest extends TestCase { public void testPerformance() throws Exception { String[] strings = new String[5]; - StringBuffer inputBld = new StringBuffer(); + StringBuilder inputBld = new StringBuilder(); for (int idx = 0; idx < 5; ++idx) { if (idx > 0) inputBld.append(','); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/AbstractEnd2EndTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/AbstractEnd2EndTest.java index a664baebf..f839fe839 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/AbstractEnd2EndTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/AbstractEnd2EndTest.java @@ -295,7 +295,7 @@ public abstract class AbstractEnd2EndTest extends AbstractProvisioningTest { IPath path = new Path(name); if ("app".equals(path.getFileExtension())) //$NON-NLS-1$ return name; - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); buffer.append(name.substring(0, 1).toUpperCase()); buffer.append(name.substring(1)); buffer.append(".app/Contents/MacOS/"); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/InstallCurrentFromPrevious.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/InstallCurrentFromPrevious.java index 2662291b9..b7de194bc 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/InstallCurrentFromPrevious.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/InstallCurrentFromPrevious.java @@ -43,7 +43,7 @@ public class InstallCurrentFromPrevious extends AbstractReconcilerTest { if (result != 0) { File logFile = new File(installFolder, "log.log"); if (logFile.exists()) { - StringBuffer fileContents = new StringBuffer(); + StringBuilder fileContents = new StringBuilder(); try (BufferedReader reader = new BufferedReader(new FileReader(logFile))) { while (reader.ready()) fileContents.append(reader.readLine()); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/BatchExecuteMetadataRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/BatchExecuteMetadataRepositoryTest.java index 0be6999c9..a562870a5 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/BatchExecuteMetadataRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/BatchExecuteMetadataRepositoryTest.java @@ -44,7 +44,7 @@ public class BatchExecuteMetadataRepositoryTest extends AbstractProvisioningTest } boolean fileContainsString(URI location, String string) throws IOException { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); try (BufferedReader reader = new BufferedReader(new FileReader(new File(location)));) { while (reader.ready()) buffer.append(reader.readLine()); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java index 682e30f1b..6d8e9dfc2 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java @@ -669,7 +669,7 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest { private String normalize(String license) { String text = license.trim(); - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); int length = text.length(); for (int i = 0; i < length; i++) { char c = text.charAt(i); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatDTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatDTest.java index 52eef6a02..201170e6a 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatDTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatDTest.java @@ -65,7 +65,7 @@ public class FormatDTest extends TestCase { Integer one = Integer.valueOf(1); Integer two = Integer.valueOf(2); for (int i = 0; i < s_delim.length; i++) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(formatString); buf.append("1"); buf.append(s_delim[i]); @@ -83,7 +83,7 @@ public class FormatDTest extends TestCase { String one = "abc"; String two = "def"; for (int i = 0; i < s_delim.length; i++) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(formatString); buf.append(one); buf.append(s_delim[i]); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/PerformanceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/PerformanceTest.java index 176724e48..5b5dc265a 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/PerformanceTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/PerformanceTest.java @@ -228,7 +228,7 @@ public class PerformanceTest extends TestCase { */ private static String[] createStrings() { String[] strings = new String[MUL * MUL * MUL]; - StringBuffer buf = new StringBuffer(100); + StringBuilder buf = new StringBuilder(100); int x = 0; for (int i = 0; i < MUL; i++) for (int j = 0; j < MUL; j++) diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java index ff4efb5a3..89e05bacf 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java @@ -654,7 +654,7 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest { File file = new File(path); if (!file.exists()) return null; - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); try (BufferedReader reader = new BufferedReader(new FileReader(file))) { for (String line = reader.readLine(); line != null; line = reader.readLine()) { buffer.append(line); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/AbstractSimpleConfiguratorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/AbstractSimpleConfiguratorTest.java index da868174c..4debb8c51 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/AbstractSimpleConfiguratorTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/AbstractSimpleConfiguratorTest.java @@ -97,7 +97,7 @@ public abstract class AbstractSimpleConfiguratorTest extends AbstractProvisionin frameworkProperties.put("osgi.framework", null); frameworkProperties.put("osgi.install.area", installarea.toURL().toExternalForm()); frameworkProperties.put("osgi.configuration.area", configarea.toURL().toExternalForm()); - StringBuffer osgiBundles = new StringBuffer(); + StringBuilder osgiBundles = new StringBuilder(); for (int i = 0; additionalBundle != null && i < additionalBundle.length; i++) { osgiBundles.append("reference:").append(additionalBundle[i].toURL().toExternalForm()).append(","); } -- cgit v1.2.3