Remove Info builder

Currently Info.Builder used only once and it is also redundant.
Removing it now in prepare for followup patches.

JIRA: NETCONF-1052
Change-Id: I978b7d067fd007114b0f22a4f5ffb98b3ab18c5b
Signed-off-by: Oleksandr Zharov <oleksandr.zharov@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 147007636cf164a9c93e93671678b9cf89141df0..a4a3b9aac9e8b7d0796ab2c40e017c7cdf8c85fc 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
@@ -292,7 +292,7 @@ public abstract class BaseYangOpenApiGenerator {
             final String basePath, final String title) {
         final OpenApiObject.Builder docBuilder = new OpenApiObject.Builder();
         docBuilder.openapi(OPEN_API_VERSION);
-        docBuilder.info(new Info.Builder().title(title).version(API_VERSION).build())
+        docBuilder.info(new Info(API_VERSION, title))
             .servers(List.of(new Server(schema + "://" + host + basePath)))
             .components(new Components(new HashMap<>(), new SecuritySchemes(OPEN_API_BASIC_AUTH)))
             .security(SECURITY);

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Info.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Info.java
index 2f7ef61fac9642a01ffbb04189c8b452a40b55e1..4f4560add47ab0ec7b24994d8206f45add18eaf9 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Info.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Info.java
@@ -9,31 +9,10 @@ package org.opendaylight.restconf.openapi.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import org.eclipse.jdt.annotation.NonNull;
 
 @JsonInclude(Include.NON_NULL)
-public record Info(String version, String title) {
-
-    private Info(final Builder builder) {
-        this(builder.version, builder.title);
-    }
-
-    @SuppressWarnings("checkstyle:hiddenField")
-    public static class Builder {
-        private String version;
-        private String title;
-
-        public Builder version(final String version) {
-            this.version = version;
-            return this;
-        }
-
-        public Builder title(final String title) {
-            this.title = title;
-            return this;
-        }
-
-        public Info build() {
-            return new Info(this);
-        }
-    }
+public record Info(
+        @NonNull String version,
+        @NonNull String title) {
 }