Skip to content

Commit de2b735

Browse files
committed
Javadoc
Allow longer lines for HTML href links
1 parent ef7652b commit de2b735

File tree

2 files changed

+27
-21
lines changed

2 files changed

+27
-21
lines changed

src/conf/checkstyle/checkstyle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ limitations under the License.
2727
</module>
2828
<module name="LineLength">
2929
<property name="max" value="160"/>
30+
<property name="ignorePattern" value="href"/>
3031
</module>
3132
<module name="NewlineAtEndOfFile" />
3233
<module name="RegexpSingleline">
@@ -88,4 +89,3 @@ limitations under the License.
8889
</module>
8990
<property name="localeLanguage" value="en" />
9091
</module>
91-

src/main/java/org/apache/commons/csv/CSVFormat.java

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,15 +1001,16 @@ public CSVFormat getFormat() {
10011001
public static final CSVFormat DEFAULT = new CSVFormat(Builder.create());
10021002

10031003
/**
1004-
* Excel file format (using a comma as the value delimiter). Note that the actual value delimiter used by Excel is locale-dependent, it might be necessary
1005-
* to customize this format to accommodate your regional settings.
1004+
* <a href="https://support.microsoft.com/en-us/office/import-or-export-text-txt-or-csv-files-5250ac4c-663c-47ce-937b-339e391393ba">Microsoft Excel</a> file
1005+
* format (using a comma as the value delimiter). Note that the actual value delimiter used by Excel is locale-dependent, it might be necessary to customize
1006+
* this format to accommodate your regional settings.
10061007
*
10071008
* <p>
10081009
* For example for parsing or generating a CSV file on a French system the following format will be used:
10091010
* </p>
10101011
*
10111012
* <pre>
1012-
* CSVFormat fmt = CSVFormat.EXCEL.builder().setDelimiter(';').get();
1013+
* CSVFormat format = CSVFormat.EXCEL.builder().setDelimiter(';').get();
10131014
* </pre>
10141015
*
10151016
* <p>
@@ -1032,6 +1033,8 @@ public CSVFormat getFormat() {
10321033
*
10331034
* @see Predefined#Excel
10341035
* @see DuplicateHeaderMode#ALLOW_ALL
1036+
* @see <a href="https://support.microsoft.com/en-us/office/import-or-export-text-txt-or-csv-files-5250ac4c-663c-47ce-937b-339e391393ba">Microsoft Excel
1037+
* </a>
10351038
*/
10361039
// @formatter:off
10371040
public static final CSVFormat EXCEL = DEFAULT.builder()
@@ -1043,7 +1046,8 @@ public CSVFormat getFormat() {
10431046
// @formatter:on
10441047

10451048
/**
1046-
* Default Informix CSV UNLOAD format used by the {@code UNLOAD TO file_name} operation.
1049+
* Default <a href="https://www.ibm.com/docs/en/informix-servers/14.10?topic=statements-unload-statement">Informix CSV UNLOAD</a>
1050+
* format used by the {@code UNLOAD TO file_name} operation.
10471051
*
10481052
* <p>
10491053
* This is a comma-delimited format with an LF character as the line separator. Values are not quoted and special characters are escaped with {@code '\'}.
@@ -1061,8 +1065,7 @@ public CSVFormat getFormat() {
10611065
* </ul>
10621066
*
10631067
* @see Predefined#MySQL
1064-
* @see <a href= "http://www.ibm.com/support/knowledgecenter/SSBJG3_2.5.0/com.ibm.gen_busug.doc/c_fgl_InOutSql_UNLOAD.htm">
1065-
* http://www.ibm.com/support/knowledgecenter/SSBJG3_2.5.0/com.ibm.gen_busug.doc/c_fgl_InOutSql_UNLOAD.htm</a>
1068+
* @see <a href="https://www.ibm.com/docs/en/informix-servers/14.10?topic=statements-unload-statement">Informix CSV UNLOAD</a>
10661069
* @since 1.3
10671070
*/
10681071
// @formatter:off
@@ -1075,7 +1078,8 @@ public CSVFormat getFormat() {
10751078
// @formatter:on
10761079

10771080
/**
1078-
* Default Informix CSV UNLOAD format used by the {@code UNLOAD TO file_name} operation (escaping is disabled.)
1081+
* Default <a href="https://www.ibm.com/docs/en/informix-servers/14.10?topic=statements-unload-statement">Informix CSV UNLOAD</a>
1082+
* format used by the {@code UNLOAD TO file_name} operation (escaping is disabled.)
10791083
*
10801084
* <p>
10811085
* This is a comma-delimited format with an LF character as the line separator. Values are not quoted and special characters are escaped with {@code '\'}.
@@ -1163,7 +1167,7 @@ public CSVFormat getFormat() {
11631167
* <li>{@link Builder#setEscape(char) setEscape}{@code ('"')}</li>
11641168
* <li>{@link Builder#setQuote(char) setQuote}{@code ('"')}</li>
11651169
* <li>{@link Builder#setQuoteMode(QuoteMode) setQuoteMode}{@code (QuoteMode.ALL_NON_NULL)}</li>
1166-
* <li>{@code setSkipHeaderRecord(false)}</li>
1170+
* <li>{@link Builder#setSkipHeaderRecord(boolean) setSkipHeaderRecord}{@code (false)}</li>
11671171
* </ul>
11681172
*
11691173
* @see Predefined#MongoDBCsv
@@ -1183,7 +1187,8 @@ public CSVFormat getFormat() {
11831187
// @formatter:off
11841188

11851189
/**
1186-
* Default MySQL format used by the {@code SELECT INTO OUTFILE} and {@code LOAD DATA INFILE} operations.
1190+
* Default <a href="https://dev.mysql.com/doc/refman/8.0/en/mysqldump-delimited-text.html">MySQL</a>
1191+
* format used by the {@code SELECT INTO OUTFILE} and {@code LOAD DATA INFILE} operations.
11871192
*
11881193
* <p>
11891194
* This is a tab-delimited format with an LF character as the line separator. Values are not quoted and special
@@ -1205,8 +1210,7 @@ public CSVFormat getFormat() {
12051210
*
12061211
* @see Predefined#MySQL
12071212
* @see QuoteMode#ALL_NON_NULL
1208-
* @see <a href="https://dev.mysql.com/doc/refman/5.1/en/load-data.html"> https://dev.mysql.com/doc/refman/5.1/en/load
1209-
* -data.html</a>
1213+
* @see <a href="https://dev.mysql.com/doc/refman/8.0/en/mysqldump-delimited-text.html">MySQL</a>
12101214
*/
12111215
// @formatter:off
12121216
public static final CSVFormat MYSQL = DEFAULT.builder()
@@ -1221,7 +1225,9 @@ public CSVFormat getFormat() {
12211225
// @formatter:off
12221226

12231227
/**
1224-
* Default Oracle format used by the SQL*Loader utility.
1228+
* Default
1229+
* <a href="https://docs.oracle.com/en/database/oracle/oracle-database/23/sutil/oracle-sql-loader-control-file-contents.html#GUID-D1762699-8154-40F6-90DE-EFB8EB6A9AB0">Oracle</a>
1230+
* format used by the SQL*Loader utility.
12251231
*
12261232
* <p>
12271233
* This is a comma-delimited format with the system line separator character as the record separator. Values are
@@ -1245,7 +1251,7 @@ public CSVFormat getFormat() {
12451251
*
12461252
* @see Predefined#Oracle
12471253
* @see QuoteMode#MINIMAL
1248-
* @see <a href="https://s.apache.org/CGXG">Oracle CSV Format Specification</a>
1254+
* @see <a href="https://docs.oracle.com/en/database/oracle/oracle-database/23/sutil/oracle-sql-loader-control-file-contents.html#GUID-D1762699-8154-40F6-90DE-EFB8EB6A9AB0">Oracle CSV Format Specification</a>
12491255
* @since 1.6
12501256
*/
12511257
// @formatter:off
@@ -1262,7 +1268,7 @@ public CSVFormat getFormat() {
12621268
// @formatter:off
12631269

12641270
/**
1265-
* Default PostgreSQL CSV format used by the {@code COPY} operation.
1271+
* Default <a href="https://www.postgresql.org/docs/current/static/sql-copy.html">PostgreSQL CSV</a> format used by the {@code COPY} operation.
12661272
*
12671273
* <p>
12681274
* This is a comma-delimited format with an LF character as the line separator. Values are double quoted and special
@@ -1284,8 +1290,7 @@ public CSVFormat getFormat() {
12841290
*
12851291
* @see Predefined#MySQL
12861292
* @see QuoteMode#ALL_NON_NULL
1287-
* @see <a href="https://www.postgresql.org/docs/current/static/sql-copy.html">PostgreSQL COPY command
1288-
* documentation</a>
1293+
* @see <a href="https://www.postgresql.org/docs/current/static/sql-copy.html">PostgreSQL CSV</a>
12891294
* @since 1.5
12901295
*/
12911296
// @formatter:off
@@ -1301,7 +1306,7 @@ public CSVFormat getFormat() {
13011306
// @formatter:off
13021307

13031308
/**
1304-
* Default PostgreSQL text format used by the {@code COPY} operation.
1309+
* Default <a href="https://www.postgresql.org/docs/current/static/sql-copy.html">PostgreSQL Text</a> format used by the {@code COPY} operation.
13051310
*
13061311
* <p>
13071312
* This is a tab-delimited format with an LF character as the line separator. Values are not quoted and special
@@ -1323,8 +1328,7 @@ public CSVFormat getFormat() {
13231328
*
13241329
* @see Predefined#MySQL
13251330
* @see QuoteMode#ALL_NON_NULL
1326-
* @see <a href="https://www.postgresql.org/docs/current/static/sql-copy.html">PostgreSQL COPY command
1327-
* documentation</a>
1331+
* @see <a href="https://www.postgresql.org/docs/current/static/sql-copy.html">PostgreSQL Text</a>
13281332
* @since 1.5
13291333
*/
13301334
// @formatter:off
@@ -1353,13 +1357,14 @@ public CSVFormat getFormat() {
13531357
* </ul>
13541358
*
13551359
* @see Predefined#RFC4180
1360+
* @see <a href="https://tools.ietf.org/html/rfc4180">RFC 4180</a>
13561361
*/
13571362
public static final CSVFormat RFC4180 = DEFAULT.builder().setIgnoreEmptyLines(false).get();
13581363

13591364
private static final long serialVersionUID = 2L;
13601365

13611366
/**
1362-
* Tab-delimited format (TDF).
1367+
* Tab-delimited format (<a href="https://en.wikipedia.org/wiki/Tab-separated_values">TDF</a>).
13631368
*
13641369
* <p>
13651370
* The {@link Builder} settings are the {@link #DEFAULT} <em>with</em>:
@@ -1370,6 +1375,7 @@ public CSVFormat getFormat() {
13701375
* </ul>
13711376
*
13721377
* @see Predefined#TDF
1378+
* @see <a href="https://en.wikipedia.org/wiki/Tab-separated_values">TDF</a>
13731379
*/
13741380
// @formatter:off
13751381
public static final CSVFormat TDF = DEFAULT.builder()

0 commit comments

Comments
 (0)