From cfdf0dbbcd208a669c9919f23f1c30b2ec16b4d8 Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Fri, 6 Dec 2019 08:37:39 +0100 Subject: Improve code coverage Issue-ID: DCAEGEN2-1980 Signed-off-by: Zebek Bogumil Change-Id: I062a4a7f6508a6a3b2c212793bdad019ab46f7e2 --- .../dcae/inventory/daos/InventoryDAOManager.java | 9 ++++-- .../inventory/daos/InventoryDataAccessManager.java | 34 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/onap/dcae/inventory/daos/InventoryDataAccessManager.java (limited to 'src/main/java/org') diff --git a/src/main/java/org/onap/dcae/inventory/daos/InventoryDAOManager.java b/src/main/java/org/onap/dcae/inventory/daos/InventoryDAOManager.java index 5bdecfe..7039700 100644 --- a/src/main/java/org/onap/dcae/inventory/daos/InventoryDAOManager.java +++ b/src/main/java/org/onap/dcae/inventory/daos/InventoryDAOManager.java @@ -40,11 +40,11 @@ import java.util.List; * * Created by mhwang on 4/19/16. */ -public final class InventoryDAOManager { +public final class InventoryDAOManager implements InventoryDataAccessManager { private static InventoryDAOManager instance; - public static InventoryDAOManager getInstance() { + public static synchronized InventoryDAOManager getInstance() { if (instance == null) { instance = new InventoryDAOManager(); } @@ -177,10 +177,12 @@ public final class InventoryDAOManager { return jdbi.onDemand(klass); } + @Override public DCAEServicesDAO getDCAEServicesDAO() { return (DCAEServicesDAO) this.getDAO(DCAEServicesDAO.class); } + @Override public DCAEServiceComponentsDAO getDCAEServiceComponentsDAO() { return (DCAEServiceComponentsDAO) this.getDAO(DCAEServiceComponentsDAO.class); } @@ -189,10 +191,12 @@ public final class InventoryDAOManager { return (DCAEServicesComponentsMapsDAO) this.getDAO(DCAEServicesComponentsMapsDAO.class); } + @Override public DCAEServiceTransactionDAO getDCAEServiceTransactionDAO() { return jdbi.onDemand(DCAEServiceTransactionDAO.class); } + @Override public DCAEServiceTypesDAO getDCAEServiceTypesDAO() { return (DCAEServiceTypesDAO) this.getDAO(DCAEServiceTypesDAO.class); } @@ -202,6 +206,7 @@ public final class InventoryDAOManager { * * @return */ + @Override public Handle getHandle() { return this.jdbi.open(); } diff --git a/src/main/java/org/onap/dcae/inventory/daos/InventoryDataAccessManager.java b/src/main/java/org/onap/dcae/inventory/daos/InventoryDataAccessManager.java new file mode 100644 index 0000000..ef4375b --- /dev/null +++ b/src/main/java/org/onap/dcae/inventory/daos/InventoryDataAccessManager.java @@ -0,0 +1,34 @@ +/*- + * ============LICENSE_START======================================================= + * dcae-inventory + * ================================================================================ + * Copyright (C) 2019 Nokia Intellectual Property. 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 org.onap.dcae.inventory.daos; + +import org.skife.jdbi.v2.Handle; + +public interface InventoryDataAccessManager { + DCAEServicesDAO getDCAEServicesDAO(); + + DCAEServiceComponentsDAO getDCAEServiceComponentsDAO(); + + DCAEServiceTransactionDAO getDCAEServiceTransactionDAO(); + + DCAEServiceTypesDAO getDCAEServiceTypesDAO(); + + Handle getHandle(); +} -- cgit 1.2.3-korg