Eliminate appendPathKeyValue() in restconf-openapi

The protected abstract void appendPathKeyValue method has just one,
single-line implementation, and only one usage.

This change eliminates the method.

JIRA: NETCONF-1084
Change-Id: If45cd7ae2ae2d2a11c5da787397f22e20de2dbc8
Signed-off-by: Šimon Ukuš <simon.ukus@pantheon.tech>

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGenerator.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGenerator.java
index 0e957922387043dd115ec2cced2c7386a7cc3759..147007636cf164a9c93e93671678b9cf89141df0 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGenerator.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGenerator.java
@@ -446,8 +446,6 @@ public abstract class BaseYangOpenApiGenerator {
         paths.put(resourcePath, pathBuilder.build());
     }
 
-    protected abstract void appendPathKeyValue(StringBuilder builder, Object value);
-
     public String generateUrlPrefixFromInstanceID(final YangInstanceIdentifier key, final String moduleName) {
         final StringBuilder builder = new StringBuilder();
         builder.append("/");
@@ -458,7 +456,7 @@ public abstract class BaseYangOpenApiGenerator {
             final String name = arg.getNodeType().getLocalName();
             if (arg instanceof NodeIdentifierWithPredicates nodeId) {
                 for (final Entry<QName, Object> entry : nodeId.entrySet()) {
-                    appendPathKeyValue(builder, entry.getValue());
+                    builder.deleteCharAt(builder.length() - 1).append("=").append(entry.getValue()).append('/');
                 }
             } else {
                 builder.append(name).append('/');

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGeneratorRFC8040.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGeneratorRFC8040.java
index 93c137320d0846ec6767b7cb348f82021c286c18..10e35fe304bd10daf0a089f50ba9e1ab48a2ec48 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGeneratorRFC8040.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/BaseYangOpenApiGeneratorRFC8040.java
@@ -37,9 +37,4 @@ public abstract class BaseYangOpenApiGeneratorRFC8040 extends BaseYangOpenApiGen
         }
         return "/" + basePath + "/operations" + context;
     }
-
-    @Override
-    protected void appendPathKeyValue(final StringBuilder builder, final Object value) {
-        builder.deleteCharAt(builder.length() - 1).append("=").append(value).append('/');
-    }
 }