Do not hide DataGetParams.EMPTY

This is a simple constant, do not hide it, as we are already a
transparent record-based DTO.

JIRA: NETCONF-773
Change-Id: I103cdc4e8341f53078204fc0c9f4192f80df65c6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java
index fa77e3d0ed1e58c058c292b55d321c8242337301..6d2015b6c5b3775cc32dd2b26dd75a079079e775 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java
@@ -28,15 +28,15 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 @Beta
 // FIXME: this probably needs to be renamed back to WriterParams, or somesuch
 public final class QueryParameters {
-    private static final @NonNull QueryParameters EMPTY = of(DataGetParams.empty());
+    private static final @NonNull QueryParameters EMPTY = of(DataGetParams.EMPTY);
 
-    private final @NonNull DataGetParams dataGetParams;
+    private final @NonNull DataGetParams params;
     private final List<YangInstanceIdentifier> fieldPaths;
     private final List<Set<QName>> fields;
 
     private QueryParameters(final DataGetParams params, final List<Set<QName>> fields,
             final List<YangInstanceIdentifier> fieldPaths) {
-        this.dataGetParams = requireNonNull(params);
+        this.params = requireNonNull(params);
         this.fields = fields;
         this.fieldPaths = fieldPaths;
     }
@@ -59,11 +59,11 @@ public final class QueryParameters {
     }
 
     public @Nullable DepthParam depth() {
-        return dataGetParams.depth();
+        return params.depth();
     }
 
     public @Nullable PrettyPrintParam prettyPrint() {
-        return dataGetParams.prettyPrint();
+        return params.prettyPrint();
     }
 
     public @Nullable List<Set<QName>> fields() {

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataGetParams.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataGetParams.java
index f99970f3f16013e9b62c743842a3a45bec2121b9..fc375ab62681aef6db1f3ec395af766cb0b558c2 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataGetParams.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/DataGetParams.java
@@ -28,14 +28,9 @@ public record DataGetParams(
         @Nullable FieldsParam fields,
         @Nullable WithDefaultsParam withDefaults,
         @Nullable PrettyPrintParam prettyPrint) implements Immutable {
-    private static final @NonNull DataGetParams EMPTY =
-        new DataGetParams(ContentParam.ALL, null, null, null, null);
+    public static final @NonNull DataGetParams EMPTY = new DataGetParams(ContentParam.ALL, null, null, null, null);
 
     public DataGetParams {
         requireNonNull(content);
     }
-
-    public static @NonNull DataGetParams empty() {
-        return EMPTY;
-    }
 }