Integrate RestconfNormalizedNodeWriter

[netconf.git] / restconf / restconf-nb / src / main / java / org / opendaylight / restconf / nb / rfc8040 / legacy / NormalizedNodePayload.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java
index f86111dcabffceebe85e04100fcce56b1c341a97..4e62f79e9b9377cfb2f3e5b76299b5c1c8ae9bc9 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java
@@ -9,76 +9,25 @@ package org.opendaylight.restconf.nb.rfc8040.legacy;
 
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.collect.ImmutableMap;
-import java.net.URI;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.opendaylight.restconf.api.query.PrettyPrintParam;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
+import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack.Inference;
 
 /**
  * A RFC8040 overlay from our marriage to NormalizedNodeContext. This represents a NormalizedNode along with further
  * messy details needed to deal with the payload.
  */
-public final class NormalizedNodePayload {
-    private final InstanceIdentifierContext context;
-    private final @NonNull ImmutableMap<String, Object> headers;
-    private final @NonNull QueryParameters writerParameters;
-    private final NormalizedNode data;
-
-    private NormalizedNodePayload(final InstanceIdentifierContext context, final NormalizedNode data,
-            final QueryParameters writerParameters, final ImmutableMap<String, Object> headers) {
-        this.context = context;
-        this.data = data;
-        this.writerParameters = requireNonNull(writerParameters);
-        this.headers = requireNonNull(headers);
-    }
-
-    public static @NonNull NormalizedNodePayload empty(final InstanceIdentifierContext path) {
-        return new NormalizedNodePayload(requireNonNull(path), null, QueryParameters.empty(), ImmutableMap.of());
-    }
-
-    public static @NonNull NormalizedNodePayload of(final InstanceIdentifierContext path, final NormalizedNode data) {
-        return new NormalizedNodePayload(requireNonNull(path), requireNonNull(data), QueryParameters.empty(),
-            ImmutableMap.of());
-    }
-
-    public static @NonNull NormalizedNodePayload ofNullable(final InstanceIdentifierContext path,
-            final NormalizedNode data) {
-        return data == null ? empty(path) : of(path, data);
-    }
-
-    public static @NonNull NormalizedNodePayload ofLocation(final InstanceIdentifierContext path,
-            final NodeIdentifier leafId, final URI location) {
-        return new NormalizedNodePayload(requireNonNull(path), ImmutableNodes.leafNode(leafId, location.toString()),
-            QueryParameters.empty(), ImmutableMap.of("Location", location));
-    }
-
-    public static Object ofReadData(final InstanceIdentifierContext path, final NormalizedNode data,
-            final QueryParameters parameters) {
-        return new NormalizedNodePayload(requireNonNull(path), requireNonNull(data), parameters, ImmutableMap.of());
-    }
-
-    public InstanceIdentifierContext getInstanceIdentifierContext() {
-        return context;
-    }
-
-    public @Nullable NormalizedNode getData() {
-        return data;
-    }
-
-    /**
-     * Return headers response headers.
-     *
-     * @return map of headers
-     */
-    // FIXME: this is only used for redirect on subscribe
-    public @NonNull ImmutableMap<String, Object> getNewHeaders() {
-        return headers;
-    }
-
-    public @NonNull QueryParameters getWriterParameters() {
-        return writerParameters;
+@NonNullByDefault
+public record NormalizedNodePayload(
+        Inference inference,
+        NormalizedNode data,
+        WriterParameters writerParameters,
+        PrettyPrintParam prettyPrint) {
+    public NormalizedNodePayload {
+        requireNonNull(inference);
+        requireNonNull(data);
+        requireNonNull(writerParameters);
+        requireNonNull(prettyPrint);
     }
 }