CodegenServers renamed to CodegenList so it can be used for sercurityrequirementsobjects also

Author: spacether

src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java

@@ -51,7 +51,7 @@
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementObject;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServers;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenList;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenTag;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenText;
 import org.openapijsonschematools.codegen.templating.DryRunTemplateManager;
@@ -538,7 +538,7 @@ private void generatePathItem(List<File> files, CodegenKey pathKey, CodegenPathI
         }
     }
 
-    private void generatePaths(List<File> files, TreeMap<CodegenKey, CodegenPathItem> paths, List<CodegenServer> servers, List<CodegenSecurityRequirementObject> security) {
+    private void generatePaths(List<File> files, TreeMap<CodegenKey, CodegenPathItem> paths, CodegenList<CodegenServer> servers, List<CodegenSecurityRequirementObject> security) {
         if (paths == null || paths.isEmpty()) {
             LOGGER.info("Skipping generation of paths because the specification document lacks them.");
             return;
@@ -1317,15 +1317,15 @@ Map<String, Object> buildSupportFileBundle(
             TreeMap<String, CodegenHeader> headers,
             TreeMap<String, CodegenParameter> parameters,
             TreeMap<String, CodegenSecurityScheme> securitySchemes,
-            CodegenServers servers,
+            CodegenList<CodegenServer> servers,
             TreeMap<CodegenKey, CodegenPathItem> paths,
             List<CodegenSecurityRequirementObject> security) {
 
         Map<String, Object> bundle = new HashMap<>(generator.additionalProperties());
         bundle.put("apiPackage", generator.apiPackage());
 
         URL url = URLPathUtils.getServerURL(openAPI, null);
-        List<CodegenServers> allServers = new ArrayList<>();
+        List<CodegenList<CodegenServer>> allServers = new ArrayList<>();
         boolean hasServers = false;
         if (servers != null) {
             allServers.add(servers);
@@ -1389,7 +1389,7 @@ Map<String, Object> buildSupportFileBundle(
         return bundle;
     }
 
-    private void generateServers(List<File> files, List<CodegenServer> servers, String jsonPath) {
+    private void generateServers(List<File> files, CodegenList<CodegenServer> servers, String jsonPath) {
         if (servers == null && servers.isEmpty()) {
             return;
         }
@@ -1521,7 +1521,7 @@ public List<File> generate() {
 
         // servers
         String serversJsonPath = "#/servers";
-        CodegenServers servers = generator.fromServers(openAPI.getServers(), serversJsonPath);
+        CodegenList<CodegenServer> servers = generator.fromServers(openAPI.getServers(), serversJsonPath);
         // paths
         TreeMap<CodegenKey, CodegenPathItem> paths = generator.fromPaths(openAPI.getPaths());
         generatePaths(files, paths, servers, security);

src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java

@@ -69,7 +69,7 @@
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementValue;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServers;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenList;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenTag;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenText;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenXml;
@@ -2676,10 +2676,10 @@ public CodegenOperation fromOperation(Operation operation, String jsonPath, Link
         CodegenKey operationId = getOperationId(operation, path, httpMethod);
 
         // servers setting
-        CodegenServers codegenServers = null;
+        CodegenList<CodegenServer> codegenList = null;
         if (operation.getServers() != null && !operation.getServers().isEmpty()) {
             // use operation-level servers first if defined
-            codegenServers = fromServers(operation.getServers(), jsonPath + "/servers");
+            codegenList = fromServers(operation.getServers(), jsonPath + "/servers");
         }
 
         CodegenText summary = null;
@@ -2941,7 +2941,7 @@ public CodegenOperation fromOperation(Operation operation, String jsonPath, Link
                 summary,
                 description,
                 produces,
-                codegenServers,
+                codegenList,
                 requestBody,
                 operationParameters,
                 pathParametersSchema,
@@ -5083,7 +5083,7 @@ public CodegenPathItem fromPathItem(PathItem pathItem, String jsonPath) {
             // sort them
             operations = new TreeMap<>(operations);
         List<Server> specServers = pathItem.getServers();
-        CodegenServers servers = fromServers(specServers, jsonPath + "/servers");
+        CodegenList servers = fromServers(specServers, jsonPath + "/servers");
 
         return new CodegenPathItem(
                 summary,
@@ -5095,7 +5095,7 @@ public CodegenPathItem fromPathItem(PathItem pathItem, String jsonPath) {
     }
 
     @Override
-    public CodegenServers fromServers(List<Server> servers, String jsonPath) {
+    public CodegenList<CodegenServer> fromServers(List<Server> servers, String jsonPath) {
         if (servers == null) {
             return null;
         }
@@ -5119,7 +5119,7 @@ public CodegenServers fromServers(List<Server> servers, String jsonPath) {
         }
         CodegenKey jsonPathPiece = getKey("s", "servers", jsonPath);
         String serversSubpackage = getSubpackage(jsonPath);
-        return new CodegenServers(
+        return new CodegenList<CodegenServer>(
                 codegenServers,
                 jsonPathPiece,
                 serversSubpackage

src/main/java/org/openapijsonschematools/codegen/generators/Generator.java

@@ -38,7 +38,8 @@
 import org.openapijsonschematools.codegen.generators.models.VendorExtension;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRefInfo;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementObject;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServers;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenList;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer;
 import org.openapijsonschematools.codegen.templating.SupportingFile;
 import org.openapijsonschematools.codegen.generators.models.CliOption;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader;
@@ -158,7 +159,7 @@ public interface Generator {
 
     CodegenPathItem fromPathItem(PathItem pathItem, String jsonPath);
 
-    CodegenServers fromServers(List<Server> servers, String jsonPath);
+    CodegenList<CodegenServer> fromServers(List<Server> servers, String jsonPath);
 
     CodegenSchema fromServerVariables(Map<String, ServerVariable> variables, String jsonPath);
 

…rators/openapimodels/CodegenServers.java …enerators/openapimodels/CodegenList.javasrc/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServers.java renamed to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenList.java src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServers.java renamed to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenList.java

@@ -1,30 +1,29 @@
 package org.openapijsonschematools.codegen.generators.openapimodels;
 
 import java.util.AbstractList;
-import java.util.Iterator;
 import java.util.List;
 
 /**
  * A class to store inline codegenschema definitions
  */
-public class CodegenServers extends AbstractList<CodegenServer> {
-    public final List<CodegenServer> servers;
+public class CodegenList <T> extends AbstractList<T> {
+    public final List<T> items;
     public final CodegenKey jsonPathPiece;
     public final String subpackage;
 
-    public CodegenServers(List<CodegenServer> servers, CodegenKey jsonPathPiece, String subpackage) {
-        this.servers = servers;
+    public CodegenList(List<T> items, CodegenKey jsonPathPiece, String subpackage) {
+        this.items = items;
         this.jsonPathPiece = jsonPathPiece;
         this.subpackage = subpackage;
     }
 
     @Override
-    public CodegenServer get(int index) {
-        return this.servers.get(index);
+    public T get(int index) {
+        return this.items.get(index);
     }
 
     @Override
     public int size() {
-        return this.servers.size();
+        return this.items.size();
     }
 }

src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java

@@ -29,7 +29,7 @@ public class CodegenOperation {
     public final LinkedHashSet<Integer> errorWildcardStatusCodes; // values like 4 for 4XX
     public final CodegenText summary, description;
     public final LinkedHashSet<String> produces;
-    public final CodegenServers servers;
+    public final CodegenList<CodegenServer> servers;
     public final CodegenRequestBody requestBody;
     // properties where key is contentType, value is a ref schema, encapsulates imports
     public final CodegenSchema requestBodySchema;
@@ -64,7 +64,7 @@ public CodegenOperation(
             CodegenText summary,
             CodegenText description,
             LinkedHashSet<String> produces,
-            CodegenServers servers,
+            CodegenList<CodegenServer> servers,
             CodegenRequestBody requestBody,
             ParameterCollection parameters,
             CodegenSchema pathParametersSchema,

src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java

@@ -7,10 +7,10 @@ public class CodegenPathItem {
     public final CodegenText summary;
     public final CodegenText description;
     public final TreeMap<CodegenKey, CodegenOperation> operations;
-    public final CodegenServers servers;
+    public final CodegenList<CodegenServer> servers;
     public final List<CodegenParameter> parameters;
 
-    public CodegenPathItem(CodegenText summary, CodegenText description, TreeMap<CodegenKey, CodegenOperation> operations, CodegenServers servers, List<CodegenParameter> parameters) {
+    public CodegenPathItem(CodegenText summary, CodegenText description, TreeMap<CodegenKey, CodegenOperation> operations, CodegenList<CodegenServer> servers, List<CodegenParameter> parameters) {
         this.summary = summary;
         this.description = description;
         this.operations = operations;

src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java

@@ -23,9 +23,9 @@
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer;
 import org.openapijsonschematools.codegen.common.ModelUtils;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServers;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenList;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -609,11 +609,11 @@ public void testHandlesTrailingSlashInServers() {
         generator.opts(opts);
         generator.configureGeneratorProperties();
 
-        CodegenServers servers = config.fromServers(openAPI.getServers(), "#/servers");
+        CodegenList<CodegenServer> servers = config.fromServers(openAPI.getServers(), "#/servers");
 
         Map<String, Object> bundle = generator.buildSupportFileBundle(
                 null, null, null, null, null, null, servers, null, null);
-        CodegenServers bundleServers = (CodegenServers) bundle.get("servers");
+        CodegenList<CodegenServer> bundleServers = (CodegenList<CodegenServer>) bundle.get("servers");
         Assert.assertEquals(bundleServers.get(0).url, "");
         Assert.assertEquals(bundleServers.get(1).url, "http://trailingshlash.io:80/v1");
         Assert.assertEquals(bundleServers.get(2).url, "http://notrailingslash.io:80/v2");
@@ -635,11 +635,11 @@ public void testHandlesRelativeUrlsInServers() {
 
         List<File> files = new ArrayList<>();
 
-        CodegenServers servers = config.fromServers(openAPI.getServers(), "#/servers");
+        CodegenList<CodegenServer> servers = config.fromServers(openAPI.getServers(), "#/servers");
         Map<String, Object> bundle = generator.buildSupportFileBundle(
                 null, null, null, null, null, null, servers, null, null);
 
-        CodegenServers bundleServers = (CodegenServers) bundle.get("servers");
+        CodegenList<CodegenServer> bundleServers = (CodegenList<CodegenServer>) bundle.get("servers");
         Assert.assertEquals(bundleServers.get(0).url, "/relative/url");
     }