jackson, HTTP codes and JSON responses, xICIC/RRMConfig fix
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEReleaseInd.java b/src/main/java/org.onosproject.xran/codecs/pdu/UEReleaseInd.java
index 9b601ad..fef213f 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/UEReleaseInd.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/UEReleaseInd.java
@@ -3,9 +3,10 @@
*/
package org.onosproject.xran.codecs.pdu;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.RelCause;
@@ -20,6 +21,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private CRNTI crnti = null;
private ECGI ecgi = null;
@@ -168,7 +170,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -176,7 +178,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -185,7 +187,7 @@
sb.append("\t");
}
if (releaseCause != null) {
- sb.append("\"releaseCause\": ").append(releaseCause);
+ sb.append("releaseCause: ").append(releaseCause);
}
sb.append("\n");