Skip to content

Commit 0aa463e

Browse files
dghgitdghgit
committed
migrated StringBuffer to StringBuilder - relates to github #2106 
1 parent d062884 commit 0aa463e

File tree

81 files changed

+776
-133
lines changed

Some content is hidden

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

81 files changed

+776
-133
lines changed

‎core/src/main/java/org/bouncycastle/asn1/ASN1BitString.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public String getString()
252252
throw new ASN1ParsingException("Internal error encoding BitString: " + e.getMessage(), e);
253253
}
254254

255-
StringBuffer buf = new StringBuffer(1 + string.length * 2);
255+
StringBuilder buf = new StringBuilder(1 + string.length * 2);
256256
buf.append('#');
257257

258258
for (int i = 0; i != string.length; i++)

‎core/src/main/java/org/bouncycastle/asn1/ASN1Sequence.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ public String toString()
388388
return "[]";
389389
}
390390

391-
StringBuffer sb = new StringBuffer();
391+
StringBuilder sb = new StringBuilder();
392392
sb.append('[');
393393
for (int i = 0;;)
394394
{

‎core/src/main/java/org/bouncycastle/asn1/ASN1Set.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ public String toString()
428428
return "[]";
429429
}
430430

431-
StringBuffer sb = new StringBuffer();
431+
StringBuilder sb = new StringBuilder();
432432
sb.append('[');
433433
for (int i = 0;;)
434434
{

‎core/src/main/java/org/bouncycastle/asn1/ASN1UniversalString.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static ASN1UniversalString getTagged(ASN1TaggedObject taggedObject, boole
8888
public final String getString()
8989
{
9090
int dl = contents.length;
91-
StringBuffer buf = new StringBuffer(3 + 2 * (ASN1OutputStream.getLengthOfDL(dl) + dl));
91+
StringBuilder buf = new StringBuilder(3 + 2 * (ASN1OutputStream.getLengthOfDL(dl) + dl));
9292
buf.append("#1C");
9393
encodeHexDL(buf, dl);
9494

@@ -147,13 +147,13 @@ static ASN1UniversalString createPrimitive(byte[] contents)
147147
return new DERUniversalString(contents, false);
148148
}
149149

150-
private static void encodeHexByte(StringBuffer buf, int i)
150+
private static void encodeHexByte(StringBuilder buf, int i)
151151
{
152152
buf.append(table[(i >>> 4) & 0xF]);
153153
buf.append(table[i & 0xF]);
154154
}
155155

156-
private static void encodeHexDL(StringBuffer buf, int dl)
156+
private static void encodeHexDL(StringBuilder buf, int dl)
157157
{
158158
if (dl < 128)
159159
{

‎core/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class ASN1Dump
5252
*
5353
* @param obj the ASN1Primitive to be dumped out.
5454
*/
55-
static void _dumpAsString(String indent, boolean verbose, ASN1Primitive obj, StringBuffer buf)
55+
static void _dumpAsString(String indent, boolean verbose, ASN1Primitive obj, StringBuilder buf)
5656
{
5757
String nl = Strings.lineSeparator();
5858
buf.append(indent);
@@ -317,12 +317,12 @@ else if (obj instanceof ASN1Encodable)
317317
return "unknown object type " + obj.toString();
318318
}
319319

320-
StringBuffer buf = new StringBuffer();
320+
StringBuilder buf = new StringBuilder();
321321
_dumpAsString("", verbose, primitive, buf);
322322
return buf.toString();
323323
}
324324

325-
private static void dumpBinaryDataAsString(StringBuffer buf, String indent, byte[] bytes)
325+
private static void dumpBinaryDataAsString(StringBuilder buf, String indent, byte[] bytes)
326326
{
327327
if (bytes.length < 1)
328328
{
@@ -351,7 +351,7 @@ private static void dumpBinaryDataAsString(StringBuffer buf, String indent, byte
351351
}
352352
}
353353

354-
private static void appendAscString(StringBuffer buf, byte[] bytes, int off, int len)
354+
private static void appendAscString(StringBuilder buf, byte[] bytes, int off, int len)
355355
{
356356
for (int i = off; i != off + len; i++)
357357
{

‎core/src/main/java/org/bouncycastle/asn1/util/DERDump.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class DERDump
1717
public static String dumpAsString(
1818
ASN1Primitive obj)
1919
{
20-
StringBuffer buf = new StringBuffer();
20+
StringBuilder buf = new StringBuilder();
2121

2222
_dumpAsString("", false, obj, buf);
2323

‎core/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ public RDN[] fromString(String dirName)
351351

352352
public String toString(X500Name name)
353353
{
354-
StringBuffer buf = new StringBuffer();
354+
StringBuilder buf = new StringBuilder();
355355
boolean first = true;
356356

357357
RDN[] rdns = name.getRDNs();

‎core/src/main/java/org/bouncycastle/asn1/x500/style/IETFUtils.java‎

Lines changed: 89 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private static String unescape(String elt)
3333

3434
boolean escaped = false;
3535
boolean quoted = false;
36-
StringBuffer buf = new StringBuffer(elt.length());
36+
StringBuilder buf = new StringBuilder(elt.length());
3737
int start = 0;
3838

3939
// if it's an escaped hash string and not an actual encoding in string form
@@ -48,8 +48,8 @@ private static String unescape(String elt)
4848
}
4949

5050
boolean nonWhiteSpaceEncountered = false;
51-
int lastEscaped = 0;
52-
char hex1 = 0;
51+
int lastEscaped = 0;
52+
char hex1 = 0;
5353

5454
for (int i = start; i != elt.length(); i++)
5555
{
@@ -246,10 +246,10 @@ private static ASN1ObjectIdentifier[] toOIDArray(Vector oids)
246246

247247
public static String[] findAttrNamesForOID(
248248
ASN1ObjectIdentifier oid,
249-
Hashtable lookup)
249+
Hashtable lookup)
250250
{
251251
int count = 0;
252-
for (Enumeration en = lookup.elements(); en.hasMoreElements();)
252+
for (Enumeration en = lookup.elements(); en.hasMoreElements(); )
253253
{
254254
if (oid.equals(en.nextElement()))
255255
{
@@ -260,7 +260,7 @@ public static String[] findAttrNamesForOID(
260260
String[] aliases = new String[count];
261261
count = 0;
262262

263-
for (Enumeration en = lookup.keys(); en.hasMoreElements();)
263+
for (Enumeration en = lookup.keys(); en.hasMoreElements(); )
264264
{
265265
String key = (String)en.nextElement();
266266
if (oid.equals(lookup.get(key)))
@@ -295,8 +295,8 @@ public static ASN1ObjectIdentifier decodeAttrName(String name, Hashtable lookUp)
295295
}
296296

297297
public static ASN1Encodable valueFromHexString(
298-
String str,
299-
int off)
298+
String str,
299+
int off)
300300
throws IOException
301301
{
302302
byte[] data = new byte[(str.length() - off) / 2];
@@ -312,9 +312,9 @@ public static ASN1Encodable valueFromHexString(
312312
}
313313

314314
public static void appendRDN(
315-
StringBuffer buf,
316-
RDN rdn,
317-
Hashtable oidSymbols)
315+
StringBuilder buf,
316+
RDN rdn,
317+
Hashtable oidSymbols)
318318
{
319319
if (rdn.isMultiValued())
320320
{
@@ -344,12 +344,66 @@ public static void appendRDN(
344344
}
345345
}
346346

347+
public static void appendRDN(
348+
StringBuffer buf,
349+
RDN rdn,
350+
Hashtable oidSymbols)
351+
{
352+
if (rdn.isMultiValued())
353+
{
354+
AttributeTypeAndValue[] atv = rdn.getTypesAndValues();
355+
boolean firstAtv = true;
356+
357+
for (int j = 0; j != atv.length; j++)
358+
{
359+
if (firstAtv)
360+
{
361+
firstAtv = false;
362+
}
363+
else
364+
{
365+
buf.append('+');
366+
}
367+
368+
IETFUtils.appendTypeAndValue(buf, atv[j], oidSymbols);
369+
}
370+
}
371+
else
372+
{
373+
if (rdn.getFirst() != null)
374+
{
375+
IETFUtils.appendTypeAndValue(buf, rdn.getFirst(), oidSymbols);
376+
}
377+
}
378+
}
379+
380+
public static void appendTypeAndValue(
381+
StringBuilder buf,
382+
AttributeTypeAndValue typeAndValue,
383+
Hashtable oidSymbols)
384+
{
385+
String sym = (String)oidSymbols.get(typeAndValue.getType());
386+
387+
if (sym != null)
388+
{
389+
buf.append(sym);
390+
}
391+
else
392+
{
393+
buf.append(typeAndValue.getType().getId());
394+
}
395+
396+
buf.append('=');
397+
398+
buf.append(valueToString(typeAndValue.getValue()));
399+
}
400+
347401
public static void appendTypeAndValue(
348-
StringBuffer buf,
402+
StringBuffer buf,
349403
AttributeTypeAndValue typeAndValue,
350-
Hashtable oidSymbols)
404+
Hashtable oidSymbols)
351405
{
352-
String sym = (String)oidSymbols.get(typeAndValue.getType());
406+
String sym = (String)oidSymbols.get(typeAndValue.getType());
353407

354408
if (sym != null)
355409
{
@@ -367,7 +421,7 @@ public static void appendTypeAndValue(
367421

368422
public static String valueToString(ASN1Encodable value)
369423
{
370-
StringBuffer vBuf = new StringBuffer();
424+
StringBuilder vBuf = new StringBuilder();
371425

372426
if (value instanceof ASN1String && !(value instanceof ASN1UniversalString))
373427
{
@@ -405,25 +459,25 @@ public static String valueToString(ASN1Encodable value)
405459
{
406460
switch (vBuf.charAt(index))
407461
{
408-
case ',':
409-
case '"':
410-
case '\\':
411-
case '+':
412-
case '=':
413-
case '<':
414-
case '>':
415-
case ';':
416-
{
417-
vBuf.insert(index, "\\");
418-
index += 2;
419-
++end;
420-
break;
421-
}
422-
default:
423-
{
424-
++index;
425-
break;
426-
}
462+
case ',':
463+
case '"':
464+
case '\\':
465+
case '+':
466+
case '=':
467+
case '<':
468+
case '>':
469+
case ';':
470+
{
471+
vBuf.insert(index, "\\");
472+
index += 2;
473+
++end;
474+
break;
475+
}
476+
default:
477+
{
478+
++index;
479+
break;
480+
}
427481
}
428482
}
429483

@@ -512,7 +566,7 @@ public static String stripInternalSpaces(
512566
return str;
513567
}
514568

515-
StringBuffer res = new StringBuffer();
569+
StringBuilder res = new StringBuilder();
516570

517571
char c1 = str.charAt(0);
518572
res.append(c1);

‎core/src/main/java/org/bouncycastle/asn1/x500/style/RFC4519Style.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public RDN[] fromString(String dirName)
222222
// convert in reverse
223223
public String toString(X500Name name)
224224
{
225-
StringBuffer buf = new StringBuffer();
225+
StringBuilder buf = new StringBuilder();
226226
boolean first = true;
227227

228228
RDN[] rdns = name.getRDNs();

‎core/src/main/java/org/bouncycastle/asn1/x509/CRLDistPoint.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public ASN1Primitive toASN1Primitive()
8181

8282
public String toString()
8383
{
84-
StringBuffer buf = new StringBuffer();
84+
StringBuilder buf = new StringBuilder();
8585
String sep = Strings.lineSeparator();
8686

8787
buf.append("CRLDistPoint:");

0 commit comments

Comments
 (0)