jackson, HTTP codes and JSON responses, xICIC/RRMConfig fix
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionRequest.java b/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionRequest.java
index 7f86f7c..7fa0f40 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionRequest.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionRequest.java
@@ -4,10 +4,11 @@
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 org.openmuc.jasn1.ber.types.BerInteger;
+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.ber.types.BerInteger;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.ERABParams;
@@ -23,6 +24,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;
@@ -217,7 +219,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -225,7 +227,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -234,7 +236,7 @@
sb.append("\t");
}
if (ueAmbr != null) {
- sb.append("\"ueAmbr\": ");
+ sb.append("ueAmbr: ");
ueAmbr.appendAsString(sb, indentLevel + 1);
}
@@ -243,7 +245,7 @@
sb.append("\t");
}
if (numErabs != null) {
- sb.append("\"numErabs\": ").append(numErabs);
+ sb.append("numErabs: ").append(numErabs);
}
sb.append(",\n");
@@ -251,7 +253,7 @@
sb.append("\t");
}
if (erabParams != null) {
- sb.append("\"erabParams\": ");
+ sb.append("erabParams: ");
erabParams.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionResponse.java b/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionResponse.java
index 15c84e6..a4dfeb0 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionResponse.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionResponse.java
@@ -4,12 +4,13 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
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.BerInteger;
-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.BerInteger;
+import org.onosproject.xran.codecs.ber.types.string.BerUTF8String;
import java.io.IOException;
import java.io.InputStream;
@@ -22,6 +23,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;
@@ -193,7 +195,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -201,7 +203,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -210,7 +212,7 @@
sb.append("\t");
}
if (numErabList != null) {
- sb.append("\"numErabList\": ").append(numErabList);
+ sb.append("numErabList: ").append(numErabList);
}
sb.append(",\n");
@@ -218,7 +220,7 @@
sb.append("\t");
}
if (erabResponse != null) {
- sb.append("\"erabResponse\": ");
+ sb.append("erabResponse: ");
erabResponse.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionStatus.java b/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionStatus.java
index 16e85e1..f9c6476 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionStatus.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/BearerAdmissionStatus.java
@@ -4,10 +4,11 @@
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 org.openmuc.jasn1.ber.types.BerInteger;
+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.ber.types.BerInteger;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.ERABResponse;
@@ -22,6 +23,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;
@@ -193,7 +195,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -201,7 +203,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -210,7 +212,7 @@
sb.append("\t");
}
if (numErabs != null) {
- sb.append("\"numErabs\": ").append(numErabs);
+ sb.append("numErabs: ").append(numErabs);
}
sb.append(",\n");
@@ -218,7 +220,7 @@
sb.append("\t");
}
if (erabResponse != null) {
- sb.append("\"erabResponse\": ");
+ sb.append("erabResponse: ");
erabResponse.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/BearerReleaseInd.java b/src/main/java/org.onosproject.xran/codecs/pdu/BearerReleaseInd.java
index 89cfa2d..055c8be 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/BearerReleaseInd.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/BearerReleaseInd.java
@@ -4,10 +4,12 @@
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 org.openmuc.jasn1.ber.types.BerInteger;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
+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.BerInteger;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.ERABID;
@@ -28,6 +30,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private List<ERABID> seqOf = null;
@@ -39,6 +42,7 @@
this.code = code;
}
+ @JsonValue
public List<ERABID> getERABID() {
if (seqOf == null) {
seqOf = new ArrayList<ERABID>();
@@ -151,7 +155,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private CRNTI crnti = null;
private ECGI ecgi = null;
private BerInteger numErabs = null;
@@ -322,7 +326,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -330,7 +334,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -339,7 +343,7 @@
sb.append("\t");
}
if (numErabs != null) {
- sb.append("\"numErabs\": ").append(numErabs);
+ sb.append("numErabs: ").append(numErabs);
}
sb.append(",\n");
@@ -347,7 +351,7 @@
sb.append("\t");
}
if (erabIds != null) {
- sb.append("\"erabIds\": ");
+ sb.append("erabIds: ");
erabIds.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigReport.java b/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigReport.java
index c858d2e..c45760d 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigReport.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigReport.java
@@ -4,11 +4,13 @@
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 org.openmuc.jasn1.ber.types.BerBoolean;
-import org.openmuc.jasn1.ber.types.BerInteger;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
+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.BerBoolean;
+import org.onosproject.xran.codecs.ber.types.BerInteger;
import org.onosproject.xran.codecs.api.*;
import java.io.IOException;
@@ -27,6 +29,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private List<CandScell> seqOf = null;
@@ -38,6 +41,7 @@
this.code = code;
}
+ @JsonValue
public List<CandScell> getCandScells() {
if (seqOf == null) {
seqOf = new ArrayList<CandScell>();
@@ -154,7 +158,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private ECGI ecgi = null;
private PhysCellId pci = null;
private CandScells candScells = null;
@@ -599,7 +603,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -608,7 +612,7 @@
sb.append("\t");
}
if (pci != null) {
- sb.append("\"pci\": ").append(pci);
+ sb.append("pci: ").append(pci);
}
sb.append(",\n");
@@ -616,7 +620,7 @@
sb.append("\t");
}
if (candScells != null) {
- sb.append("\"candScells\": ");
+ sb.append("candScells: ");
candScells.appendAsString(sb, indentLevel + 1);
}
@@ -625,7 +629,7 @@
sb.append("\t");
}
if (earfcnDl != null) {
- sb.append("\"earfcnDl\": ").append(earfcnDl);
+ sb.append("earfcnDl: ").append(earfcnDl);
}
sb.append(",\n");
@@ -633,7 +637,7 @@
sb.append("\t");
}
if (earfcnUl != null) {
- sb.append("\"earfcnUl\": ").append(earfcnUl);
+ sb.append("earfcnUl: ").append(earfcnUl);
}
sb.append(",\n");
@@ -641,7 +645,7 @@
sb.append("\t");
}
if (rbsPerTtiDl != null) {
- sb.append("\"rbsPerTtiDl\": ").append(rbsPerTtiDl);
+ sb.append("rbsPerTtiDl: ").append(rbsPerTtiDl);
}
sb.append(",\n");
@@ -649,7 +653,7 @@
sb.append("\t");
}
if (rbsPerTtiUl != null) {
- sb.append("\"rbsPerTtiUl\": ").append(rbsPerTtiUl);
+ sb.append("rbsPerTtiUl: ").append(rbsPerTtiUl);
}
sb.append(",\n");
@@ -657,7 +661,7 @@
sb.append("\t");
}
if (numTxAntenna != null) {
- sb.append("\"numTxAntenna\": ").append(numTxAntenna);
+ sb.append("numTxAntenna: ").append(numTxAntenna);
}
sb.append(",\n");
@@ -665,7 +669,7 @@
sb.append("\t");
}
if (duplexMode != null) {
- sb.append("\"duplexMode\": ").append(duplexMode);
+ sb.append("duplexMode: ").append(duplexMode);
}
if (tddConfig != null) {
@@ -673,7 +677,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"tddConfig\": ").append(tddConfig);
+ sb.append("tddConfig: ").append(tddConfig);
}
if (tddSplSfConfig != null) {
@@ -681,7 +685,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"tddSplSfConfig\": ").append(tddSplSfConfig);
+ sb.append("tddSplSfConfig: ").append(tddSplSfConfig);
}
sb.append(",\n");
@@ -689,7 +693,7 @@
sb.append("\t");
}
if (maxNumConnectedUes != null) {
- sb.append("\"maxNumConnectedUes\": ").append(maxNumConnectedUes);
+ sb.append("maxNumConnectedUes: ").append(maxNumConnectedUes);
}
sb.append(",\n");
@@ -697,7 +701,7 @@
sb.append("\t");
}
if (maxNumConnectedBearers != null) {
- sb.append("\"maxNumConnectedBearers\": ").append(maxNumConnectedBearers);
+ sb.append("maxNumConnectedBearers: ").append(maxNumConnectedBearers);
}
sb.append(",\n");
@@ -705,7 +709,7 @@
sb.append("\t");
}
if (maxNumUesSchedPerTtiDl != null) {
- sb.append("\"maxNumUesSchedPerTtiDl\": ").append(maxNumUesSchedPerTtiDl);
+ sb.append("maxNumUesSchedPerTtiDl: ").append(maxNumUesSchedPerTtiDl);
}
sb.append(",\n");
@@ -713,7 +717,7 @@
sb.append("\t");
}
if (maxNumUesSchedPerTtiUl != null) {
- sb.append("\"maxNumUesSchedPerTtiUl\": ").append(maxNumUesSchedPerTtiUl);
+ sb.append("maxNumUesSchedPerTtiUl: ").append(maxNumUesSchedPerTtiUl);
}
sb.append(",\n");
@@ -721,7 +725,7 @@
sb.append("\t");
}
if (dlfsSchedEnable != null) {
- sb.append("\"dlfsSchedEnable\": ").append(dlfsSchedEnable);
+ sb.append("dlfsSchedEnable: ").append(dlfsSchedEnable);
}
sb.append("\n");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigRequest.java b/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigRequest.java
index d2a8b69..4f5e20b 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigRequest.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/CellConfigRequest.java
@@ -4,11 +4,12 @@
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.ECGI;
-import org.openmuc.jasn1.ber.types.string.BerUTF8String;
+import org.onosproject.xran.codecs.ber.types.string.BerUTF8String;
import java.io.IOException;
import java.io.InputStream;
@@ -21,6 +22,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private ECGI ecgi = null;
@@ -123,7 +125,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/HOComplete.java b/src/main/java/org.onosproject.xran/codecs/pdu/HOComplete.java
index 7a4290a..68ae5c1 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/HOComplete.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/HOComplete.java
@@ -4,11 +4,12 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import java.io.IOException;
import java.io.InputStream;
@@ -21,6 +22,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private ECGI ecgiT = null;
private ECGI ecgiS = null;
@@ -169,7 +171,7 @@
sb.append("\t");
}
if (ecgiT != null) {
- sb.append("\"ecgiT\": ");
+ sb.append("ecgiT: ");
ecgiT.appendAsString(sb, indentLevel + 1);
}
@@ -178,7 +180,7 @@
sb.append("\t");
}
if (ecgiS != null) {
- sb.append("\"ecgiS\": ");
+ sb.append("ecgiS: ");
ecgiS.appendAsString(sb, indentLevel + 1);
}
@@ -187,7 +189,7 @@
sb.append("\t");
}
if (crntiNew != null) {
- sb.append("\"crntiNew\": ").append(crntiNew);
+ sb.append("crntiNew: ").append(crntiNew);
}
sb.append("\n");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/HOFailure.java b/src/main/java/org.onosproject.xran/codecs/pdu/HOFailure.java
index d0d2c90..ac42dcd 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/HOFailure.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/HOFailure.java
@@ -4,12 +4,13 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.HOFailureCause;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import java.io.IOException;
import java.io.InputStream;
@@ -21,6 +22,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;
@@ -169,7 +171,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -177,7 +179,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -186,7 +188,7 @@
sb.append("\t");
}
if (cause != null) {
- sb.append("\"cause\": ").append(cause);
+ sb.append("cause: ").append(cause);
}
sb.append("\n");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/HORequest.java b/src/main/java/org.onosproject.xran/codecs/pdu/HORequest.java
index f6a3076..38218d7 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/HORequest.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/HORequest.java
@@ -4,12 +4,13 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
-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;
@@ -22,6 +23,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 ecgiS = null;
@@ -170,7 +172,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -178,7 +180,7 @@
sb.append("\t");
}
if (ecgiS != null) {
- sb.append("\"ecgiS\": ");
+ sb.append("ecgiS: ");
ecgiS.appendAsString(sb, indentLevel + 1);
}
@@ -187,7 +189,7 @@
sb.append("\t");
}
if (ecgiT != null) {
- sb.append("\"ecgiT\": ");
+ sb.append("ecgiT: ");
ecgiT.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/L2MeasConfig.java b/src/main/java/org.onosproject.xran/codecs/pdu/L2MeasConfig.java
index f0de6d1..4e1f958 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/L2MeasConfig.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/L2MeasConfig.java
@@ -4,12 +4,13 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.onosproject.xran.codecs.api.ECGI;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.types.BerInteger;
-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.BerInteger;
+import org.onosproject.xran.codecs.ber.types.string.BerUTF8String;
import java.io.IOException;
import java.io.InputStream;
@@ -22,6 +23,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private ECGI ecgi = null;
private BerInteger reportIntervalMs = null;
@@ -147,7 +149,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -156,7 +158,7 @@
sb.append("\t");
}
if (reportIntervalMs != null) {
- sb.append("\"reportIntervalMs\": ").append(reportIntervalMs);
+ sb.append("reportIntervalMs: ").append(reportIntervalMs);
}
sb.append("\n");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/PDCPMeasReportPerUe.java b/src/main/java/org.onosproject.xran/codecs/pdu/PDCPMeasReportPerUe.java
index d272974..b2ed3a3 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/PDCPMeasReportPerUe.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/PDCPMeasReportPerUe.java
@@ -14,12 +14,14 @@
import java.math.BigInteger;
import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.QCI;
-import org.openmuc.jasn1.ber.*;
-import org.openmuc.jasn1.ber.types.*;
-import org.openmuc.jasn1.ber.types.string.*;
+import org.onosproject.xran.codecs.ber.*;
+import org.onosproject.xran.codecs.ber.types.*;
+import org.onosproject.xran.codecs.ber.types.string.*;
@@ -32,6 +34,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private List<QCI> seqOf = null;
@@ -43,6 +46,7 @@
this.code = code;
}
+ @JsonValue
public List<QCI> getQCI() {
if (seqOf == null) {
seqOf = new ArrayList<QCI>();
@@ -161,7 +165,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<BerInteger> seqOf = null;
public DataVolDl() {
@@ -172,7 +176,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -290,7 +294,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<BerInteger> seqOf = null;
public DataVolUl() {
@@ -301,7 +305,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -419,7 +423,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<BerInteger> seqOf = null;
public PktDelayDl() {
@@ -430,7 +434,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -548,7 +552,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<BerInteger> seqOf = null;
public PktDelayUl() {
@@ -559,7 +563,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -677,7 +681,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<BerInteger> seqOf = null;
public PktDiscardRateDl() {
@@ -688,7 +692,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -806,7 +810,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<BerInteger> seqOf = null;
public PktLossRateDl() {
@@ -817,7 +821,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -935,7 +939,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<BerInteger> seqOf = null;
public PktLossRateUl() {
@@ -946,7 +950,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -1064,7 +1068,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<BerInteger> seqOf = null;
public ThroughputDl() {
@@ -1075,7 +1079,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -1193,7 +1197,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<BerInteger> seqOf = null;
public ThroughputUl() {
@@ -1204,6 +1208,7 @@
this.code = code;
}
+ @JsonValue
public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
@@ -1319,7 +1324,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private ECGI ecgi = null;
private CRNTI crnti = null;
private QciVals qciVals = null;
@@ -1674,7 +1679,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -1683,7 +1688,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -1691,7 +1696,7 @@
sb.append("\t");
}
if (qciVals != null) {
- sb.append("\"qciVals\": ");
+ sb.append("qciVals: ");
qciVals.appendAsString(sb, indentLevel + 1);
}
@@ -1700,7 +1705,7 @@
sb.append("\t");
}
if (dataVolDl != null) {
- sb.append("\"dataVolDl\": ");
+ sb.append("dataVolDl: ");
dataVolDl.appendAsString(sb, indentLevel + 1);
}
@@ -1709,7 +1714,7 @@
sb.append("\t");
}
if (dataVolUl != null) {
- sb.append("\"dataVolUl\": ");
+ sb.append("dataVolUl: ");
dataVolUl.appendAsString(sb, indentLevel + 1);
}
@@ -1718,7 +1723,7 @@
sb.append("\t");
}
if (pktDelayDl != null) {
- sb.append("\"pktDelayDl\": ");
+ sb.append("pktDelayDl: ");
pktDelayDl.appendAsString(sb, indentLevel + 1);
}
@@ -1727,7 +1732,7 @@
sb.append("\t");
}
if (pktDelayUl != null) {
- sb.append("\"pktDelayUl\": ");
+ sb.append("pktDelayUl: ");
pktDelayUl.appendAsString(sb, indentLevel + 1);
}
@@ -1736,7 +1741,7 @@
sb.append("\t");
}
if (pktDiscardRateDl != null) {
- sb.append("\"pktDiscardRateDl\": ");
+ sb.append("pktDiscardRateDl: ");
pktDiscardRateDl.appendAsString(sb, indentLevel + 1);
}
@@ -1745,7 +1750,7 @@
sb.append("\t");
}
if (pktLossRateDl != null) {
- sb.append("\"pktLossRateDl\": ");
+ sb.append("pktLossRateDl: ");
pktLossRateDl.appendAsString(sb, indentLevel + 1);
}
@@ -1754,7 +1759,7 @@
sb.append("\t");
}
if (pktLossRateUl != null) {
- sb.append("\"pktLossRateUl\": ");
+ sb.append("pktLossRateUl: ");
pktLossRateUl.appendAsString(sb, indentLevel + 1);
}
@@ -1763,7 +1768,7 @@
sb.append("\t");
}
if (throughputDl != null) {
- sb.append("\"throughputDl\": ");
+ sb.append("throughputDl: ");
throughputDl.appendAsString(sb, indentLevel + 1);
}
@@ -1772,7 +1777,7 @@
sb.append("\t");
}
if (throughputUl != null) {
- sb.append("\"throughputUl\": ");
+ sb.append("throughputUl: ");
throughputUl.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfig.java b/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfig.java
index 4c9bae7..c2164c3 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfig.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfig.java
@@ -4,15 +4,17 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.XICICPA;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.types.BerBitString;
-import org.openmuc.jasn1.ber.types.BerInteger;
-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.BerBitString;
+import org.onosproject.xran.codecs.ber.types.BerInteger;
+import org.onosproject.xran.codecs.ber.types.string.BerUTF8String;
import java.io.IOException;
import java.io.InputStream;
@@ -26,6 +28,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
+ @JsonIgnore
public byte[] code = null;
private ECGI ecgi = null;
private Crnti crnti = null;
@@ -355,7 +358,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -364,7 +367,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"crnti\": ");
+ sb.append("crnti: ");
crnti.appendAsString(sb, indentLevel + 1);
}
@@ -373,7 +376,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"pa\": ");
+ sb.append("pa: ");
pa.appendAsString(sb, indentLevel + 1);
}
@@ -382,7 +385,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"startPrbDl\": ");
+ sb.append("startPrbDl: ");
startPrbDl.appendAsString(sb, indentLevel + 1);
}
@@ -391,7 +394,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"endPrbDl\": ");
+ sb.append("endPrbDl: ");
endPrbDl.appendAsString(sb, indentLevel + 1);
}
@@ -400,7 +403,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"subframeBitmaskDl\": ");
+ sb.append("subframeBitmaskDl: ");
subframeBitmaskDl.appendAsString(sb, indentLevel + 1);
}
@@ -409,7 +412,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"p0UePusch\": ");
+ sb.append("p0UePusch: ");
p0UePusch.appendAsString(sb, indentLevel + 1);
}
@@ -418,7 +421,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"startPrbUl\": ");
+ sb.append("startPrbUl: ");
startPrbUl.appendAsString(sb, indentLevel + 1);
}
@@ -427,7 +430,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"endPrbUl\": ");
+ sb.append("endPrbUl: ");
endPrbUl.appendAsString(sb, indentLevel + 1);
}
@@ -436,7 +439,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"subframeBitmaskUl\": ");
+ sb.append("subframeBitmaskUl: ");
subframeBitmaskUl.appendAsString(sb, indentLevel + 1);
}
@@ -451,7 +454,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<CRNTI> seqOf = null;
public Crnti() {
@@ -462,6 +465,7 @@
this.code = code;
}
+ @JsonValue
public List<CRNTI> getCRNTI() {
if (seqOf == null) {
seqOf = new ArrayList<CRNTI>();
@@ -579,7 +583,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<XICICPA> seqOf = null;
public Pa() {
@@ -590,6 +594,7 @@
this.code = code;
}
+ @JsonValue
public List<XICICPA> getXICICPA() {
if (seqOf == null) {
seqOf = new ArrayList<XICICPA>();
@@ -703,7 +708,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<BerInteger> seqOf = null;
public StartPrbDl() {
@@ -722,7 +727,7 @@
this.seqOf = seqOf;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -838,7 +843,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<BerInteger> seqOf = null;
public EndPrbDl() {
@@ -849,7 +854,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -973,7 +978,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<BerBitString> seqOf = null;
public SubframeBitmaskDl() {
@@ -984,6 +989,7 @@
this.code = code;
}
+ @JsonValue
public List<BerBitString> getBerBitString() {
if (seqOf == null) {
seqOf = new ArrayList<BerBitString>();
@@ -1077,13 +1083,13 @@
} else {
Iterator<BerBitString> it = seqOf.iterator();
if (it.hasNext()) {
- sb.append("\"" + it.next() + "\"");
+ sb.append("" + it.next() + "");
while (it.hasNext()) {
sb.append(",\n");
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"" + it.next() + "\"");
+ sb.append("" + it.next() + "");
}
}
}
@@ -1101,7 +1107,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<BerInteger> seqOf = null;
public P0UePusch() {
@@ -1112,7 +1118,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -1225,7 +1231,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<BerInteger> seqOf = null;
public StartPrbUl() {
@@ -1236,7 +1242,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -1360,7 +1366,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<BerInteger> seqOf = null;
public EndPrbUl() {
@@ -1371,6 +1377,7 @@
this.code = code;
}
+ @JsonValue
public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
@@ -1495,7 +1502,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<BerBitString> seqOf = null;
public SubframeBitmaskUl() {
@@ -1506,6 +1513,7 @@
this.code = code;
}
+ @JsonValue
public List<BerBitString> getBerBitString() {
if (seqOf == null) {
seqOf = new ArrayList<BerBitString>();
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfigStatus.java b/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfigStatus.java
index ab88a6d..015e8fe 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfigStatus.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/RRMConfigStatus.java
@@ -4,12 +4,14 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.types.BerEnum;
+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.BerEnum;
import java.io.IOException;
import java.io.InputStream;
@@ -28,6 +30,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private List<CRNTI> seqOf = null;
@@ -39,6 +42,7 @@
this.code = code;
}
+ @JsonValue
public List<CRNTI> getCRNTI() {
if (seqOf == null) {
seqOf = new ArrayList<CRNTI>();
@@ -154,7 +158,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<BerEnum> seqOf = null;
public Status() {
@@ -165,6 +169,7 @@
this.code = code;
}
+ @JsonValue
public List<BerEnum> getBerEnum() {
if (seqOf == null) {
seqOf = new ArrayList<BerEnum>();
@@ -277,7 +282,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private ECGI ecgi = null;
private Crnti crnti = null;
private Status status = null;
@@ -424,7 +429,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -433,7 +438,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"crnti\": ");
+ sb.append("crnti: ");
crnti.appendAsString(sb, indentLevel + 1);
}
@@ -442,7 +447,7 @@
sb.append("\t");
}
if (status != null) {
- sb.append("\"status\": ");
+ sb.append("status: ");
status.appendAsString(sb, indentLevel + 1);
}
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");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasReport.java b/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasReport.java
index bee7bdd..e6d735e 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasReport.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/RXSigMeasReport.java
@@ -4,12 +4,14 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.RXSigReport;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import java.io.IOException;
import java.io.InputStream;
@@ -27,6 +29,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private List<RXSigReport> seqOf = null;
@@ -38,6 +41,7 @@
this.code = code;
}
+ @JsonValue
public List<RXSigReport> getRXSigReport() {
if (seqOf == null) {
seqOf = new ArrayList<RXSigReport>();
@@ -153,7 +157,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private CRNTI crnti = null;
private ECGI ecgi = null;
private CellMeasReports cellMeasReports = null;
@@ -301,7 +305,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -309,7 +313,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -318,7 +322,7 @@
sb.append("\t");
}
if (cellMeasReports != null) {
- sb.append("\"cellMeasReports\": ");
+ sb.append("cellMeasReports: ");
cellMeasReports.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerCell.java b/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerCell.java
index ac138c6..bb1c59a 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerCell.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerCell.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.ECGI;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.types.BerInteger;
+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.BerInteger;
import java.io.IOException;
import java.io.InputStream;
@@ -27,6 +29,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private List<BerInteger> seqOf = null;
@@ -38,7 +41,7 @@
this.code = code;
}
- public List<BerInteger> getBerInteger() {
+ @JsonValue public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
}
@@ -157,7 +160,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<BerInteger> seqOf = null;
public PucchIntfPowerHist() {
@@ -168,6 +171,7 @@
this.code = code;
}
+ @JsonValue
public List<BerInteger> getBerInteger() {
if (seqOf == null) {
seqOf = new ArrayList<BerInteger>();
@@ -283,7 +287,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private ECGI ecgi = null;
private PuschIntfPowerHist puschIntfPowerHist = null;
private PucchIntfPowerHist pucchIntfPowerHist = null;
@@ -431,7 +435,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -440,7 +444,7 @@
sb.append("\t");
}
if (puschIntfPowerHist != null) {
- sb.append("\"puschIntfPowerHist\": ");
+ sb.append("puschIntfPowerHist: ");
puschIntfPowerHist.appendAsString(sb, indentLevel + 1);
}
@@ -449,7 +453,7 @@
sb.append("\t");
}
if (pucchIntfPowerHist != null) {
- sb.append("\"pucchIntfPowerHist\": ");
+ sb.append("pucchIntfPowerHist: ");
pucchIntfPowerHist.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerUE.java b/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerUE.java
index 15f1ea9..7b6b17c 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerUE.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/RadioMeasReportPerUE.java
@@ -4,12 +4,14 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.RadioRepPerServCell;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import java.io.IOException;
import java.io.InputStream;
@@ -27,6 +29,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private List<RadioRepPerServCell> seqOf = null;
@@ -38,6 +41,7 @@
this.code = code;
}
+ @JsonValue
public List<RadioRepPerServCell> getRadioRepPerServCell() {
if (seqOf == null) {
seqOf = new ArrayList<RadioRepPerServCell>();
@@ -153,7 +157,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private ECGI ecgi = null;
private CRNTI crnti = null;
private RadioReportServCells radioReportServCells = null;
@@ -301,7 +305,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -310,7 +314,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -318,7 +322,7 @@
sb.append("\t");
}
if (radioReportServCells != null) {
- sb.append("\"radioReportServCells\": ");
+ sb.append("radioReportServCells: ");
radioReportServCells.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/ScellAdd.java b/src/main/java/org.onosproject.xran/codecs/pdu/ScellAdd.java
index 3ee1f02..674b79d 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/ScellAdd.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/ScellAdd.java
@@ -4,16 +4,18 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.PropScell;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.types.BerBoolean;
-import org.openmuc.jasn1.ber.types.BerEnum;
-import org.openmuc.jasn1.ber.types.BerInteger;
-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.BerBoolean;
+import org.onosproject.xran.codecs.ber.types.BerEnum;
+import org.onosproject.xran.codecs.ber.types.BerInteger;
+import org.onosproject.xran.codecs.ber.types.string.BerUTF8String;
import java.io.IOException;
import java.io.InputStream;
@@ -28,6 +30,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
+ @JsonIgnore
public byte[] code = null;
private CRNTI crnti = null;
private ECGI ecgi = null;
@@ -205,7 +208,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -213,7 +216,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -222,7 +225,7 @@
sb.append("\t");
}
if (scellsProp != null) {
- sb.append("\"scellsProp\": ");
+ sb.append("scellsProp: ");
scellsProp.appendAsString(sb, indentLevel + 1);
}
@@ -237,7 +240,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<PropScell> seqOf = null;
public ScellsProp() {
@@ -248,6 +251,7 @@
this.code = code;
}
+ @JsonValue
public List<PropScell> getPropScell() {
if (seqOf == null) {
seqOf = new ArrayList<PropScell>();
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/ScellAddStatus.java b/src/main/java/org.onosproject.xran/codecs/pdu/ScellAddStatus.java
index 99ddadd..1efc52f 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/ScellAddStatus.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/ScellAddStatus.java
@@ -4,13 +4,15 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.PCIARFCN;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.types.BerEnum;
+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.BerEnum;
import java.io.IOException;
import java.io.InputStream;
@@ -28,6 +30,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private List<PCIARFCN> seqOf = null;
@@ -39,6 +42,7 @@
this.code = code;
}
+ @JsonValue
public List<PCIARFCN> getPCIARFCN() {
if (seqOf == null) {
seqOf = new ArrayList<PCIARFCN>();
@@ -154,7 +158,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<BerEnum> seqOf = null;
public Status() {
@@ -165,6 +169,7 @@
this.code = code;
}
+ @JsonValue
public List<BerEnum> getBerEnum() {
if (seqOf == null) {
seqOf = new ArrayList<BerEnum>();
@@ -277,7 +282,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private CRNTI crnti = null;
private ECGI ecgi = null;
private ScellsInd scellsInd = null;
@@ -448,7 +453,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -456,7 +461,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -465,7 +470,7 @@
sb.append("\t");
}
if (scellsInd != null) {
- sb.append("\"scellsInd\": ");
+ sb.append("scellsInd: ");
scellsInd.appendAsString(sb, indentLevel + 1);
}
@@ -474,7 +479,7 @@
sb.append("\t");
}
if (status != null) {
- sb.append("\"status\": ");
+ sb.append("status: ");
status.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/ScellDelete.java b/src/main/java/org.onosproject.xran/codecs/pdu/ScellDelete.java
index 02dd7d2..6080f69 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/ScellDelete.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/ScellDelete.java
@@ -4,13 +4,15 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.PCIARFCN;
-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;
@@ -24,6 +26,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
+ @JsonIgnore
public byte[] code = null;
private CRNTI crnti = null;
private ECGI ecgi = null;
@@ -199,7 +202,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -207,7 +210,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -216,7 +219,7 @@
sb.append("\t");
}
if (scellsInd != null) {
- sb.append("\"scellsInd\": ");
+ sb.append("scellsInd: ");
scellsInd.appendAsString(sb, indentLevel + 1);
}
@@ -231,7 +234,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
private static final long serialVersionUID = 1L;
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private List<PCIARFCN> seqOf = null;
public ScellsInd() {
@@ -242,6 +245,7 @@
this.code = code;
}
+ @JsonValue
public List<PCIARFCN> getPCIARFCN() {
if (seqOf == null) {
seqOf = new ArrayList<PCIARFCN>();
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerCell.java b/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerCell.java
index 1493c63..80821b8 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerCell.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerCell.java
@@ -2,12 +2,14 @@
* This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org)
*/
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.PRBUsage;
import org.onosproject.xran.codecs.api.QCI;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import java.io.IOException;
import java.io.InputStream;
@@ -26,6 +28,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private List<QCI> seqOf = null;
@@ -37,6 +40,7 @@
this.code = code;
}
+ @JsonValue
public List<QCI> getQCI() {
if (seqOf == null) {
seqOf = new ArrayList<QCI>();
@@ -152,7 +156,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private ECGI ecgi = null;
private QciVals qciVals = null;
private PRBUsage prbUsagePcell = null;
@@ -323,7 +327,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -332,7 +336,7 @@
sb.append("\t");
}
if (qciVals != null) {
- sb.append("\"qciVals\": ");
+ sb.append("qciVals: ");
qciVals.appendAsString(sb, indentLevel + 1);
}
@@ -341,7 +345,7 @@
sb.append("\t");
}
if (prbUsagePcell != null) {
- sb.append("\"prbUsagePcell\": ");
+ sb.append("prbUsagePcell: ");
prbUsagePcell.appendAsString(sb, indentLevel + 1);
}
@@ -350,7 +354,7 @@
sb.append("\t");
}
if (prbUsageScell != null) {
- sb.append("\"prbUsageScell\": ");
+ sb.append("prbUsageScell: ");
prbUsageScell.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerUE.java b/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerUE.java
index 3205e88..61616f4 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerUE.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/SchedMeasReportPerUE.java
@@ -3,12 +3,14 @@
*/
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.SchedMeasRepPerServCell;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import java.io.IOException;
import java.io.InputStream;
@@ -26,6 +28,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private List<SchedMeasRepPerServCell> seqOf = null;
@@ -37,6 +40,7 @@
this.code = code;
}
+ @JsonValue
public List<SchedMeasRepPerServCell> getSchedMeasRepPerServCell() {
if (seqOf == null) {
seqOf = new ArrayList<SchedMeasRepPerServCell>();
@@ -152,7 +156,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private ECGI ecgi = null;
private CRNTI crnti = null;
private SchedReportServCells schedReportServCells = null;
@@ -300,7 +304,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -309,7 +313,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -317,7 +321,7 @@
sb.append("\t");
}
if (schedReportServCells != null) {
- sb.append("\"schedReportServCells\": ");
+ sb.append("schedReportServCells: ");
schedReportServCells.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAdd.java b/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAdd.java
index d86cf6d..5f1d1fa 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAdd.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAdd.java
@@ -3,11 +3,12 @@
*/
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
@@ -19,6 +20,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 mEcgi = null;
@@ -167,7 +169,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -175,7 +177,7 @@
sb.append("\t");
}
if (mEcgi != null) {
- sb.append("\"mEcgi\": ");
+ sb.append("mEcgi: ");
mEcgi.appendAsString(sb, indentLevel + 1);
}
@@ -184,7 +186,7 @@
sb.append("\t");
}
if (sEcgi != null) {
- sb.append("\"sEcgi\": ");
+ sb.append("sEcgi: ");
sEcgi.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAddStatus.java b/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAddStatus.java
index e09c110..1548c9f 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAddStatus.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/SeNBAddStatus.java
@@ -3,12 +3,13 @@
*/
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.types.BerEnum;
+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.BerEnum;
import java.io.IOException;
import java.io.InputStream;
@@ -21,6 +22,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;
@@ -169,7 +171,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -177,7 +179,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -186,7 +188,7 @@
sb.append("\t");
}
if (status != null) {
- sb.append("\"status\": ").append(status);
+ sb.append("status: ").append(status);
}
sb.append("\n");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/SeNBDelete.java b/src/main/java/org.onosproject.xran/codecs/pdu/SeNBDelete.java
index 8441c3f..14b9dc5 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/SeNBDelete.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/SeNBDelete.java
@@ -3,11 +3,12 @@
*/
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import java.io.IOException;
import java.io.InputStream;
@@ -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 mEcgi = 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 (mEcgi != null) {
- sb.append("\"mEcgi\": ");
+ sb.append("mEcgi: ");
mEcgi.appendAsString(sb, indentLevel + 1);
}
@@ -185,7 +187,7 @@
sb.append("\t");
}
if (sEcgi != null) {
- sb.append("\"sEcgi\": ");
+ sb.append("sEcgi: ");
sEcgi.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/TrafficSplitConfig.java b/src/main/java/org.onosproject.xran/codecs/pdu/TrafficSplitConfig.java
index 408b722..cd68d7f 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/TrafficSplitConfig.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/TrafficSplitConfig.java
@@ -3,12 +3,14 @@
*/
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonValue;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.TrafficSplitPercentage;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import java.io.IOException;
import java.io.InputStream;
@@ -26,6 +28,7 @@
private static final long serialVersionUID = 1L;
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private List<TrafficSplitPercentage> seqOf = null;
@@ -37,6 +40,7 @@
this.code = code;
}
+ @JsonValue
public List<TrafficSplitPercentage> getTrafficSplitPercentage() {
if (seqOf == null) {
seqOf = new ArrayList<TrafficSplitPercentage>();
@@ -149,7 +153,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
- public byte[] code = null;
+ @JsonIgnore public byte[] code = null;
private CRNTI crnti = null;
private ECGI ecgi = null;
private TrafficSplitPercent trafficSplitPercent = null;
@@ -297,7 +301,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -305,7 +309,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -314,7 +318,7 @@
sb.append("\t");
}
if (trafficSplitPercent != null) {
- sb.append("\"trafficSplitPercent\": ");
+ sb.append("trafficSplitPercent: ");
trafficSplitPercent.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionRequest.java b/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionRequest.java
index 3eb4b9e..fd5148e 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionRequest.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionRequest.java
@@ -4,9 +4,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.AdmEstCause;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
@@ -21,6 +22,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;
@@ -169,7 +171,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -177,7 +179,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -186,7 +188,7 @@
sb.append("\t");
}
if (admEstCause != null) {
- sb.append("\"admEstCause\": ").append(admEstCause);
+ sb.append("admEstCause: ").append(admEstCause);
}
sb.append("\n");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionResponse.java b/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionResponse.java
index 5d323b7..8600ba3 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionResponse.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionResponse.java
@@ -4,13 +4,14 @@
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.AdmEstResponse;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
-import org.openmuc.jasn1.ber.types.string.BerUTF8String;
+import org.onosproject.xran.codecs.ber.types.string.BerUTF8String;
import java.io.IOException;
import java.io.InputStream;
@@ -23,6 +24,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;
@@ -171,7 +173,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -179,7 +181,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -188,7 +190,7 @@
sb.append("\t");
}
if (admEstResponse != null) {
- sb.append("\"admEstResponse\": ").append(admEstResponse);
+ sb.append("admEstResponse: ").append(admEstResponse);
}
sb.append("\n");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionStatus.java b/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionStatus.java
index edfd056..5a06a8a 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionStatus.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/UEAdmissionStatus.java
@@ -4,9 +4,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.AdmEstStatus;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
@@ -21,6 +22,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;
@@ -169,7 +171,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -177,7 +179,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -186,7 +188,7 @@
sb.append("\t");
}
if (admEstStatus != null) {
- sb.append("\"admEstStatus\": ").append(admEstStatus);
+ sb.append("admEstStatus: ").append(admEstStatus);
}
sb.append("\n");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityEnquiry.java b/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityEnquiry.java
index db212e5..01fa001 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityEnquiry.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityEnquiry.java
@@ -4,12 +4,13 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
-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;
@@ -23,6 +24,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;
@@ -148,7 +150,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -156,7 +158,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityInfo.java b/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityInfo.java
index a2c017e..732b717 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityInfo.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/UECapabilityInfo.java
@@ -3,13 +3,14 @@
*/
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.onosproject.xran.codecs.api.CACap;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.DCCap;
import org.onosproject.xran.codecs.api.ECGI;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import java.io.IOException;
import java.io.InputStream;
@@ -22,6 +23,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;
@@ -200,7 +202,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -208,7 +210,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -217,7 +219,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"caCap\": ");
+ sb.append("caCap: ");
caCap.appendAsString(sb, indentLevel + 1);
}
@@ -226,7 +228,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"dcCap\": ");
+ sb.append("dcCap: ");
dcCap.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEContextUpdate.java b/src/main/java/org.onosproject.xran/codecs/pdu/UEContextUpdate.java
index d9d6066..287316a 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/UEContextUpdate.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/UEContextUpdate.java
@@ -4,13 +4,14 @@
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.ENBUES1APID;
import org.onosproject.xran.codecs.api.MMEUES1APID;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
+import org.onosproject.xran.codecs.ber.BerByteArrayOutputStream;
+import org.onosproject.xran.codecs.ber.BerLength;
+import org.onosproject.xran.codecs.ber.BerTag;
import java.io.IOException;
import java.io.InputStream;
@@ -22,6 +23,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;
@@ -193,7 +195,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti\": ").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
sb.append(",\n");
@@ -201,7 +203,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -210,7 +212,7 @@
sb.append("\t");
}
if (mMEUES1APID != null) {
- sb.append("\"mMEUES1APID\": ").append(mMEUES1APID);
+ sb.append("mMEUES1APID: ").append(mMEUES1APID);
}
sb.append(",\n");
@@ -218,7 +220,7 @@
sb.append("\t");
}
if (eNBUES1APID != null) {
- sb.append("\"eNBUES1APID\": ").append(eNBUES1APID);
+ sb.append("eNBUES1APID: ").append(eNBUES1APID);
}
sb.append("\n");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/UEReconfigInd.java b/src/main/java/org.onosproject.xran/codecs/pdu/UEReconfigInd.java
index 4a5fd3d..6aa03ed 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/UEReconfigInd.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/UEReconfigInd.java
@@ -4,9 +4,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.ReconfIndReason;
@@ -21,6 +22,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private CRNTI crntiOld = null;
private ECGI ecgi = null;
@@ -192,7 +194,7 @@
sb.append("\t");
}
if (crntiOld != null) {
- sb.append("\"crntiOld\": ").append(crntiOld);
+ sb.append("crntiOld: ").append(crntiOld);
}
sb.append(",\n");
@@ -200,7 +202,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi\": ");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -209,7 +211,7 @@
sb.append("\t");
}
if (crntiNew != null) {
- sb.append("\"crntiNew\": ").append(crntiNew);
+ sb.append("crntiNew: ").append(crntiNew);
}
sb.append(",\n");
@@ -217,7 +219,7 @@
sb.append("\t");
}
if (reconfigCause != null) {
- sb.append("\"reconfigCause\": ").append(reconfigCause);
+ sb.append("reconfigCause: ").append(reconfigCause);
}
sb.append("\n");
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");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/XICICConfig.java b/src/main/java/org.onosproject.xran/codecs/pdu/XICICConfig.java
index 2d1bc70..7d841c9 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/XICICConfig.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/XICICConfig.java
@@ -3,16 +3,17 @@
*/
package org.onosproject.xran.codecs.pdu;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.onosproject.xran.codecs.api.CRNTI;
import org.onosproject.xran.codecs.api.ECGI;
import org.onosproject.xran.codecs.api.PCIARFCN;
import org.onosproject.xran.codecs.api.XICICPA;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.BerTag;
-import org.openmuc.jasn1.ber.types.BerBitString;
-import org.openmuc.jasn1.ber.types.BerInteger;
-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.BerBitString;
+import org.onosproject.xran.codecs.ber.types.BerInteger;
+import org.onosproject.xran.codecs.ber.types.string.BerUTF8String;
import java.io.IOException;
import java.io.InputStream;
@@ -25,6 +26,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private ECGI ecgi = null;
private PCIARFCN pciArfcn = null;
@@ -374,7 +376,7 @@
sb.append("\t");
}
if (ecgi != null) {
- sb.append("\"ecgi: \"");
+ sb.append("ecgi: ");
ecgi.appendAsString(sb, indentLevel + 1);
}
@@ -383,7 +385,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"pciArfcn: \"");
+ sb.append("pciArfcn: ");
pciArfcn.appendAsString(sb, indentLevel + 1);
}
@@ -392,7 +394,7 @@
sb.append("\t");
}
if (crnti != null) {
- sb.append("\"crnti: \"").append(crnti);
+ sb.append("crnti: ").append(crnti);
}
if (pa != null) {
@@ -400,7 +402,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"pa: \"").append(pa);
+ sb.append("pa: ").append(pa);
}
if (startPrbDl != null) {
@@ -408,7 +410,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"startPrbDl: \"").append(startPrbDl);
+ sb.append("startPrbDl: ").append(startPrbDl);
}
if (endPrbDl != null) {
@@ -416,7 +418,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"endPrbDl: \"").append(endPrbDl);
+ sb.append("endPrbDl: ").append(endPrbDl);
}
if (subframeBitmaskDl != null) {
@@ -424,7 +426,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"subframeBitmaskDl: \"").append(subframeBitmaskDl);
+ sb.append("subframeBitmaskDl: ").append(subframeBitmaskDl);
}
if (p0UePusch != null) {
@@ -432,7 +434,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"p0UePusch: \"").append(p0UePusch);
+ sb.append("p0UePusch: ").append(p0UePusch);
}
if (startPrbUl != null) {
@@ -440,7 +442,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"startPrbUl: \"").append(startPrbUl);
+ sb.append("startPrbUl: ").append(startPrbUl);
}
if (endPrbUl != null) {
@@ -448,7 +450,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"endPrbUl: \"").append(endPrbUl);
+ sb.append("endPrbUl: ").append(endPrbUl);
}
if (subframeBitmaskUl != null) {
@@ -456,7 +458,7 @@
for (int i = 0; i < indentLevel + 1; i++) {
sb.append("\t");
}
- sb.append("\"subframeBitmaskUl: \"").append(subframeBitmaskUl);
+ sb.append("subframeBitmaskUl: ").append(subframeBitmaskUl);
}
sb.append("\n");
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/XrancApiID.java b/src/main/java/org.onosproject.xran/codecs/pdu/XrancApiID.java
index 341b70f..fa902f8 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/XrancApiID.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/XrancApiID.java
@@ -4,7 +4,7 @@
package org.onosproject.xran.codecs.pdu;
-import org.openmuc.jasn1.ber.types.BerEnum;
+import org.onosproject.xran.codecs.ber.types.BerEnum;
import java.math.BigInteger;
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/XrancPdu.java b/src/main/java/org.onosproject.xran/codecs/pdu/XrancPdu.java
index d365a39..d983713 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/XrancPdu.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/XrancPdu.java
@@ -4,9 +4,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 java.io.IOException;
import java.io.InputStream;
@@ -18,6 +19,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private XrancPduHdr hdr = null;
private XrancPduBody body = null;
@@ -148,7 +150,7 @@
sb.append("\t");
}
if (hdr != null) {
- sb.append("\"hdr\": ");
+ sb.append("hdr: ");
hdr.appendAsString(sb, indentLevel + 1);
}
@@ -157,7 +159,7 @@
sb.append("\t");
}
if (body != null) {
- sb.append("\"body\": ");
+ sb.append("body: ");
body.appendAsString(sb, indentLevel + 1);
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduBody.java b/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduBody.java
index 2770211..29bef78 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduBody.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduBody.java
@@ -4,8 +4,9 @@
package org.onosproject.xran.codecs.pdu;
-import org.openmuc.jasn1.ber.BerByteArrayOutputStream;
-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.BerTag;
import java.io.IOException;
import java.io.InputStream;
@@ -15,6 +16,7 @@
private static final long serialVersionUID = 1L;
+ @JsonIgnore
public byte[] code = null;
private CellConfigRequest cellConfigRequest = null;
private CellConfigReport cellConfigReport = null;
@@ -882,211 +884,211 @@
public void appendAsString(StringBuilder sb, int indentLevel) {
if (cellConfigRequest != null) {
- sb.append("\"cellConfigRequest\": ");
+ sb.append("cellConfigRequest: ");
cellConfigRequest.appendAsString(sb, indentLevel + 1);
return;
}
if (cellConfigReport != null) {
- sb.append("\"cellConfigReport\": ");
+ sb.append("cellConfigReport: ");
cellConfigReport.appendAsString(sb, indentLevel + 1);
return;
}
if (uEAdmissionRequest != null) {
- sb.append("\"uEAdmissionRequest\": ");
+ sb.append("uEAdmissionRequest: ");
uEAdmissionRequest.appendAsString(sb, indentLevel + 1);
return;
}
if (uEAdmissionResponse != null) {
- sb.append("\"uEAdmissionResponse\": ");
+ sb.append("uEAdmissionResponse: ");
uEAdmissionResponse.appendAsString(sb, indentLevel + 1);
return;
}
if (uEContextUpdate != null) {
- sb.append("\"uEContextUpdate\": ");
+ sb.append("uEContextUpdate: ");
uEContextUpdate.appendAsString(sb, indentLevel + 1);
return;
}
if (uEAdmissionStatus != null) {
- sb.append("\"uEAdmissionStatus\": ");
+ sb.append("uEAdmissionStatus: ");
uEAdmissionStatus.appendAsString(sb, indentLevel + 1);
return;
}
if (uEReconfigInd != null) {
- sb.append("\"uEReconfigInd\": ");
+ sb.append("uEReconfigInd: ");
uEReconfigInd.appendAsString(sb, indentLevel + 1);
return;
}
if (uEReleaseInd != null) {
- sb.append("\"uEReleaseInd\": ");
+ sb.append("uEReleaseInd: ");
uEReleaseInd.appendAsString(sb, indentLevel + 1);
return;
}
if (bearerAdmissionRequest != null) {
- sb.append("\"bearerAdmissionRequest\": ");
+ sb.append("bearerAdmissionRequest: ");
bearerAdmissionRequest.appendAsString(sb, indentLevel + 1);
return;
}
if (bearerAdmissionResponse != null) {
- sb.append("\"bearerAdmissionResponse\": ");
+ sb.append("bearerAdmissionResponse: ");
bearerAdmissionResponse.appendAsString(sb, indentLevel + 1);
return;
}
if (bearerAdmissionStatus != null) {
- sb.append("\"bearerAdmissionStatus\": ");
+ sb.append("bearerAdmissionStatus: ");
bearerAdmissionStatus.appendAsString(sb, indentLevel + 1);
return;
}
if (bearerReleaseInd != null) {
- sb.append("\"bearerReleaseInd\": ");
+ sb.append("bearerReleaseInd: ");
bearerReleaseInd.appendAsString(sb, indentLevel + 1);
return;
}
if (uECapabilityEnquiry != null) {
- sb.append("\"uECapabilityEnquiry\": ");
+ sb.append("uECapabilityEnquiry: ");
uECapabilityEnquiry.appendAsString(sb, indentLevel + 1);
return;
}
if (uECapabilityInfo != null) {
- sb.append("\"uECapabilityInfo\": ");
+ sb.append("uECapabilityInfo: ");
uECapabilityInfo.appendAsString(sb, indentLevel + 1);
return;
}
if (hORequest != null) {
- sb.append("\"hORequest\": ");
+ sb.append("hORequest: ");
hORequest.appendAsString(sb, indentLevel + 1);
return;
}
if (hOFailure != null) {
- sb.append("\"hOFailure\": ");
+ sb.append("hOFailure: ");
hOFailure.appendAsString(sb, indentLevel + 1);
return;
}
if (hOComplete != null) {
- sb.append("\"hOComplete\": ");
+ sb.append("hOComplete: ");
hOComplete.appendAsString(sb, indentLevel + 1);
return;
}
if (rXSigMeasConfig != null) {
- sb.append("\"rXSigMeasConfig\": ");
+ sb.append("rXSigMeasConfig: ");
rXSigMeasConfig.appendAsString(sb, indentLevel + 1);
return;
}
if (rXSigMeasReport != null) {
- sb.append("\"rXSigMeasReport\": ");
+ sb.append("rXSigMeasReport: ");
rXSigMeasReport.appendAsString(sb, indentLevel + 1);
return;
}
if (l2MeasConfig != null) {
- sb.append("\"l2MeasConfig\": ");
+ sb.append("l2MeasConfig: ");
l2MeasConfig.appendAsString(sb, indentLevel + 1);
return;
}
if (radioMeasReportPerUE != null) {
- sb.append("\"radioMeasReportPerUE\": ");
+ sb.append("radioMeasReportPerUE: ");
radioMeasReportPerUE.appendAsString(sb, indentLevel + 1);
return;
}
if (radioMeasReportPerCell != null) {
- sb.append("\"radioMeasReportPerCell\": ");
+ sb.append("radioMeasReportPerCell: ");
radioMeasReportPerCell.appendAsString(sb, indentLevel + 1);
return;
}
if (schedMeasReportPerUE != null) {
- sb.append("\"schedMeasReportPerUE\": ");
+ sb.append("schedMeasReportPerUE: ");
schedMeasReportPerUE.appendAsString(sb, indentLevel + 1);
return;
}
if (schedMeasReportPerCell != null) {
- sb.append("\"schedMeasReportPerCell\": ");
+ sb.append("schedMeasReportPerCell: ");
schedMeasReportPerCell.appendAsString(sb, indentLevel + 1);
return;
}
if (pDCPMeasReportPerUe != null) {
- sb.append("\"pDCPMeasReportPerUe\": ");
+ sb.append("pDCPMeasReportPerUe: ");
pDCPMeasReportPerUe.appendAsString(sb, indentLevel + 1);
return;
}
if (xICICConfig != null) {
- sb.append("\"xICICConfig\": ");
+ sb.append("xICICConfig: ");
xICICConfig.appendAsString(sb, indentLevel + 1);
return;
}
if (rRMConfig != null) {
- sb.append("\"rRMConfig\": ");
+ sb.append("rRMConfig: ");
rRMConfig.appendAsString(sb, indentLevel + 1);
return;
}
if (rRMConfigStatus != null) {
- sb.append("\"rRMConfigStatus\": ");
+ sb.append("rRMConfigStatus: ");
rRMConfigStatus.appendAsString(sb, indentLevel + 1);
return;
}
if (scellAdd != null) {
- sb.append("\"scellAdd\": ");
+ sb.append("scellAdd: ");
scellAdd.appendAsString(sb, indentLevel + 1);
return;
}
if (scellAddStatus != null) {
- sb.append("\"scellAddStatus\": ");
+ sb.append("scellAddStatus: ");
scellAddStatus.appendAsString(sb, indentLevel + 1);
return;
}
if (scellDelete != null) {
- sb.append("\"scellDelete\": ");
+ sb.append("scellDelete: ");
scellDelete.appendAsString(sb, indentLevel + 1);
return;
}
if (seNBAdd != null) {
- sb.append("\"seNBAdd\": ");
+ sb.append("seNBAdd: ");
seNBAdd.appendAsString(sb, indentLevel + 1);
return;
}
if (seNBAddStatus != null) {
- sb.append("\"seNBAddStatus\": ");
+ sb.append("seNBAddStatus: ");
seNBAddStatus.appendAsString(sb, indentLevel + 1);
return;
}
if (seNBDelete != null) {
- sb.append("\"seNBDelete\": ");
+ sb.append("seNBDelete: ");
seNBDelete.appendAsString(sb, indentLevel + 1);
return;
}
if (trafficSplitConfig != null) {
- sb.append("\"trafficSplitConfig\": ");
+ sb.append("trafficSplitConfig: ");
trafficSplitConfig.appendAsString(sb, indentLevel + 1);
return;
}
diff --git a/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduHdr.java b/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduHdr.java
index 63480d4..124e692 100644
--- a/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduHdr.java
+++ b/src/main/java/org.onosproject.xran/codecs/pdu/XrancPduHdr.java
@@ -4,10 +4,11 @@
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 org.openmuc.jasn1.ber.types.string.BerUTF8String;
+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.ber.types.string.BerUTF8String;
import java.io.IOException;
import java.io.InputStream;
@@ -19,6 +20,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private BerUTF8String ver = null;
private XrancApiID apiId = null;
@@ -144,7 +146,7 @@
sb.append("\t");
}
if (ver != null) {
- sb.append("\"ver\": ").append(ver);
+ sb.append("ver: ").append(ver);
}
sb.append(",\n");
@@ -152,7 +154,7 @@
sb.append("\t");
}
if (apiId != null) {
- sb.append("\"apiId\": ").append(apiId);
+ sb.append("apiId: ").append(apiId);
}
sb.append("\n");