Fix restconf capabilities writer

Using incorrect type of leaf set causes validation failure
on attempt to persist capabilities to datastore. Also fixed
typo in method name.

JIRA: NETCONF-668
Change-Id: Ia87102b069a5a42b69a29c462e912775154c2be7
Signed-off-by: Ruslan Kashapov <ruslan.kashapov@pantheon.tech>

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/monitoring/CapabilitiesWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/monitoring/CapabilitiesWriter.java
index 3001d7eb3fab232a2f71d00d5233b6048e06850a..7fb869506dbac38e5a4aa04f7b0f70a42150e7a2 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/monitoring/CapabilitiesWriter.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/monitoring/CapabilitiesWriter.java
@@ -162,7 +162,7 @@ public final class CapabilitiesWriter
         }
 
         final var tx = txChain.newWriteOnlyTransaction();
-        tx.put(LogicalDatastoreType.OPERATIONAL, PATH, mapCapabilites());
+        tx.put(LogicalDatastoreType.OPERATIONAL, PATH, mapCapabilities());
         tx.commit().addCallback(new FutureCallback<CommitInfo>() {
             @Override
             public void onSuccess(final CommitInfo result) {
@@ -192,8 +192,8 @@ public final class CapabilitiesWriter
      * @return A container holding capabilities
      */
     @VisibleForTesting
-    static @NonNull LeafSetNode<String> mapCapabilites() {
-        return Builders.<String>orderedLeafSetBuilder()
+    static @NonNull LeafSetNode<String> mapCapabilities() {
+        return Builders.<String>leafSetBuilder()
             .withNodeIdentifier(CAPABILITY)
             .withChildValue(DepthParam.capabilityUri().toString())
             .withChildValue(FieldsParam.capabilityUri().toString())

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/monitoring/CapabilitiesWriterTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/monitoring/CapabilitiesWriterTest.java
index d3459497856196f38f95ce6652471b8a8543c69c..22543d1344433b8f5214e8c4c68161df33bad27b 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/monitoring/CapabilitiesWriterTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/monitoring/CapabilitiesWriterTest.java
@@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 public class CapabilitiesWriterTest {
     @Test
     public void restconfStateCapabilitiesTest() {
-        final var capability = CapabilitiesWriter.mapCapabilites();
+        final var capability = CapabilitiesWriter.mapCapabilities();
         assertEquals(CapabilitiesWriter.CAPABILITY, capability.name());
 
         assertThat(capability.body().stream().map(LeafSetEntryNode::body).toList(),