You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2018/07/18 09:00:06 UTC
svn commit: r1836153 - in /felix/trunk/framework/src:
main/java/org/apache/felix/framework/
main/java/org/apache/felix/framework/cache/
main/java/org/apache/felix/framework/capabilityset/
main/java/org/apache/felix/framework/util/ main/java/org/apache/...
Author: pauls
Date: Wed Jul 18 09:00:05 2018
New Revision: 1836153
URL: http://svn.apache.org/viewvc?rev=1836153&view=rev
Log:
Clean-up: use StringBuilder instead of StringBuffer everywhere.
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibrary.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
felix/trunk/framework/src/test/java/org/apache/felix/framework/FrameworkVersionTest.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java Wed Jul 18 09:00:05 2018
@@ -560,7 +560,7 @@ class BundleImpl implements Bundle, Bund
List<String> result = new ArrayList(4);
StringTokenizer tokens;
- StringBuffer tempLocale = new StringBuffer(basename);
+ StringBuilder tempLocale = new StringBuilder(basename);
result.add(tempLocale.toString());
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java Wed Jul 18 09:00:05 2018
@@ -354,7 +354,7 @@ public class BundleRevisionImpl implemen
}
catch (Exception ex)
{
- ((BundleImpl) m_bundle).getFramework().getLogger().log(
+ m_bundle.getFramework().getLogger().log(
m_bundle, Logger.LOG_ERROR, "Unable to get module class path.", ex);
}
}
@@ -395,7 +395,6 @@ public class BundleRevisionImpl implemen
private List calculateContentPath(
BundleRevision revision, Content content, List<Content> contentList,
boolean searchFragments)
- throws Exception
{
// Creating the content path entails examining the bundle's
// class path to determine whether the bundle JAR file itself
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java Wed Jul 18 09:00:05 2018
@@ -2659,7 +2659,7 @@ public class BundleWiringImpl implements
{
String exporter = wires.get(i).getProviderWiring().getBundle().toString();
- StringBuffer sb = new StringBuffer("*** Package '");
+ StringBuilder sb = new StringBuilder("*** Package '");
sb.append(pkgName);
sb.append("' is imported by bundle ");
sb.append(importer);
@@ -2709,7 +2709,7 @@ public class BundleWiringImpl implements
long expId = (exporters.length == 0)
? -1 : Util.getBundleIdFromModuleId(exporters[0].getId());
- StringBuffer sb = new StringBuffer("*** Class '");
+ StringBuilder sb = new StringBuilder("*** Class '");
sb.append(name);
sb.append("' was not found, but this is likely normal since package '");
sb.append(pkgName);
@@ -2764,7 +2764,7 @@ public class BundleWiringImpl implements
String exporter = (exporters.isEmpty())
? null : exporters.iterator().next().toString();
- StringBuffer sb = new StringBuffer("*** Class '");
+ StringBuilder sb = new StringBuilder("*** Class '");
sb.append(name);
sb.append("' was not found, but this is likely normal since package '");
sb.append(pkgName);
@@ -2809,7 +2809,7 @@ public class BundleWiringImpl implements
String exporter = exports.iterator().next().toString();
- StringBuffer sb = new StringBuffer("*** Class '");
+ StringBuilder sb = new StringBuilder("*** Class '");
sb.append(name);
sb.append("' was not found because bundle ");
sb.append(importer);
@@ -2851,7 +2851,7 @@ public class BundleWiringImpl implements
BundleRevisionImpl.getSecureAction()
.getClassLoader(BundleClassLoader.class).loadClass(name);
- StringBuffer sb = new StringBuffer("*** Package '");
+ StringBuilder sb = new StringBuilder("*** Package '");
sb.append(pkgName);
sb.append("' is not imported by bundle ");
sb.append(importer);
@@ -2881,7 +2881,7 @@ public class BundleWiringImpl implements
// Finally, if there are no imports or exports for the package
// and it is not available on the system class path, simply
// log a message saying so.
- StringBuffer sb = new StringBuffer("*** Class '");
+ StringBuilder sb = new StringBuilder("*** Class '");
sb.append(name);
sb.append("' was not found. Bundle ");
sb.append(importer);
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java Wed Jul 18 09:00:05 2018
@@ -1000,7 +1000,7 @@ class ExtensionManager implements Conten
private String convertCapabilitiesToHeaders(List<BundleCapability> caps)
{
- StringBuffer exportSB = new StringBuffer("");
+ StringBuilder exportSB = new StringBuilder();
for (BundleCapability cap : caps)
{
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Wed Jul 18 09:00:05 2018
@@ -4953,8 +4953,8 @@ public class Felix extends BundleImpl im
// Maven uses a '-' to separate the version qualifier,
// while OSGi uses a '.', so we need to convert to a '.'
- StringBuffer sb =
- new StringBuffer(
+ StringBuilder sb =
+ new StringBuilder(
props.getProperty(
FelixConstants.FELIX_VERSION_PROPERTY, "0.0.0"));
String toRet = cleanMavenVersion(sb);
@@ -4977,7 +4977,7 @@ public class Felix extends BundleImpl im
* @param sb The version to be cleaned
* @return The cleaned version
*/
- private static String cleanMavenVersion(StringBuffer sb)
+ private static String cleanMavenVersion(StringBuilder sb)
{
int dots = 0;
for (int i = 0; i < sb.length(); i++)
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java Wed Jul 18 09:00:05 2018
@@ -823,7 +823,7 @@ public class BundleArchive
// used by URI to decode uri components.
private static String decode(String s) throws UnsupportedEncodingException
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
ByteArrayOutputStream out = new ByteArrayOutputStream();
for (int i = 0; i < s.length();)
{
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java Wed Jul 18 09:00:05 2018
@@ -353,7 +353,7 @@ public class DirectoryContent implements
// Remove the leading path of the reference directory, since the
// entry paths are supposed to be relative to the root.
- StringBuffer sb = new StringBuffer(abs);
+ StringBuilder sb = new StringBuilder(abs);
sb.delete(0, BundleCache.getSecureAction().getAbsolutePath(m_dir).length() + 1);
// Add a '/' to the end of directory entries.
if (BundleCache.getSecureAction().isFileDirectory(m_children[m_counter]))
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java Wed Jul 18 09:00:05 2018
@@ -562,7 +562,7 @@ public class CapabilitySet
private static String removeWhitespace(String s)
{
- StringBuffer sb = new StringBuffer(s.length());
+ StringBuilder sb = new StringBuilder(s.length());
for (int i = 0; i < s.length(); i++)
{
if (!Character.isWhitespace(s.charAt(i)))
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java Wed Jul 18 09:00:05 2018
@@ -106,7 +106,7 @@ public class SimpleFilter
private static String toString(List list)
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < list.size(); i++)
{
sb.append(list.get(i).toString());
@@ -116,7 +116,7 @@ public class SimpleFilter
private static String toDecodedString(String s, int startIdx, int endIdx)
{
- StringBuffer sb = new StringBuffer(endIdx - startIdx);
+ StringBuilder sb = new StringBuilder(endIdx - startIdx);
boolean escaped = false;
for (int i = 0; i < (endIdx - startIdx); i++)
{
@@ -140,7 +140,7 @@ public class SimpleFilter
if (o instanceof String)
{
String s = (String) o;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < s.length(); i++)
{
char c = s.charAt(i);
@@ -370,7 +370,7 @@ public class SimpleFilter
public static List<String> parseSubstring(String value)
{
List<String> pieces = new ArrayList();
- StringBuffer ss = new StringBuffer();
+ StringBuilder ss = new StringBuilder();
// int kind = SIMPLE; // assume until proven otherwise
boolean wasStar = false; // indicates last piece was a star
boolean leftstar = false; // track if the initial piece is a star
@@ -451,7 +451,7 @@ loop: for (;;)
public static String unparseSubstring(List<String> pieces)
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < pieces.size(); i++)
{
if (i > 0)
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java Wed Jul 18 09:00:05 2018
@@ -928,7 +928,7 @@ public class Util
// UUID.toString()
//
- StringBuffer builder = new StringBuffer(36);
+ StringBuilder builder = new StringBuilder(36);
String msbStr = Long.toHexString(mostSigBits);
if (msbStr.length() < 16) {
int diff = 16 - msbStr.length();
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java Wed Jul 18 09:00:05 2018
@@ -2030,7 +2030,7 @@ public class ManifestParser
int STARTQUOTE = 4;
int ENDQUOTE = 8;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
int expecting = (CHAR | DELIMITER | STARTQUOTE);
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibrary.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibrary.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibrary.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibrary.java Wed Jul 18 09:00:05 2018
@@ -141,7 +141,7 @@ public class NativeLibrary
{
if (m_libraryFile != null)
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(m_libraryFile);
for (int i = 0; (m_osnames != null) && (i < m_osnames.length); i++)
{
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java Wed Jul 18 09:00:05 2018
@@ -778,7 +778,7 @@ public class NativeLibraryClause
private static String cleanupVersion( String version )
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
Matcher m = FUZZY_VERSION.matcher( version );
if ( m.matches() )
{
@@ -834,7 +834,7 @@ public class NativeLibraryClause
}
- private static void cleanupModifier( StringBuffer result, String modifier )
+ private static void cleanupModifier( StringBuilder result, String modifier )
{
for ( int i = 0; i < modifier.length(); i++ )
{
Modified: felix/trunk/framework/src/test/java/org/apache/felix/framework/FrameworkVersionTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/test/java/org/apache/felix/framework/FrameworkVersionTest.java?rev=1836153&r1=1836152&r2=1836153&view=diff
==============================================================================
--- felix/trunk/framework/src/test/java/org/apache/felix/framework/FrameworkVersionTest.java (original)
+++ felix/trunk/framework/src/test/java/org/apache/felix/framework/FrameworkVersionTest.java Wed Jul 18 09:00:05 2018
@@ -40,10 +40,10 @@ public class FrameworkVersionTest extend
private void testFrameworkVersion(String out, String in) throws Exception
{
- Method method = Felix.class.getDeclaredMethod("cleanMavenVersion", new Class [] {StringBuffer.class});
+ Method method = Felix.class.getDeclaredMethod("cleanMavenVersion", new Class [] {StringBuilder.class});
method.setAccessible(true);
- StringBuffer sb = new StringBuffer(in);
+ StringBuilder sb = new StringBuilder(in);
assertEquals(new Version(out), new Version((String) method.invoke(null, sb)));
}
}