Replace getCaononicalName() with getName() in code base

Issue-ID: POLICY-1861
Change-Id: Iccbdcbc5b5978305c56ab74c01a52a562697bee1
Signed-off-by: liamfallon <liam.fallon@est.tech>

2 files changed, 10 insertions, 8 deletions

diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsObjectEventConverter.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsObjectEventConverter.java
index fe11cdca3..958a25dde 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsObjectEventConverter.java
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsObjectEventConverter.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. 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.
@@ -60,7 +61,7 @@ public final class Apex2JmsObjectEventConverter implements ApexEventProtocolConv
         // on both sides of Apex
         if (!(parameters instanceof JmsObjectEventProtocolParameters)) {
             final String errormessage = "specified Event Protocol Parameters properties of type \""
-                            + parameters.getClass().getCanonicalName() + "\" are not applicable to a "
+                            + parameters.getClass().getName() + "\" are not applicable to a "
                             + Apex2JmsObjectEventConverter.class.getName() + " converter";
             LOGGER.error(errormessage);
         } else {
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/Apex2YamlEventConverter.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/Apex2YamlEventConverter.java
index 17c535990..d4c25196d 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/Apex2YamlEventConverter.java
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/Apex2YamlEventConverter.java
@@ -1,19 +1,20 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. 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.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -270,7 +271,7 @@ public class Apex2YamlEventConverter implements ApexEventProtocolConverter {
 
     /**
      * Get the event header name space.
-     * 
+     *
      * @param yamlMap the YAML map to read from
      * @param eventDefinition the event definition
      * @return the event header name space
@@ -293,7 +294,7 @@ public class Apex2YamlEventConverter implements ApexEventProtocolConverter {
 
     /**
      * Get the event header source.
-     * 
+     *
      * @param yamlMap the YAML map to read from
      * @param eventDefinition the event definition
      * @return the event header source
@@ -310,7 +311,7 @@ public class Apex2YamlEventConverter implements ApexEventProtocolConverter {
 
     /**
      * Get the event header target.
-     * 
+     *
      * @param yamlMap the YAML map to read from
      * @param eventDefinition the event definition
      * @return the event header target
@@ -349,7 +350,7 @@ public class Apex2YamlEventConverter implements ApexEventProtocolConverter {
         if (!(yamlField instanceof String)) {
             // The element is not a string so throw an error
             throw new ApexEventRuntimeException("field \"" + fieldName + "\" with type \""
-                            + yamlField.getClass().getCanonicalName() + "\" is not a string value");
+                            + yamlField.getClass().getName() + "\" is not a string value");
         }
 
         final String fieldValueString = (String) yamlField;