Refactor NormalizedNodePayload

[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 aa241ddec25dca4ac68f91d19231cda3d425c4dc..272695ff8415a69e392a0f3dc467f5b600926231 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,8 +9,7 @@ package org.opendaylight.restconf.nb.rfc8040.legacy;
 
 import static java.util.Objects.requireNonNull;
 
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack.Inference;
 
@@ -18,44 +17,15 @@ 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 @NonNull QueryParameters writerParameters;
-    private final @NonNull Inference inference;
-    private final NormalizedNode data;
-
-    private NormalizedNodePayload(final Inference inference, final NormalizedNode data,
-            final QueryParameters writerParameters) {
-        this.inference = requireNonNull(inference);
-        this.data = data;
-        this.writerParameters = requireNonNull(writerParameters);
-    }
-
-    public static @NonNull NormalizedNodePayload empty(final Inference inference) {
-        return new NormalizedNodePayload(inference, null, QueryParameters.empty());
-    }
-
-    public static @NonNull NormalizedNodePayload of(final Inference inference, final NormalizedNode data) {
-        return new NormalizedNodePayload(inference, requireNonNull(data), QueryParameters.empty());
-    }
-
-    public static @NonNull NormalizedNodePayload ofNullable(final Inference inference, final NormalizedNode data) {
-        return data == null ? empty(inference) : of(inference, data);
-    }
-
-    public static Object ofReadData(final Inference inference, final NormalizedNode data,
-            final QueryParameters parameters) {
-        return new NormalizedNodePayload(inference, requireNonNull(data), parameters);
-    }
-
-    public @NonNull Inference inference() {
-        return inference;
-    }
-
-    public @Nullable NormalizedNode getData() {
-        return data;
+@NonNullByDefault
+public record NormalizedNodePayload(Inference inference, NormalizedNode data, QueryParameters writerParameters) {
+    public NormalizedNodePayload {
+        requireNonNull(inference);
+        requireNonNull(data);
+        requireNonNull(writerParameters);
     }
 
-    public @NonNull QueryParameters getWriterParameters() {
-        return writerParameters;
+    public NormalizedNodePayload(final Inference inference, final NormalizedNode data) {
+        this(inference, data, QueryParameters.empty());
     }
 }