1 files changed, 21 insertions, 24 deletions

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/XMLValidator.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/XMLValidator.java
index c3dfe2c685..b972f7e1db 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/XMLValidator.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/XMLValidator.java
@@ -25,18 +25,15 @@ package org.onap.so.apihandler.common;
 
 import java.io.FileInputStream;
 import java.io.IOException;
-
 import javax.xml.XMLConstants;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
-
 import org.apache.commons.io.IOUtils;
 import org.onap.so.logger.ErrorCode;
 import org.onap.so.logger.MessageEnum;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
@@ -46,7 +43,7 @@ public class XMLValidator {
     private static String XSDS_PATH;
 
     static {
-        String prefixMsoPropertiesPath = System.getProperty ("mso.config.path");
+        String prefixMsoPropertiesPath = System.getProperty("mso.config.path");
         if (prefixMsoPropertiesPath == null) {
             prefixMsoPropertiesPath = "";
         }
@@ -61,44 +58,44 @@ public class XMLValidator {
     private static Logger logger = LoggerFactory.getLogger(XMLValidator.class);
 
 
-    public XMLValidator (String xsdFile){
+    public XMLValidator(String xsdFile) {
 
-        try (FileInputStream xsdStream = new FileInputStream (XSDS_PATH + xsdFile)) {
+        try (FileInputStream xsdStream = new FileInputStream(XSDS_PATH + xsdFile)) {
 
-            stringXsd = IOUtils.toString (xsdStream);
+            stringXsd = IOUtils.toString(xsdStream);
 
-            factory = SchemaFactory.newInstance (XMLConstants.W3C_XML_SCHEMA_NS_URI);
-            factory.setResourceResolver (new PathResourceResolver (XSDS_PATH));
-            factory.setFeature (XMLConstants.FEATURE_SECURE_PROCESSING, true);
+            factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+            factory.setResourceResolver(new PathResourceResolver(XSDS_PATH));
+            factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
 
-            String quotedXsd = stringXsd.replaceAll (""", "\"");
-            Source src = new StreamSource (new java.io.StringReader (quotedXsd));
-            schema = factory.newSchema (src);
+            String quotedXsd = stringXsd.replaceAll(""", "\"");
+            Source src = new StreamSource(new java.io.StringReader(quotedXsd));
+            schema = factory.newSchema(src);
 
         } catch (IOException | SAXException e) {
 
-            logger.debug ("Cannot open file {}", XSDS_PATH + xsdFile, e);
-            errorMsg = "ErrorDetails: xsd file " + xsdFile + "could not be opened - " + e.getMessage ();
+            logger.debug("Cannot open file {}", XSDS_PATH + xsdFile, e);
+            errorMsg = "ErrorDetails: xsd file " + xsdFile + "could not be opened - " + e.getMessage();
         }
     }
 
     // Returns null when XML valid, otherwise returns error details.
-    public String isXmlValid (String stringXml) {
+    public String isXmlValid(String stringXml) {
         try {
-            if (errorMsg != null && !errorMsg.isEmpty ()) {
+            if (errorMsg != null && !errorMsg.isEmpty()) {
                 return errorMsg;
             }
-            Source src2 = new StreamSource (new java.io.StringReader (stringXml));
-            Validator validator = schema.newValidator ();
-            validator.validate (src2);
+            Source src2 = new StreamSource(new java.io.StringReader(stringXml));
+            Validator validator = schema.newValidator();
+            validator.validate(src2);
 
         } catch (IOException | SAXException e) {
-            logger.debug ("Exception: ", e);
-            return "ErrorDetails: " + e.getMessage ();
+            logger.debug("Exception: ", e);
+            return "ErrorDetails: " + e.getMessage();
 
         } catch (Exception e) {
-            logger.error("{} {} {}", MessageEnum.APIH_CANNOT_READ_SCHEMA.toString(),
-                ErrorCode.SchemaError.getValue(), "APIH cannot read schema file", e);
+            logger.error("{} {} {}", MessageEnum.APIH_CANNOT_READ_SCHEMA.toString(), ErrorCode.SchemaError.getValue(),
+                    "APIH cannot read schema file", e);
 
             return "ErrorDetails: " + "Unable to read the schema file";
         }