adaptation of old eclipse code to Intellij

This commit is contained in:
2024-11-18 13:08:35 +07:00
parent db13021be9
commit c501ebcbb6
70 changed files with 335 additions and 665 deletions

View File

@@ -29,13 +29,13 @@ import peers.sip.syntaxencoding.SipHeaderFieldValue;
import peers.sip.syntaxencoding.SipHeaders;
import peers.sip.transport.SipMessage;
@SuppressWarnings("unused")
public class Utils {
public static final String PEERSHOME_SYSTEM_PROPERTY = "peers.home";
public static final String DEFAULT_PEERS_HOME = ".";
public final static SipHeaderFieldValue getTopVia(SipMessage sipMessage) {
public static SipHeaderFieldValue getTopVia(SipMessage sipMessage) {
SipHeaders sipHeaders = sipMessage.getSipHeaders();
SipHeaderFieldName viaName = new SipHeaderFieldName(RFC3261.HDR_VIA);
SipHeaderFieldValue via = sipHeaders.get(viaName);
@@ -45,40 +45,37 @@ public class Utils {
return via;
}
public final static String generateTag() {
public static String generateTag() {
return randomString(8);
}
public final static String generateCallID(InetAddress inetAddress) {
public static String generateCallID(InetAddress inetAddress) {
//TODO make a hash using current time millis, public ip @, private @, and a random string
StringBuffer buf = new StringBuffer();
buf.append(randomString(8));
buf.append('-');
buf.append(String.valueOf(System.currentTimeMillis()));
buf.append('@');
buf.append(inetAddress.getHostName());
return buf.toString();
return randomString(8) +
'-' +
System.currentTimeMillis() +
'@' +
inetAddress.getHostName();
}
public final static String generateBranchId() {
StringBuffer buf = new StringBuffer();
buf.append(RFC3261.BRANCHID_MAGIC_COOKIE);
public static String generateBranchId() {
//TODO must be unique across space and time...
buf.append(randomString(9));
return buf.toString();
return RFC3261.BRANCHID_MAGIC_COOKIE +
//TODO must be unique across space and time...
randomString(9);
}
public final static String getMessageCallId(SipMessage sipMessage) {
public static String getMessageCallId(SipMessage sipMessage) {
SipHeaderFieldValue callId = sipMessage.getSipHeaders().get(
new SipHeaderFieldName(RFC3261.HDR_CALLID));
return callId.getValue();
}
public final static String randomString(int length) {
public static String randomString(int length) {
String chars = "abcdefghijklmnopqrstuvwxyz" +
"ABCDEFGHIFKLMNOPRSTUVWXYZ" +
"0123456789";
StringBuffer buf = new StringBuffer(length);
StringBuilder buf = new StringBuilder(length);
for (int i = 0; i < length; ++i) {
int pos = (int)Math.round(Math.random() * (chars.length() - 1));
buf.append(chars.charAt(pos));
@@ -86,7 +83,7 @@ public class Utils {
return buf.toString();
}
public final static void copyHeader(SipMessage src, SipMessage dst, String name) {
public static void copyHeader(SipMessage src, SipMessage dst, String name) {
SipHeaderFieldName sipHeaderFieldName = new SipHeaderFieldName(name);
SipHeaderFieldValue sipHeaderFieldValue = src.getSipHeaders().get(sipHeaderFieldName);
if (sipHeaderFieldValue != null) {
@@ -94,7 +91,7 @@ public class Utils {
}
}
public final static String getUserPart(String sipUri) {
public static String getUserPart(String sipUri) {
int start = sipUri.indexOf(RFC3261.SCHEME_SEPARATOR);
int end = sipUri.indexOf(RFC3261.AT);
return sipUri.substring(start + 1, end);
@@ -102,9 +99,9 @@ public class Utils {
/**
* adds Max-Forwards Supported and Require headers
* @param headers
* @param headers the headers to add to
*/
public final static void addCommonHeaders(SipHeaders headers) {
public static void addCommonHeaders(SipHeaders headers) {
//Max-Forwards
headers.add(new SipHeaderFieldName(RFC3261.HDR_MAX_FORWARDS),
@@ -114,8 +111,8 @@ public class Utils {
//TODO Supported and Require
}
public final static String generateAllowHeader() {
StringBuffer buf = new StringBuffer();
public static String generateAllowHeader() {
StringBuilder buf = new StringBuilder();
for (String supportedMethod: UAS.SUPPORTED_METHODS) {
buf.append(supportedMethod);
buf.append(", ");