You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/01/13 13:38:19 UTC
[tomcat] 01/02: Checkstyle checks for Javadoc += SingleLineJavadoc
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 12794a3685838ef749d48b60b6c5f40c675ab161
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 13 10:37:21 2023 +0000
Checkstyle checks for Javadoc += SingleLineJavadoc
---
.../tomcat/dbcp/dbcp2/DelegatingCallableStatement.java | 4 +++-
.../tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java | 4 +++-
.../apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java | 16 ++++++++++++----
res/checkstyle/checkstyle.xml | 4 ++++
4 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
index 57ee36357e..4eaf4bb283 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
@@ -96,7 +96,9 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement imp
}
}
- /** @deprecated Use {@link #getBigDecimal(int)} or {@link #getBigDecimal(String)} */
+ /**
+ * @deprecated Use {@link #getBigDecimal(int)} or {@link #getBigDecimal(String)}
+ */
@Override
@Deprecated
public BigDecimal getBigDecimal(final int parameterIndex, final int scale) throws SQLException {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
index 01466c4cbb..d509e33109 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
@@ -617,7 +617,9 @@ public class DelegatingPreparedStatement extends DelegatingStatement implements
}
}
- /** @deprecated Use setAsciiStream(), setCharacterStream() or setNCharacterStream() */
+ /**
+ * @deprecated Use setAsciiStream(), setCharacterStream() or setNCharacterStream()
+ */
@Deprecated
@Override
public void setUnicodeStream(final int parameterIndex, final InputStream x, final int length) throws SQLException {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
index c2382237ab..bb35beefe5 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
@@ -276,7 +276,9 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
}
}
- /** @deprecated Use {@link #getBigDecimal(int)} */
+ /**
+ * @deprecated Use {@link #getBigDecimal(int)}
+ */
@Deprecated
@Override
public BigDecimal getBigDecimal(final int columnIndex, final int scale) throws SQLException {
@@ -298,7 +300,9 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
}
}
- /** @deprecated Use {@link #getBigDecimal(String)} */
+ /**
+ * @deprecated Use {@link #getBigDecimal(String)}
+ */
@Deprecated
@Override
public BigDecimal getBigDecimal(final String columnName, final int scale) throws SQLException {
@@ -989,7 +993,9 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
}
}
- /** @deprecated Use {@link #getCharacterStream(int)} */
+ /**
+ * @deprecated Use {@link #getCharacterStream(int)}
+ */
@Deprecated
@Override
public InputStream getUnicodeStream(final int columnIndex) throws SQLException {
@@ -1001,7 +1007,9 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
}
}
- /** @deprecated Use {@link #getCharacterStream(String)} */
+ /**
+ * @deprecated Use {@link #getCharacterStream(String)}
+ */
@Deprecated
@Override
public InputStream getUnicodeStream(final String columnName) throws SQLException {
diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index b30d0d14e2..1b23c8df84 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -101,6 +101,10 @@
<module name="MissingJavadocType"/>
-->
<module name="NonEmptyAtclauseDescription"/>
+ <!-- ~1600 errors
+ <module name="RequireEmptyLineBeforeBlockTagGroup"/>
+ -->
+ <module name="SingleLineJavadoc"/>
<!-- Miscellaneous -->
<!-- ~5500 errors
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org