From 671c5880b9da9d76e4716a40b0b148c1857bff12 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Sat, 20 Feb 2016 21:09:27 -0800 Subject: [PATCH] added sort --- .../generator/DynamicSwaggerConfig.java | 25 +++++++++++-------- .../generator/resource/SwaggerResource.java | 25 +++++++++++-------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java b/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java index 974b938a1aa..bfd121fe1c8 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java @@ -11,12 +11,26 @@ import io.swagger.models.parameters.Parameter; import io.swagger.models.parameters.PathParameter; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class DynamicSwaggerConfig extends BeanConfig { static List clients = new ArrayList(); static List servers = new ArrayList(); + static { + List extensions = Codegen.getExtensions(); + for (CodegenConfig config : extensions) { + if (config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) { + clients.add(config.getName()); + } else if (config.getTag().equals(CodegenType.SERVER)) { + servers.add(config.getName()); + } + } + Collections.sort(clients); + Collections.sort(servers); + } + @Override public Swagger configure(Swagger swagger) { Path clientPath = swagger.getPaths().get("/gen/clients/{language}"); @@ -62,15 +76,4 @@ public class DynamicSwaggerConfig extends BeanConfig { .host(getHost()) .basePath("/api"); } - - static { - List extensions = Codegen.getExtensions(); - for (CodegenConfig config : extensions) { - if (config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) { - clients.add(config.getName()); - } else if (config.getTag().equals(CodegenType.SERVER)) { - servers.add(config.getName()); - } - } - } } diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java index 53d5d8a72a6..be2976df1ba 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java @@ -30,6 +30,20 @@ public class SwaggerResource { static List servers = new ArrayList(); private static Map fileMap = new HashMap(); + static { + List extensions = Codegen.getExtensions(); + for (CodegenConfig config : extensions) { + if (config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) { + clients.add(config.getName()); + } else if (config.getTag().equals(CodegenType.SERVER)) { + servers.add(config.getName()); + } + } + + Collections.sort(clients); + Collections.sort(servers); + } + @GET @Path("/download/{fileId}") @Produces({MediaType.APPLICATION_OCTET_STREAM}) @@ -202,15 +216,4 @@ public class SwaggerResource { return Response.status(500).build(); } } - - static { - List extensions = Codegen.getExtensions(); - for (CodegenConfig config : extensions) { - if (config.getTag().equals(CodegenType.CLIENT) || config.getTag().equals(CodegenType.DOCUMENTATION)) { - clients.add(config.getName()); - } else if (config.getTag().equals(CodegenType.SERVER)) { - servers.add(config.getName()); - } - } - } }