Skip to content

Commit 2d784b2

Browse files
authored
Remove long ago deprecated methods from CsvSchema (#494)
1 parent f779ea9 commit 2d784b2

File tree

1 file changed

+0
-61
lines changed

1 file changed

+0
-61
lines changed

csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvSchema.java

-61
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,6 @@ public Column withType(ColumnType newType) {
315315
return new Column(_index, _name, newType, _arrayElementSeparator);
316316
}
317317

318-
/**
319-
* @deprecated use {@link #withArrayElementSeparator(String)} instead
320-
*/
321-
@Deprecated // in 2.7; remove from 2.8
322-
public Column withElementSeparator(int separator) {
323-
return withArrayElementSeparator((separator < 0) ? NO_ARRAY_ELEMENT_SEPARATOR : Character.toString((char) separator));
324-
}
325-
326318
public Column withArrayElementSeparator(String separator) {
327319
String sep = _validArrayElementSeparator(separator);
328320
if (_arrayElementSeparator.equals(sep)) {
@@ -707,16 +699,6 @@ public Builder setColumnSeparator(char c) {
707699
return this;
708700
}
709701

710-
/**
711-
* @since 2.5
712-
* @deprecated use {@link #setArrayElementSeparator(String)} instead
713-
*/
714-
@Deprecated // in 2.7; remove from 2.8
715-
public Builder setArrayElementSeparator(char c) {
716-
_arrayElementSeparator = Character.toString(c);
717-
return this;
718-
}
719-
720702
/**
721703
* Method for specifying character used to separate array element
722704
* values.
@@ -729,15 +711,6 @@ public Builder setArrayElementSeparator(String separator) {
729711
return this;
730712
}
731713

732-
/**
733-
* @since 2.5
734-
* @deprecated use {@link #disableArrayElementSeparator()} instead
735-
*/
736-
@Deprecated // in 2.7; remove from 2.8
737-
public Builder disableElementSeparator(char c) {
738-
return disableArrayElementSeparator();
739-
}
740-
741714
/**
742715
* @since 2.7
743716
*/
@@ -870,19 +843,6 @@ protected void _checkIndex(int index) {
870843
*/
871844
protected final String _anyPropertyName;
872845

873-
/**
874-
* @deprecated use {@link #CsvSchema(Column[], int, char, int, int, char[], String, char[], String)} instead
875-
*/
876-
@Deprecated // in 2.7; remove from 2.8
877-
public CsvSchema(Column[] columns, int features,
878-
char columnSeparator, int quoteChar, int escapeChar,
879-
char[] lineSeparator, int arrayElementSeparator,
880-
char[] nullValue) {
881-
this(columns, features, columnSeparator, quoteChar, escapeChar, lineSeparator,
882-
arrayElementSeparator == -1 ? "" : Character.toString((char) arrayElementSeparator), nullValue,
883-
DEFAULT_ANY_PROPERTY_NAME);
884-
}
885-
886846
/**
887847
* @since 2.7
888848
*/
@@ -1161,15 +1121,6 @@ public CsvSchema withoutEscapeChar() {
11611121
_nullValue, _columnsByName, _anyPropertyName);
11621122
}
11631123

1164-
/**
1165-
* @since 2.5
1166-
* @deprecated use {@link #withArrayElementSeparator(String)} instead
1167-
*/
1168-
@Deprecated // in 2.7; remove in 2.8
1169-
public CsvSchema withArrayElementSeparator(char c) {
1170-
return withArrayElementSeparator( Character.toString(c));
1171-
}
1172-
11731124
/**
11741125
* @since 2.7
11751126
*/
@@ -1317,18 +1268,6 @@ public String getSchemaType() {
13171268
public boolean allowsComments() { return (_features & ENCODING_FEATURE_ALLOW_COMMENTS) != 0; }
13181269
public boolean strictHeaders() { return (_features & ENCODING_FEATURE_STRICT_HEADERS) != 0; }
13191270

1320-
/**
1321-
* @deprecated Use {@link #usesHeader()} instead
1322-
*/
1323-
@Deprecated // since 2.5
1324-
public boolean useHeader() { return (_features & ENCODING_FEATURE_USE_HEADER) != 0; }
1325-
1326-
/**
1327-
* @deprecated Use {@link #skipsFirstDataRow()} instead
1328-
*/
1329-
@Deprecated // since 2.5
1330-
public boolean skipFirstDataRow() { return (_features & ENCODING_FEATURE_SKIP_FIRST_DATA_ROW) != 0; }
1331-
13321271
public char getColumnSeparator() { return _columnSeparator; }
13331272
public String getArrayElementSeparator() { return _arrayElementSeparator; }
13341273
public int getQuoteChar() { return _quoteChar; }

0 commit comments

Comments
 (0)