From 1cdad9b78056103a4ca1d1b71d996489787ed702 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 18 Jun 2019 12:47:14 -0400 Subject: Change getCanonicalName to getName in models Per javadocs, getName() should generally be used instead of Class.getCanonicalName(). This change only applies to classes; it does not apply to File objects. Note: this impacts the output from PfValidationMessage, as it will now list the names of embedded classes with a "$" separator instead of a ".". Change-Id: I2cd64bc0281dd324bf80eac57335a7299a516447 Issue-ID: POLICY-1646 Signed-off-by: Jim Hahn --- .../src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java | 5 +++-- models-dao/src/test/java/org/onap/policy/models/dao/EntityTest.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'models-dao') diff --git a/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java b/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java index c44d05fe2..b5739a610 100644 --- a/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java +++ b/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019 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. @@ -330,7 +331,7 @@ public class DefaultPfDao implements PfDao { t.copyTo(clonedT); return clonedT; } catch (final Exception e) { - LOGGER.warn("Could not clone object of class \"" + someClass.getCanonicalName() + "\"", e); + LOGGER.warn("Could not clone object of class \"" + someClass.getName() + "\"", e); return null; } } else { @@ -355,7 +356,7 @@ public class DefaultPfDao implements PfDao { t.copyTo(clonedT); return clonedT; } catch (final Exception e) { - LOGGER.warn("Could not clone object of class \"" + someClass.getCanonicalName() + "\"", e); + LOGGER.warn("Could not clone object of class \"" + someClass.getName() + "\"", e); return null; } } else { diff --git a/models-dao/src/test/java/org/onap/policy/models/dao/EntityTest.java b/models-dao/src/test/java/org/onap/policy/models/dao/EntityTest.java index e7a505d1f..70505aa2d 100644 --- a/models-dao/src/test/java/org/onap/policy/models/dao/EntityTest.java +++ b/models-dao/src/test/java/org/onap/policy/models/dao/EntityTest.java @@ -93,7 +93,7 @@ public class EntityTest { public void testEntityTestAllOpsJpa() throws PfModelException { final DaoParameters daoParameters = new DaoParameters(); - daoParameters.setPluginClass(DefaultPfDao.class.getCanonicalName()); + daoParameters.setPluginClass(DefaultPfDao.class.getName()); daoParameters.setPersistenceUnit("DaoTest"); Properties jdbcProperties = new Properties(); @@ -119,7 +119,7 @@ public class EntityTest { @Test public void testEntityTestBadVals() throws PfModelException { final DaoParameters daoParameters = new DaoParameters(); - daoParameters.setPluginClass(DefaultPfDao.class.getCanonicalName()); + daoParameters.setPluginClass(DefaultPfDao.class.getName()); daoParameters.setPersistenceUnit("DaoTest"); pfDao = new PfDaoFactory().createPfDao(daoParameters); -- cgit 1.2.3-korg