From 63e357348ac7f7d3127b1554de0eb18cae4b1e64 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 23 Oct 2021 16:20:56 +0200 Subject: [PATCH] Move WriterParameters.tagged This field is not used anywhere in bierman02, move it to RFC8040 only. JIRA: NETCONF-773 Change-Id: Id9c02e32c76b8f6d12bb0a5ed58638163997836f Signed-off-by: Robert Varga --- .../restconf/common/context/WriterParameters.java | 11 ----------- .../sal/restconf/impl/QueryParametersParser.java | 11 +---------- .../netconf/sal/restconf/impl/RestconfImpl.java | 5 +++-- .../restconf/nb/rfc8040/legacy/QueryParameters.java | 12 ++++++++++++ 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/WriterParameters.java b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/WriterParameters.java index aca8c5f43a..0453430d7e 100644 --- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/WriterParameters.java +++ b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/WriterParameters.java @@ -12,12 +12,10 @@ public class WriterParameters { private final Integer depth; private final boolean prettyPrint; - private final boolean tagged; protected WriterParameters(final WriterParametersBuilder builder) { depth = builder.depth; prettyPrint = builder.prettyPrint; - tagged = builder.tagged; } public Integer getDepth() { @@ -28,14 +26,9 @@ public class WriterParameters { return prettyPrint; } - public boolean isTagged() { - return tagged; - } - public static class WriterParametersBuilder { private Integer depth; private boolean prettyPrint; - private boolean tagged; public WriterParametersBuilder() { @@ -54,9 +47,5 @@ public class WriterParameters { public WriterParameters build() { return new WriterParameters(this); } - - public void setTagged(final boolean tagged) { - this.tagged = tagged; - } } } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/QueryParametersParser.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/QueryParametersParser.java index 58589c2d2b..6a54e4bbce 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/QueryParametersParser.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/QueryParametersParser.java @@ -29,7 +29,7 @@ public final class QueryParametersParser { @Override public String toString() { - return this.uriParameterName; + return uriParameterName; } } @@ -38,16 +38,7 @@ public final class QueryParametersParser { } public static WriterParameters parseWriterParameters(final UriInfo info) { - return parseParams(info, false); - } - - public static WriterParameters parseWriterParameters(final UriInfo uriInfo, final boolean tagged) { - return parseParams(uriInfo, tagged); - } - - private static WriterParameters parseParams(final UriInfo info, final boolean tagged) { final WriterParameters.WriterParametersBuilder wpBuilder = new WriterParameters.WriterParametersBuilder(); - wpBuilder.setTagged(tagged); if (info == null) { return wpBuilder.build(); } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java index ba7195daab..fb7a8b0342 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java @@ -687,6 +687,8 @@ public final class RestconfImpl implements RestconfService { break; } } + + // TODO: this flag is always ignored boolean tagged = false; if (withDefaUsed) { if ("report-all-tagged".equals(withDefa)) { @@ -710,8 +712,7 @@ public final class RestconfImpl implements RestconfService { if (data == null) { throw dataMissing(identifier); } - return new NormalizedNodeContext(iiWithData, data, - QueryParametersParser.parseWriterParameters(uriInfo, tagged)); + return new NormalizedNodeContext(iiWithData, data, QueryParametersParser.parseWriterParameters(uriInfo)); } @Override diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java index 7fa4deb822..220d5ff383 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java @@ -24,6 +24,7 @@ public final class QueryParameters extends WriterParameters { private List fieldPaths; private List> fields; private String withDefault; + private boolean tagged; private String content; Builder() { @@ -45,6 +46,11 @@ public final class QueryParameters extends WriterParameters { return this; } + public Builder setTagged(final boolean tagged) { + this.tagged = tagged; + return this; + } + public Builder setWithDefault(final String withDefault) { this.withDefault = withDefault; return this; @@ -61,6 +67,7 @@ public final class QueryParameters extends WriterParameters { private final List fieldPaths; private final List> fields; private final String withDefault; + private final boolean tagged; private final String content; private QueryParameters(final Builder builder) { @@ -68,6 +75,7 @@ public final class QueryParameters extends WriterParameters { content = builder.content; fields = builder.fields; fieldPaths = builder.fieldPaths; + tagged = builder.tagged; withDefault = builder.withDefault; } @@ -94,4 +102,8 @@ public final class QueryParameters extends WriterParameters { public String getWithDefault() { return withDefault; } + + public boolean isTagged() { + return tagged; + } } -- 2.36.6