Skip to content

Commit ff6dca4

Browse files
DFUKDFUK
DFUK
authored and
DFUK
committed
Better table conversion. Closes #433,#434.
1 parent f79d5d6 commit ff6dca4

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

History.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.1.1...master)
22

3+
* [Core] Support `DataTable.toTable(List<String[]>) and `DataTable.toTable(List<Map<String,String>>)` ([#433](https://github.com/cucumber/cucumber-jvm/issues/433), [#434](https://github.com/cucumber/cucumber-jvm/pull/434) Nicholas Albion, Aslak Hellesøy)
34
* [Core] Formatters and `--dotcucumber` can now write to a file or an URL (via HTTP PUT). This allows easier distribution of reports. (Aslak Hellesøy)
45
* [JUnit] Added `@Cucumber.Options.dotcucumber`, allowing metadata to be written from JUnit. Useful for code completion. ([#418](https://github.com/cucumber/cucumber-jvm/issues/418 Aslak Hellesøy)
56
* [Core] Embedded data fails to display in HTML reports due to invalid string passed from HTMLFormatter ([#412](https://github.com/cucumber/cucumber-jvm/issues/412) Aslak Hellesøy)

core/src/main/java/cucumber/api/DataTable.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ public static DataTable create(List<?> raw) {
3232
return create(raw, Locale.getDefault(), null, new String[0]);
3333
}
3434

35-
public static DataTable create(List<?> raw, String dateFormat, String... columnNames) {
36-
return create(raw, Locale.getDefault(), dateFormat, columnNames);
35+
public static DataTable create(List<?> raw, String format, String... columnNames) {
36+
return create(raw, Locale.getDefault(), format, columnNames);
3737
}
3838

3939
public static DataTable create(List<?> raw, Locale locale, String... columnNames) {
4040
return create(raw, locale, null, columnNames);
4141
}
4242

43-
private static DataTable create(List<?> raw, Locale locale, String dateFormat, String... columnNames) {
44-
ParameterInfo parameterInfo = new ParameterInfo(null, dateFormat, null, null);
43+
private static DataTable create(List<?> raw, Locale locale, String format, String... columnNames) {
44+
ParameterInfo parameterInfo = new ParameterInfo(null, format, null, null);
4545
TableConverter tableConverter = new TableConverter(new LocalizedXStreams(Thread.currentThread().getContextClassLoader()).get(locale), parameterInfo);
4646
return tableConverter.toTable(raw, columnNames);
4747
}
@@ -74,7 +74,7 @@ public List<List<String>> raw() {
7474
}
7575

7676
public <T> T convert(Type type) {
77-
return tableConverter.<T>convert(type, this);
77+
return tableConverter.convert(type, this);
7878
}
7979

8080
/**

core/src/main/java/cucumber/runtime/table/TableConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public <T> List<T> toList(final Type type, DataTable dataTable) {
162162
* Converts a List of objects to a DataTable.
163163
*
164164
* @param objects the objects to convert
165-
* @param columnNames an explicit list of column names (currently not used)
165+
* @param columnNames an explicit list of column names
166166
* @return a DataTable
167167
*/
168168
public DataTable toTable(List<?> objects, String... columnNames) {

0 commit comments

Comments
 (0)