Remove tagged field from ReadDataParams

Remove unneeded tagged field from ReadDataParams as suggested by FIXME.
This means we pass through the selected mode.

JIRA: NETCONF-1044
Change-Id: Ia64ed6b1de3daefb3d38caa234c7c6eaa48f8f59
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ReadDataParams.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ReadDataParams.java
index bcf9aaebb9f90cefcd0c3028e141d42156f78d66..5ddd2272dcf8bb9e8d0431927f3f433a03f10c9f 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ReadDataParams.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ReadDataParams.java
@@ -27,22 +27,20 @@ import org.opendaylight.yangtools.concepts.Immutable;
 // FIXME: this should be a record once we have JDK17+
 public final class ReadDataParams implements Immutable {
     private static final @NonNull ReadDataParams EMPTY =
-        new ReadDataParams(ContentParam.ALL, null, null, null, false, null);
+        new ReadDataParams(ContentParam.ALL, null, null, null, null);
 
     private final @NonNull ContentParam content;
     private final WithDefaultsParam withDefaults;
     private final PrettyPrintParam prettyPrint;
     private final FieldsParam fields;
     private final DepthParam depth;
-    private final boolean tagged;
 
     private ReadDataParams(final ContentParam content,  final DepthParam depth, final FieldsParam fields,
-            final WithDefaultsParam withDefaults, final boolean tagged, final PrettyPrintParam prettyPrint) {
+            final WithDefaultsParam withDefaults, final PrettyPrintParam prettyPrint) {
         this.content = requireNonNull(content);
         this.depth = depth;
         this.fields = fields;
         this.withDefaults = withDefaults;
-        this.tagged = tagged;
         this.prettyPrint = prettyPrint;
     }
 
@@ -51,9 +49,8 @@ public final class ReadDataParams implements Immutable {
     }
 
     public static @NonNull ReadDataParams of(final ContentParam content,  final DepthParam depth,
-            final FieldsParam fields, final WithDefaultsParam withDefaults, final boolean tagged,
-            final PrettyPrintParam prettyPrint) {
-        return new ReadDataParams(content, depth, fields, withDefaults, tagged, prettyPrint);
+            final FieldsParam fields, final WithDefaultsParam withDefaults, final PrettyPrintParam prettyPrint) {
+        return new ReadDataParams(content, depth, fields, withDefaults, prettyPrint);
     }
 
     public @NonNull ContentParam content() {
@@ -76,11 +73,6 @@ public final class ReadDataParams implements Immutable {
         return prettyPrint;
     }
 
-    // FIXME: for migration only
-    public boolean tagged() {
-        return tagged;
-    }
-
     @Override
     public String toString() {
         final var helper = MoreObjects.toStringHelper(this).add("content", content.paramValue());
@@ -93,7 +85,6 @@ public final class ReadDataParams implements Immutable {
         if (withDefaults != null) {
             helper.add("withDefaults", withDefaults.paramValue());
         }
-        helper.add("tagged", tagged);
         if (prettyPrint != null) {
             helper.add("prettyPrint", prettyPrint.value());
         }

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java
index 4f836d009690fcd7ba703ba9b9d7886f93146385..504f029b325e852225c04359bcee702b44ed5114 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java
@@ -134,7 +134,6 @@ public final class QueryParams {
         FieldsParam fields = null;
         WithDefaultsParam withDefaults = null;
         PrettyPrintParam prettyPrint = null;
-        boolean tagged = false;
 
         for (Entry<String, List<String>> entry : uriInfo.getQueryParameters().entrySet()) {
             final String paramName = entry.getKey();
@@ -159,23 +158,7 @@ public final class QueryParams {
                         fields = optionalParam(FieldsParam::forUriValue, paramName, paramValues);
                         break;
                     case WithDefaultsParam.uriName:
-                        final var defaultsVal = optionalParam(WithDefaultsParam::forUriValue, paramName, paramValues);
-                        if (defaultsVal != null) {
-                            tagged = switch (defaultsVal) {
-                                case REPORT_ALL -> {
-                                    withDefaults = null;
-                                    yield false;
-                                }
-                                case REPORT_ALL_TAGGED -> {
-                                    withDefaults = null;
-                                    yield true;
-                                }
-                                default -> {
-                                    withDefaults = defaultsVal;
-                                    yield false;
-                                }
-                            };
-                        }
+                        withDefaults = optionalParam(WithDefaultsParam::forUriValue, paramName, paramValues);
                         break;
                     case PrettyPrintParam.uriName:
                         prettyPrint = optionalParam(PrettyPrintParam::forUriValue, paramName, paramValues);
@@ -189,7 +172,7 @@ public final class QueryParams {
             }
         }
 
-        return ReadDataParams.of(content, depth, fields, withDefaults, tagged, prettyPrint);
+        return ReadDataParams.of(content, depth, fields, withDefaults, prettyPrint);
     }
 
     public static @NonNull WriteDataParams newWriteDataParams(final UriInfo uriInfo) {

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java
index 4ebce1efb23c2f4590f21343c3d0ad9396ba7a51..76448320b838abcc37c1630e838bae9b5092d032 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java
@@ -8,11 +8,9 @@
 package org.opendaylight.restconf.nb.rfc8040.databind.jaxrs;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.withSettings;
@@ -92,7 +90,7 @@ public class QueryParamsTest {
     @Test
     public void parseUriParametersDefaultTest() {
         // no parameters, default values should be used
-        final var params = assertParams(QueryParams::newReadDataParams, new MultivaluedHashMap<String, String>());
+        final var params = assertParams(QueryParams::newReadDataParams, new MultivaluedHashMap<>());
         assertEquals(ContentParam.ALL, params.content());
         assertNull(params.depth());
         assertNull(params.fields());
@@ -111,25 +109,21 @@ public class QueryParamsTest {
     }
 
     /**
-     * Testing parsing of with-defaults parameter which value matches 'report-all-tagged' setting - default value should
-     * be set to {@code null} and tagged flag should be set to {@code true}.
+     * Testing parsing of with-defaults parameter which value matches 'report-all-tagged' setting.
      */
     @Test
     public void parseUriParametersWithDefaultAndTaggedTest() {
         final var params = assertParams(QueryParams::newReadDataParams, WithDefaultsParam.uriName, "report-all-tagged");
-        assertNull(params.withDefaults());
-        assertTrue(params.tagged());
+        assertEquals(WithDefaultsParam.REPORT_ALL_TAGGED, params.withDefaults());
     }
 
     /**
-     * Testing parsing of with-defaults parameter which value matches 'report-all' setting - default value should
-     * be set to {@code null} and tagged flag should be set to {@code false}.
+     * Testing parsing of with-defaults parameter which value matches 'report-all' setting.
      */
     @Test
     public void parseUriParametersWithDefaultAndReportAllTest() {
         final var params = assertParams(QueryParams::newReadDataParams, WithDefaultsParam.uriName, "report-all");
-        assertNull(params.withDefaults());
-        assertFalse(params.tagged());
+        assertEquals(WithDefaultsParam.REPORT_ALL, params.withDefaults());
     }
 
     /**
@@ -140,7 +134,6 @@ public class QueryParamsTest {
     public void parseUriParametersWithDefaultAndNonTaggedTest() {
         final var params = assertParams(QueryParams::newReadDataParams, WithDefaultsParam.uriName, "explicit");
         assertEquals(WithDefaultsParam.EXPLICIT, params.withDefaults());
-        assertFalse(params.tagged());
     }
 
     /**