jackson, HTTP codes and JSON responses, xICIC/RRMConfig fix
diff --git a/src/main/java/org.onosproject.xran/codecs/api/CACap.java b/src/main/java/org.onosproject.xran/codecs/api/CACap.java
index cd2ef5c..4642978 100644
--- a/src/main/java/org.onosproject.xran/codecs/api/CACap.java
+++ b/src/main/java/org.onosproject.xran/codecs/api/CACap.java
@@ -4,12 +4,13 @@
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 org.openmuc.jasn1.ber.types.BerBoolean;
-import org.openmuc.jasn1.ber.types.BerEnum;
-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.BerBoolean;
+import org.onosproject.xran.codecs.ber.types.BerEnum;
+import org.onosproject.xran.codecs.ber.types.BerInteger;
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 BerInteger band = null;
private BerEnum caclassdl = null;
@@ -193,7 +195,7 @@
sb.append("\t");
}
if (band != null) {
- sb.append("\"band\":").append(band);
+ sb.append("band:").append(band);
}
sb.append(",\n");
@@ -201,7 +203,7 @@
sb.append("\t");
}
if (caclassdl != null) {
- sb.append("\"caclassdl\":").append(caclassdl);
+ sb.append("caclassdl:").append(caclassdl);
}
sb.append(",\n");
@@ -209,7 +211,7 @@
sb.append("\t");
}
if (caclassul != null) {
- sb.append("\"caclassul\":").append(caclassul);
+ sb.append("caclassul:").append(caclassul);
}
sb.append(",\n");
@@ -217,7 +219,7 @@
sb.append("\t");
}
if (crossCarrierSched != null) {
- sb.append("\"crossCarrierSched\":").append(crossCarrierSched);
+ sb.append("crossCarrierSched:").append(crossCarrierSched);
}
sb.append("\n");