Skip to content

Commit

Permalink
make Javadoc happy
Browse files Browse the repository at this point in the history
  • Loading branch information
andreitokar committed Nov 6, 2021
1 parent 9ee083f commit 814de57
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions h2/src/docsrc/html/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion h2/src/main/org/h2/command/dml/Help.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions h2/src/main/org/h2/jdbc/JdbcSQLXML.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions h2/src/main/org/h2/value/ValueLob.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 814de57

Please sign in to comment.