Get rid of ImmutableList.of in sal-rest-docgen

Replaced guava’s ImmutableList.of with java’s List.of
in sal-rest-docgen package.

JIRA: NETCONF-1008
Change-Id: Iefa7a20432fbbabda8d67e2166f658bacfe75eb8
Signed-off-by: OleksandrZharov <Oleksandr.Zharov@pantheon.tech>
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>

diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangOpenApiGenerator.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangOpenApiGenerator.java
index 399755512934a4509c33cefb94c37b0185a04a76..a81e9c0769c7fd3d482f391d83bda5e2d7c3651e 100644 (file)
--- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangOpenApiGenerator.java
+++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangOpenApiGenerator.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
 import java.io.IOException;
 import java.time.format.DateTimeParseException;
@@ -310,7 +309,7 @@ public abstract class BaseYangOpenApiGenerator {
         info.setTitle(title);
         info.setVersion(API_VERSION);
         doc.setInfo(info);
-        doc.setServers(convertToServers(ImmutableList.of(schema), host, basePath));
+        doc.setServers(convertToServers(List.of(schema), host, basePath));
         doc.setComponents(new Components(JsonNodeFactory.instance.objectNode(),
                 new SecuritySchemes(OPEN_API_BASIC_AUTH)));
         doc.setSecurity(SECURITY);
@@ -318,7 +317,7 @@ public abstract class BaseYangOpenApiGenerator {
     }
 
     private static List<Server> convertToServers(final List<String> schemes, final String host, final String basePath) {
-        return ImmutableList.of(new Server(schemes.get(0) + "://" + host + basePath));
+        return List.of(new Server(schemes.get(0) + "://" + host + basePath));
     }
 
     public abstract String getResourcePath(String resourceType, String context);

diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/model/builder/OperationBuilder.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/model/builder/OperationBuilder.java
index d31282ff38fa858ea7d953ae025f6a65d1cbc3b7..42e1b647e257dbbeb6e463097b3bcda3f76ef2cc 100644 (file)
--- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/model/builder/OperationBuilder.java
+++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/model/builder/OperationBuilder.java
@@ -16,7 +16,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.Optional;
 import javax.ws.rs.HttpMethod;
@@ -55,8 +54,7 @@ public final class OperationBuilder {
     private static final String CONTENT = "content";
     private static final ArrayNode CONSUMES_PUT_POST;
     private static final String ENUM_KEY = "enum";
-    private static final List<String> MIME_TYPES = ImmutableList.of(MediaType.APPLICATION_XML,
-            MediaType.APPLICATION_JSON);
+    private static final List<String> MIME_TYPES = List.of(MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON);
     private static final String OBJECT = "object";
     private static final String REQUIRED_KEY = "required";
     private static final String STRING = "string";