aboutsummaryrefslogtreecommitdiffstats
path: root/models-dao/src/main/java/org
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-01-10 17:52:57 -0500
committerJim Hahn <jrh3@att.com>2020-01-10 18:43:39 -0500
commit93fb25deaadd3df511844fdf735c35cff51b4364 (patch)
tree1e0353ac32e3eaca2671a3b42b3e1181fc8b95ac /models-dao/src/main/java/org
parent754f9a02943058dc03337c9550e8f37fece14d25 (diff)
Remove deprecated methods from models
Addressed the following issues related to the java 11 upgrade: - forClass().newInstance() - java.xml.bind no longer included in jdk - new mockito doesn't clear captured lists Issue-ID: POLICY-1406 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: Ia254c1ed21f847d1824e7abc22528975372ee2b6
Diffstat (limited to 'models-dao/src/main/java/org')
-rw-r--r--models-dao/src/main/java/org/onap/policy/models/dao/PfDaoFactory.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/models-dao/src/main/java/org/onap/policy/models/dao/PfDaoFactory.java b/models-dao/src/main/java/org/onap/policy/models/dao/PfDaoFactory.java
index 6b7c7b3ad..d61229722 100644
--- a/models-dao/src/main/java/org/onap/policy/models/dao/PfDaoFactory.java
+++ b/models-dao/src/main/java/org/onap/policy/models/dao/PfDaoFactory.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2020 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.
@@ -20,6 +21,7 @@
package org.onap.policy.models.dao;
+import java.lang.reflect.InvocationTargetException;
import javax.ws.rs.core.Response;
import org.onap.policy.common.utils.validation.Assertions;
@@ -51,8 +53,9 @@ public class PfDaoFactory {
// Get the class for the DAO using reflection
Object pfDaoObject = null;
try {
- pfDaoObject = Class.forName(daoParameters.getPluginClass()).newInstance();
- } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+ pfDaoObject = Class.forName(daoParameters.getPluginClass()).getDeclaredConstructor().newInstance();
+ } catch (InstantiationException | IllegalAccessException | ClassNotFoundException | IllegalArgumentException
+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {
String errorMessage =
"Policy Framework DAO class not found for DAO plugin \"" + daoParameters.getPluginClass() + "\"";
LOGGER.error(errorMessage, e);