Changed camelcase of Line number.

Dennis Labordus · Dennis Labordus · commit d3ff4ee50be6 · 2022-08-25T07:34:22.000+02:00
Signed-off-by: Dennis Labordus &lt;dennis.labordus@alliander.com&gt;
diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseDecoderTest.java
@@ -38,15 +38,15 @@ void willDecode_WhenCalledWithNull_ThenFalseReturned() {
     void decode_WhenCalledWithCorrectRequestXML_ThenStringConvertedToObject() {
         var validationMessage = "Some validation error";
         var ruleName = "Rule Name 1";
-        var linenumber = 15;
+        var lineNumber = 15;
         var columnNumber = 34;
 
         var message = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                 + "<svs:SclValidateResponse xmlns:svs=\"" + SCL_VALIDATOR_SERVICE_V1_NS_URI + "\">"
                 + "<svs:ValidationErrors>"
                 + "<svs:Message>" + validationMessage + "</svs:Message>"
                 + "<svs:RuleName>" + ruleName + "</svs:RuleName>"
-                + "<svs:Linenumber>" + linenumber + "</svs:Linenumber>"
+                + "<svs:LineNumber>" + lineNumber + "</svs:LineNumber>"
                 + "<svs:ColumnNumber>" + columnNumber + "</svs:ColumnNumber>"
                 + "</svs:ValidationErrors>"
                 + "</svs:SclValidateResponse>";
@@ -59,7 +59,7 @@ void decode_WhenCalledWithCorrectRequestXML_ThenStringConvertedToObject() {
         var validationError = result.getValidationErrorList().get(0);
         assertEquals(validationMessage, validationError.getMessage());
         assertEquals(ruleName, validationError.getRuleName());
-        assertEquals(linenumber, validationError.getLinenumber());
+        assertEquals(lineNumber, validationError.getLineNumber());
         assertEquals(columnNumber, validationError.getColumnNumber());
     }
 
diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseEncoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseEncoderTest.java
@@ -29,15 +29,15 @@ void init() {
     void encode_WhenCalledWithRequest_ThenRequestConvertedToString() {
         var validationMessage = "Some Validation Message";
         var ruleName = "Rule Name 1";
-        var linenumber = 15;
+        var lineNumber = 15;
         var columnNumber = 34;
 
         var request = new SclValidateResponse();
         request.setValidationErrorList(new ArrayList<>());
         var validationError = new ValidationError();
         validationError.setMessage(validationMessage);
         validationError.setRuleName(ruleName);
-        validationError.setLinenumber(linenumber);
+        validationError.setLineNumber(lineNumber);
         validationError.setColumnNumber(columnNumber);
         request.getValidationErrorList().add(validationError);
 
@@ -48,7 +48,7 @@ void encode_WhenCalledWithRequest_ThenRequestConvertedToString() {
                 "<svs:ValidationErrors>" +
                 "<svs:Message>" + validationMessage + "</svs:Message>" +
                 "<svs:RuleName>" + ruleName + "</svs:RuleName>" +
-                "<svs:Linenumber>" + linenumber + "</svs:Linenumber>" +
+                "<svs:LineNumber>" + lineNumber + "</svs:LineNumber>" +
                 "<svs:ColumnNumber>" + columnNumber + "</svs:ColumnNumber>" +
                 "</svs:ValidationErrors>" +
                 "</svs:SclValidateResponse>";
diff --git a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/SclRiseClipseValidator.java b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/SclRiseClipseValidator.java
@@ -81,10 +81,10 @@ private void processDiagnostic(Diagnostic diagnostic, List<ValidationError> vali
             if (validationError.isPresent()) {
                 validationErrors.add(validationError.get());
                 if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("SCL Validation Error '{}' from Rule '{}' (Linenumber {})",
+                    LOGGER.debug("SCL Validation Error '{}' from Rule '{}' (Line number {})",
                             validationError.get().getMessage(),
                             validationError.get().getRuleName(),
-                            validationError.get().getLinenumber());
+                            validationError.get().getLineNumber());
                 }
             }
 
diff --git a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/util/MessageUtil.java b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/util/MessageUtil.java
@@ -24,16 +24,16 @@ public static Optional<ValidationError> createValidationError(String message) {
         var validationError = new ValidationError();
         var messageParts = message.split(";");
         if (messageParts.length == 5) {
-            // The expected number of parts is found, the message and rule are set as-is, the linenumber is converted
-            // to a Long value,
+            // The expected number of parts is found, the message and rule are set as-is, the line number
+            // is converted to a Integer value,
             validationError.setRuleName(messageParts[1]);
             validationError.setMessage(messageParts[4]);
 
             try {
-                validationError.setLinenumber(Integer.parseInt(messageParts[3]));
+                validationError.setLineNumber(Integer.parseInt(messageParts[3]));
             } catch (NumberFormatException exp) {
-                validationError.setLinenumber(-1);
-                LOGGER.debug("Invalid linenumber '{}' found", messageParts[3], exp);
+                validationError.setLineNumber(-1);
+                LOGGER.debug("Invalid line number '{}' found", messageParts[3], exp);
             }
         } else if (messageParts.length == 2) {
             // It seems like an old message that starts with 'ERROR;', so only set the second part as Message
diff --git a/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/SclRiseClipseValidatorTest.java b/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/SclRiseClipseValidatorTest.java
@@ -37,6 +37,6 @@ void validate_WhenCalled_ThenExpectedValidationErrorsReturned() throws IOExcepti
         var firstMessage = result.get(0);
         assertNotNull(firstMessage.getRuleName());
         assertNotNull(firstMessage.getMessage());
-        assertTrue(firstMessage.getLinenumber() > 0);
+        assertTrue(firstMessage.getLineNumber() > 0);
     }
 }
diff --git a/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/util/MessageUtilTest.java b/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/util/MessageUtilTest.java
@@ -41,7 +41,7 @@ void createValidationError_WhenCalledWithoutParts_ThenSameMessageReturned() {
 
         var validationError = result.get();
         assertNull(validationError.getRuleName());
-        assertNull(validationError.getLinenumber());
+        assertNull(validationError.getLineNumber());
         assertNull(validationError.getColumnNumber());
         assertEquals(message, validationError.getMessage());
     }
@@ -57,7 +57,7 @@ void createValidationError_WhenCalledWithTooManyParts_ThenSameMessageReturned()
 
         var validationError = result.get();
         assertNull(validationError.getRuleName());
-        assertNull(validationError.getLinenumber());
+        assertNull(validationError.getLineNumber());
         assertNull(validationError.getColumnNumber());
         assertEquals(message, validationError.getMessage());
     }
@@ -66,22 +66,22 @@ void createValidationError_WhenCalledWithTooManyParts_ThenSameMessageReturned()
     void createValidationError_WhenCalledWithCorrectMessage_ThenConvertValidationErrorReturned() {
         var message = "AnyLN (lnType=LN2) does not refer an existing LNodeType in DataTypeTemplates section";
         var ruleName = "OCL/SemanticConstraints/AnyLN_RefersToLNodeType";
-        var linenumber = 9;
+        var lineNumber = 9;
 
-        var result = createValidationError("ERROR;" + ruleName + ";scl-file.scd;" + linenumber + ";" + message);
+        var result = createValidationError("ERROR;" + ruleName + ";scl-file.scd;" + lineNumber + ";" + message);
 
         assertNotNull(result);
         assertFalse(result.isEmpty());
 
         var validationError = result.get();
         assertEquals(ruleName, validationError.getRuleName());
-        assertEquals(linenumber, validationError.getLinenumber());
+        assertEquals(lineNumber, validationError.getLineNumber());
         assertNull(validationError.getColumnNumber());
         assertEquals(message, validationError.getMessage());
     }
 
     @Test
-    void createValidationError_WhenCalledWithInvalidLinenumber_ThenNegativeLinenumberReturned() {
+    void createValidationError_WhenCalledWithInvalidLineNumber_ThenNegativeLineNumberReturned() {
         var message = "AnyLN (lnType=LN2) does not refer an existing LNodeType in DataTypeTemplates section";
         var ruleName = "OCL/SemanticConstraints/AnyLN_RefersToLNodeType";
 
@@ -92,7 +92,7 @@ void createValidationError_WhenCalledWithInvalidLinenumber_ThenNegativeLinenumbe
 
         var validationError = result.get();
         assertEquals(ruleName, validationError.getRuleName());
-        assertEquals(-1, validationError.getLinenumber());
+        assertEquals(-1, validationError.getLineNumber());
         assertNull(validationError.getColumnNumber());
         assertEquals(message, validationError.getMessage());
     }
diff --git a/validator/src/main/java/org/lfenergy/compas/scl/validator/model/ValidationError.java b/validator/src/main/java/org/lfenergy/compas/scl/validator/model/ValidationError.java
@@ -27,13 +27,13 @@ public class ValidationError {
             namespace = SCL_VALIDATOR_SERVICE_V1_NS_URI)
     private String ruleName;
 
-    @Schema(description = "The linenumber in the SCL file where the validation error occurred",
+    @Schema(description = "The line number in the SCL file where the validation error occurred",
             example = "9")
-    @XmlElement(name = "Linenumber",
+    @XmlElement(name = "LineNumber",
             namespace = SCL_VALIDATOR_SERVICE_V1_NS_URI)
-    private Integer linenumber;
+    private Integer lineNumber;
 
-    @Schema(description = "The column number on the linenumber in the SCL file where the validation error occurred",
+    @Schema(description = "The column number on the line number in the SCL file where the validation error occurred",
             example = "14")
     @XmlElement(name = "ColumnNumber",
             namespace = SCL_VALIDATOR_SERVICE_V1_NS_URI)
@@ -55,12 +55,12 @@ public void setRuleName(String ruleName) {
         this.ruleName = ruleName;
     }
 
-    public Integer getLinenumber() {
-        return linenumber;
+    public Integer getLineNumber() {
+        return lineNumber;
     }
 
-    public void setLinenumber(Integer linenumber) {
-        this.linenumber = linenumber;
+    public void setLineNumber(Integer lineNumber) {
+        this.lineNumber = lineNumber;
     }
 
     public Integer getColumnNumber() {
diff --git a/validator/src/main/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandler.java b/validator/src/main/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandler.java
@@ -28,9 +28,9 @@ public void warning(SAXParseException exception) {
         var validationError = createValidationError(exception);
         errorList.add(validationError);
 
-        LOGGER.debug("XSD Validation - warning: '{}' (Linenumber {}, Column number {})",
+        LOGGER.debug("XSD Validation - warning: '{}' (Line number {}, Column number {})",
                 validationError.getMessage(),
-                validationError.getLinenumber(),
+                validationError.getLineNumber(),
                 validationError.getColumnNumber());
     }
 
@@ -39,9 +39,9 @@ public void error(SAXParseException exception) {
         var validationError = createValidationError(exception);
         errorList.add(validationError);
 
-        LOGGER.debug("XSD Validation - error: '{}' (Linenumber {}, Column number {})",
+        LOGGER.debug("XSD Validation - error: '{}' (Line number {}, Column number {})",
                 validationError.getMessage(),
-                validationError.getLinenumber(),
+                validationError.getLineNumber(),
                 validationError.getColumnNumber());
     }
 
@@ -50,9 +50,9 @@ public void fatalError(SAXParseException exception) {
         var validationError = createValidationError(exception);
         errorList.add(validationError);
 
-        LOGGER.debug("XSD Validation - fatal error, stopping: '{}' (Linenumber {}, Column number {})",
+        LOGGER.debug("XSD Validation - fatal error, stopping: '{}' (Line number {}, Column number {})",
                 validationError.getMessage(),
-                validationError.getLinenumber(),
+                validationError.getLineNumber(),
                 validationError.getColumnNumber());
     }
 
@@ -61,7 +61,7 @@ private ValidationError createValidationError(SAXParseException exception) {
         var xsdMessage = exception.getMessage();
         validationError.setMessage(getMessage(xsdMessage));
         validationError.setRuleName(getRuleName(xsdMessage));
-        validationError.setLinenumber(exception.getLineNumber());
+        validationError.setLineNumber(exception.getLineNumber());
         validationError.setColumnNumber(exception.getColumnNumber());
         return validationError;
     }
diff --git a/validator/src/test/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandlerTest.java b/validator/src/test/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandlerTest.java
@@ -21,42 +21,42 @@ class XSDErrorHandlerTest {
     @Test
     void warning_WhenCalled_ThenNewValidationErrorAddedToList() {
         var message = "Some Warning Message";
-        var linenumber = 3;
+        var lineNumber = 3;
         var columnNumber = 15;
 
-        handler.warning(new SAXParseException(message, "", "", linenumber, columnNumber));
+        handler.warning(new SAXParseException(message, "", "", lineNumber, columnNumber));
 
         assertEquals(1, errorList.size());
-        assertValidationError(errorList.get(0), message, linenumber, columnNumber);
+        assertValidationError(errorList.get(0), message, lineNumber, columnNumber);
     }
 
     @Test
     void error_WhenCalled_ThenNewValidationErrorAddedToList() {
         var message = "Some Error Message";
-        var linenumber = 5;
+        var lineNumber = 5;
         var columnNumber = 25;
 
-        handler.error(new SAXParseException(message, "", "", linenumber, columnNumber));
+        handler.error(new SAXParseException(message, "", "", lineNumber, columnNumber));
 
         assertEquals(1, errorList.size());
-        assertValidationError(errorList.get(0), message, linenumber, columnNumber);
+        assertValidationError(errorList.get(0), message, lineNumber, columnNumber);
     }
 
     @Test
     void fatalError_WhenCalled_ThenNewValidationErrorAddedToList() {
         var message = "Some Error Message";
-        var linenumber = 5;
+        var lineNumber = 5;
         var columnNumber = 25;
 
-        handler.fatalError(new SAXParseException(message, "", "", linenumber, columnNumber));
+        handler.fatalError(new SAXParseException(message, "", "", lineNumber, columnNumber));
 
         assertEquals(1, errorList.size());
-        assertValidationError(errorList.get(0), message, linenumber, columnNumber);
+        assertValidationError(errorList.get(0), message, lineNumber, columnNumber);
     }
 
-    private void assertValidationError(ValidationError validationError, String message, int linenumber, int columnNumber) {
+    private void assertValidationError(ValidationError validationError, String message, int lineNumber, int columnNumber) {
         assertEquals(message, validationError.getMessage());
-        assertEquals(linenumber, validationError.getLinenumber());
+        assertEquals(lineNumber, validationError.getLineNumber());
         assertEquals(columnNumber, validationError.getColumnNumber());
     }
 
diff --git a/validator/src/test/java/org/lfenergy/compas/scl/validator/xsd/XSDValidatorTest.java b/validator/src/test/java/org/lfenergy/compas/scl/validator/xsd/XSDValidatorTest.java
@@ -41,7 +41,7 @@ void validate_WhenCalledWithSclDataWithXsdValidationErrors_ThenErrorsAreRetrieve
             var error = errorList.get(2);
             assertEquals("Attribute 'name' must appear on element 'BDA'.", error.getMessage());
             assertEquals("XSD/cvc-complex-type.4", error.getRuleName());
-            assertEquals(66, error.getLinenumber());
+            assertEquals(66, error.getLineNumber());
             assertEquals(45, error.getColumnNumber());
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,10 @@ private void processDiagnostic(Diagnostic diagnostic, List<ValidationError> vali`
`81`	`81`	`if (validationError.isPresent()) {`
`82`	`82`	`validationErrors.add(validationError.get());`
`83`	`83`	`if (LOGGER.isDebugEnabled()) {`
`84`		`- LOGGER.debug("SCL Validation Error '{}' from Rule '{}' (Linenumber {})",`
	`84`	`+ LOGGER.debug("SCL Validation Error '{}' from Rule '{}' (Line number {})",`
`85`	`85`	`validationError.get().getMessage(),`
`86`	`86`	`validationError.get().getRuleName(),`
`87`		`- validationError.get().getLinenumber());`
	`87`	`+ validationError.get().getLineNumber());`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ void validate_WhenCalled_ThenExpectedValidationErrorsReturned() throws IOExcepti`
`37`	`37`	`var firstMessage = result.get(0);`
`38`	`38`	`assertNotNull(firstMessage.getRuleName());`
`39`	`39`	`assertNotNull(firstMessage.getMessage());`
`40`		`- assertTrue(firstMessage.getLinenumber() > 0);`
	`40`	`+ assertTrue(firstMessage.getLineNumber() > 0);`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void validate_WhenCalledWithSclDataWithXsdValidationErrors_ThenErrorsAreRetrieve`
`41`	`41`	`var error = errorList.get(2);`
`42`	`42`	`assertEquals("Attribute 'name' must appear on element 'BDA'.", error.getMessage());`
`43`	`43`	`assertEquals("XSD/cvc-complex-type.4", error.getRuleName());`
`44`		`- assertEquals(66, error.getLinenumber());`
	`44`	`+ assertEquals(66, error.getLineNumber());`
`45`	`45`	`assertEquals(45, error.getColumnNumber());`
`46`	`46`	`}`
`47`	`47`	`}`