From: Robert Varga Date: Sat, 23 Oct 2021 08:58:47 +0000 (+0200) Subject: Add WriterParameters.EMPTY X-Git-Tag: v2.0.6~40 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=d76ff11933c5751ba3371a23e5621784920a0721;p=netconf.git Add WriterParameters.EMPTY We use defaults in at least two places, let's use a simple constant for the job. Change-Id: Iaef3e8445ea02e432dc99aaf3be33004a0449ba6 Signed-off-by: Robert Varga --- diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/NormalizedNodeContext.java b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/NormalizedNodeContext.java index 3b13372abb..b22e163514 100644 --- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/NormalizedNodeContext.java +++ b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/NormalizedNodeContext.java @@ -40,7 +40,7 @@ public class NormalizedNodeContext { this.context = context; this.data = data; // default writer parameters - this.writerParameters = new WriterParameters.WriterParametersBuilder().build(); + writerParameters = WriterParameters.EMPTY; } public NormalizedNodeContext(final InstanceIdentifierContext context, @@ -48,20 +48,20 @@ public class NormalizedNodeContext { this.context = context; this.data = data; // default writer parameters - this.writerParameters = new WriterParameters.WriterParametersBuilder().build(); + writerParameters = WriterParameters.EMPTY; this.headers = headers; } public InstanceIdentifierContext getInstanceIdentifierContext() { - return this.context; + return context; } public NormalizedNode getData() { - return this.data; + return data; } public WriterParameters getWriterParameters() { - return this.writerParameters; + return writerParameters; } /** @@ -70,6 +70,6 @@ public class NormalizedNodeContext { * @return map of headers */ public Map getNewHeaders() { - return this.headers; + return headers; } } 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 d8a42f03f0..03958b8587 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 @@ -13,6 +13,8 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; public final class WriterParameters { + static final WriterParameters EMPTY = new WriterParametersBuilder().build(); + private final String content; private final Integer depth; private final List> fields; @@ -22,37 +24,37 @@ public final class WriterParameters { private final String withDefault; private WriterParameters(final WriterParametersBuilder builder) { - this.content = builder.content; - this.depth = builder.depth; - this.fields = builder.fields; - this.fieldPaths = builder.fieldPaths; - this.prettyPrint = builder.prettyPrint; - this.tagged = builder.tagged; - this.withDefault = builder.withDefault; + content = builder.content; + depth = builder.depth; + fields = builder.fields; + fieldPaths = builder.fieldPaths; + prettyPrint = builder.prettyPrint; + tagged = builder.tagged; + withDefault = builder.withDefault; } public String getContent() { - return this.content; + return content; } public Integer getDepth() { - return this.depth; + return depth; } public List> getFields() { - return this.fields; + return fields; } public List getFieldPaths() { - return this.fieldPaths; + return fieldPaths; } public boolean isPrettyPrint() { - return this.prettyPrint; + return prettyPrint; } public boolean isTagged() { - return this.tagged; + return tagged; } public String getWithDefault() {