Replace getCaononicalName() with getName() in code base

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

8 files changed, 58 insertions, 51 deletions

diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java
index d8d0d8c19..fa17a22c2 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.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=========================================================
  */
@@ -87,9 +88,9 @@ public class AvroBytesObjectMapper implements AvroObjectMapper {
     public Object mapFromAvro(final Object avroObject) {
         // The Avro object should be a Utf8 object
         if (!(avroObject instanceof ByteBuffer)) {
-            final String returnString =
-                    userKey.getId() + ": object \"" + avroObject + "\" of class \"" + avroObject.getClass()
-                            + "\" cannot be decoded to an object of class \"" + schemaClass.getCanonicalName() + "\"";
+            final String returnString = userKey.getId() + ": object \"" + avroObject + "\" of class \""
+                            + avroObject.getClass() + "\" cannot be decoded to an object of class \""
+                            + schemaClass.getName() + "\"";
             LOGGER.warn(returnString);
             throw new ContextRuntimeException(returnString);
         }
@@ -111,7 +112,7 @@ public class AvroBytesObjectMapper implements AvroObjectMapper {
     public Object mapToAvro(final Object object) {
         if (object == null) {
             final String returnString = userKey.getId() + ": cannot encode a null object of class \""
-                    + schemaClass.getCanonicalName() + "\"";
+                            + schemaClass.getName() + "\"";
             LOGGER.warn(returnString);
             throw new ContextRuntimeException(returnString);
         }
@@ -119,7 +120,7 @@ public class AvroBytesObjectMapper implements AvroObjectMapper {
         // The incoming object should be a byte array
         if (!(object instanceof byte[])) {
             final String returnString = userKey.getId() + ": object \"" + object + "\" of class \"" + object.getClass()
-                    + "\" cannot be decoded to an object of class \"" + schemaClass.getCanonicalName() + "\"";
+                            + "\" cannot be decoded to an object of class \"" + schemaClass.getName() + "\"";
             LOGGER.warn(returnString);
             throw new ContextRuntimeException(returnString);
         }
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java
index f627651fa..f9ec4ed85 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.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=========================================================
  */
@@ -33,8 +34,8 @@ import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
 /**
- * This class does direct mapping from Avro classes to Java classes, used for Avro primitive types
- * that directly produce Java objects.
+ * This class does direct mapping from Avro classes to Java classes, used for Avro primitive types that directly produce
+ * Java objects.
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
@@ -117,9 +118,9 @@ public class AvroDirectObjectMapper implements AvroObjectMapper {
         // It is legal for the schema class to be null, if the Avro schema has a "null" type then
         // the decoded object is always returned as a null
         if (!schemaClass.isAssignableFrom(avroObject.getClass())) {
-            final String returnString =
-                            userKey.getId() + ": object \"" + avroObject + "\" of class \"" + avroObject.getClass()
-                            + "\" cannot be decoded to an object of class \"" + schemaClass.getCanonicalName() + "\"";
+            final String returnString = userKey.getId() + ": object \"" + avroObject + "\" of class \""
+                            + avroObject.getClass() + "\" cannot be decoded to an object of class \""
+                            + schemaClass.getName() + "\"";
             LOGGER.warn(returnString);
             throw new ContextRuntimeException(returnString);
         }
@@ -135,7 +136,7 @@ public class AvroDirectObjectMapper implements AvroObjectMapper {
         // Null values are only allowed if the schema class is null
         if (object == null && schemaClass != null) {
             final String returnString = userKey.getId() + ": cannot encode a null object of class \""
-                            + schemaClass.getCanonicalName() + "\"";
+                            + schemaClass.getName() + "\"";
             LOGGER.warn(returnString);
             throw new ContextRuntimeException(returnString);
         }
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java
index 723aefdc5..94841301d 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.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=========================================================
  */
@@ -152,7 +153,7 @@ public class AvroSchemaHelper extends AbstractSchemaHelper {
 
     /**
      * Create an instance of a sub type of this type.
-     * 
+     *
      * @param schema the Avro schema of the the type
      * @param subInstanceType the sub type
      * @param foundTypes types we have already found
@@ -188,7 +189,7 @@ public class AvroSchemaHelper extends AbstractSchemaHelper {
 
     /**
      * Instantiate a sub instance of a type.
-     * 
+     *
      * @param subInstanceType the type of the sub instance to create
      * @param subSchema the sub schema we have received
      * @param foundTypes types we have already found
@@ -245,7 +246,7 @@ public class AvroSchemaHelper extends AbstractSchemaHelper {
 
     /**
      * Check that the incoming object is a string, the incoming object must be a string containing Json.
-     * 
+     *
      * @param object incoming object
      * @return object as String
      */
@@ -258,8 +259,8 @@ public class AvroSchemaHelper extends AbstractSchemaHelper {
             }
         } catch (final ClassCastException e) {
             final String returnString = getUserKey().getId() + OBJECT_TAG + object + "\" of type \""
-                            + (object != null ? object.getClass().getCanonicalName() : "null")
-                            + "\" must be assignable to \"" + getSchemaClass().getCanonicalName()
+                            + (object != null ? object.getClass().getName() : "null") + "\" must be assignable to \""
+                            + getSchemaClass().getName()
                             + "\" or be a Json string representation of it for Avro unmarshalling";
             LOGGER.warn(returnString, e);
             throw new ContextRuntimeException(returnString);
@@ -268,7 +269,7 @@ public class AvroSchemaHelper extends AbstractSchemaHelper {
 
     /**
      * Get a string object.
-     * 
+     *
      * @param object the string object
      * @return the string
      */
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java
index 5a8fac404..4f3fe0cae 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.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=========================================================
  */
@@ -29,10 +30,9 @@ import org.onap.policy.apex.context.parameters.SchemaHelperParameters;
  */
 public class AvroSchemaHelperParameters extends SchemaHelperParameters {
     /**
-     * The Default Constructor sets the {@link AvroSchemaHelper} as the schema helper class for Avro
-     * schemas.
+     * The Default Constructor sets the {@link AvroSchemaHelper} as the schema helper class for Avro schemas.
      */
     public AvroSchemaHelperParameters() {
-        this.setSchemaHelperPluginClass(AvroSchemaHelper.class.getCanonicalName());
+        this.setSchemaHelperPluginClass(AvroSchemaHelper.class.getName());
     }
 }
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java
index 46e6c43ef..f664006e2 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.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=========================================================
  */
@@ -86,9 +87,9 @@ public class AvroStringObjectMapper implements AvroObjectMapper {
     public Object mapFromAvro(final Object avroObject) {
         // The Avro object should be a Utf8 object
         if (!(avroObject instanceof Utf8)) {
-            final String returnString =
-                    userKey.getId() + ": object \"" + avroObject + "\" of class \"" + avroObject.getClass()
-                            + "\" cannot be decoded to an object of class \"" + schemaClass.getCanonicalName() + "\"";
+            final String returnString = userKey.getId() + ": object \"" + avroObject + "\" of class \""
+                            + avroObject.getClass() + "\" cannot be decoded to an object of class \""
+                            + schemaClass.getName() + "\"";
             LOGGER.warn(returnString);
             throw new ContextRuntimeException(returnString);
         }
@@ -103,7 +104,7 @@ public class AvroStringObjectMapper implements AvroObjectMapper {
     public Object mapToAvro(final Object object) {
         if (object == null) {
             final String returnString = userKey.getId() + ": cannot encode a null object of class \""
-                    + schemaClass.getCanonicalName() + "\"";
+                            + schemaClass.getName() + "\"";
             LOGGER.warn(returnString);
             throw new ContextRuntimeException(returnString);
         }
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaFixedTest.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaFixedTest.java
index 7fb417c78..ee742a8be 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaFixedTest.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaFixedTest.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=========================================================
  */
@@ -103,7 +104,7 @@ public class AvroSchemaFixedTest {
             fail("Test should throw an exception here");
         } catch (final Exception e) {
             assertEquals("AvroTest:0.0.1: could not create an instance "
-                            + "of class \"org.apache.avro.generic.GenericData.Fixed\" "
+                            + "of class \"org.apache.avro.generic.GenericData$Fixed\" "
                             + "using the default constructor \"Fixed()\"", e.getMessage());
         }
 
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperMarshalTest.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperMarshalTest.java
index 6d3ebb30a..778573939 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperMarshalTest.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperMarshalTest.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=========================================================
  */
@@ -320,7 +321,7 @@ public class AvroSchemaHelperMarshalTest {
             fail("Test should throw an exception here");
         } catch (final Exception e) {
             assertTrue(e.getMessage()
-                            .startsWith("AvroTest:0.0.1: cannot encode a null object of class \"java.lang.Byte[]\""));
+                            .startsWith("AvroTest:0.0.1: cannot encode a null object of class \"[Ljava.lang.Byte;\""));
         }
     }
 }
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperUnmarshalTest.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperUnmarshalTest.java
index a8711e06d..fee21ae2a 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperUnmarshalTest.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperUnmarshalTest.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=========================================================
  */
@@ -395,7 +396,7 @@ public class AvroSchemaHelperUnmarshalTest {
             schemaHelper.createNewInstance();
             fail("test should throw an exception here");
         } catch (final Exception e) {
-            assertEquals("AvroTest:0.0.1: could not create an instance of class \"java.lang.Byte[]\" "
+            assertEquals("AvroTest:0.0.1: could not create an instance of class \"[Ljava.lang.Byte;\" "
                             + "using the default constructor \"Byte[]()\"", e.getMessage());
         }
         final byte[] newBytes = (byte[]) schemaHelper.createNewInstance("\"hello\"");