GEODE-2908: Adding the new tag as per swagger notification.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a48fe922 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a48fe922 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a48fe922 Branch: refs/heads/feature/GEODE-3023 Commit: a48fe922c0c92ad66642acb6758f74042b0d7851 Parents: 7997b20 Author: Prasad.S.Indulkar <[email protected]> Authored: Thu May 11 12:27:39 2017 +0530 Committer: Udo Kohlmeyer <[email protected]> Committed: Fri Jun 9 13:12:03 2017 -0700 ---------------------------------------------------------------------- .../controllers/FunctionAccessController.java | 30 +++++++--------- .../web/controllers/PdxBasedCrudController.java | 27 ++++++--------- .../web/controllers/QueryAccessController.java | 36 ++++++-------------- 3 files changed, 35 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/a48fe922/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java ---------------------------------------------------------------------- diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java index 473b8b9..edfdeaa 100644 --- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java +++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java @@ -14,15 +14,17 @@ */ package org.apache.geode.rest.internal.web.controllers; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import org.apache.geode.cache.LowMemoryException; +import org.apache.geode.cache.execute.*; +import org.apache.geode.internal.cache.execute.NoResult; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.rest.internal.web.exception.GemfireRestException; +import org.apache.geode.rest.internal.web.util.ArrayUtils; +import org.apache.geode.rest.internal.web.util.JSONUtils; import org.apache.logging.log4j.Logger; import org.json.JSONException; import org.springframework.http.HttpHeaders; @@ -40,17 +42,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import org.apache.geode.cache.LowMemoryException; -import org.apache.geode.cache.execute.Execution; -import org.apache.geode.cache.execute.Function; -import org.apache.geode.cache.execute.FunctionException; -import org.apache.geode.cache.execute.FunctionService; -import org.apache.geode.cache.execute.ResultCollector; -import org.apache.geode.internal.cache.execute.NoResult; -import org.apache.geode.internal.logging.LogService; -import org.apache.geode.rest.internal.web.exception.GemfireRestException; -import org.apache.geode.rest.internal.web.util.ArrayUtils; -import org.apache.geode.rest.internal.web.util.JSONUtils; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * The FunctionsController class serving REST Requests related to the function execution @@ -59,7 +54,8 @@ import org.apache.geode.rest.internal.web.util.JSONUtils; * @since GemFire 8.0 */ @Controller("functionController") -@Api(value = "functions", description = "Rest api for gemfire function execution") +@Api(value = "functions", description = "Rest api for gemfire function execution", + tags = "functions") @RequestMapping(FunctionAccessController.REST_API_VERSION + "/functions") @SuppressWarnings("unused") public class FunctionAccessController extends AbstractBaseController { http://git-wip-us.apache.org/repos/asf/geode/blob/a48fe922/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java ---------------------------------------------------------------------- diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java index a6f10b1..3dd987f 100644 --- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java +++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java @@ -14,14 +14,16 @@ */ package org.apache.geode.rest.internal.web.controllers; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.rest.internal.web.controllers.support.JSONTypes; +import org.apache.geode.rest.internal.web.controllers.support.RegionData; +import org.apache.geode.rest.internal.web.controllers.support.RegionEntryData; +import org.apache.geode.rest.internal.web.exception.ResourceNotFoundException; +import org.apache.geode.rest.internal.web.util.ArrayUtils; import org.apache.logging.log4j.Logger; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -30,18 +32,11 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; -import org.apache.geode.internal.logging.LogService; -import org.apache.geode.rest.internal.web.controllers.support.JSONTypes; -import org.apache.geode.rest.internal.web.controllers.support.RegionData; -import org.apache.geode.rest.internal.web.controllers.support.RegionEntryData; -import org.apache.geode.rest.internal.web.exception.ResourceNotFoundException; -import org.apache.geode.rest.internal.web.util.ArrayUtils; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * The PdxBasedCrudController class serving REST Requests related to the REST CRUD operation on @@ -51,7 +46,7 @@ import org.apache.geode.rest.internal.web.util.ArrayUtils; * @since GemFire 8.0 */ @Controller("pdxCrudController") -@Api(value = "region", description = "region CRUD operations") +@Api(value = "region", description = "region CRUD operations", tags = "region") @RequestMapping(PdxBasedCrudController.REST_API_VERSION) @SuppressWarnings("unused") public class PdxBasedCrudController extends CommonCrudController { http://git-wip-us.apache.org/repos/asf/geode/blob/a48fe922/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java ---------------------------------------------------------------------- diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java index 8007491..e6b6303 100644 --- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java +++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java @@ -14,12 +14,18 @@ */ package org.apache.geode.rest.internal.web.controllers; -import java.util.concurrent.ConcurrentHashMap; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.*; +import org.apache.geode.cache.query.internal.DefaultQuery; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.rest.internal.web.exception.GemfireRestException; +import org.apache.geode.rest.internal.web.exception.ResourceNotFoundException; +import org.apache.geode.rest.internal.web.util.JSONUtils; +import org.apache.geode.rest.internal.web.util.ValidationUtils; import org.apache.logging.log4j.Logger; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -27,29 +33,9 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.*; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.query.FunctionDomainException; -import org.apache.geode.cache.query.NameResolutionException; -import org.apache.geode.cache.query.Query; -import org.apache.geode.cache.query.QueryExecutionLowMemoryException; -import org.apache.geode.cache.query.QueryExecutionTimeoutException; -import org.apache.geode.cache.query.QueryInvalidException; -import org.apache.geode.cache.query.QueryInvocationTargetException; -import org.apache.geode.cache.query.TypeMismatchException; -import org.apache.geode.cache.query.internal.DefaultQuery; -import org.apache.geode.internal.logging.LogService; -import org.apache.geode.rest.internal.web.exception.GemfireRestException; -import org.apache.geode.rest.internal.web.exception.ResourceNotFoundException; -import org.apache.geode.rest.internal.web.util.JSONUtils; -import org.apache.geode.rest.internal.web.util.ValidationUtils; +import java.util.concurrent.ConcurrentHashMap; /** * The QueryingController class serves all HTTP REST requests related to the gemfire querying @@ -59,7 +45,7 @@ import org.apache.geode.rest.internal.web.util.ValidationUtils; */ @Controller("queryController") @Api(value = "queries", description = "Rest api for geode query execution", - produces = MediaType.APPLICATION_JSON_VALUE) + produces = MediaType.APPLICATION_JSON_VALUE, tags = "queries") @RequestMapping(QueryAccessController.REST_API_VERSION + "/queries") @SuppressWarnings("unused") public class QueryAccessController extends AbstractBaseController {
