From b9c324e98a42ba7af4c7c8e5ac4b5482e7509b8c Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Mon, 16 Dec 2019 09:34:21 +0100 Subject: Improve code coverage Issue-ID: DCAEGEN2-1992 Signed-off-by: Zebek Bogumil Change-Id: I3e57f34fb8d3fcec66a5c937aa352032dc84b1e8 --- .../api/impl/DcaeServicesGroupByApiServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/main/java/io/swagger/api/impl/DcaeServicesGroupByApiServiceImpl.java') diff --git a/src/main/java/io/swagger/api/impl/DcaeServicesGroupByApiServiceImpl.java b/src/main/java/io/swagger/api/impl/DcaeServicesGroupByApiServiceImpl.java index f879bff..fff2bd4 100644 --- a/src/main/java/io/swagger/api/impl/DcaeServicesGroupByApiServiceImpl.java +++ b/src/main/java/io/swagger/api/impl/DcaeServicesGroupByApiServiceImpl.java @@ -27,6 +27,7 @@ import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; import io.swagger.model.DCAEServiceGroupByResults; import io.swagger.model.DCAEServiceGroupByResultsPropertyValues; import org.skife.jdbi.v2.Handle; +import org.skife.jdbi.v2.Query; import javax.ws.rs.core.Link; import javax.ws.rs.core.Response; @@ -149,14 +150,18 @@ public class DcaeServicesGroupByApiServiceImpl extends DcaeServicesGroupbyApiSer String queryString = createQuery(columnName); try (Handle jdbiHandle = inventoryDataAccessManager.getHandle()) { - - // NOTE: This is hardcoded because service status is only used internally. - return jdbiHandle.createQuery(queryString) - .bind(SERVICE_STATUS_PLACE_HOLDER, DCAEServiceObject.DCAEServiceStatus.RUNNING) - .list(); + return executeQuery(queryString, jdbiHandle); } } + List> executeQuery(String queryString, Handle jdbiHandle) { + // NOTE: This is hardcoded because service status is only used internally. + final Query> query = jdbiHandle.createQuery(queryString); + final Query> bind = query + .bind(SERVICE_STATUS_PLACE_HOLDER, DCAEServiceObject.DCAEServiceStatus.RUNNING); + return bind.list(); + } + static String createQuery(String columnName) { StringBuilder sb = new StringBuilder(); sb.append(String.format("select %s, count(1) as num ", columnName)); -- cgit 1.2.3-korg