Reduce builder exposure

Build objects fluently so the builders do not escape.

Change-Id: I34d145224ae33965bb9751ec3f59a115378a41c4
Signed-off-by: Robert Varga <robert.varga@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 52780cadbed2c44271d3da7d849ff22effd09d3e..d62cbc3f22facc1c7d07ef71cc17810617df7343 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
@@ -275,10 +275,9 @@ public abstract class BaseYangOpenApiGenerator {
         if (containsListOrContainer(module.getChildNodes())) {
             final String moduleName = module.getName();
             final String name = moduleName + MODULE_NAME_SUFFIX;
-            final var postBuilder = new Path.Builder();
-            postBuilder.post(buildPost("", name, "", moduleName, deviceName,
-                    module.getDescription().orElse(""), pathParams));
-            paths.put(resourcePath, postBuilder.build());
+            paths.put(resourcePath, new Path.Builder()
+                .post(buildPost("", name, "", moduleName, deviceName, module.getDescription().orElse(""), pathParams))
+                .build());
         }
     }
 
@@ -399,13 +398,13 @@ public abstract class BaseYangOpenApiGenerator {
 
                 final String description = listSchemaNode.findDataChildByName(listKey)
                     .flatMap(DataSchemaNode::getDescription).orElse(null);
-                final Parameter.Builder pathParamBuilder = new Parameter.Builder()
+                pathParams.add(new Parameter.Builder()
                     .name(paramName)
                     .schema(new Schema.Builder().type("string").build())
                     .in("path")
                     .required(true)
-                    .description(description);
-                pathParams.add(pathParamBuilder.build());
+                    .description(description)
+                    .build());
             }
         }
         return path.toString();
@@ -433,10 +432,9 @@ public abstract class BaseYangOpenApiGenerator {
     private static void addOperations(final OperationDefinition operDef, final String moduleName,
             final String deviceName, final Map<String, Path> paths, final String parentName,
             final DefinitionNames definitionNames, final String resourcePath, final List<Parameter> parentPathParams) {
-        final var pathBuilder = new Path.Builder();
-        pathBuilder.post(buildPostOperation(operDef, moduleName, deviceName, parentName, definitionNames,
-            parentPathParams));
-        paths.put(resourcePath, pathBuilder.build());
+        paths.put(resourcePath, new Path.Builder()
+            .post(buildPostOperation(operDef, moduleName, deviceName, parentName, definitionNames, parentPathParams))
+            .build());
     }
 
     public String generateUrlPrefixFromInstanceID(final YangInstanceIdentifier key, final String moduleName) {