Mercurial > hg > thermostat-ng > web-gateway
changeset 266:3055303a670f
Add CommonQueryParams class
This patch defines and passes around a CommonQueryParams class, to be used by all the HTTP GET handlers.
The class collects and verifies the limit/offset/sort/query/include/exclude/metadata parameters instead of passing them around individually as parameters within the framework. Using this class makes the code simpler and allows for consistent handling of parameters (without it, only some endpoints verified 'offset' was not negative, for instance).
This class also allows new common GET parameters tto be added trivially.
Reviewed-by: sgehwolf
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-September/024999.html
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/core/src/main/java/com/redhat/thermostat/gateway/common/core/model/LimitParameter.java Tue Sep 26 11:41:34 2017 -0400 @@ -0,0 +1,65 @@ +/* + * Copyright 2012-2017 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.gateway.common.core.model; + +import com.redhat.thermostat.gateway.common.core.jaxrs.InvalidParameterValueException; + +public class LimitParameter { + + private final Integer limit; + + public LimitParameter(Integer limit) { + this.limit = limit; + } + + public Integer getValue() { + return limit; + } + + public static LimitParameter valueOf(String rawParam) { + if (rawParam == null) { + return null; + } + Integer intVal = Integer.valueOf(rawParam); + if (intVal < 0) { + // JAX RS throws 404 on illegal parameter types by default, make it throw + // 400 instead. + throw new InvalidParameterValueException("Limit value must not be negative"); + } + return new LimitParameter(intVal); + } +}
--- a/common/core/src/main/java/com/redhat/thermostat/gateway/common/core/model/OffsetParameter.java Mon Sep 25 16:40:59 2017 +0200 +++ b/common/core/src/main/java/com/redhat/thermostat/gateway/common/core/model/OffsetParameter.java Tue Sep 26 11:41:34 2017 -0400 @@ -42,7 +42,7 @@ private final Integer offset; - private OffsetParameter(Integer offset) { + public OffsetParameter(Integer offset) { this.offset = offset; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/core/src/main/java/com/redhat/thermostat/gateway/common/core/servlet/CommonQueryParams.java Tue Sep 26 11:41:34 2017 -0400 @@ -0,0 +1,109 @@ +/* + * Copyright 2012-2017 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.gateway.common.core.servlet; + +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; +import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; + +import java.util.LinkedHashMap; +import java.util.Map; + +public class CommonQueryParams { + + private final boolean returnMetadata; + private final int limit; + private final int offset; + private final String sort; + private final String queries; + private final String includes; + private final String excludes; + + public CommonQueryParams(LimitParameter limit, OffsetParameter offset, String sort, String queries, String includes, String excludes, Boolean returnMetadata) { + this(limit.getValue(), offset.getValue(), sort, queries, includes, excludes, returnMetadata); + } + + public CommonQueryParams(int limit, int offset, String sort, String queries, String includes, String excludes, boolean returnMetadata) { + this.limit = limit; + this.offset = offset; + this.sort = sort; + this.queries = queries; + this.includes = includes; + this.excludes = excludes; + this.returnMetadata = returnMetadata; + } + + public Map<String, String> buildParams() { + // Test suites expect a consistent order of next and prev links, hence LinkedHashMap + LinkedHashMap<String, String> paramArgs = new LinkedHashMap<>(); + paramArgs.put(RequestParameters.SORT, sort); + paramArgs.put(RequestParameters.QUERY, queries); + paramArgs.put(RequestParameters.INCLUDE, includes); + paramArgs.put(RequestParameters.EXCLUDE, excludes); + paramArgs.put(RequestParameters.METADATA, String.valueOf(returnMetadata)); + paramArgs.put(RequestParameters.LIMIT, String.valueOf(limit)); + paramArgs.put(RequestParameters.OFFSET, String.valueOf(offset)); + return paramArgs; + } + + public int getLimit() { + return limit; + } + + public int getOffset() { + return offset; + } + + public String getSort() { + return sort; + } + + public String getQueries() { + return queries; + } + + public String getIncludes() { + return includes; + } + + public String getExcludes() { + return excludes; + } + + public boolean isReturnMetadata() { + return returnMetadata; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/core/src/main/java/com/redhat/thermostat/gateway/common/core/servlet/RequestParameters.java Tue Sep 26 11:41:34 2017 -0400 @@ -0,0 +1,53 @@ +/* + * Copyright 2012-2017 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.gateway.common.core.servlet; + +public interface RequestParameters { + String SYSTEM_ID = "systemId"; + String JVM_ID = "jvmId"; + + String METADATA = "metadata"; + String SORT = "sort"; + String QUERY = "query"; + String OFFSET = "offset"; + String LIMIT = "limit"; + String INCLUDE = "include"; + String EXCLUDE = "exclude"; + + String TIMESTAMP = "timeStamp"; + String ALIVE_ONLY = "aliveOnly"; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/core/src/test/java/com/redhat/thermostat/gateway/common/core/servlet/CommonQueryParameterTest.java Tue Sep 26 11:41:34 2017 -0400 @@ -0,0 +1,101 @@ +/* + * Copyright 2012-2017 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.gateway.common.core.servlet; + +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; +import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Map; + +import static org.junit.Assert.assertEquals; + +public class CommonQueryParameterTest { + + private static final int LIMIT = 11; + private static final int OFFSET = 55; + private static final String SORT = "s1"; + private static final String QUERIES = "q2"; + private static final String INCLUDES = "i3"; + private static final String EXCLUDES = "x4"; + + private static final LimitParameter LIMITP = new LimitParameter(LIMIT); + private static final OffsetParameter OFFSETP = new OffsetParameter(OFFSET); + + private static final boolean RETURN_METADATA = true; + private static final Boolean RETURN_METADATAP = RETURN_METADATA; + + @Test + public void testCreate1() { + final CommonQueryParams qp1 = new CommonQueryParams(LIMIT, OFFSET, SORT, QUERIES, INCLUDES, EXCLUDES, RETURN_METADATA); + assertEquals(LIMIT, qp1.getLimit()); + assertEquals(OFFSET, qp1.getOffset()); + assertEquals(SORT, qp1.getSort()); + assertEquals(QUERIES, qp1.getQueries()); + assertEquals(INCLUDES, qp1.getIncludes()); + assertEquals(EXCLUDES, qp1.getExcludes()); + assertEquals(RETURN_METADATA, qp1.isReturnMetadata()); + } + + @Test + public void testCreate2() { + final CommonQueryParams qp1 = new CommonQueryParams(LIMITP, OFFSETP, SORT, QUERIES, INCLUDES, EXCLUDES, RETURN_METADATAP); + assertEquals(LIMIT, qp1.getLimit()); + assertEquals(OFFSET, qp1.getOffset()); + assertEquals(SORT, qp1.getSort()); + assertEquals(QUERIES, qp1.getQueries()); + assertEquals(INCLUDES, qp1.getIncludes()); + assertEquals(EXCLUDES, qp1.getExcludes()); + assertEquals(RETURN_METADATA, qp1.isReturnMetadata()); + } + + @Test + public void testBuildParams() { + final CommonQueryParams qp1 = new CommonQueryParams(LIMIT, OFFSET, SORT, QUERIES, INCLUDES, EXCLUDES, RETURN_METADATA); + Map<String, String> pmap = qp1.buildParams(); + assertEquals(LIMIT, Integer.parseInt(pmap.get(RequestParameters.LIMIT))); + assertEquals(OFFSET, Integer.parseInt(pmap.get(RequestParameters.OFFSET))); + assertEquals(SORT, pmap.get(RequestParameters.SORT)); + assertEquals(QUERIES, pmap.get(RequestParameters.QUERY)); + assertEquals(INCLUDES, pmap.get(RequestParameters.INCLUDE)); + assertEquals(EXCLUDES, pmap.get(RequestParameters.EXCLUDE)); + assertEquals(RETURN_METADATA, Boolean.parseBoolean(pmap.get(RequestParameters.METADATA))); + } + + +}
--- a/common/mongodb/src/main/java/com/redhat/thermostat/gateway/common/mongodb/executor/MongoExecutor.java Mon Sep 25 16:40:59 2017 +0200 +++ b/common/mongodb/src/main/java/com/redhat/thermostat/gateway/common/mongodb/executor/MongoExecutor.java Tue Sep 26 11:41:34 2017 -0400 @@ -49,6 +49,7 @@ import com.mongodb.client.result.DeleteResult; import com.mongodb.client.result.UpdateResult; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; import com.redhat.thermostat.gateway.common.mongodb.ThermostatFields; import org.bson.Document; import org.bson.conversions.Bson; @@ -63,14 +64,14 @@ import com.redhat.thermostat.gateway.common.mongodb.keycloak.KeycloakFields; public class MongoExecutor { - public MongoDataResultContainer execGetRequest(MongoCollection<Document> collection, int limit, int offset, - String sort, String queries, String includes, String excludes, + public MongoDataResultContainer execGetRequest(MongoCollection<Document> collection, String queries, + CommonQueryParams params, Set<String> realms) throws IOException { - return execGetRequest(collection, limit, offset, sort, buildClientQueries(queries), includes, excludes, realms); + return execGetRequest(collection, buildClientQueries(queries), params, realms); } - public MongoDataResultContainer execGetRequest(MongoCollection<Document> collection, int limit, int offset, - String sort, List<String> queries, String includes, String excludes, + public MongoDataResultContainer execGetRequest(MongoCollection<Document> collection, List<String> queries, + CommonQueryParams params, Set<String> realms) { FindIterable<Document> documents = collection.find(); MongoDataResultContainer queryDataContainer = new MongoDataResultContainer(); @@ -79,10 +80,10 @@ documents = documents.filter(query); long count = collection.count(query); queryDataContainer.setGetReqCount(count); - queryDataContainer.setRemainingNumQueryDocuments((int) (count - (limit + offset))); - documents = buildProjection(documents, includes, excludes); - final Bson sortObject = MongoSortFilters.createSortObject(sort); - documents = documents.sort(sortObject).limit(limit).skip(offset).batchSize(limit).cursorType(CursorType.NonTailable); + queryDataContainer.setRemainingNumQueryDocuments((int) (count - (params.getLimit() + params.getOffset()))); + documents = buildProjection(documents, params.getIncludes(), params.getExcludes()); + final Bson sortObject = MongoSortFilters.createSortObject(params.getSort()); + documents = documents.sort(sortObject).limit(params.getLimit()).skip(params.getOffset()).batchSize(params.getLimit()).cursorType(CursorType.NonTailable); queryDataContainer.setQueryDataResult(documents); return queryDataContainer;
--- a/common/mongodb/src/main/java/com/redhat/thermostat/gateway/common/mongodb/response/MongoMetaDataGenerator.java Mon Sep 25 16:40:59 2017 +0200 +++ b/common/mongodb/src/main/java/com/redhat/thermostat/gateway/common/mongodb/response/MongoMetaDataGenerator.java Tue Sep 26 11:41:34 2017 -0400 @@ -36,9 +36,10 @@ package com.redhat.thermostat.gateway.common.mongodb.response; -import java.util.LinkedHashMap; +import java.util.Map; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.executor.MongoDataResultContainer; public class MongoMetaDataGenerator { @@ -50,17 +51,17 @@ private final String includes; private final String excludes; private final MongoDataResultContainer execResult; - private final LinkedHashMap<String, String> requestParamArguments; + private final Map<String, String> requestParamArguments; private final String baseURL; - public MongoMetaDataGenerator(Integer limit, Integer offset, String sort, String queries, String includes, String excludes, - LinkedHashMap<String, String> requestParamArguments, MongoDataResultContainer execResult, String baseUrl) { - this.limit = limit; - this.offset = offset; - this.sort = sort; - this.queries = queries; - this.includes = includes; - this.excludes = excludes; + public MongoMetaDataGenerator(CommonQueryParams params, + Map<String, String> requestParamArguments, MongoDataResultContainer execResult, String baseUrl) { + this.limit = params.getLimit(); + this.offset = params.getOffset(); + this.sort = params.getSort(); + this.queries = params.getQueries(); + this.includes = params.getIncludes(); + this.excludes = params.getExcludes(); this.execResult = execResult; this.requestParamArguments = requestParamArguments; this.baseURL = baseUrl;
--- a/common/mongodb/src/main/java/com/redhat/thermostat/gateway/common/mongodb/response/MongoMetaDataResponseBuilder.java Mon Sep 25 16:40:59 2017 +0200 +++ b/common/mongodb/src/main/java/com/redhat/thermostat/gateway/common/mongodb/response/MongoMetaDataResponseBuilder.java Tue Sep 26 11:41:34 2017 -0400 @@ -36,11 +36,11 @@ package com.redhat.thermostat.gateway.common.mongodb.response; -import java.util.LinkedHashMap; +import java.util.Map; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; /* * Builds the appropriate metadata for the response after executing the request's MongoDB Query. @@ -122,7 +122,7 @@ return new MongoMetaDataResponseBuilder(this); } - public String getQueryArgumentsNoOffsetLimit(LinkedHashMap<String, String> requestParamArguments) { + public String getQueryArgumentsNoOffsetLimit(Map<String, String> requestParamArguments) { StringBuilder queryString = new StringBuilder(); String sep = ""; for (String param : requestParamArguments.keySet()) {
--- a/common/mongodb/src/main/java/com/redhat/thermostat/gateway/common/mongodb/servlet/MongoHttpHandlerHelper.java Mon Sep 25 16:40:59 2017 +0200 +++ b/common/mongodb/src/main/java/com/redhat/thermostat/gateway/common/mongodb/servlet/MongoHttpHandlerHelper.java Tue Sep 26 11:41:34 2017 -0400 @@ -43,7 +43,6 @@ import static com.redhat.thermostat.gateway.common.util.ServiceException.UNEXPECTED_ERROR; import java.io.IOException; -import java.util.LinkedHashMap; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -55,6 +54,7 @@ import com.mongodb.MongoTimeoutException; import com.mongodb.MongoWriteException; import com.redhat.thermostat.gateway.common.core.auth.RealmAuthorizer; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; import com.redhat.thermostat.gateway.common.mongodb.ThermostatFields; import com.redhat.thermostat.gateway.common.mongodb.ThermostatMongoStorage; import com.redhat.thermostat.gateway.common.mongodb.executor.MongoDataResultContainer; @@ -64,6 +64,8 @@ import com.redhat.thermostat.gateway.common.mongodb.response.MongoResponseBuilder; import com.redhat.thermostat.gateway.common.util.HttpResponseExceptionHandler; +import java.util.Map; + public class MongoHttpHandlerHelper { private final String collectionName; @@ -85,62 +87,42 @@ * HTTP GET handling */ - public Response handleGetWithSystemID(HttpServletRequest httpServletRequest, ServletContext context, - String systemId, int limit, int offset, String sort, String queries, - String includes, String excludes, boolean returnMetadata) { - return handleGet(httpServletRequest, context, limit, offset, sort, - andSystemIdQuery(queries, systemId), includes, excludes, returnMetadata, queries); + public Response handleGetWithSystemID(HttpServletRequest httpServletRequest, ServletContext context, String systemId, CommonQueryParams params) { + return handleGet(httpServletRequest, context, andSystemIdQuery(params.getQueries(), systemId), params); } - public Response handleGetWithJvmID(HttpServletRequest httpServletRequest, ServletContext context, String systemId, - String jvmId, int limit, int offset, String sort, String queries, - String includes, String excludes, boolean returnMetadata) { - return handleGet(httpServletRequest, context, limit, offset, sort, - andSystemIdJvmIdQuery(queries, systemId, jvmId), includes, excludes, returnMetadata, queries); + public Response handleGetWithJvmID(HttpServletRequest httpServletRequest, ServletContext context, String systemId, String jvmId, CommonQueryParams params) { + return handleGet(httpServletRequest, context, andSystemIdJvmIdQuery(params.getQueries(), systemId, jvmId), params); } - public Response handleGet(HttpServletRequest httpServletRequest, ServletContext context, int limit, int offset, - String sort, String queries, String includes, String excludes, boolean returnMetadata) { - return handleGet(httpServletRequest, context, limit, offset, sort, queries, includes, excludes, returnMetadata, ""); + public Response handleGet(HttpServletRequest httpServletRequest, ServletContext context, CommonQueryParams params) { + return handleGet(httpServletRequest, context, params.getQueries(), params); } /* * originalQueries contains only query info from the client's original request argument. queries contains this info, * as well as added JVM/SYS ids built by andSystemIdJvmIdQuery(...). */ - public Response handleGet(HttpServletRequest httpServletRequest, ServletContext context, int limit, int offset, - String sort, String queries, String includes, String excludes, boolean returnMetadata, - String originalQueries) { + public Response handleGet(HttpServletRequest httpServletRequest, ServletContext context, String queries, CommonQueryParams params) { try { - RealmAuthorizer realmAuthorizer = (RealmAuthorizer) httpServletRequest.getAttribute( - RealmAuthorizer.class.getName()); + RealmAuthorizer realmAuthorizer = (RealmAuthorizer) httpServletRequest.getAttribute(RealmAuthorizer.class.getName()); if (realmAuthorizer.readable()) { - ThermostatMongoStorage storage = (ThermostatMongoStorage) context.getAttribute( - ServletContextConstants.MONGODB_CLIENT_ATTRIBUTE); + ThermostatMongoStorage storage = (ThermostatMongoStorage) context.getAttribute(ServletContextConstants.MONGODB_CLIENT_ATTRIBUTE); MongoDataResultContainer execResult = mongoExecutor.execGetRequest( - storage.getDatabase().getCollection(collectionName), limit, offset, sort, queries, includes, - excludes, realmAuthorizer.getReadableRealms()); + storage.getDatabase().getCollection(collectionName), queries, params, realmAuthorizer.getReadableRealms()); MongoResponseBuilder.Builder response = new MongoResponseBuilder.Builder(); response.addQueryDocuments(execResult.getQueryDataResult()); - if (returnMetadata) { - // Test suites expect a consistent order of next and prev links, hence LinkedHashMap - LinkedHashMap<String, String> paramArgs = new LinkedHashMap<>(); - paramArgs.put(RequestParameters.SORT, sort); - paramArgs.put(RequestParameters.QUERY, originalQueries); - paramArgs.put(RequestParameters.INCLUDE, includes); - paramArgs.put(RequestParameters.EXCLUDE, excludes); - paramArgs.put(RequestParameters.METADATA, Boolean.toString(returnMetadata)); - paramArgs.put(RequestParameters.LIMIT, String.valueOf(limit)); - paramArgs.put(RequestParameters.OFFSET, String.valueOf(offset)); + if (params.isReturnMetadata()) { + + Map<String, String> paramArgs = params.buildParams(); String baseUrl = httpServletRequest.getRequestURL().toString(); MongoMetaDataResponseBuilder.MetaBuilder metaDataResponse = new MongoMetaDataResponseBuilder.MetaBuilder(); - MongoMetaDataGenerator metaDataGenerator = new MongoMetaDataGenerator(limit, offset, sort, queries, - includes, excludes, paramArgs, execResult, baseUrl); + MongoMetaDataGenerator metaDataGenerator = new MongoMetaDataGenerator(params, paramArgs, execResult, baseUrl); metaDataGenerator.setDocAndPayloadCount(metaDataResponse); metaDataGenerator.setPrev(metaDataResponse); @@ -161,34 +143,26 @@ * HTTP PUT handling */ - public Response handlePutWithSystemId(HttpServletRequest httpServletRequest, ServletContext context, - String systemId, String queries, boolean returnMetadata, String body) { - return handlePut(httpServletRequest, context, systemId, null, queries, returnMetadata, body); + public Response handlePutWithSystemId(HttpServletRequest httpServletRequest, ServletContext context, String systemId, String queries, boolean metadata, String body) { + return handlePut(httpServletRequest, context, systemId, null, queries, metadata, body); } - public Response handlePutWithJvmId(HttpServletRequest httpServletRequest, ServletContext context, - String systemId, String jvmId, String queries, boolean returnMetadata, String body) { - return handlePut(httpServletRequest, context, systemId, jvmId, queries, returnMetadata, body); + public Response handlePutWithJvmId(HttpServletRequest httpServletRequest, ServletContext context, String systemId, String jvmId, String queries, boolean metadata, String body) { + return handlePut(httpServletRequest, context, systemId, jvmId, queries, metadata, body); } - public Response handlePut(HttpServletRequest httpServletRequest, ServletContext context, String queries, - boolean returnMetadata, String body) { - return handlePut(httpServletRequest, context, null, null, queries, returnMetadata, body); + public Response handlePut(HttpServletRequest httpServletRequest, ServletContext context, String queries, boolean metadata, String body) { + return handlePut(httpServletRequest, context, null, null, queries, metadata, body); } - public Response handlePut(HttpServletRequest httpServletRequest, ServletContext context, String systemId, - String jvmId, String queries, boolean returnMetadata, String body) { + public Response handlePut(HttpServletRequest httpServletRequest, ServletContext context, String systemId, String jvmId, String queries, boolean returnMetadata, String body) { try { - RealmAuthorizer realmAuthorizer = (RealmAuthorizer) httpServletRequest.getAttribute( - RealmAuthorizer.class.getName()); + RealmAuthorizer realmAuthorizer = (RealmAuthorizer) httpServletRequest.getAttribute(RealmAuthorizer.class.getName()); if (realmAuthorizer.updatable()) { - ThermostatMongoStorage storage = (ThermostatMongoStorage) context.getAttribute( - ServletContextConstants.MONGODB_CLIENT_ATTRIBUTE); + ThermostatMongoStorage storage = (ThermostatMongoStorage) context.getAttribute(ServletContextConstants.MONGODB_CLIENT_ATTRIBUTE); - MongoDataResultContainer execResult = mongoExecutor.execPutRequest( - storage.getDatabase().getCollection(collectionName), body, queries, - realmAuthorizer.getUpdatableRealms(), systemId, jvmId); + MongoDataResultContainer execResult = mongoExecutor.execPutRequest(storage.getDatabase().getCollection(collectionName), body, queries, realmAuthorizer.getUpdatableRealms(), systemId, jvmId); MongoResponseBuilder.Builder response = new MongoResponseBuilder.Builder(); if (returnMetadata) { @@ -211,34 +185,26 @@ * HTTP POST handling */ - public Response handlePostWithSystemID(HttpServletRequest httpServletRequest, ServletContext context, - String systemId, boolean returnMetadata, String body) { + public Response handlePostWithSystemID(HttpServletRequest httpServletRequest, ServletContext context, String systemId, boolean returnMetadata, String body) { return handlePost(httpServletRequest, context, systemId, null, returnMetadata, body); } - public Response handlePostWithJvmID(HttpServletRequest httpServletRequest, ServletContext context, - String systemId, String jvmId, boolean returnMetadata, String body) { + public Response handlePostWithJvmID(HttpServletRequest httpServletRequest, ServletContext context, String systemId, String jvmId, boolean returnMetadata, String body) { return handlePost(httpServletRequest, context, systemId, jvmId, returnMetadata, body); } - public Response handlePost(HttpServletRequest httpServletRequest, ServletContext context, - boolean returnMetadata, String body) { + public Response handlePost(HttpServletRequest httpServletRequest, ServletContext context, boolean returnMetadata, String body) { return handlePost(httpServletRequest, context, null, null, returnMetadata, body); } - public Response handlePost(HttpServletRequest httpServletRequest, ServletContext context, String systemId, - String jvmId, boolean returnMetadata, String body) { + public Response handlePost(HttpServletRequest httpServletRequest, ServletContext context, String systemId, String jvmId, boolean returnMetadata, String body) { try { RealmAuthorizer realmAuthorizer = (RealmAuthorizer) httpServletRequest.getAttribute(RealmAuthorizer.class.getName()); if (realmAuthorizer.writable()) { - ThermostatMongoStorage storage = (ThermostatMongoStorage) context.getAttribute( - ServletContextConstants.MONGODB_CLIENT_ATTRIBUTE); + ThermostatMongoStorage storage = (ThermostatMongoStorage) context.getAttribute(ServletContextConstants.MONGODB_CLIENT_ATTRIBUTE); - MongoDataResultContainer execResult = mongoExecutor.execPostRequest( - storage.getDatabase().getCollection(collectionName, DBObject.class), body, - realmAuthorizer.getWritableRealms(), systemId, jvmId); - + MongoDataResultContainer execResult = mongoExecutor.execPostRequest(storage.getDatabase().getCollection(collectionName, DBObject.class), body, realmAuthorizer.getWritableRealms(), systemId, jvmId); MongoResponseBuilder.Builder response = new MongoResponseBuilder.Builder(); if (returnMetadata) { @@ -261,25 +227,22 @@ * HTTP DELETE handling */ - public Response handleDeleteWithSystemID(HttpServletRequest httpServletRequest, ServletContext context, - String systemId, String queries, boolean returnMetadata) { + public Response handleDeleteWithSystemID(HttpServletRequest httpServletRequest, ServletContext context, String systemId, String queries, boolean returnMetadata) { return handleDelete(httpServletRequest, context, andSystemIdQuery(queries, systemId), returnMetadata); } - public Response handleDeleteWithJvmID(HttpServletRequest httpServletRequest, ServletContext context, - String systemId, String jvmId, String queries, boolean returnMetadata) { + public Response handleDeleteWithJvmID(HttpServletRequest httpServletRequest, ServletContext context, String systemId, String jvmId, String queries, boolean returnMetadata) { return handleDelete(httpServletRequest, context, andSystemIdJvmIdQuery(queries, systemId, jvmId), returnMetadata); } public Response handleDelete(HttpServletRequest httpServletRequest, ServletContext context, String queries, boolean returnMetadata) { try { RealmAuthorizer realmAuthorizer = (RealmAuthorizer) httpServletRequest.getAttribute(RealmAuthorizer.class.getName()); + if (realmAuthorizer.deletable()) { - ThermostatMongoStorage storage = (ThermostatMongoStorage) context.getAttribute( - ServletContextConstants.MONGODB_CLIENT_ATTRIBUTE); + ThermostatMongoStorage storage = (ThermostatMongoStorage) context.getAttribute(ServletContextConstants.MONGODB_CLIENT_ATTRIBUTE); - MongoDataResultContainer execResult = mongoExecutor.execDeleteRequest( - storage.getDatabase().getCollection(collectionName), queries, realmAuthorizer.getDeletableRealms()); + MongoDataResultContainer execResult = mongoExecutor.execDeleteRequest(storage.getDatabase().getCollection(collectionName), queries, realmAuthorizer.getDeletableRealms()); MongoResponseBuilder.Builder response = new MongoResponseBuilder.Builder(); if (returnMetadata) {
--- a/common/mongodb/src/main/java/com/redhat/thermostat/gateway/common/mongodb/servlet/RequestParameters.java Mon Sep 25 16:40:59 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -/* - * Copyright 2012-2017 Red Hat, Inc. - * - * This file is part of Thermostat. - * - * Thermostat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * Thermostat is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Thermostat; see the file COPYING. If not see - * <http://www.gnu.org/licenses/>. - * - * Linking this code with other modules is making a combined work - * based on this code. Thus, the terms and conditions of the GNU - * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this code give - * you permission to link this code with independent modules to - * produce an executable, regardless of the license terms of these - * independent modules, and to copy and distribute the resulting - * executable under terms of your choice, provided that you also - * meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module - * which is not derived from or based on this code. If you modify - * this code, you may extend this exception to your version of the - * library, but you are not obligated to do so. If you do not wish - * to do so, delete this exception statement from your version. - */ - -package com.redhat.thermostat.gateway.common.mongodb.servlet; - -public interface RequestParameters { - String SYSTEM_ID = "systemId"; - String JVM_ID = "jvmId"; - - String METADATA = "metadata"; - String SORT = "sort"; - String QUERY = "query"; - String OFFSET = "offset"; - String LIMIT = "limit"; - String INCLUDE = "include"; - String EXCLUDE = "exclude"; - - String TIMESTAMP = "timeStamp"; - String ALIVE_ONLY = "aliveOnly"; -}
--- a/common/mongodb/src/test/java/com/redhat/thermostat/gateway/common/mongodb/response/MongoMetaDataGeneratorTest.java Mon Sep 25 16:40:59 2017 +0200 +++ b/common/mongodb/src/test/java/com/redhat/thermostat/gateway/common/mongodb/response/MongoMetaDataGeneratorTest.java Tue Sep 26 11:41:34 2017 -0400 @@ -45,7 +45,10 @@ import javax.servlet.http.HttpServletRequest; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; +import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import org.junit.Before; import org.junit.Test; @@ -69,7 +72,7 @@ LinkedHashMap<String, String> paramArgs = new LinkedHashMap<>(); paramArgs.put(RequestParameters.METADATA, "true"); - fullGenerator = new MongoMetaDataGenerator(2, 2, "", "test1==b", "", "", paramArgs, container, baseUrl); + fullGenerator = new MongoMetaDataGenerator(new CommonQueryParams(new LimitParameter(2), new OffsetParameter(2), "", "test1==b", "", "", true), paramArgs, container, baseUrl); response = new MongoMetaDataResponseBuilder.MetaBuilder(); }
--- a/services/jvm-byteman/src/main/java/com/redhat/thermostat/gateway/service/jvm/byteman/JvmBytemanMetricsHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/jvm-byteman/src/main/java/com/redhat/thermostat/gateway/service/jvm/byteman/JvmBytemanMetricsHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -50,8 +50,9 @@ import javax.ws.rs.core.Response; import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; @Path("/metrics") public class JvmBytemanMetricsHttpHandler { @@ -74,7 +75,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context ServletContext context, @Context HttpServletRequest httpServletRequest) { - return metricsServiceHelper.handleGetWithJvmID(httpServletRequest, context, NO_SYSTEM_ID, jvmId, limit, offsetParam.getValue(), sort, queries, includes, excludes, metadata); + return metricsServiceHelper.handleGetWithJvmID(httpServletRequest, context, NO_SYSTEM_ID, jvmId, new CommonQueryParams(limit, offsetParam.getValue(), sort, queries, includes, excludes, metadata)); } @POST
--- a/services/jvm-byteman/src/main/java/com/redhat/thermostat/gateway/service/jvm/byteman/JvmBytemanStatusHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/jvm-byteman/src/main/java/com/redhat/thermostat/gateway/service/jvm/byteman/JvmBytemanStatusHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -51,8 +51,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; @Path("/status") public class JvmBytemanStatusHttpHandler { @@ -74,7 +75,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context ServletContext context, @Context HttpServletRequest httpServletRequest) { - return statusServiceHelper.handleGetWithJvmID(httpServletRequest, context, NO_SYSTEM_ID, jvmId, LIMIT_ONE, OFFSET_ZERO, DESCENDING_TIMESTAMP_SORT, NO_QUERIES, includes, excludes, metadata); + return statusServiceHelper.handleGetWithJvmID(httpServletRequest, context, NO_SYSTEM_ID, jvmId, new CommonQueryParams(LIMIT_ONE, OFFSET_ZERO, DESCENDING_TIMESTAMP_SORT, NO_QUERIES, includes, excludes, metadata)); } @POST
--- a/services/jvm-compiler/src/main/java/com/redhat/thermostat/gateway/service/jvm/compiler/JvmCompilerHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/jvm-compiler/src/main/java/com/redhat/thermostat/gateway/service/jvm/compiler/JvmCompilerHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -50,9 +50,11 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; @Path("/") public class JvmCompilerHttpHandler { @@ -65,7 +67,7 @@ @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getJvmCompiler(@PathParam(RequestParameters.JVM_ID) String jvmId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @@ -74,7 +76,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context HttpServletRequest httpServletRequest, @Context ServletContext context) { - return serviceHelper.handleGetWithJvmID(httpServletRequest, context, null, jvmId, limit, offset.getValue(), sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithJvmID(httpServletRequest, context, null, jvmId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @GET @@ -83,7 +85,7 @@ @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getJvmCompiler(@PathParam(RequestParameters.SYSTEM_ID) String systemId, @PathParam(RequestParameters.JVM_ID) String jvmId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @@ -92,7 +94,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context HttpServletRequest httpServletRequest, @Context ServletContext context) { - return serviceHelper.handleGetWithJvmID(httpServletRequest, context, systemId, jvmId, limit, offset.getValue(), sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithJvmID(httpServletRequest, context, systemId, jvmId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @POST
--- a/services/jvm-cpu/src/main/java/com/redhat/thermostat/gateway/service/jvm/cpu/JvmCpuHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/jvm-cpu/src/main/java/com/redhat/thermostat/gateway/service/jvm/cpu/JvmCpuHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -50,8 +50,11 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; +import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; @Path("/") public class JvmCpuHttpHandler { @@ -64,8 +67,8 @@ @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getJvmCpu(@PathParam(RequestParameters.JVM_ID) String jvmId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") Integer offset, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes, @@ -73,7 +76,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context HttpServletRequest httpServletRequest, @Context ServletContext context) { - return serviceHelper.handleGetWithJvmID(httpServletRequest, context, null, jvmId, limit, offset, sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithJvmID(httpServletRequest, context, null, jvmId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @GET @@ -82,8 +85,8 @@ @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getJvmCpu(@PathParam(RequestParameters.SYSTEM_ID) String systemId, @PathParam(RequestParameters.JVM_ID) String jvmId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") Integer offset, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes, @@ -91,7 +94,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context HttpServletRequest httpServletRequest, @Context ServletContext context) { - return serviceHelper.handleGetWithJvmID(httpServletRequest, context, systemId, jvmId, limit, offset, sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithJvmID(httpServletRequest, context, systemId, jvmId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @POST
--- a/services/jvm-gc/src/main/java/com/redhat/thermostat/gateway/service/jvm/gc/http/JvmGcHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/jvm-gc/src/main/java/com/redhat/thermostat/gateway/service/jvm/gc/http/JvmGcHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -52,8 +52,11 @@ import javax.ws.rs.core.Response; import com.redhat.thermostat.gateway.common.core.auth.RealmAuthorizer; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; +import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; import com.redhat.thermostat.gateway.common.mongodb.ThermostatMongoStorage; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; import com.redhat.thermostat.gateway.common.mongodb.servlet.ServletContextConstants; import com.redhat.thermostat.gateway.service.jvm.gc.mongo.JvmGcMongoStorageHandler; @@ -71,8 +74,8 @@ @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getJvmGc(@PathParam(RequestParameters.JVM_ID) String jvmId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") Integer offset, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes, @@ -80,7 +83,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context HttpServletRequest httpServletRequest, @Context ServletContext context) { - return serviceHelper.handleGetWithJvmID(httpServletRequest, context, null, jvmId, limit, offset, sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithJvmID(httpServletRequest, context, null, jvmId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @@ -90,8 +93,8 @@ @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getJvmGc(@PathParam(RequestParameters.SYSTEM_ID) String systemId, @PathParam(RequestParameters.JVM_ID) String jvmId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") Integer offset, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes, @@ -99,7 +102,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context HttpServletRequest httpServletRequest, @Context ServletContext context) { - return serviceHelper.handleGetWithJvmID(httpServletRequest, context, systemId, jvmId, limit, offset, sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithJvmID(httpServletRequest, context, systemId, jvmId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @PUT
--- a/services/jvm-gc/src/main/java/com/redhat/thermostat/gateway/service/jvm/gc/mongo/JvmGcMongoStorageHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/jvm-gc/src/main/java/com/redhat/thermostat/gateway/service/jvm/gc/mongo/JvmGcMongoStorageHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -39,13 +39,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedHashMap; + import java.util.List; import java.util.Map; import java.util.Set; import javax.servlet.http.HttpServletRequest; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; import org.bson.Document; import com.mongodb.client.MongoCollection; @@ -57,7 +58,6 @@ import com.redhat.thermostat.gateway.common.mongodb.response.MongoMetaDataGenerator; import com.redhat.thermostat.gateway.common.mongodb.response.MongoMetaDataResponseBuilder; import com.redhat.thermostat.gateway.common.mongodb.response.MongoResponseBuilder; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; public class JvmGcMongoStorageHandler { @@ -81,7 +81,7 @@ } MongoDataResultContainer execResult = mongoExecutor.execGetRequest( - collection, limit, offset, descendingSort, queries, null, null, realms); + collection, queries, new CommonQueryParams(limit, offset, descendingSort, "", null, null, false), realms); MongoResponseBuilder.Builder response = new MongoResponseBuilder.Builder(); @@ -120,7 +120,7 @@ nextQuery.add(ThermostatFields.JVM_ID + "==" + jvmId); MongoDataResultContainer execLastResult = mongoExecutor.execGetRequest( - collection, 1, 0, descendingSort, nextQuery, null, null, realms); + collection, nextQuery, new CommonQueryParams(1, 0, descendingSort, null, null, null, false), realms); Document first = execLastResult.getQueryDataResult().first(); @@ -134,27 +134,20 @@ } if (metadata) { - setMetadata(limit, offset, descendingSort, null, null, null, httpServletRequest, execResult, response); + setMetadata(new CommonQueryParams(limit, offset, descendingSort, null, null, null, true), httpServletRequest, execResult, response); } return response.build(); } - private void setMetadata(int limit, int offset, String sort, String queries, String includes, String excludes, HttpServletRequest httpServletRequest, + private void setMetadata(CommonQueryParams params, HttpServletRequest httpServletRequest, MongoDataResultContainer execResult, MongoResponseBuilder.Builder response) { MongoMetaDataResponseBuilder.MetaBuilder metaDataResponse = new MongoMetaDataResponseBuilder.MetaBuilder(); - LinkedHashMap<String, String> paramArgs = new LinkedHashMap<>(); - paramArgs.put(RequestParameters.SORT, sort); - paramArgs.put(RequestParameters.QUERY, queries); - paramArgs.put(RequestParameters.INCLUDE, includes); - paramArgs.put(RequestParameters.EXCLUDE, excludes); - paramArgs.put(RequestParameters.METADATA, "true"); - paramArgs.put(RequestParameters.LIMIT, String.valueOf(limit)); - paramArgs.put(RequestParameters.OFFSET, String.valueOf(offset)); + Map<String, String> paramArgs = params.buildParams(); String baseUrl = httpServletRequest.getRequestURL().toString(); - MongoMetaDataGenerator metaDataGenerator = new MongoMetaDataGenerator(limit, offset, sort, queries, includes, excludes, paramArgs, execResult, baseUrl); + MongoMetaDataGenerator metaDataGenerator = new MongoMetaDataGenerator(params, paramArgs, execResult, baseUrl); metaDataGenerator.setDocAndPayloadCount(metaDataResponse); metaDataGenerator.setPrev(metaDataResponse);
--- a/services/jvm-io/src/main/java/com/redhat/thermostat/gateway/service/jvm/io/JvmIoHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/jvm-io/src/main/java/com/redhat/thermostat/gateway/service/jvm/io/JvmIoHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -51,8 +51,10 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; @Path("/") @@ -65,16 +67,16 @@ @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getJvmIo(@PathParam(RequestParameters.JVM_ID) String jvmId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offsetParam, - @QueryParam(RequestParameters.SORT) String sort, - @QueryParam(RequestParameters.QUERY) String queries, - @QueryParam(RequestParameters.INCLUDE) String includes, - @QueryParam(RequestParameters.EXCLUDE) String excludes, - @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, - @Context ServletContext context, - @Context HttpServletRequest httpServletRequest) { - return serviceHelper.handleGetWithJvmID(httpServletRequest, context, null, jvmId, limit, offsetParam.getValue(), sort, queries, includes, excludes, metadata); + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, + @QueryParam(RequestParameters.SORT) String sort, + @QueryParam(RequestParameters.QUERY) String queries, + @QueryParam(RequestParameters.INCLUDE) String includes, + @QueryParam(RequestParameters.EXCLUDE) String excludes, + @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, + @Context ServletContext context, + @Context HttpServletRequest httpServletRequest) { + return serviceHelper.handleGetWithJvmID(httpServletRequest, context, null, jvmId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @GET @@ -82,17 +84,17 @@ @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getJvmIo(@PathParam(RequestParameters.SYSTEM_ID) String systemId, - @PathParam(RequestParameters.JVM_ID) String jvmId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offsetParam, - @QueryParam(RequestParameters.SORT) String sort, - @QueryParam(RequestParameters.QUERY) String queries, - @QueryParam(RequestParameters.INCLUDE) String includes, - @QueryParam(RequestParameters.EXCLUDE) String excludes, - @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, - @Context ServletContext context, - @Context HttpServletRequest httpServletRequest) { - return serviceHelper.handleGetWithJvmID(httpServletRequest, context, systemId, jvmId, limit, offsetParam.getValue(), sort, queries, includes, excludes, metadata); + @PathParam(RequestParameters.JVM_ID) String jvmId, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, + @QueryParam(RequestParameters.SORT) String sort, + @QueryParam(RequestParameters.QUERY) String queries, + @QueryParam(RequestParameters.INCLUDE) String includes, + @QueryParam(RequestParameters.EXCLUDE) String excludes, + @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, + @Context ServletContext context, + @Context HttpServletRequest httpServletRequest) { + return serviceHelper.handleGetWithJvmID(httpServletRequest, context, systemId, jvmId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @PUT
--- a/services/jvm-memory/src/main/java/com/redhat/thermostat/gateway/service/jvm/memory/JvmMemoryHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/jvm-memory/src/main/java/com/redhat/thermostat/gateway/service/jvm/memory/JvmMemoryHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -51,8 +51,10 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; @Path("/") @@ -65,8 +67,8 @@ @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getJvmMemory(@PathParam(RequestParameters.JVM_ID) String jvmId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offsetParam, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes, @@ -74,7 +76,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context ServletContext context, @Context HttpServletRequest httpServletRequest) { - return serviceHelper.handleGetWithJvmID(httpServletRequest, context, null, jvmId, limit, offsetParam.getValue(), sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithJvmID(httpServletRequest, context, null, jvmId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @GET @@ -83,8 +85,8 @@ @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getJvmMemory(@PathParam(RequestParameters.SYSTEM_ID) String systemId, @PathParam(RequestParameters.JVM_ID) String jvmId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offsetParam, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes, @@ -92,7 +94,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context ServletContext context, @Context HttpServletRequest httpServletRequest) { - return serviceHelper.handleGetWithJvmID(httpServletRequest, context, systemId, jvmId, limit, offsetParam.getValue(), sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithJvmID(httpServletRequest, context, systemId, jvmId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @PUT
--- a/services/jvms/src/main/java/com/redhat/thermostat/gateway/service/jvms/http/JvmsHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/jvms/src/main/java/com/redhat/thermostat/gateway/service/jvms/http/JvmsHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -62,7 +62,9 @@ import com.mongodb.MongoTimeoutException; import com.mongodb.MongoWriteException; import com.redhat.thermostat.gateway.common.core.auth.RealmAuthorizer; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; +import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.ThermostatMongoStorage; import com.redhat.thermostat.gateway.common.mongodb.servlet.ServletContextConstants; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; @@ -92,8 +94,8 @@ @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getJvmInfos(@PathParam(RequestParameters.SYSTEM_ID) final String systemId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") final Integer offset, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes,
--- a/services/jvms/src/main/java/com/redhat/thermostat/gateway/service/jvms/mongo/JvmInfoMongoStorageHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/jvms/src/main/java/com/redhat/thermostat/gateway/service/jvms/mongo/JvmInfoMongoStorageHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -51,6 +51,8 @@ import java.util.List; import java.util.Map; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; +import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; import org.bson.Document; import org.bson.conversions.Bson; @@ -122,7 +124,7 @@ return mongoResponseBuilder.addQueryDocuments(documents, runnable).build(); } - public String getJvmInfos(MongoCollection<Document> collection, String systemId, Integer limit, Integer offset, String sort, String queries, String includes, String excludes) { + public String getJvmInfos(MongoCollection<Document> collection, String systemId, LimitParameter limit, OffsetParameter offset, String sort, String queries, String includes, String excludes) { final Bson baseQuery; baseQuery = eq(StorageFields.SYSTEM_ID, systemId); FindIterable<Document> documents; @@ -153,7 +155,7 @@ } final Bson sortObject = MongoSortFilters.createSortObject(sort); - documents = documents.sort(sortObject).limit(limit).skip(offset).batchSize(limit).cursorType(CursorType.NonTailable); + documents = documents.sort(sortObject).limit(limit.getValue()).skip(offset.getValue()).batchSize(limit.getValue()).cursorType(CursorType.NonTailable); return mongoResponseBuilder.addQueryDocuments(documents, runnable).build(); }
--- a/services/system-cpu/src/main/java/com/redhat/thermostat/gateway/service/system/cpu/http/SystemInfoCPUHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/system-cpu/src/main/java/com/redhat/thermostat/gateway/service/system/cpu/http/SystemInfoCPUHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -51,7 +51,10 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; +import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; @Path("/") @@ -64,8 +67,8 @@ @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getCPUInfo(@PathParam(RequestParameters.SYSTEM_ID) String systemId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") Integer offset, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes, @@ -73,7 +76,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context ServletContext context, @Context HttpServletRequest httpServletRequest) { - return serviceHelper.handleGetWithSystemID(httpServletRequest, context, systemId, limit, offset, sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithSystemID(httpServletRequest, context, systemId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @PUT
--- a/services/system-memory/src/main/java/com/redhat/thermostat/gateway/service/system/memory/http/SystemMemoryHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/system-memory/src/main/java/com/redhat/thermostat/gateway/service/system/memory/http/SystemMemoryHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -49,9 +49,13 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; +import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; @Path("/") @@ -64,8 +68,8 @@ @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getCPUInfo(@PathParam(RequestParameters.SYSTEM_ID) String systemId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") Integer offset, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes, @@ -73,7 +77,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context ServletContext context, @Context HttpServletRequest httpServletRequest) { - return serviceHelper.handleGetWithSystemID(httpServletRequest, context, systemId, limit, offset, sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithSystemID(httpServletRequest, context, systemId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @PUT
--- a/services/system-network/src/main/java/com/redhat/thermostat/gateway/service/system/network/http/SystemNetworkHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/system-network/src/main/java/com/redhat/thermostat/gateway/service/system/network/http/SystemNetworkHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -36,7 +36,10 @@ package com.redhat.thermostat.gateway.service.system.network.http; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; +import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; import javax.servlet.ServletContext; @@ -64,8 +67,8 @@ @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) public Response get(@PathParam(RequestParameters.SYSTEM_ID) String systemId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") Integer offset, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes, @@ -73,7 +76,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context ServletContext context, @Context HttpServletRequest httpServletRequest) { - return serviceHelper.handleGetWithSystemID(httpServletRequest, context, systemId, limit, offset, sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithSystemID(httpServletRequest, context, systemId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @PUT
--- a/services/systems/src/main/java/com/redhat/thermostat/gateway/service/systems/http/SystemsHttpHandler.java Mon Sep 25 16:40:59 2017 +0200 +++ b/services/systems/src/main/java/com/redhat/thermostat/gateway/service/systems/http/SystemsHttpHandler.java Tue Sep 26 11:41:34 2017 -0400 @@ -51,7 +51,10 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.model.LimitParameter; +import com.redhat.thermostat.gateway.common.core.model.OffsetParameter; +import com.redhat.thermostat.gateway.common.core.servlet.CommonQueryParams; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.common.mongodb.servlet.MongoHttpHandlerHelper; @Path("/") @@ -62,8 +65,8 @@ @GET @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) - public Response getSystemInfoAll(@QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") Integer offset, + public Response getSystemInfoAll(@QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes, @@ -71,7 +74,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context ServletContext context, @Context HttpServletRequest httpServletRequest) { - return serviceHelper.handleGet(httpServletRequest, context, limit, offset, sort, queries, includes, excludes, metadata); + return serviceHelper.handleGet(httpServletRequest, context, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @GET @@ -79,8 +82,8 @@ @Consumes({ "application/json" }) @Produces({ "application/json", "text/html; charset=utf-8" }) public Response getSystemInfo(@PathParam(RequestParameters.SYSTEM_ID) String systemId, - @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") Integer limit, - @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") Integer offset, + @QueryParam(RequestParameters.LIMIT) @DefaultValue("1") LimitParameter limit, + @QueryParam(RequestParameters.OFFSET) @DefaultValue("0") OffsetParameter offset, @QueryParam(RequestParameters.SORT) String sort, @QueryParam(RequestParameters.QUERY) String queries, @QueryParam(RequestParameters.INCLUDE) String includes, @@ -88,7 +91,7 @@ @QueryParam(RequestParameters.METADATA) @DefaultValue("false") Boolean metadata, @Context ServletContext context, @Context HttpServletRequest httpServletRequest) { - return serviceHelper.handleGetWithSystemID(httpServletRequest, context, systemId, limit, offset, sort, queries, includes, excludes, metadata); + return serviceHelper.handleGetWithSystemID(httpServletRequest, context, systemId, new CommonQueryParams(limit, offset, sort, queries, includes, excludes, metadata)); } @PUT
--- a/tests/integration-tests/src/test/java/com/redhat/thermostat/gateway/service/jvm/gc/JvmGcServiceIntegrationTest.java Mon Sep 25 16:40:59 2017 +0200 +++ b/tests/integration-tests/src/test/java/com/redhat/thermostat/gateway/service/jvm/gc/JvmGcServiceIntegrationTest.java Tue Sep 26 11:41:34 2017 -0400 @@ -69,7 +69,7 @@ import com.mongodb.client.FindIterable; import com.mongodb.client.MongoCollection; import com.redhat.thermostat.gateway.common.core.auth.basic.BasicRealmAuthorizer; -import com.redhat.thermostat.gateway.common.mongodb.servlet.RequestParameters; +import com.redhat.thermostat.gateway.common.core.servlet.RequestParameters; import com.redhat.thermostat.gateway.tests.integration.MongoIntegrationTest; public class JvmGcServiceIntegrationTest extends MongoIntegrationTest {