jackson, HTTP codes and JSON responses, xICIC/RRMConfig fix
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasConfig.java b/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasConfig.java
index f8b5403..02b7cf3 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasConfig.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasConfig.java
@@ -4,11 +4,13 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.*;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.types.string.BerUTF8String;
+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.ber.types.string.BerUTF8String;
import java.io.IOException;
import java.io.InputStream;
@@ -27,7 +29,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<PCIARFCN> seqOf = null;
public MeasCells() {
@@ -38,6 +40,7 @@
this.code = code;
}
+ @JsonValue
public List<PCIARFCN> getPCIARFCN() {
if (seqOf == null) {
seqOf = new ArrayList<PCIARFCN>();
@@ -153,6 +156,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private ECGI ecgi = null;
private CRNTI crnti = null;
@@ -347,7 +351,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -356,7 +360,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -364,7 +368,7 @@
sb.append("\t");
}
if (reportQty != null) {
- sb.append("\"reportQty\": ").append(reportQty);
+ sb.append("reportQty: ").append(reportQty);
}
sb.append(",\n");
@@ -372,7 +376,7 @@
sb.append("\t");
}
if (measCells != null) {
- sb.append("\"measCells\": ");
+ sb.append("measCells: ");
measCells.appendAsString(sb, indentLevel + 1);
}
@@ -381,7 +385,7 @@
sb.append("\t");
}
if (reportInterval != null) {
- sb.append("\"reportInterval\": ").append(reportInterval);
+ sb.append("reportInterval: ").append(reportInterval);
}
sb.append("\n");