diff options
author | 2019-10-31 16:39:37 +0000 | |
---|---|---|
committer | 2019-11-01 06:44:52 +0000 | |
commit | 5a5842e77e4e0f0b6207192b374d99753db26c7e (patch) | |
tree | 789892696da184e8208ba5c75753aaca3c82fadb /ONAP-REST/src/main/java/org/onap | |
parent | fdfd5a00ed2805fe6138dbd0a78840c7210e8098 (diff) |
ONAP-REST DAO Sonar/Checkstyle clean and knock-on
Clean up the ONAP-REST DAO package and also deal with knock-on chages in
other packages.
Issue-ID: POLICY-2131
Change-Id: I381d514d37ffbddb7a91b8f8a018c7354fc437b3
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'ONAP-REST/src/main/java/org/onap')
-rw-r--r-- | ONAP-REST/src/main/java/org/onap/policy/rest/dao/CommonClassDao.java | 36 | ||||
-rw-r--r-- | ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDbException.java (renamed from ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDBException.java) | 25 |
2 files changed, 36 insertions, 25 deletions
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/dao/CommonClassDao.java b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/CommonClassDao.java index 0056a2bf5..6bc9a646e 100644 --- a/ONAP-REST/src/main/java/org/onap/policy/rest/dao/CommonClassDao.java +++ b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/CommonClassDao.java @@ -3,6 +3,7 @@ * ONAP-REST * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,37 +23,46 @@ package org.onap.policy.rest.dao; import java.util.List; -import org.onap.policy.rest.jpa.PolicyRoles; import javax.script.SimpleBindings; +import org.onap.policy.rest.jpa.PolicyRoles; + public interface CommonClassDao { - //Common methods + // Common methods List<Object> getData(@SuppressWarnings("rawtypes") Class className); + List<Object> getDataById(@SuppressWarnings("rawtypes") Class className, String columnName, String key); + List<String> getDataByColumn(@SuppressWarnings("rawtypes") Class className, String columnName); - List<Object> checkDuplicateEntry(String value, String columnName, @SuppressWarnings("rawtypes") Class className); + + List<Object> checkDuplicateEntry(String value, String columnName, @SuppressWarnings("rawtypes") Class className); + Object getEntityItem(@SuppressWarnings("rawtypes") Class className, String columnName, String key); - List<Object> getDataByQuery(String query, SimpleBindings params); - List<Object> getMultipleDataOnAddingConjunction(@SuppressWarnings("rawtypes") Class className, String columnName, List<String> data); + + List<Object> getDataByQuery(String query, SimpleBindings params); + + List<Object> getMultipleDataOnAddingConjunction(@SuppressWarnings("rawtypes") Class className, String columnName, + List<String> data); + void save(Object entity); + void delete(Object entity); + void update(Object entity); + void updateQuery(String query); - //Group Policy Scope + // Group Policy Scope List<Object> checkExistingGroupListforUpdate(String groupListValue, String groupNameValue); - - //Roles + // Roles List<PolicyRoles> getUserRoles(); - - //ClosedLoops + // ClosedLoops void updateClAlarms(String clName, String alarms); - void updateClYaml(String clName, String yaml); - void deleteAll(); - + void updateClYaml(String clName, String yaml); + void deleteAll(); } diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDBException.java b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDbException.java index df6bf12b2..4a982ccc0 100644 --- a/ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDBException.java +++ b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDbException.java @@ -3,6 +3,7 @@ * ONAP-REST * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,30 +22,30 @@ package org.onap.policy.rest.dao; /** - * PolicyDBException extends <code>Exception</code> to implement exceptions thrown by Policy Database transactions. - * + * PolicyDBException extends <code>Exception</code> to implement exceptions thrown by Policy Database transactions. + * * @version 0.1 */ -public class PolicyDBException extends Exception { +public class PolicyDbException extends Exception { private static final long serialVersionUID = -6162444281003852781L; - public PolicyDBException() { + public PolicyDbException() { // Empty constructor } - - public PolicyDBException(String message) { + + public PolicyDbException(String message) { super(message); } - - public PolicyDBException(Throwable cause){ + + public PolicyDbException(Throwable cause) { super(cause); } - - public PolicyDBException(String message, Throwable cause) { + + public PolicyDbException(String message, Throwable cause) { super(message, cause); } - - public PolicyDBException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + + public PolicyDbException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { super(message, cause, enableSuppression, writableStackTrace); } } |