Skip to content

Commit 997837e

Browse files
committed
Update release notes wrt #175
1 parent 1331fc2 commit 997837e

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

release-notes/CREDITS-2.x

+10
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,16 @@ Björn Michael (bjmi@github)
142142
* Reported #204: `CsvParser.Feature.ALLOW_TRAILING_COMMA` doesn't work with header columns
143143
(2.11.2)
144144

145+
Jesper Nielsen (jn-asseco@github)
146+
* Requested #175: (yaml) Add `YAMLGenerator.Feature.INDENT_ARRAYS_WITH_INDICATOR`
147+
to indent by 2 spaces
148+
(2.12.0)
149+
150+
Damian Swiecki (dswiecki@github)
151+
* Contributed fix for #175: (yaml) Add `YAMLGenerator.Feature.INDENT_ARRAYS_WITH_INDICATOR`
152+
to indent by 2 spaces
153+
(2.12.0)
154+
145155
Simon Levermann (sonOfRa@github)
146156
* Reported #199: (csv) Empty Lists can only be String-typed in CSV
147157
(2.12.0)

release-notes/VERSION-2.x

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Modules:
1010

1111
2.12.0 (not yet released)
1212

13+
#175: (yaml) Add `YAMLGenerator.Feature.INDENT_ARRAYS_WITH_INDICATOR` to indent by 2 spaces
14+
(requested by Jesper N; fix contributed by Damian S)
1315
#199: (csv) Empty Lists can only be String-typed in CSV
1416
(reported by Simon L)
1517
#222: (csv) `JsonParser.Feature.EMPTY_STRING_AS_NULL` does not work when

yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLGenerator.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public enum Feature implements FormatFeature // since 2.9
111111
* Feature enabling of which adds indentation for array entry generation
112112
* (default indentation being 2 spaces).
113113
*<p>
114-
* Default value is `false` for backwards compatibility
114+
* Default value is {@code false} for backwards compatibility
115115
*
116116
* @since 2.9
117117
*/
@@ -120,9 +120,9 @@ public enum Feature implements FormatFeature // since 2.9
120120
* Feature enabling of which adds indentation with indicator for array entry generation
121121
* (default indentation being 2 spaces).
122122
*<p>
123-
* Default value is `false` for backwards compatibility
123+
* Default value is {@code false} for backwards compatibility
124124
*
125-
* @since 2.12.0
125+
* @since 2.12
126126
*/
127127
INDENT_ARRAYS_WITH_INDICATOR(false),
128128

@@ -131,7 +131,7 @@ public enum Feature implements FormatFeature // since 2.9
131131
* serialization should be same as what the default is for current platform.
132132
* If disabled, Unix linefeed ({@code \n}) will be used.
133133
* <p>
134-
* Default value is `false` for backwards compatibility.
134+
* Default value is {@code false} for backwards compatibility.
135135
*
136136
* @since 2.9.6
137137
*/
@@ -300,6 +300,7 @@ protected DumperOptions buildDumperOptions(int jsonFeatures, int yamlFeatures,
300300
opt.setIndicatorIndent(1);
301301
opt.setIndent(2);
302302
}
303+
// [dataformats-text#175]: further configurability that overrides prev setting
303304
if (Feature.INDENT_ARRAYS_WITH_INDICATOR.enabledIn(_formatFeatures)) {
304305
opt.setIndicatorIndent(2);
305306
opt.setIndentWithIndicator(true);

0 commit comments

Comments
 (0)