Rework body formatting wiring

[netconf.git] / restconf / restconf-nb / src / main / java / org / opendaylight / restconf / nb / jaxrs / JaxRsFormattableBodyWriter.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/jaxrs/FormattableBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/jaxrs/JaxRsFormattableBodyWriter.java
similarity index 65%
rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/jaxrs/FormattableBodyWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/jaxrs/JaxRsFormattableBodyWriter.java
index 10aa2fccdc8e0504ed4842d54efb59558b70176c..f92e09ba175f5b679612bdf57149cc41cd009337 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/jaxrs/FormattableBodyWriter.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/jaxrs/JaxRsFormattableBodyWriter.java
@@ -16,11 +16,12 @@ import java.lang.reflect.Type;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.MessageBodyWriter;
-import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.opendaylight.restconf.api.FormatParameters;
 import org.opendaylight.restconf.api.FormattableBody;
 
-abstract sealed class FormattableBodyWriter implements MessageBodyWriter<FormattableBody>
-        permits JsonFormattableBody, XmlFormattableBody {
+abstract sealed class JaxRsFormattableBodyWriter implements MessageBodyWriter<JaxRsFormattableBody>
+        permits JsonJaxRsFormattableBodyWriter, XmlJaxRsFormattableBodyWriter {
     @Override
     public final boolean isWriteable(final Class<?> type, final Type genericType, final Annotation[] annotations,
             final MediaType mediaType) {
@@ -28,11 +29,12 @@ abstract sealed class FormattableBodyWriter implements MessageBodyWriter<Formatt
     }
 
     @Override
-    public final void writeTo(final FormattableBody body, final Class<?> type, final Type genericType,
+    public final void writeTo(final JaxRsFormattableBody entity, final Class<?> type, final Type genericType,
             final Annotation[] annotations, final MediaType mediaType, final MultivaluedMap<String, Object> httpHeaders,
             final OutputStream entityStream) throws IOException {
-        writeTo(requireNonNull(body), requireNonNull(entityStream));
+        writeTo(entity.body(), entity.format(), requireNonNull(entityStream));
     }
 
-    abstract void writeTo(@NonNull FormattableBody body, @NonNull OutputStream out) throws IOException;
+    @NonNullByDefault
+    abstract void writeTo(FormattableBody body, FormatParameters format, OutputStream out) throws IOException;
 }