Skip to content

Commit

Permalink
Merge pull request #10 from hduelme/use-StringBuilder-instead-of-Stri…
Browse files Browse the repository at this point in the history
…ngBuffer

use StringBuilder instead of StringBuffer
  • Loading branch information
hduelme authored May 2, 2024
2 parents b866da5 + 73afa00 commit 62bdcfd
Show file tree
Hide file tree
Showing 22 changed files with 44 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ protected SipMessage validateRequest(SipMessage msg) {

/** Picks the token used for loop detection. */
private String pickLoopTag(SipMessage msg) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
sb.append(msg.getRequestLine().getAddress().toString());
//sb.append(msg.getToHeader().getTag());
sb.append(msg.getFromHeader().getTag());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public static SipMessage unmangleContact(SipMessage msg) {

/** Stuffes a String. */
private static String stuffString(String str) {
StringBuffer stuffed=new StringBuffer();
StringBuilder stuffed=new StringBuilder();
for (int i=0; i<str.length(); ) {
char c=str.charAt(i++);
switch (c) {
Expand All @@ -198,7 +198,7 @@ private static String stuffString(String str) {

/** Untuffes a String. */
private static String unstuffString(String str) {
StringBuffer unstuffed=new StringBuffer();
StringBuilder unstuffed=new StringBuilder();
for (int i=0; i<str.length(); ) {
char c=str.charAt(i++);
if (c==ESC) {
Expand Down
2 changes: 1 addition & 1 deletion mjsip-sip/src/main/java/org/mjsip/rtp/NtpTimeStamp.java
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public boolean equals(Object obj) {
/** Gets a string representation of this object. */
@Override
public String toString()
{ StringBuffer sb=new StringBuffer();
{ StringBuilder sb=new StringBuilder();
sb.append(Long.toHexString(seconds));
sb.append('.');
sb.append(Long.toHexString(fraction));
Expand Down
6 changes: 3 additions & 3 deletions mjsip-sip/src/main/java/org/mjsip/rtp/SdesRtcpPacket.java
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public Chunk[] getChunks() {
* @return a string representing this object. */
@Override
public String toString() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
Chunk[] chunks=getChunks();
for (int i=0; i<chunks.length; i++) sb.append(chunks[i].toString());
return sb.toString();
Expand Down Expand Up @@ -263,7 +263,7 @@ public int getBytes(byte[] buf, int off) {
* @return a string representing this object. */
@Override
public String toString() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
sb.append("type=");
sb.append(type);
sb.append(",value=");
Expand Down Expand Up @@ -365,7 +365,7 @@ public int getBytes(byte[] buf, int off) {
* @return a string representing this object. */
@Override
public String toString() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
sb.append("ssrc=");
sb.append(ssrc);
sb.append(",items=[");
Expand Down
2 changes: 1 addition & 1 deletion mjsip-sip/src/main/java/org/mjsip/rtp/SrRtcpPacket.java
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public long getOctectCount() {
* @return a string representing this object. */
@Override
public String toString() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
sb.append("NTP time: ");
sb.append(org.zoolu.util.DateFormat.formatYyyyMMddHHmmssSSS(new java.util.Date(getNtpTimestamp())));
sb.append(", RTP time: ");
Expand Down
2 changes: 1 addition & 1 deletion mjsip-sip/src/main/java/org/mjsip/sdp/SdpMessage.java
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ public Vector<AttributeField> getAttributes(String attribute_name) {
@Override
public String toString() {
//String str=v.toString()+o.toString()+s.toString();
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
if (_version!=null) sb.append(_version.toString());
if (_origin != null)
sb.append(_origin.toString());
Expand Down
2 changes: 1 addition & 1 deletion mjsip-sip/src/main/java/org/mjsip/sdp/TimeDescription.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public SdpField[] getRepeatFields() {
* @return the string representation */
@Override
public String toString() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
sb.append(t.toString());
if (rv!=null) for (int i=0; i<rv.length; i++) sb.append(rv[i].toString());
return sb.toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public ConnectionField(AddressType address_type, String address) {
/** Gets the value of the origin field.
* @return a string with the value of the origin field */
private static String getValue(AddressType address_type, String address, int ttl, int num) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
if (address_type == null || address_type == AddressType.DEFAULT)
address_type = ConnectionField.addressType(address);
sb.append("IN").append(' ').append(address_type);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public OriginField(String username, AddressType addrtype, String address) {
* @return a string with the value of the origin field */
private static String getValue(String username, String sess_id, String sess_version, AddressType addrtype,
String address) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
if (username==null || username.length()==0) username="-";
if (sess_id==null || sess_id.length()==0) sess_id="0";
if (sess_version==null || sess_version.length()==0) sess_version="0";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public boolean hasDisplayName() {
/** Gets string representation of this object. */
@Override
public String toString() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
if (hasDisplayName()) sb.append('\"').append(name).append("\" <").append(uri).append('>');
else sb.append('<').append(uri).append('>');
return sb.toString();
Expand Down
6 changes: 3 additions & 3 deletions mjsip-sip/src/main/java/org/mjsip/sip/address/SipURI.java
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ public boolean isTelURI() {

@Override
public String toString() {
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();

sb.append((_secure) ? SIPS_COLON : SIP_COLON);

Expand All @@ -409,14 +409,14 @@ public String toString() {

@Override
public String getSpecificPart() {
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();

appendSpecific(sb);

return sb.toString();
}

private void appendSpecific(StringBuffer sb) {
private void appendSpecific(StringBuilder sb) {
if (_user != null) {
sb.append(_user);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public DigestAuthentication(String method, String uri, AuthenticationHeader ah,
/** Gets a String representation of the object. */
@Override
public String toString() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
sb.append("method=").append(method).append("\n");
sb.append("username=").append(username).append("\n");
sb.append("passwd=").append(passwd).append("\n");
Expand Down Expand Up @@ -141,7 +141,7 @@ public ProxyAuthorizationHeader getProxyAuthorizationHeader() {
*/
public String getResponse() {
String secret=HEX(MD5(A1()));
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
if (nonce!=null) sb.append(nonce);
sb.append(":");
if (qop!=null) {
Expand All @@ -162,7 +162,7 @@ public String getResponse() {
* <p> KD(secret, data) = H(concat(secret, ":", data))
*/
private byte[] KD(String secret, String data) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
sb.append(secret).append(":").append(data);
return MD5(sb.toString());
}
Expand All @@ -176,7 +176,7 @@ private byte[] KD(String secret, String data) {
* <br> A1 = H( unq(username) ":" unq(realm) ":" passwd ) ":" unq(nonce) ":" unq(cnonce)
*/
private byte[] A1() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
if (username!=null) sb.append(username);
sb.append(":");
if (realm!=null) sb.append(realm);
Expand All @@ -187,7 +187,7 @@ private byte[] A1() {
return sb.toString().getBytes();
}
else {
StringBuffer sb2=new StringBuffer();
StringBuilder sb2=new StringBuilder();
sb2.append(":");
if (nonce!=null) sb2.append(nonce);
sb2.append(":");
Expand All @@ -205,7 +205,7 @@ private byte[] A1() {
* <br> A2 = Method ":" digest-uri ":" H(entity-body)
*/
private String A2() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
sb.append(method);
sb.append(":");
if (uri!=null) sb.append(uri);
Expand Down
6 changes: 3 additions & 3 deletions mjsip-sip/src/main/java/org/mjsip/sip/header/ListHeader.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public Vector getElements() {

/** Sets the list of tokens. */
public void setElements(Vector elements) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
for (int i=0; i<elements.size(); i++) {
if (i>0) sb.append(",");
sb.append((String)elements.elementAt(i));
Expand All @@ -82,10 +82,10 @@ public void setElements(Vector elements) {

/** Sets the list of tokens. */
public void setElements(String[] elements) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
for (int i=0; i<elements.length; i++) {
if (i>0) sb.append(",");
sb.append((String)elements[i]);
sb.append(elements[i]);
}
value=sb.toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public abstract class OptionTagsHeader extends LegacyHeader {
protected OptionTagsHeader(String header, Vector option_tags) {
super(header,null);
if (option_tags!=null && option_tags.size()>0) {
StringBuffer sb=new StringBuffer((String)option_tags.elementAt(0));
StringBuilder sb=new StringBuilder((String)option_tags.elementAt(0));
for (int i=1; i<option_tags.size(); i++) sb.append(',').append((String)option_tags.elementAt(i));
value=sb.toString();
}
Expand All @@ -51,7 +51,7 @@ protected OptionTagsHeader(String header, Vector option_tags) {
protected OptionTagsHeader(String header, String[] option_tags) {
super(header,null);
if (option_tags!=null && option_tags.length>0) {
StringBuffer sb=new StringBuffer(option_tags[0]);
StringBuilder sb=new StringBuilder(option_tags[0]);
for (int i=1; i<option_tags.length; i++) sb.append(',').append(option_tags[i]);
value=sb.toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ protected int setMessage(byte[] buf, int off, int len) throws MalformedSipMessag
/** Gets string representation of Message. */
@Override
public String toString() {
StringBuffer str=getMessageHeader();
StringBuilder str=getMessageHeader();
if (body != null)
str.append(getStringBody());
return str.toString();
Expand All @@ -302,8 +302,8 @@ public byte[] getBytes() {


/** Gets the message header. */
private StringBuffer getMessageHeader() {
StringBuffer sb=new StringBuffer();
private StringBuilder getMessageHeader() {
StringBuilder sb=new StringBuilder();
if (request_line!=null) sb.append(request_line.toString());
else if (status_line!=null) sb.append(status_line.toString());
for (int i = 0; i < headers.size(); i++)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@ public static String pickBranch() {
/** Picks an unique branch value based on a SIP message.
* This value could also be used as transaction ID */
public String pickBranch(SipMessage msg) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
sb.append(msg.getRequestLine().getAddress().toString());
sb.append(getViaAddress()+getPort());
ViaHeader top_via=msg.getViaHeader();
Expand Down Expand Up @@ -1165,7 +1165,7 @@ private String toStringTransportProtocols() {
return "";
}

StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
for (Enumeration<String> e = sip_transports.keys(); e.hasMoreElements();) {
sb.append("/").append(e.nextElement());
}
Expand Down
6 changes: 3 additions & 3 deletions mjsip-util/src/main/java/org/zoolu/util/Base64.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ private static int charToInt(char c) {

/** Encodes in base64 a given array of bytes. */
public static String encode(byte[] input) {
StringBuffer sb=new StringBuffer();

StringBuilder sb=new StringBuilder();

int len_floor3=((input.length)/3)*3;
for (int i=0; i<len_floor3; ) {
Expand Down Expand Up @@ -100,7 +100,7 @@ public static String encode(byte[] input) {

/** Justifies a string fitting a given line length. */
public static String justify(String str, int len) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
char[] buff=str.toCharArray();
int begin=0;
int end=len;
Expand Down
2 changes: 1 addition & 1 deletion mjsip-util/src/main/java/org/zoolu/util/BitString.java
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ public BitString invert() {
/** Gets a string representation of this object. */
@Override
public String toString() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
for (int i=0; i<length(); i++) sb.append((bitAt(i))?'1':'0');
return sb.toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public synchronized BitString toBitString() {
/** Gets a string representation of this object. */
@Override
public synchronized String toString() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
for (int i=0; i<buffer.size(); i++) sb.append(buffer.elementAt(i).toString());
return sb.toString();
}
Expand Down
4 changes: 2 additions & 2 deletions mjsip-util/src/main/java/org/zoolu/util/ByteAddrUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public static String asHex4Bytes(byte[] buf) {

/** Converts a portion of an array of bytes into a string of hexadecimal 4-byte words. */
public static String asHex4Bytes(byte[] buf, int off, int len) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
for (int i=0; i<len; i+=4) {
int res=len-i;
sb.append(ByteUtils.asHex(buf,off+i,((res<4)?res:4)));
Expand All @@ -95,7 +95,7 @@ public static String asHexEthernetPacket(byte[] buf) {

/** Converts a portion of an array of bytes representing a data packet into a hex string. */
public static String asHexEthernetPacket(byte[] buf, int off, int len) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
sb.append(ByteUtils.asHex(buf,off,6));
sb.append(' ').append(ByteUtils.asHex(buf,off+6,6));
sb.append(' ').append(ByteUtils.asHex(buf,off+12,2));
Expand Down
4 changes: 2 additions & 2 deletions mjsip-util/src/main/java/org/zoolu/util/ByteUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ public static String bytesToFormattedHexString(byte[] buf, int off, int len, cha
* @param str the formatted hexadecimal string
* @return the unformatted hexadecimal string */
public static String trimHexString(String str) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
char c;
for (int i=0; i<str.length(); i++) if (isHexDigit(c=str.charAt(i))) sb.append(c);
return sb.toString();
Expand Down Expand Up @@ -649,7 +649,7 @@ public static String bytesToBinString(byte[] data) {
* @param len the length of the array
* @return the binary string */
public static String bytesToBinString(byte[] buf, int off, int len) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
int end=off+len;
for (int i=off; i<end; i++) {
int b=buf[i];
Expand Down
6 changes: 3 additions & 3 deletions mjsip-util/src/main/java/org/zoolu/util/Flags.java
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ public int size() {

@Override
public String toString() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
final Option nopt=new Option(" !",null,"inverts the next option");
// compute option-param part width
//int oplen_max=0;
Expand Down Expand Up @@ -358,7 +358,7 @@ public int compare(Option o1, Option o2) {
* @param program the main class
* @return a string like "Usage: java program [options] ..." */
public String toUsageString() {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
if (FIRST_PARAMS_THEN_OPTIONS || options.size() == 0)
sb.append("Usage: java ").append(_program);
else
Expand Down Expand Up @@ -418,7 +418,7 @@ public String getDescription() {
* @param oplen minimum number of character of the 'opt-param' part
* @param sep separator between the 'opt-param' part and the 'description' part */
public String toString(int oplen, String sep) {
StringBuffer sb=new StringBuffer();
StringBuilder sb=new StringBuilder();
if (tag!=PARAM && tag!=OPTIONAL_PARAM) {
sb.append(tag);
if (param!=null) sb.append(" ");
Expand Down

0 comments on commit 62bdcfd

Please sign in to comment.