diff options
author | 2019-11-27 13:32:45 +0000 | |
---|---|---|
committer | 2019-11-28 11:06:05 +0000 | |
commit | 9253f81d14a5217479ca8e59efb198eaa32ec9f0 (patch) | |
tree | 4b4c5d42738928e9ade09e57d1b4cc01cdc7ae75 /plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main | |
parent | 8a3a78067eb678f3e51e2199a57b713e3ffcfb29 (diff) |
Replace getCaononicalName() with getName() in code base
Issue-ID: POLICY-1861
Change-Id: Iccbdcbc5b5978305c56ab74c01a52a562697bee1
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main')
5 files changed, 43 insertions, 39 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); } |