aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/io/swagger/api/impl/DcaeServiceTypeObjectRepository.java107
-rw-r--r--src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java74
2 files changed, 119 insertions, 62 deletions
diff --git a/src/main/java/io/swagger/api/impl/DcaeServiceTypeObjectRepository.java b/src/main/java/io/swagger/api/impl/DcaeServiceTypeObjectRepository.java
new file mode 100644
index 0000000..3212fe0
--- /dev/null
+++ b/src/main/java/io/swagger/api/impl/DcaeServiceTypeObjectRepository.java
@@ -0,0 +1,107 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2020 Nokia. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package io.swagger.api.impl;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.onap.dcae.inventory.daos.InventoryDataAccessManager;
+import org.onap.dcae.inventory.dbthings.mappers.DCAEServiceTypeObjectMapper;
+import org.onap.dcae.inventory.dbthings.models.DCAEServiceTypeObject;
+import org.skife.jdbi.v2.Handle;
+import org.skife.jdbi.v2.Query;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+class DcaeServiceTypeObjectRepository {
+ private static final Logger metricsLogger = LoggerFactory.getLogger("metricsLogger");
+ private final InventoryDataAccessManager instance;
+
+ public DcaeServiceTypeObjectRepository(InventoryDataAccessManager instance) {
+ this.instance = instance;
+ }
+
+ List<DCAEServiceTypeObject> fetch(String typeName, Boolean onlyLatest, Boolean onlyActive, String vnfType,
+ String serviceId, String serviceLocation, String asdcServiceId,
+ String asdcResourceId, String application, String component, String owner) {
+
+ List<DCAEServiceTypeObject> serviceTypeObjects;
+
+ // TODO: Make this variable also a URL parameter.
+ DateTime createdCutoff = DateTime.now(DateTimeZone.UTC);
+
+ try (Handle jdbiHandle = instance.getHandle()) {
+ final String queryStatement = DcaeServiceTypesQueryStatement.create(typeName, onlyLatest, onlyActive,
+ vnfType, serviceId, serviceLocation, asdcServiceId, asdcResourceId, owner, application, component);
+
+ metricsLogger.info("Query created as: {}." + queryStatement);
+
+ Query<DCAEServiceTypeObject> query = getQuery(jdbiHandle, queryStatement);
+
+ if (typeName != null){
+ typeName = resolveTypeName(typeName);
+ }
+
+ ifNotNullBind(typeName, it -> query.bind("typeName", it));
+ ifNotNullBind(vnfType, it -> query.bind("vnfType", it));
+ ifNotNullBind(serviceId, it -> query.bind("serviceId", it));
+ ifNotNullBind(serviceLocation, it -> query.bind("serviceLocation", it));
+ ifNotNoneBind(asdcServiceId, it -> query.bind("asdcServiceId", it));
+ ifNotNoneBind(asdcResourceId, it -> query.bind("asdcResourceId", it));
+ ifNotNullBind(application, it -> query.bind("application", it));
+ ifNotNullBind(component, it -> query.bind("component", it));
+ ifNotNullBind(owner, it -> query.bind("owner", it));
+ bindCreatedCutoff(createdCutoff, query);
+
+ serviceTypeObjects = query.list();
+ }
+
+ return serviceTypeObjects;
+ }
+
+ private void ifNotNullBind(String value, Consumer<String> bind) {
+ if (value != null) {
+ bind.accept(value);
+ }
+ }
+
+ private void ifNotNoneBind(String value, Consumer<String> bind) {
+ if (value != null && !"NONE".equalsIgnoreCase(value)) {
+ bind.accept(value);
+ }
+ }
+
+ void bindCreatedCutoff(DateTime createdCutoff, Query<DCAEServiceTypeObject> query) {
+ query.bind("createdCutoff", createdCutoff);
+ }
+
+ Query<DCAEServiceTypeObject> getQuery(Handle jdbiHandle, String queryStatement) {
+ return jdbiHandle.createQuery(queryStatement).map(new DCAEServiceTypeObjectMapper());
+ }
+
+ static String resolveTypeName(String typeName){
+ if (typeName.contains("*")) {
+ return typeName.replaceAll("\\*", "%");
+ }
+ return typeName;
+ }
+}
diff --git a/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java b/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java
index 3a08daa..9c52ded 100644
--- a/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java
+++ b/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java
@@ -24,7 +24,6 @@ package io.swagger.api.impl;
import org.onap.dcae.inventory.daos.DCAEServiceTypesDAO;
import org.onap.dcae.inventory.daos.DCAEServicesDAO;
import org.onap.dcae.inventory.daos.InventoryDAOManager;
-import org.onap.dcae.inventory.dbthings.mappers.DCAEServiceTypeObjectMapper;
import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject;
import org.onap.dcae.inventory.dbthings.models.DCAEServiceTypeObject;
import io.swagger.api.*;
@@ -33,8 +32,6 @@ import io.swagger.model.*;
import io.swagger.api.NotFoundException;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
-import org.skife.jdbi.v2.Handle;
-import org.skife.jdbi.v2.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -83,60 +80,16 @@ public class DcaeServiceTypesApiServiceImpl extends DcaeServiceTypesApiService {
UriInfo uriInfo, SecurityContext securityContext,
String application, String component, String owner)
throws NotFoundException {
- List<DCAEServiceTypeObject> serviceTypeObjects = new ArrayList<>();
- // TODO: Make this variable also a URL parameter.
- DateTime createdCutoff = DateTime.now(DateTimeZone.UTC);
+ DcaeServiceTypeObjectRepository dcaeServiceTypeObjectRepository = new DcaeServiceTypeObjectRepository(
+ InventoryDAOManager.getInstance()
+ );
- try (Handle jdbiHandle = InventoryDAOManager.getInstance().getHandle()) {
- final String queryStatement = DcaeServiceTypesQueryStatement.create(typeName, onlyLatest, onlyActive,
- vnfType, serviceId, serviceLocation, asdcServiceId, asdcResourceId, owner, application, component);
-
- metricsLogger.info("Query created as: {}." + queryStatement);
-
- Query<DCAEServiceTypeObject> query = jdbiHandle.createQuery(queryStatement).map(new DCAEServiceTypeObjectMapper());
-
- if (typeName != null) {
- typeName = resolveTypeName(typeName);
- query.bind("typeName", typeName);
- }
-
- if (vnfType != null) {
- query.bind("vnfType", vnfType);
- }
-
- if (serviceId != null) {
- query.bind("serviceId", serviceId);
- }
-
- if (serviceLocation != null) {
- query.bind("serviceLocation", serviceLocation);
- }
-
- if (asdcServiceId != null && !"NONE".equalsIgnoreCase(asdcServiceId)) {
- query.bind("asdcServiceId", asdcServiceId);
- }
-
- if (asdcResourceId != null && !"NONE".equalsIgnoreCase(asdcResourceId)) {
- query.bind("asdcResourceId", asdcResourceId);
- }
-
- if (application != null) {
- query.bind("application", application);
- }
-
- if (component != null) {
- query.bind("component", component);
- }
-
- if (owner != null) {
- query.bind("owner", owner);
- }
-
- query.bind("createdCutoff", createdCutoff);
-
- serviceTypeObjects = query.list();
- }
+ List<DCAEServiceTypeObject> serviceTypeObjects = dcaeServiceTypeObjectRepository.fetch(
+ typeName, onlyLatest, onlyActive, vnfType,
+ serviceId, serviceLocation, asdcServiceId,
+ asdcResourceId, application, component, owner
+ );
offset = (offset == null) ? 0 : offset;
@@ -161,6 +114,10 @@ public class DcaeServiceTypesApiServiceImpl extends DcaeServiceTypesApiService {
// TODO: MUST UPDATE THIS LINK NAV CODE
+ if (typeName != null){
+ typeName = DcaeServiceTypeObjectRepository.resolveTypeName(typeName);
+ }
+
if (offsetPrev >= 0) {
navigationLinks.setPreviousLink(DcaeServiceTypesApi.buildLinkForGet(uriInfo, "prev", typeName, onlyLatest,
onlyActive, vnfType, serviceId, serviceLocation, asdcServiceId, asdcResourceId, offsetPrev, application, component, owner));
@@ -193,13 +150,6 @@ public class DcaeServiceTypesApiServiceImpl extends DcaeServiceTypesApiService {
return Response.ok().entity(createDCAEServiceType(serviceTypeObject, uriInfo)).build();
}
- static String resolveTypeName(String typeName){
- if (typeName.contains("*")) {
- return typeName.replaceAll("\\*", "%");
- }
- return typeName;
- }
-
/**
* Create a DCAE service type database object
*