From 01566dd41c162b950cfbbd4eca5a09482ed833c2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 8 Jun 2022 16:31:14 +0200 Subject: [PATCH] Simplify trimming We have needlessly complicated if/else flows, simplify them. Change-Id: I358482f477cce6f889895537572ed1ca2b4942f0 Signed-off-by: Robert Varga --- .../rests/utils/ReadDataTransactionUtil.java | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java index 91a9b280a7..76f0d6f1a2 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java @@ -199,18 +199,14 @@ public final class ReadDataTransactionUtil { if (keys.contains(child.getIdentifier().getNodeType())) { leafBuilder.withValue(((LeafNode) child).body()); builder.withChild(leafBuilder.build()); - } else { - if (trim) { - if (defaultVal == null || !defaultVal.equals(nodeVal)) { - leafBuilder.withValue(((LeafNode) child).body()); - builder.withChild(leafBuilder.build()); - } - } else { - if (defaultVal != null && defaultVal.equals(nodeVal)) { - leafBuilder.withValue(((LeafNode) child).body()); - builder.withChild(leafBuilder.build()); - } + } else if (trim) { + if (defaultVal == null || !defaultVal.equals(nodeVal)) { + leafBuilder.withValue(((LeafNode) child).body()); + builder.withChild(leafBuilder.build()); } + } else if (defaultVal != null && defaultVal.equals(nodeVal)) { + leafBuilder.withValue(((LeafNode) child).body()); + builder.withChild(leafBuilder.build()); } } } @@ -257,11 +253,9 @@ public final class ReadDataTransactionUtil { leafBuilder.withValue(((LeafNode) child).body()); builder.withChild(leafBuilder.build()); } - } else { - if (defaultVal != null && defaultVal.equals(nodeVal)) { - leafBuilder.withValue(((LeafNode) child).body()); - builder.withChild(leafBuilder.build()); - } + } else if (defaultVal != null && defaultVal.equals(nodeVal)) { + leafBuilder.withValue(((LeafNode) child).body()); + builder.withChild(leafBuilder.build()); } } } -- 2.36.6