Skip to content

Commit

Permalink
Merge pull request #49
Browse files Browse the repository at this point in the history 
Cleaned code up in DiameterUtilities
  • Loading branch information
@eddiecarpenter
eddiecarpenter authored Sep 26, 2024
2 parents ceaea66 + 2fa578c commit 1ad8ab2
Showing 1 changed file with 139 additions and 126 deletions.
265 changes: 139 additions & 126 deletions core/jdiameter/impl/src/main/java/org/jdiameter/common/impl/DiameterUtilities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,130 +29,143 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class DiameterUtilities {
private static final Logger LOG = LoggerFactory.getLogger(DiameterUtilities.class);
public static final Dictionary AVP_DICTIONARY = DictionaryImpl.INSTANCE;

private DiameterUtilities() {
}

//-------------------------------------------------------[ printMessage ]---
public static void printMessage(Message message) {
if (LOG.isTraceEnabled()) {
String reqFlag = message.isRequest() ? "R" : "A";
String flags = reqFlag + (message.isError() ? " | E" : "");

LOG.trace("Message [{}] Command-Code: {} / E2E({}) / HbH({})", flags, message.getCommandCode(),
message.getEndToEndIdentifier(), message.getHopByHopIdentifier());
LOG.trace("\n- - - - - - - - - - - - - - - - AVPs - - - - - - - - - - - - - - - -\n{}",
printAvps(message.getAvps()));
} //if
}//printMessage

//----------------------------------------------------------[ printAvps ]---
public static String printAvps(AvpSet avps, String keywordSep) {
return printAvps(avps, keywordSep, "", false);
}

public static String printAvps(AvpSet avps) {
return printAvps(avps, "-");
}//printAvps

//----------------------------------------------------------[ printAvps ]---
public static String printAvps(AvpSet avps, String indentation, boolean log) {
return printAvps(avps, "-", indentation, log);
}

public static String printAvps(AvpSet avps, String pKeywordSep, String indentation, boolean log) {
if (avps == null) {
return "AvpSet is null";
} //if

StringBuilder stringBuilder = new StringBuilder();
for (Avp avp : avps) {
AvpRepresentation avpRep = AVP_DICTIONARY.getAvp(avp.getCode(), avp.getVendorId());
if (avpRep == null) {
avpRep = new AvpRepresentationImpl("Unknown AVP "+avp.getCode(), "Unknown AVP",
avp.getCode(), false, null, null, null,
avp.getVendorId(),
AvpRepresentation.Type.UTF8String.toString(),
AvpRepresentation.Type.UTF8String.toString());
}

Object avpValue;
boolean isGrouped = false;

try {
String avpType = avpRep.getType();

if (null == avpType) {
avpValue = avp.getUTF8String().replace("\r", "").replace("\n", "");
} //if
else {
switch (avpType) {
case "Integer32", "AppId":
avpValue = avp.getInteger32();
break;
case "Unsigned32", "VendorId":
avpValue = avp.getUnsigned32();
break;
case "Float64":
avpValue = avp.getFloat64();
break;
case "Integer64":
avpValue = avp.getInteger64();
break;
case "Time":
avpValue = avp.getTime();
break;
case "Unsigned64":
avpValue = avp.getUnsigned64();
break;
case "Grouped":
avpValue = "<Grouped>";
isGrouped = true;
break;
default:
avpValue = avp.getUTF8String().replace("\r", "").replace("\n", "");
break;
}//else Switch
}
} //try
catch (AvpDataException ignore) {
try {
avpValue = avp.getUTF8String().replace("\r", "").replace("\n", "");
} //try
catch (AvpDataException e) {
avpValue = avp.toString();
} //catch
} //catch

String fieldName = avpRep.getName().replace("-", pKeywordSep);
StringBuilder avpLine = new StringBuilder(indentation)
.append(avp.getCode())
.append(": ")
.append(fieldName);
while (avpLine.length() < 40) {
avpLine.append(avpLine.length() % 2 == 0 ? "." : " ");
} //while
avpLine.append(avpValue);

if (log && LOG.isDebugEnabled()) {
LOG.debug(avpLine.toString());
} //if

stringBuilder.append(avpLine).append('\n');

if (isGrouped) {
try {
stringBuilder.append(printAvps(avp.getGrouped(), pKeywordSep, indentation + " ", log));
} //try
catch (AvpDataException e) {
// Failed to ungroup... ignore then...
} //catch
} //if
} //for

return stringBuilder.toString();
}//printAvps
public class DiameterUtilities
{
private static final Logger LOG = LoggerFactory.getLogger(DiameterUtilities.class);
public static final Dictionary AVP_DICTIONARY = DictionaryImpl.INSTANCE;

private DiameterUtilities()
{
}

public static void printMessage(Message message)
{
if (LOG.isTraceEnabled()) {
String reqFlag = message.isRequest() ? "R" : "A";
String flags = reqFlag + (message.isError() ? " | E" : "");

LOG.trace("Message [{}] Command-Code: {} / E2E({}) / HbH({})", flags, message.getCommandCode(),
message.getEndToEndIdentifier(), message.getHopByHopIdentifier());
LOG.trace("\n- - - - - - - - - - - - - - - - AVPs - - - - - - - - - - - - - - - -\n{}",
printAvps(message.getAvps()));
} //if
}//printMessage

public static void printMessage(String logHeading, AvpSet avps)
{
if (LOG.isTraceEnabled()) {
LOG.trace("{}\n- - - - - - - - - - - - - - - - AVPs - - - - - - - - - - - - - - - -\n{}",
logHeading,
printAvps(avps));
} //if
}//printMessage

public static String printAvps(AvpSet avps, String keywordSep)
{
return printAvps(avps, keywordSep, "", false);
}

public static String printAvps(AvpSet avps)
{
return printAvps(avps, "-");
}//printAvps

public static String printAvps(AvpSet avps, String indentation, boolean log)
{
return printAvps(avps, "-", indentation, log);
}

public static String printAvps(AvpSet avps, String pKeywordSep, String indentation, boolean log)
{
if (avps == null) {
return "AvpSet is null";
} //if

StringBuilder stringBuilder = new StringBuilder();
for (Avp avp : avps) {
AvpRepresentation avpRep = AVP_DICTIONARY.getAvp(avp.getCode(), avp.getVendorId());
if (avpRep == null) {
avpRep = new AvpRepresentationImpl("Unknown AVP " + avp.getCode(), "Unknown AVP",
avp.getCode(), false, null, null, null,
avp.getVendorId(),
AvpRepresentation.Type.UTF8String.toString(),
AvpRepresentation.Type.UTF8String.toString());
}

Object avpValue;
boolean isGrouped = false;

try {
String avpType = avpRep.getType();

if (null == avpType) {
avpValue = avp.getUTF8String().replace("\r", "").replace("\n", "");
} //if
else {
switch (avpType) {
case "Integer32", "AppId":
avpValue = avp.getInteger32();
break;
case "Unsigned32", "VendorId":
avpValue = avp.getUnsigned32();
break;
case "Float64":
avpValue = avp.getFloat64();
break;
case "Integer64":
avpValue = avp.getInteger64();
break;
case "Time":
avpValue = avp.getTime();
break;
case "Unsigned64":
avpValue = avp.getUnsigned64();
break;
case "Grouped":
avpValue = "<Grouped>";
isGrouped = true;
break;
default:
avpValue = avp.getUTF8String().replace("\r", "").replace("\n", "");
break;
}//else Switch
}
} //try
catch (AvpDataException ignore) {
try {
avpValue = avp.getUTF8String().replace("\r", "").replace("\n", "");
} //try
catch (AvpDataException e) {
avpValue = avp.toString();
} //catch
} //catch

String fieldName = avpRep.getName().replace("-", pKeywordSep);
StringBuilder avpLine = new StringBuilder(indentation)
.append(avp.getCode())
.append(": ")
.append(fieldName);
while (avpLine.length() < 40) {
avpLine.append(avpLine.length() % 2 == 0 ? "." : " ");
} //while
avpLine.append(avpValue);

if (log && LOG.isDebugEnabled()) {
LOG.debug(avpLine.toString());
} //if

stringBuilder.append(avpLine).append('\n');

if (isGrouped) {
try {
stringBuilder.append(printAvps(avp.getGrouped(), pKeywordSep, indentation + " ", log));
} //try
catch (AvpDataException e) {
// Failed to ungroup... ignore then...
} //catch
} //if
} //for

return stringBuilder.toString();
}//printAvps
}//DiameterUtilities

0 comments on commit 1ad8ab2

Please sign in to comment.