Rework body formatting wiring

[netconf.git] / restconf / restconf-nb / src / main / java / org / opendaylight / restconf / server / api / DatabindFormattableBody.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DatabindFormattableBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DatabindFormattableBody.java
index 71daa7645ecb96d7094be287730ea5aa03b1f85e..d1aaf2d0902f70fa547bc3346ada517e9002be42 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DatabindFormattableBody.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DatabindFormattableBody.java
@@ -19,32 +19,26 @@ import org.opendaylight.restconf.api.FormattableBody;
  * A {@link FormattableBody} which has an attached {@link DatabindContext}.
  */
 @NonNullByDefault
-public abstract class DatabindFormattableBody extends FormattableBody implements DatabindAware {
+public abstract class DatabindFormattableBody extends FormattableBody {
     private final DatabindContext databind;
 
-    protected DatabindFormattableBody(final FormatParameters format, final DatabindContext databind) {
-        super(format);
+    protected DatabindFormattableBody(final DatabindContext databind) {
         this.databind = requireNonNull(databind);
     }
 
     @Override
-    public final DatabindContext databind() {
-        return databind;
+    public final void formatToJSON(final FormatParameters format, final OutputStream out) throws IOException {
+        formatToJSON(databind, format, out);
     }
 
-    @Override
-    protected final void formatToJSON(final OutputStream out, final FormatParameters format) throws IOException {
-        formatToJSON(out, format, databind());
-    }
-
-    protected abstract void formatToJSON(OutputStream out, FormatParameters format, DatabindContext databind)
+    protected abstract void formatToJSON(DatabindContext databind, FormatParameters format, OutputStream out)
         throws IOException;
 
     @Override
-    protected final void formatToXML(final OutputStream out, final FormatParameters format) throws IOException {
-        formatToXML(out, format, databind());
+    public final void formatToXML(final FormatParameters format, final OutputStream out) throws IOException {
+        formatToXML(databind, format, out);
     }
 
-    protected abstract void formatToXML(OutputStream out, FormatParameters format, DatabindContext databind)
+    protected abstract void formatToXML(DatabindContext databind, FormatParameters format, OutputStream out)
         throws IOException;
 }