Simplify RpcContainerSchemaNode.getChildNodes() 80/104880/1
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 14 Mar 2023 19:58:02 +0000 (20:58 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 14 Mar 2023 20:08:15 +0000 (21:08 +0100)
RPC guarantees input and output being non-null, eliminate dead code
pointed out by Eclipse.

Change-Id: Ic8d0ed02bffbec7c66eeb63e964e17e8ac4a2a79
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java

index 89a0c8952c6d06a6bb6b6b79769d970a0dc16e37..7545de655bc3c34e83bb099454ae76f1c6dda81d 100644 (file)
@@ -23,10 +23,8 @@ import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerLike;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
-import org.opendaylight.yangtools.yang.model.api.InputSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.MustDefinition;
 import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
-import org.opendaylight.yangtools.yang.model.api.OutputSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Status;
@@ -130,18 +128,7 @@ public final class ContainerSchemaNodes {
 
         @Override
         public Collection<? extends DataSchemaNode> getChildNodes() {
-            // FIXME: input/output are always present, clean this up
-            final InputSchemaNode input = schemaNode.getInput();
-            final OutputSchemaNode output = schemaNode.getOutput();
-            if (input == null && output == null) {
-                return ImmutableList.of();
-            } else if (input != null && output != null) {
-                return ImmutableList.of(input, output);
-            } else if (input != null) {
-                return ImmutableList.of(input);
-            } else {
-                return ImmutableList.of(output);
-            }
+            return ImmutableList.of(schemaNode.getInput(), schemaNode.getOutput());
         }
 
         @Override