From 5a5842e77e4e0f0b6207192b374d99753db26c7e Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 31 Oct 2019 16:39:37 +0000 Subject: 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 --- .../org/onap/policy/rest/dao/CommonClassDao.java | 36 +++++++++----- .../onap/policy/rest/dao/PolicyDBException.java | 50 -------------------- .../onap/policy/rest/dao/PolicyDbException.java | 51 ++++++++++++++++++++ .../policy/rest/dao/PolicyDBExceptionTest.java | 54 --------------------- .../policy/rest/dao/PolicyDbExceptionTest.java | 55 ++++++++++++++++++++++ 5 files changed, 129 insertions(+), 117 deletions(-) delete mode 100644 ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDBException.java create mode 100644 ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDbException.java delete mode 100644 ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDBExceptionTest.java create mode 100644 ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDbExceptionTest.java (limited to 'ONAP-REST') 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 getData(@SuppressWarnings("rawtypes") Class className); + List getDataById(@SuppressWarnings("rawtypes") Class className, String columnName, String key); + List getDataByColumn(@SuppressWarnings("rawtypes") Class className, String columnName); - List checkDuplicateEntry(String value, String columnName, @SuppressWarnings("rawtypes") Class className); + + List checkDuplicateEntry(String value, String columnName, @SuppressWarnings("rawtypes") Class className); + Object getEntityItem(@SuppressWarnings("rawtypes") Class className, String columnName, String key); - List getDataByQuery(String query, SimpleBindings params); - List getMultipleDataOnAddingConjunction(@SuppressWarnings("rawtypes") Class className, String columnName, List data); + + List getDataByQuery(String query, SimpleBindings params); + + List getMultipleDataOnAddingConjunction(@SuppressWarnings("rawtypes") Class className, String columnName, + List data); + void save(Object entity); + void delete(Object entity); + void update(Object entity); + void updateQuery(String query); - //Group Policy Scope + // Group Policy Scope List checkExistingGroupListforUpdate(String groupListValue, String groupNameValue); - - //Roles + // Roles List 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 deleted file mode 100644 index df6bf12b2..000000000 --- a/ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDBException.java +++ /dev/null @@ -1,50 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP-REST - * ================================================================================ - * Copyright (C) 2017 AT&T 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.policy.rest.dao; - -/** - * PolicyDBException extends Exception to implement exceptions thrown by Policy Database transactions. - * - * @version 0.1 - */ -public class PolicyDBException extends Exception { - private static final long serialVersionUID = -6162444281003852781L; - - public PolicyDBException() { - // Empty constructor - } - - public PolicyDBException(String message) { - super(message); - } - - public PolicyDBException(Throwable cause){ - super(cause); - } - - public PolicyDBException(String message, Throwable cause) { - super(message, cause); - } - - public PolicyDBException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } -} 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 new file mode 100644 index 000000000..4a982ccc0 --- /dev/null +++ b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDbException.java @@ -0,0 +1,51 @@ +/*- + * ============LICENSE_START======================================================= + * 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. + * 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.policy.rest.dao; + +/** + * PolicyDBException extends Exception to implement exceptions thrown by Policy Database transactions. + * + * @version 0.1 + */ +public class PolicyDbException extends Exception { + private static final long serialVersionUID = -6162444281003852781L; + + public PolicyDbException() { + // Empty constructor + } + + public PolicyDbException(String message) { + super(message); + } + + public PolicyDbException(Throwable cause) { + super(cause); + } + + public PolicyDbException(String message, Throwable cause) { + super(message, cause); + } + + public PolicyDbException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } +} diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDBExceptionTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDBExceptionTest.java deleted file mode 100644 index 0cd89a40e..000000000 --- a/ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDBExceptionTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PolicyEngineUtils - * ================================================================================ - * Copyright (C) 2018 AT&T 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.policy.rest.dao; - -import java.io.IOException; -import org.junit.Test; - -public class PolicyDBExceptionTest { - @Test(expected = PolicyDBException.class) - public void testException1() throws PolicyDBException { - throw new PolicyDBException(); - } - - @Test(expected = PolicyDBException.class) - public void testException2() throws PolicyDBException { - throw new PolicyDBException("test"); - } - - @Test(expected = PolicyDBException.class) - public void testException3() throws PolicyDBException { - Throwable cause = new IOException(); - throw new PolicyDBException(cause); - } - - @Test(expected = PolicyDBException.class) - public void testException4() throws PolicyDBException { - Throwable cause = new IOException(); - throw new PolicyDBException("test", cause); - } - - @Test(expected = PolicyDBException.class) - public void testException5() throws PolicyDBException { - Throwable cause = new IOException(); - throw new PolicyDBException("test", cause, true, true); - } -} diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDbExceptionTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDbExceptionTest.java new file mode 100644 index 000000000..5293477e8 --- /dev/null +++ b/ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDbExceptionTest.java @@ -0,0 +1,55 @@ +/*- + * ============LICENSE_START======================================================= + * PolicyEngineUtils + * ================================================================================ + * Copyright (C) 2018 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. + * 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.policy.rest.dao; + +import java.io.IOException; +import org.junit.Test; + +public class PolicyDbExceptionTest { + @Test(expected = PolicyDbException.class) + public void testException1() throws PolicyDbException { + throw new PolicyDbException(); + } + + @Test(expected = PolicyDbException.class) + public void testException2() throws PolicyDbException { + throw new PolicyDbException("test"); + } + + @Test(expected = PolicyDbException.class) + public void testException3() throws PolicyDbException { + Throwable cause = new IOException(); + throw new PolicyDbException(cause); + } + + @Test(expected = PolicyDbException.class) + public void testException4() throws PolicyDbException { + Throwable cause = new IOException(); + throw new PolicyDbException("test", cause); + } + + @Test(expected = PolicyDbException.class) + public void testException5() throws PolicyDbException { + Throwable cause = new IOException(); + throw new PolicyDbException("test", cause, true, true); + } +} -- cgit 1.2.3-korg