loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge pull request #4189 from cbornet/spring_cloud_operations

Browse Source 
[Spring] Use tag operation grouping for spring-cloud
This commit is contained in:
wing328 2016-11-18 16:51:36 +08:00 committed by GitHub
commit cde24f1113
15 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java
View File

@ -221,27 +221,31 @@ public class SpringCodegen extends AbstractJavaCodegen {
@Override @Override
public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) { public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
String basePath = resourcePath; if(library.equals(DEFAULT_LIBRARY) || library.equals(SPRING_MVC_LIBRARY)) {
if (basePath.startsWith("/")) { String basePath = resourcePath;
basePath = basePath.substring(1); if (basePath.startsWith("/")) {
} basePath = basePath.substring(1);
int pos = basePath.indexOf("/"); }
if (pos > 0) { int pos = basePath.indexOf("/");
basePath = basePath.substring(0, pos); if (pos > 0) {
} basePath = basePath.substring(0, pos);
}
if (basePath == "") { if (basePath.equals("")) {
basePath = "default"; basePath = "default";
} else {
co.subresourceOperation = !co.path.isEmpty();
}
List<CodegenOperation> opList = operations.get(basePath);
if (opList == null) {
opList = new ArrayList<CodegenOperation>();
operations.put(basePath, opList);
}
opList.add(co);
co.baseName = basePath;
} else { } else {
co.subresourceOperation = !co.path.isEmpty(); super.addOperationToGroup(tag, resourcePath, operation, co, operations);
} }
List<CodegenOperation> opList = operations.get(basePath);
if (opList == null) {
opList = new ArrayList<CodegenOperation>();
operations.put(basePath, opList);
}
opList.add(co);
co.baseName = basePath;
} }
@Override @Override

4
samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/PetApi.java
View File

@ -1,8 +1,8 @@
package io.swagger.api; package io.swagger.api;
import io.swagger.model.Pet; import io.swagger.model.Pet;
import java.io.File;
import io.swagger.model.ModelApiResponse; import io.swagger.model.ModelApiResponse;
import java.io.File;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@ -18,7 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.List; import java.util.List;
@Api(value = "pet", description = "the pet API") @Api(value = "Pet", description = "the Pet API")
public interface PetApi { public interface PetApi {
@ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = { @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {

2
samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/StoreApi.java
View File

@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.List; import java.util.List;
@Api(value = "store", description = "the store API") @Api(value = "Store", description = "the Store API")
public interface StoreApi { public interface StoreApi {
@ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store", }) @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store", })

2
samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/UserApi.java
View File

@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.List; import java.util.List;
@Api(value = "user", description = "the user API") @Api(value = "User", description = "the User API")
public interface UserApi { public interface UserApi {
@ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })

2
samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
View File

@ -1,8 +1,8 @@
package io.swagger.api; package io.swagger.api;
import io.swagger.model.Pet; import io.swagger.model.Pet;
import java.io.File;
import io.swagger.model.ModelApiResponse; import io.swagger.model.ModelApiResponse;
import java.io.File;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;

6
samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java
View File

@ -1,8 +1,8 @@
package io.swagger.api; package io.swagger.api;
import io.swagger.model.Client; import io.swagger.model.Client;
import java.time.LocalDate;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.time.LocalDate;
import java.math.BigDecimal; import java.math.BigDecimal;
import io.swagger.annotations.*; import io.swagger.annotations.*;
@ -71,8 +71,8 @@ public interface FakeApi {
@ApiResponse(code = 400, message = "Invalid request", response = Void.class), @ApiResponse(code = 400, message = "Invalid request", response = Void.class),
@ApiResponse(code = 404, message = "Not found", response = Void.class) }) @ApiResponse(code = 404, message = "Not found", response = Void.class) })
@RequestMapping(value = "/fake", @RequestMapping(value = "/fake",
produces = { "application/json" }, produces = { "*/*" },
consumes = { "application/json" }, consumes = { "*/*" },
method = RequestMethod.GET) method = RequestMethod.GET)
default CompletableFuture<ResponseEntity<Void>> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)" , allowableValues="GREATER_THAN, DOLLAR") @RequestPart(value="enumFormStringArray", required=false) List<String> enumFormStringArray, default CompletableFuture<ResponseEntity<Void>> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)" , allowableValues="GREATER_THAN, DOLLAR") @RequestPart(value="enumFormStringArray", required=false) List<String> enumFormStringArray,
@ApiParam(value = "Form parameter enum test (string)" , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestPart(value="enumFormString", required=false) String enumFormString, @ApiParam(value = "Form parameter enum test (string)" , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestPart(value="enumFormString", required=false) String enumFormString,

2
samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java
View File

@ -1,8 +1,8 @@
package io.swagger.api; package io.swagger.api;
import io.swagger.model.Pet; import io.swagger.model.Pet;
import java.io.File;
import io.swagger.model.ModelApiResponse; import io.swagger.model.ModelApiResponse;
import java.io.File;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;

6
samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
View File

@ -2,8 +2,8 @@ package io.swagger.api;
import io.swagger.model.Client; import io.swagger.model.Client;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import org.joda.time.DateTime;
import java.math.BigDecimal; import java.math.BigDecimal;
import org.joda.time.DateTime;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@ -63,8 +63,8 @@ public interface FakeApi {
@ApiResponse(code = 400, message = "Invalid request", response = Void.class), @ApiResponse(code = 400, message = "Invalid request", response = Void.class),
@ApiResponse(code = 404, message = "Not found", response = Void.class) }) @ApiResponse(code = 404, message = "Not found", response = Void.class) })
@RequestMapping(value = "/fake", @RequestMapping(value = "/fake",
produces = { "application/json" }, produces = { "*/*" },
consumes = { "application/json" }, consumes = { "*/*" },
method = RequestMethod.GET) method = RequestMethod.GET)
ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)" , allowableValues="GREATER_THAN, DOLLAR") @RequestPart(value="enumFormStringArray", required=false) List<String> enumFormStringArray, ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)" , allowableValues="GREATER_THAN, DOLLAR") @RequestPart(value="enumFormStringArray", required=false) List<String> enumFormStringArray,
@ApiParam(value = "Form parameter enum test (string)" , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestPart(value="enumFormString", required=false) String enumFormString, @ApiParam(value = "Form parameter enum test (string)" , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestPart(value="enumFormString", required=false) String enumFormString,

2
samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java
View File

@ -2,8 +2,8 @@ package io.swagger.api;
import io.swagger.model.Client; import io.swagger.model.Client;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import org.joda.time.DateTime;
import java.math.BigDecimal; import java.math.BigDecimal;
import org.joda.time.DateTime;
import io.swagger.annotations.*; import io.swagger.annotations.*;

2
samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
View File

@ -1,8 +1,8 @@
package io.swagger.api; package io.swagger.api;
import io.swagger.model.Pet; import io.swagger.model.Pet;
import java.io.File;
import io.swagger.model.ModelApiResponse; import io.swagger.model.ModelApiResponse;
import java.io.File;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;

2
samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApiController.java
View File

@ -1,8 +1,8 @@
package io.swagger.api; package io.swagger.api;
import io.swagger.model.Pet; import io.swagger.model.Pet;
import java.io.File;
import io.swagger.model.ModelApiResponse; import io.swagger.model.ModelApiResponse;
import java.io.File;
import io.swagger.annotations.*; import io.swagger.annotations.*;

6
samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java
View File

@ -2,8 +2,8 @@ package io.swagger.api;
import io.swagger.model.Client; import io.swagger.model.Client;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import org.joda.time.DateTime;
import java.math.BigDecimal; import java.math.BigDecimal;
import org.joda.time.DateTime;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@ -63,8 +63,8 @@ public interface FakeApi {
@ApiResponse(code = 400, message = "Invalid request", response = Void.class), @ApiResponse(code = 400, message = "Invalid request", response = Void.class),
@ApiResponse(code = 404, message = "Not found", response = Void.class) }) @ApiResponse(code = 404, message = "Not found", response = Void.class) })
@RequestMapping(value = "/fake", @RequestMapping(value = "/fake",
produces = { "application/json" }, produces = { "*/*" },
consumes = { "application/json" }, consumes = { "*/*" },
method = RequestMethod.GET) method = RequestMethod.GET)
ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)" , allowableValues="GREATER_THAN, DOLLAR") @RequestPart(value="enumFormStringArray", required=false) List<String> enumFormStringArray, ResponseEntity<Void> testEnumParameters(@ApiParam(value = "Form parameter enum test (string array)" , allowableValues="GREATER_THAN, DOLLAR") @RequestPart(value="enumFormStringArray", required=false) List<String> enumFormStringArray,
@ApiParam(value = "Form parameter enum test (string)" , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestPart(value="enumFormString", required=false) String enumFormString, @ApiParam(value = "Form parameter enum test (string)" , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestPart(value="enumFormString", required=false) String enumFormString,

2
samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java
View File

@ -2,8 +2,8 @@ package io.swagger.api;
import io.swagger.model.Client; import io.swagger.model.Client;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import org.joda.time.DateTime;
import java.math.BigDecimal; import java.math.BigDecimal;
import org.joda.time.DateTime;
import io.swagger.annotations.*; import io.swagger.annotations.*;

2
samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
View File

@ -1,8 +1,8 @@
package io.swagger.api; package io.swagger.api;
import io.swagger.model.Pet; import io.swagger.model.Pet;
import java.io.File;
import io.swagger.model.ModelApiResponse; import io.swagger.model.ModelApiResponse;
import java.io.File;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;

2
samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java
View File

@ -1,8 +1,8 @@
package io.swagger.api; package io.swagger.api;
import io.swagger.model.Pet; import io.swagger.model.Pet;
import java.io.File;
import io.swagger.model.ModelApiResponse; import io.swagger.model.ModelApiResponse;
import java.io.File;
import io.swagger.annotations.*; import io.swagger.annotations.*;