jackson, HTTP codes and JSON responses, xICIC/RRMConfig fix
diff --git a/src/main/java/org.onosproject.xran/codecs/api/ECGI.java b/src/main/java/org.onosproject.xran/codecs/api/ECGI.java
index 01789f2..c903fd6 100644
--- a/src/main/java/org.onosproject.xran/codecs/api/ECGI.java
+++ b/src/main/java/org.onosproject.xran/codecs/api/ECGI.java
@@ -4,9 +4,10 @@
package org.onosproject.xran.codecs.api;
-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;
@@ -19,6 +20,7 @@
public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+ @JsonIgnore
public byte[] code = null;
private PLMNIdentity pLMNIdentity = null;
private EUTRANCellIdentifier eUTRANcellIdentifier = null;
@@ -144,7 +146,7 @@
sb.append("\t");
}
if (pLMNIdentity != null) {
- sb.append("\"pLMNIdentity\": ").append(pLMNIdentity);
+ sb.append("pLMNIdentity: ").append(pLMNIdentity);
}
sb.append(",\n");
@@ -152,7 +154,7 @@
sb.append("\t");
}
if (eUTRANcellIdentifier != null) {
- sb.append("\"eUTRANcellIdentifier\": ").append(eUTRANcellIdentifier);
+ sb.append("eUTRANcellIdentifier: ").append(eUTRANcellIdentifier);
}
sb.append("\n");