Update to Apex jmx files

[policy/apex-pdp.git] / plugins / plugins-context / plugins-context-schema / plugins-context-schema-avro / src / main / java / org / onap / policy / apex / plugins / context / schema / avro / AvroDirectObjectMapper.java

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 f9ec4ed..945c30c 100644 (file)
--- 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,7 +1,8 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2021 Nordix Foundation.
+ *  Modifications Copyright (C) 2021 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.
@@ -24,7 +25,7 @@ package org.onap.policy.apex.plugins.context.schema.avro;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
-
+import lombok.Getter;
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Type;
 import org.apache.avro.generic.GenericData;
@@ -65,6 +66,7 @@ public class AvroDirectObjectMapper implements AvroObjectMapper {
 
     // The user keyAvro type for direct mapping
     private AxKey userKey;
+    @Getter
     private Type avroType;
 
     // The Apex compatible class
@@ -97,14 +99,6 @@ public class AvroDirectObjectMapper implements AvroObjectMapper {
         return null;
     }
 
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public Type getAvroType() {
-        return avroType;
-    }
-
     /**
      * {@inheritDoc}.
      */
@@ -118,7 +112,7 @@ 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 \""
+            final var returnString = userKey.getId() + ": object \"" + avroObject + "\" of class \""
                             + avroObject.getClass() + "\" cannot be decoded to an object of class \""
                             + schemaClass.getName() + "\"";
             LOGGER.warn(returnString);
@@ -135,7 +129,7 @@ public class AvroDirectObjectMapper implements AvroObjectMapper {
     public Object mapToAvro(final Object object) {
         // 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 \""
+            final var returnString = userKey.getId() + ": cannot encode a null object of class \""
                             + schemaClass.getName() + "\"";
             LOGGER.warn(returnString);
             throw new ContextRuntimeException(returnString);