From 194adee686ebb90488f739f2c637f6cb3def94d5 Mon Sep 17 00:00:00 2001 From: "Sotiropoulos, Ioannis (is948x)" Date: Thu, 12 Jul 2018 11:02:18 +0100 Subject: Fix sonar violations Issue-ID: AAI-1190 Change-Id: I72894665b288416069d3c2eb84185fcc303976f7 Signed-off-by: Sotiropoulos, Ioannis (is948x) --- .../java/org/onap/schema/validation/OxmModelValidator.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/main/java/org/onap/schema') diff --git a/src/main/java/org/onap/schema/validation/OxmModelValidator.java b/src/main/java/org/onap/schema/validation/OxmModelValidator.java index 89b8030..d317678 100644 --- a/src/main/java/org/onap/schema/validation/OxmModelValidator.java +++ b/src/main/java/org/onap/schema/validation/OxmModelValidator.java @@ -43,7 +43,8 @@ import com.google.gson.JsonNull; public class OxmModelValidator { private static Logger logger = LoggerFactory.getInstance().getLogger(OxmModelValidator.class.getName()); - + private static final String OXM_LOAD_ERROR = "Error loading oxm model"; + public enum Metadata { NODE_TYPE("aai-node-type"), URI("aai-uri"), @@ -84,8 +85,8 @@ public class OxmModelValidator { Map result = new HashMap(); if (jaxbContext == null) { - logger.error(CrudServiceMsgs.OXM_LOAD_ERROR, "Error loading oxm model: " + version); - throw new CrudException("Error loading oxm model: " + version, Status.NOT_FOUND); + logger.error(CrudServiceMsgs.OXM_LOAD_ERROR, OXM_LOAD_ERROR + ": " + version); + throw new CrudException(OXM_LOAD_ERROR + ": " + version, Status.NOT_FOUND); } final DynamicType modelObjectType = jaxbContext.getDynamicType( CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, type))); @@ -131,8 +132,8 @@ public class OxmModelValidator { } if (jaxbContext == null) { - logger.error(CrudServiceMsgs.OXM_LOAD_ERROR, "Error loading oxm model: " + version); - throw new CrudException("Error loading oxm model: " + version, Status.NOT_FOUND); + logger.error(CrudServiceMsgs.OXM_LOAD_ERROR, OXM_LOAD_ERROR + ": " + version); + throw new CrudException(OXM_LOAD_ERROR + ": " + version, Status.NOT_FOUND); } // Determine if the Object part is a collection type in the model // definition -- cgit 1.2.3-korg