Merge pull request #6 from andreitokar/javadoc-2

make Javadoc happy
andreitokar · Nov 6, 2021 · deb68b1 · deb68b1
2 parents 9ee083f + 814de57
commit deb68b1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/h2/src/docsrc/html/changelog.html b/h2/src/docsrc/html/changelog.html
@@ -22,6 +22,7 @@ <h1>Change Log</h1>
 <h2>Next Version (unreleased)</h2>
 <ul>
 <li>Issue #3174: Add keyword AUTOCOMMIT on create linked table to control the commit mode
+</li>
 <li>Issue #3130: Precision of NUMERIC values isn't verified in the Oracle compatibility mode
 </li>
 <li>Issue #3122: Documentation: Syntax diagram for RENAME CONSTRAINT incorrect

diff --git a/h2/src/main/org/h2/command/dml/Help.java b/h2/src/main/org/h2/command/dml/Help.java
@@ -86,7 +86,7 @@ public ResultInterface query(long maxrows) {
     /**
      * Strip out the special annotations we use to help build the railroad/BNF diagrams
      * @param s to process
-     * @return sanitized text
+     * @return cleaned text
      */
     public static String stripAnnotationsFromSyntax(String s) {
         // SYNTAX column - Strip out the special annotations we use to

diff --git a/h2/src/main/org/h2/jdbc/JdbcSQLXML.java b/h2/src/main/org/h2/jdbc/JdbcSQLXML.java
@@ -56,7 +56,7 @@
 public final class JdbcSQLXML extends JdbcLob implements SQLXML {
 
     private static final Map<String,Boolean> secureFeatureMap = new HashMap<>();
-    private static final EntityResolver NOOP_ENTITY_RESOLVER = (publicId, systemId) -> new InputSource(new StringReader(""));
+    private static final EntityResolver NOOP_ENTITY_RESOLVER = (pubId, sysId) -> new InputSource(new StringReader(""));
     private static final URIResolver NOOP_URI_RESOLVER = (href, base) -> new StreamSource(new StringReader(""));
 
     static {
@@ -128,7 +128,7 @@ public <T extends Source> T getSource(Class<T> sourceClass) throws SQLException
                         "getSource(" + (sourceClass != null ? sourceClass.getSimpleName() + ".class" : "null") + ')');
             }
             checkReadable();
-            // According to https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html
+            // see https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html
             if (sourceClass == null || sourceClass == DOMSource.class) {
                 DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
                 for (Map.Entry<String,Boolean> entry : secureFeatureMap.entrySet()) {
@@ -162,7 +162,8 @@ public <T extends Source> T getSource(Class<T> sourceClass) throws SQLException
                 tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
                 tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
                 tf.setURIResolver(NOOP_URI_RESOLVER);
-                tf.newTransformer().transform(new StreamSource(value.getInputStream()), new SAXResult(new DefaultHandler()));
+                tf.newTransformer().transform(new StreamSource(value.getInputStream()),
+                                                new SAXResult(new DefaultHandler()));
                 return (T) new StreamSource(value.getInputStream());
             }
             throw unsupported(sourceClass.getName());

diff --git a/h2/src/main/org/h2/value/ValueLob.java b/h2/src/main/org/h2/value/ValueLob.java
@@ -115,9 +115,9 @@ static Reader rangeReader(Reader reader, long oneBasedOffset, long length, long
     }
 
     /**
-     * Create file name for tem LOB storage
+     * Create file name for temporary LOB storage
      * @param handler to get path from
-     * @return full pathname of the created file
+     * @return full path and name of the created file
      * @throws IOException if file creation fails
      */
     static String createTempLobFileName(DataHandler handler) throws IOException {