Some refactoring of classes.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

service/src/main/java/org/lfenergy/compas/scl/validator/common/NsdocInfo.java

@@ -5,18 +5,18 @@
 
 import org.lfenergy.compas.scl.validator.exception.SclValidatorException;
 
-import javax.xml.namespace.QName;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.events.Attribute;
 import javax.xml.stream.events.StartElement;
 import javax.xml.stream.events.XMLEvent;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 
 import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.DETERMINING_ID_FAILED;
+import static org.lfenergy.compas.scl.validator.util.StaxUtil.getAttributeValue;
+import static org.lfenergy.compas.scl.validator.util.StaxUtil.isElement;
 
 public class NsdocInfo {
     private static final String NSDOC_ELEMENT_NAME = "NSDoc";
@@ -29,16 +29,7 @@ public NsdocInfo(File file) {
             XMLEventReader reader = xmlInputFactory.createXMLEventReader(fis);
 
             while (id == null && reader.hasNext()) {
-                XMLEvent nextEvent = reader.nextEvent();
-                if (nextEvent.isStartElement()) {
-                    StartElement startElement = nextEvent.asStartElement();
-                    if (NSDOC_ELEMENT_NAME.equals(startElement.getName().getLocalPart())) {
-                        Attribute attribute = startElement.getAttributeByName(new QName("id"));
-                        if (attribute != null) {
-                            id = attribute.getValue();
-                        }
-                    }
-                }
+                processEvent(reader.nextEvent());
             }
         } catch (IOException | XMLStreamException exp) {
             throw new SclValidatorException(DETERMINING_ID_FAILED, "Error loading NSDoc File " + file.getName() + "'.", exp);
@@ -49,6 +40,18 @@ public NsdocInfo(File file) {
         }
     }
 
+    private void processEvent(XMLEvent nextEvent) {
+        if (nextEvent.isStartElement()) {
+            processStartElement(nextEvent.asStartElement());
+        }
+    }
+
+    private void processStartElement(StartElement element) {
+        if (isElement(element, NSDOC_ELEMENT_NAME)) {
+            id = getAttributeValue(element, "id");
+        }
+    }
+
     public String getId() {
         return id;
     }

validator/src/main/java/org/lfenergy/compas/scl/validator/util/StaxUtil.java

@@ -0,0 +1,26 @@
+// SPDX-FileCopyrightText: 2022 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.validator.util;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.events.Attribute;
+import javax.xml.stream.events.StartElement;
+
+public class StaxUtil {
+    StaxUtil() {
+        throw new UnsupportedOperationException("StaxUtil class");
+    }
+
+    public static boolean isElement(StartElement element, String elementName) {
+        return elementName.equals(element.getName().getLocalPart());
+    }
+
+    public static String getAttributeValue(StartElement element, String attributeName) {
+        Attribute attribute = element.getAttributeByName(new QName(attributeName));
+        if (attribute != null) {
+            return attribute.getValue();
+        }
+        return null;
+    }
+}

validator/src/test/java/org/lfenergy/compas/scl/validator/util/StaxUtilTest.java

@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2022 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.validator.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class StaxUtilTest {
+    @Test
+    void constructor_WhenConstructorCalled_ThenShouldThrowExceptionCauseForbidden() {
+        assertThrows(UnsupportedOperationException.class, StaxUtil::new);
+    }
+
+}