[ignore] Minor improvements

Author: adamretter

exist-core/src/main/java/org/exist/xquery/SequenceConstructor.java

@@ -125,13 +125,13 @@ public String toString() {
     /**
      * Add another PathExpr to this object's expression list.
      * Performs a static check, if return type is a function type other than array.
-     * see #id-content setion 1.e.i and 1.e.ii
+     * see #id-content section 1.e.i and 1.e.ii
      *
      * @throws XPathException when Path returns a function type
      * @param path A path to add to this path
      */
     public void addPathIfNotFunction(final PathExpr path) throws XPathException {
-        int retType = path.returnsType();
+        final int retType = path.returnsType();
         if (Type.subTypeOf(retType, Type.FUNCTION_REFERENCE) && retType != Type.ARRAY) {
             throw new XPathException(path, ErrorCodes.XQTY0105, "Function types are not allowed in element content. Got " + Type.getTypeName(retType));
         }

exist-core/src/test/java/org/exist/xquery/FunctionTypeInElementContentTest.java

@@ -30,8 +30,9 @@
 import static org.exist.test.XQueryAssertions.*;
 
 /**
- * Ensure function types returned in element content throws at compile time and has location information
- * https://github.com/eXist-db/exist/issues/3474
+ * Ensure function types returned in element content throws at compile time and
+ * has location information.
+ * See issue :<a href="https://github.com/eXist-db/exist/issues/3474">#3474</a>.
  *
  * @author <a href="mailto:[email protected]">Juri Leino</a>
  */
@@ -43,7 +44,7 @@ public void arrayLiteral() throws EXistException, PermissionDeniedException {
         assertXQResultSimilar(elemSource("<test/>"), executeQuery(query));
     }
 
-    // TODO: array content could be removed after https://github.com/eXist-db/exist/issues/3472 is fixed
+    // TODO(JL): array content could be removed after https://github.com/eXist-db/exist/issues/3472 is fixed
     @Test
     public void arrayConstructor() throws EXistException, PermissionDeniedException {
         final String query = "element test { array { () } }";
@@ -63,23 +64,23 @@ public void partialBuiltIn() throws EXistException, PermissionDeniedException {
         assertXQStaticError(ErrorCodes.XQTY0105, 1, 16, error, compileQuery(query));
     }
 
-    // TODO: Does still throw without location info
+    // TODO(JL): Does still throw without location info
     @Test
     public void functionReference() throws EXistException, PermissionDeniedException {
         final String query = "element test { sum#0 }";
         final String error = "Function types are not allowed in element content. Got function(*)";
         assertXQStaticError(ErrorCodes.XQTY0105, 0, 0, error, compileQuery(query));
     }
 
-    // TODO: Does not throw at compile time
+    // TODO(JL): Does not throw at compile time
     @Test
     public void functionVariable() throws EXistException, PermissionDeniedException {
         final String query = "let $f := function () {} return element test { $f }";
         final String error = "Enclosed expression contains function item";
         assertXQDynamicError(ErrorCodes.XQTY0105, 1, 49, error, executeQuery(query));
     }
 
-    // TODO: user defined function has its location offset to a weird location
+    // TODO(JL): user defined function has its location offset to a weird location
     @Test
     public void userDefinedFunction() throws EXistException, PermissionDeniedException {
         final String query = "element test { function () {} }";
@@ -110,29 +111,29 @@ public void sequenceOfMaps() throws EXistException, PermissionDeniedException {
         assertXQDynamicError(ErrorCodes.XQTY0105, 0, 0, error, executeQuery(query));
     }
 
+    // TODO(JL): add (sub-expression) location
     /**
      * This is an edge case, which would evaluate to empty sequence
      * but should arguably still throw.
      */
-    // TODO: add (sub-expression) location
     @Test
     public void sequenceOfMapsEdgeCase() throws EXistException, PermissionDeniedException {
         final String query = "element test { (map {})[2] }";
         final String error = "Function types are not allowed in element content. Got map(*)";
         assertXQStaticError(ErrorCodes.XQTY0105, 0, 0, error, compileQuery(query));
     }
 
-    // TODO: add (sub-expression) location
-    // TODO: this could throw at compile time
+    // TODO(JL): add (sub-expression) location
+    // TODO(JL): this could throw at compile time
     @Test
     public void arrayOfMaps() throws EXistException, PermissionDeniedException {
         final String query = "element test { [map {}] }";
         final String error = "Enclosed expression contains function item";
         assertXQDynamicError(ErrorCodes.XQTY0105, 1, 16, error, executeQuery(query));
     };
 
-    // TODO: add (sub-expression) location
-    // TODO: This should throw at compile time, but does not
+    // TODO(JL): add (sub-expression) location
+    // TODO(JL): This should throw at compile time, but does not
     @Test
     public void mapConstructorInSubExpression() throws EXistException, PermissionDeniedException {
         final String query = "element test { \"a\", map {} }";