This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-csv. See https://gitlab.nuiton.org/nuiton/nuiton-csv.git commit 2f841e265f9292fd1d7278c9e91eb01c7ae0bb87 Author: Arnaud Thimel <thimel@codelutin.com> Date: Tue May 1 16:52:10 2018 +0200 Use diamond operator when possible --- src/main/java/org/nuiton/csv/Column.java | 42 +++++++++++----------- src/main/java/org/nuiton/csv/Common.java | 16 ++++----- src/main/java/org/nuiton/csv/Export.java | 1 + src/main/java/org/nuiton/csv/Import.java | 24 ++++++------- src/main/java/org/nuiton/csv/Import2.java | 28 +++++++-------- src/main/java/org/nuiton/csv/ImportToMap.java | 2 +- src/main/java/org/nuiton/csv/ModelBuilder.java | 4 +-- src/main/java/org/nuiton/csv/MyModelBuilder.java | 8 ++--- .../org/nuiton/csv/ext/AbstractExportModel.java | 2 +- .../nuiton/csv/ext/AbstractImportExportModel.java | 2 +- .../org/nuiton/csv/ext/AbstractImportModel.java | 2 +- .../java/org/nuiton/csv/ext/RepeatableExport.java | 2 +- src/test/java/org/nuiton/csv/ExportTest.java | 6 ++-- src/test/java/org/nuiton/csv/Import2Test.java | 4 +-- src/test/java/org/nuiton/csv/ImportExportTest.java | 2 +- src/test/java/org/nuiton/csv/ImportTest.java | 10 +++--- .../java/org/nuiton/csv/RowBeanExportModel.java | 2 +- src/test/java/org/nuiton/csv/Utf8WithBomTest.java | 2 +- 18 files changed, 80 insertions(+), 79 deletions(-) diff --git a/src/main/java/org/nuiton/csv/Column.java b/src/main/java/org/nuiton/csv/Column.java index 932bd06..8ba82dc 100644 --- a/src/main/java/org/nuiton/csv/Column.java +++ b/src/main/java/org/nuiton/csv/Column.java @@ -36,13 +36,13 @@ public class Column<E, T> implements ImportableExportableColumn<E, T> { ValueGetter<E, T> valueGetter, ValueFormatter<T> valueFormatter, boolean ignored) { - return new Column<E, T>(headerName, - valueGetter, - valueFormatter, - null, - null, - ignored, - !ignored + return new Column<>(headerName, + valueGetter, + valueFormatter, + null, + null, + ignored, + !ignored ); } @@ -51,13 +51,13 @@ public class Column<E, T> implements ImportableExportableColumn<E, T> { ValueSetter<E, T> valueSetter, boolean ignored, boolean mandatory) { - return new Column<E, T>(headerName, - null, - null, - valueParser, - valueSetter, - ignored, - mandatory + return new Column<>(headerName, + null, + null, + valueParser, + valueSetter, + ignored, + mandatory ); } @@ -67,13 +67,13 @@ public class Column<E, T> implements ImportableExportableColumn<E, T> { ValueParser<T> valueParser, ValueSetter<E, T> valueSetter, boolean ignored) { - return new Column<E, T>(headerName, - valueGetter, - valueFormatter, - valueParser, - valueSetter, - ignored, - !ignored + return new Column<>(headerName, + valueGetter, + valueFormatter, + valueParser, + valueSetter, + ignored, + !ignored ); } diff --git a/src/main/java/org/nuiton/csv/Common.java b/src/main/java/org/nuiton/csv/Common.java index b90bff4..fc0b204 100644 --- a/src/main/java/org/nuiton/csv/Common.java +++ b/src/main/java/org/nuiton/csv/Common.java @@ -115,23 +115,23 @@ public class Common { new DateValue("yyyy"); public static <E extends Map<String, Object>, T> MapProperty<E, T> newMapProperty(String propertyName) { - return new MapProperty<E, T>(propertyName); + return new MapProperty<>(propertyName); } public static <E, T> BeanProperty<E, T> newBeanProperty(String propertyName) { - return new BeanProperty<E, T>(propertyName); + return new BeanProperty<>(propertyName); } public static <E extends Enum<E>> ValueParserFormatter<E> newEnumByNameParserFormatter(Class<E> enumType) { - return new EnumByNameParserFormatter<E>(enumType); + return new EnumByNameParserFormatter<>(enumType); } public static <E> ValueParserFormatter<List<E>> newListParserFormatter(char separator, ValueParserFormatter<E> valueParserFormatter, List<E> defaultValue, boolean nullAllowed) { - return new ListValueParser<E>(separator, valueParserFormatter, defaultValue, nullAllowed); + return new ListValueParser<>(separator, valueParserFormatter, defaultValue, nullAllowed); } public static <E extends Enum<E>> ValueParserFormatter<E> newEnumByOrdinalParserFormatter(Class<E> enumType) { - return new EnumByOrdinalParserFormatter<E>(enumType); + return new EnumByOrdinalParserFormatter<>(enumType); } public static class StringValueParser implements ValueParserFormatter<String> { @@ -308,9 +308,9 @@ public class Common { public static class ToStringParserFormatter<E> implements ValueParserFormatter<E> { - protected Map<E, String> toStrings = new HashMap<E, String>(); + protected Map<E, String> toStrings = new HashMap<>(); - protected Map<String, E> fromString = new HashMap<String, E>(); + protected Map<String, E> fromString = new HashMap<>(); public ToStringParserFormatter(List<E> values) { this(values, null); @@ -328,7 +328,7 @@ public class Common { /** fill toStrings and fromString */ protected void computeToStrings(E[] values, StringUtil.ToString<E> toString) { - List<E> valuesAsList = new LinkedList<E>(); + List<E> valuesAsList = new LinkedList<>(); Collections.addAll(valuesAsList, values); computeToStrings(valuesAsList, toString); } diff --git a/src/main/java/org/nuiton/csv/Export.java b/src/main/java/org/nuiton/csv/Export.java index 7d6657d..bbb128e 100644 --- a/src/main/java/org/nuiton/csv/Export.java +++ b/src/main/java/org/nuiton/csv/Export.java @@ -62,6 +62,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 2.4 */ +@SuppressWarnings("ALL") public class Export<E> { /** Logger. */ diff --git a/src/main/java/org/nuiton/csv/Import.java b/src/main/java/org/nuiton/csv/Import.java index 31a0d63..2ecb974 100644 --- a/src/main/java/org/nuiton/csv/Import.java +++ b/src/main/java/org/nuiton/csv/Import.java @@ -79,24 +79,24 @@ public class Import<E> implements Iterable<E>, Closeable { public static <E> Import<E> newImport(ImportModel<E> model, InputStream inputStream) { - return new Import<E>(model, inputStream); + return new Import<>(model, inputStream); } public static <E> Import<E> newImport(ImportModel<E> model, Reader reader) { - return new Import<E>(model, reader); + return new Import<>(model, reader); } public static <E> Import<E> newImport(ImportModel<E> model, InputStream inputStream, boolean safetySwitch) { - return new Import<E>(model, inputStream, safetySwitch); + return new Import<>(model, inputStream, safetySwitch); } public static <E> Import<E> newImport(ImportModel<E> model, Reader reader, boolean safetySwitch) { - return new Import<E>(model, reader, safetySwitch); + return new Import<>(model, reader, safetySwitch); } /** @@ -257,14 +257,14 @@ public class Import<E> implements Iterable<E>, Closeable { } protected void checkHeaderNamesAreAllKnown(String... headers) { - List<String> csvHeaders = new ArrayList<String>(); + List<String> csvHeaders = new ArrayList<>(); Collections.addAll(csvHeaders, headers); for (ImportableColumn<E, ?> field : model.getColumnsForImport()) { csvHeaders.remove(field.getHeaderName()); } if (!csvHeaders.isEmpty()) { - List<String> validHeaderNames = new LinkedList<String>(); + List<String> validHeaderNames = new LinkedList<>(); for (ImportableColumn<E, ?> importableColumn : model.getColumnsForImport()) { validHeaderNames.add(importableColumn.getHeaderName()); @@ -278,8 +278,8 @@ public class Import<E> implements Iterable<E>, Closeable { } protected void checkUniqueModelColumnNames() { - Set<String> headerNames = new HashSet<String>(); - Set<String> doubleHeaderNames = new HashSet<String>(); + Set<String> headerNames = new HashSet<>(); + Set<String> doubleHeaderNames = new HashSet<>(); for (ImportableColumn<E, ?> importableColumn : model.getColumnsForImport()) { String headerName = importableColumn.getHeaderName(); @@ -299,10 +299,10 @@ public class Import<E> implements Iterable<E>, Closeable { protected void checkAllMandatoryHeadersArePresent(String... headers) { - List<String> csvHeaders = new ArrayList<String>(); + List<String> csvHeaders = new ArrayList<>(); Collections.addAll(csvHeaders, headers); - List<String> mandatoryHeadersNames = new ArrayList<String>(); + List<String> mandatoryHeadersNames = new ArrayList<>(); for (ImportableColumn<E, ?> field : getAllMandatoryHeaders()) { mandatoryHeadersNames.add(field.getHeaderName()); } @@ -342,7 +342,7 @@ public class Import<E> implements Iterable<E>, Closeable { protected List<ImportableColumn<E, Object>> getNonIgnoredHeaders() { List<ImportableColumn<E, Object>> nonIgnoredHeaders = - new ArrayList<ImportableColumn<E, Object>>(); + new ArrayList<>(); for (ImportableColumn<E, Object> field : model.getColumnsForImport()) { if (!field.isIgnored()) { nonIgnoredHeaders.add(field); @@ -353,7 +353,7 @@ public class Import<E> implements Iterable<E>, Closeable { protected List<ImportableColumn<E, ?>> getAllMandatoryHeaders() { List<ImportableColumn<E, ?>> allMandatoryHeaders = - new ArrayList<ImportableColumn<E, ?>>(); + new ArrayList<>(); for (ImportableColumn<E, ?> field : model.getColumnsForImport()) { if (field.isMandatory()) { allMandatoryHeaders.add(field); diff --git a/src/main/java/org/nuiton/csv/Import2.java b/src/main/java/org/nuiton/csv/Import2.java index 2a11e3a..8dc46fb 100644 --- a/src/main/java/org/nuiton/csv/Import2.java +++ b/src/main/java/org/nuiton/csv/Import2.java @@ -86,13 +86,13 @@ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { public static <E> Import2<E> newImport(ImportConf conf, ImportModel<E> model, InputStream inputStream) { - return new Import2<E>(conf, model, inputStream); + return new Import2<>(conf, model, inputStream); } public static <E> Import2<E> newImport(ImportConf conf, ImportModel<E> model, Reader reader) { - return new Import2<E>(conf, model, reader); + return new Import2<>(conf, model, reader); } /** @@ -199,14 +199,14 @@ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { } protected void checkHeaderNamesAreAllKnown(String... headers) { - List<String> csvHeaders = new ArrayList<String>(); + List<String> csvHeaders = new ArrayList<>(); Collections.addAll(csvHeaders, headers); for (ImportableColumn<E, ?> field : model.getColumnsForImport()) { csvHeaders.remove(field.getHeaderName()); } if (!csvHeaders.isEmpty()) { - List<String> validHeaderNames = new LinkedList<String>(); + List<String> validHeaderNames = new LinkedList<>(); for (ImportableColumn<E, ?> importableColumn : model.getColumnsForImport()) { validHeaderNames.add(importableColumn.getHeaderName()); @@ -220,8 +220,8 @@ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { } protected void checkUniqueModelColumnNames() { - Set<String> headerNames = new HashSet<String>(); - Set<String> doubleHeaderNames = new HashSet<String>(); + Set<String> headerNames = new HashSet<>(); + Set<String> doubleHeaderNames = new HashSet<>(); for (ImportableColumn<E, ?> importableColumn : model.getColumnsForImport()) { String headerName = importableColumn.getHeaderName(); @@ -241,10 +241,10 @@ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { protected void checkAllMandatoryHeadersArePresent(String... headers) { - List<String> csvHeaders = new ArrayList<String>(); + List<String> csvHeaders = new ArrayList<>(); Collections.addAll(csvHeaders, headers); - List<String> mandatoryHeadersNames = new ArrayList<String>(); + List<String> mandatoryHeadersNames = new ArrayList<>(); for (ImportableColumn<E, ?> field : getAllMandatoryHeaders()) { mandatoryHeadersNames.add(field.getHeaderName()); } @@ -284,7 +284,7 @@ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { protected List<ImportableColumn<E, Object>> getNonIgnoredHeaders() { List<ImportableColumn<E, Object>> nonIgnoredHeaders = - new ArrayList<ImportableColumn<E, Object>>(); + new ArrayList<>(); for (ImportableColumn<E, Object> field : model.getColumnsForImport()) { if (!field.isIgnored()) { nonIgnoredHeaders.add(field); @@ -295,7 +295,7 @@ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { protected List<ImportableColumn<E, ?>> getAllMandatoryHeaders() { List<ImportableColumn<E, ?>> allMandatoryHeaders = - new ArrayList<ImportableColumn<E, ?>>(); + new ArrayList<>(); for (ImportableColumn<E, ?> field : model.getColumnsForImport()) { if (field.isMandatory()) { allMandatoryHeaders.add(field); @@ -356,7 +356,7 @@ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { // get once for all columns to import this.columns = columns; - row = new ImportRow<E>(); + row = new ImportRow<>(); // read first line since first line is header boolean hasNext = readRow(); @@ -408,7 +408,7 @@ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { t("csv.import.error.unableToReadField", field.getHeaderName(), lineNumber), e); } else { - row.addError(new ImportReadErrorInfo<E>( + row.addError(new ImportReadErrorInfo<>( row, field, e)); } continue; @@ -425,7 +425,7 @@ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { + "\n" + e.getMessage(); throw new ImportRuntimeException(message, e); } else { - row.addError(new ImportParseErrorInfo<E>( + row.addError(new ImportParseErrorInfo<>( row, field, value, e)); } continue; @@ -442,7 +442,7 @@ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { lineNumber, field.getHeaderName()); throw new ImportRuntimeException(message, e); } else { - row.addError(new ImportSetErrorInfo<E>( + row.addError(new ImportSetErrorInfo<>( row, field, value, parsedValue, e)); } } diff --git a/src/main/java/org/nuiton/csv/ImportToMap.java b/src/main/java/org/nuiton/csv/ImportToMap.java index dae2719..b815bf2 100644 --- a/src/main/java/org/nuiton/csv/ImportToMap.java +++ b/src/main/java/org/nuiton/csv/ImportToMap.java @@ -79,7 +79,7 @@ public class ImportToMap extends Import<Map<String, Object>> { int lineNumber; // the map where to object of a row - final Map<String, Object> element = new HashMap<String, Object>(); + final Map<String, Object> element = new HashMap<>(); @Override public boolean hasNext() { diff --git a/src/main/java/org/nuiton/csv/ModelBuilder.java b/src/main/java/org/nuiton/csv/ModelBuilder.java index d137b2c..5ec9688 100644 --- a/src/main/java/org/nuiton/csv/ModelBuilder.java +++ b/src/main/java/org/nuiton/csv/ModelBuilder.java @@ -34,10 +34,10 @@ import java.util.LinkedList; public class ModelBuilder<E> { protected Collection<ImportableColumn<E, ?>> columnsForImport = - new LinkedList<ImportableColumn<E, ?>>(); + new LinkedList<>(); protected Collection<ExportableColumn<E, ?>> columnsForExport = - new LinkedList<ExportableColumn<E, ?>>(); + new LinkedList<>(); public <T> ImportableColumn<E, T> newIgnoredColumn(String headerName) { Column<E, T> newColumn = Column.newImportableColumn(headerName, null, null, true, false); diff --git a/src/main/java/org/nuiton/csv/MyModelBuilder.java b/src/main/java/org/nuiton/csv/MyModelBuilder.java index 65e4365..75d01d3 100644 --- a/src/main/java/org/nuiton/csv/MyModelBuilder.java +++ b/src/main/java/org/nuiton/csv/MyModelBuilder.java @@ -31,9 +31,9 @@ public class MyModelBuilder<E> { protected char separator; - protected List<ImportableColumn<E, Object>> columnsForImport = new LinkedList<ImportableColumn<E, Object>>(); + protected List<ImportableColumn<E, Object>> columnsForImport = new LinkedList<>(); - protected List<ExportableColumn<E, Object>> columnsForExport = new LinkedList<ExportableColumn<E, Object>>(); + protected List<ExportableColumn<E, Object>> columnsForExport = new LinkedList<>(); public BuildOrAddColumnStep newEmptyModel(char separator) { this.separator = separator; @@ -47,7 +47,7 @@ public class MyModelBuilder<E> { } public CsvModel<E> buildModelForExport() { - return new CsvModel<E>(separator, (Iterable) columnsForImport, (Iterable) columnsForExport, null); + return new CsvModel<>(separator, (Iterable) columnsForImport, (Iterable) columnsForExport, null); } public CsvModel<E> buildModelForImport(CsvModel.Factory<E> emptyEFactory) { @@ -158,7 +158,7 @@ public class MyModelBuilder<E> { columnsForImport.add((ImportableColumn) importableColumn); columnsForExport.add((ExportableColumn) exportableColumn); } - return new BuildOrAddColumnStep<E>(); + return new BuildOrAddColumnStep<>(); } } } diff --git a/src/main/java/org/nuiton/csv/ext/AbstractExportModel.java b/src/main/java/org/nuiton/csv/ext/AbstractExportModel.java index 41de2da..319dec7 100644 --- a/src/main/java/org/nuiton/csv/ext/AbstractExportModel.java +++ b/src/main/java/org/nuiton/csv/ext/AbstractExportModel.java @@ -43,7 +43,7 @@ public abstract class AbstractExportModel<E> implements ExportModel<E> { public AbstractExportModel(char separator) { this.separator = separator; - modelBuilder = new ModelBuilder<E>(); + modelBuilder = new ModelBuilder<>(); } @Override diff --git a/src/main/java/org/nuiton/csv/ext/AbstractImportExportModel.java b/src/main/java/org/nuiton/csv/ext/AbstractImportExportModel.java index 8da2670..f74b096 100644 --- a/src/main/java/org/nuiton/csv/ext/AbstractImportExportModel.java +++ b/src/main/java/org/nuiton/csv/ext/AbstractImportExportModel.java @@ -51,7 +51,7 @@ public abstract class AbstractImportExportModel<E> implements ImportExportModel< public AbstractImportExportModel(char separator) { this.separator = separator; - modelBuilder = new ModelBuilder<E>(); + modelBuilder = new ModelBuilder<>(); } @Override diff --git a/src/main/java/org/nuiton/csv/ext/AbstractImportModel.java b/src/main/java/org/nuiton/csv/ext/AbstractImportModel.java index 387c2e5..2fa11f2 100644 --- a/src/main/java/org/nuiton/csv/ext/AbstractImportModel.java +++ b/src/main/java/org/nuiton/csv/ext/AbstractImportModel.java @@ -45,7 +45,7 @@ public abstract class AbstractImportModel<E> implements ImportModel<E> { public AbstractImportModel(char separator) { this.separator = separator; - modelBuilder = new ModelBuilder<E>(); + modelBuilder = new ModelBuilder<>(); } @Override diff --git a/src/main/java/org/nuiton/csv/ext/RepeatableExport.java b/src/main/java/org/nuiton/csv/ext/RepeatableExport.java index bf046e1..f06734a 100644 --- a/src/main/java/org/nuiton/csv/ext/RepeatableExport.java +++ b/src/main/java/org/nuiton/csv/ext/RepeatableExport.java @@ -41,7 +41,7 @@ public class RepeatableExport<E> extends Export<E> { public static <E> RepeatableExport<E> newExport(ExportModel<E> model, Iterable<E> data, boolean writeOnceHeader) { - return new RepeatableExport<E>(model, data, writeOnceHeader); + return new RepeatableExport<>(model, data, writeOnceHeader); } public static <E> void exportToWriter(ExportModel<E> model, diff --git a/src/test/java/org/nuiton/csv/ExportTest.java b/src/test/java/org/nuiton/csv/ExportTest.java index c522f9b..2e4c732 100644 --- a/src/test/java/org/nuiton/csv/ExportTest.java +++ b/src/test/java/org/nuiton/csv/ExportTest.java @@ -47,11 +47,11 @@ public class ExportTest { public static final Charset CHARSET = Charset.forName("UTF-8"); - protected Set<RowBean> oneSizedSet = new HashSet<RowBean>(); + protected Set<RowBean> oneSizedSet = new HashSet<>(); - protected Set<RowBean> twoSizedSet = new HashSet<RowBean>(); + protected Set<RowBean> twoSizedSet = new HashSet<>(); - protected Set<RowBean> fiveSizedSet = new HashSet<RowBean>(); + protected Set<RowBean> fiveSizedSet = new HashSet<>(); protected List<Set<RowBean>> sets; diff --git a/src/test/java/org/nuiton/csv/Import2Test.java b/src/test/java/org/nuiton/csv/Import2Test.java index a153928..6193793 100644 --- a/src/test/java/org/nuiton/csv/Import2Test.java +++ b/src/test/java/org/nuiton/csv/Import2Test.java @@ -190,7 +190,7 @@ public class Import2Test { Reader reader = new StringReader(content); Import2<RowBean> rowImport = Import2.newImport(conf, model, reader) ){ - List<RowBean> result = new ArrayList<RowBean>(); + List<RowBean> result = new ArrayList<>(); for (ImportRow<RowBean> row : rowImport) { result.add(row.getBean()); } @@ -204,7 +204,7 @@ public class Import2Test { Reader reader = new StringReader(content); Import2<RowBean> rowImport = Import2.newImport(model, reader) ){ - List<RowBean> result = new ArrayList<RowBean>(); + List<RowBean> result = new ArrayList<>(); for (ImportRow<RowBean> row : rowImport) { result.add(row.getBean()); } diff --git a/src/test/java/org/nuiton/csv/ImportExportTest.java b/src/test/java/org/nuiton/csv/ImportExportTest.java index bb23b9c..5666c55 100644 --- a/src/test/java/org/nuiton/csv/ImportExportTest.java +++ b/src/test/java/org/nuiton/csv/ImportExportTest.java @@ -111,7 +111,7 @@ public class ImportExportTest { try { Import2<RowBean> rowImport = Import2.newImport(model, reader); try { - List<RowBean> result = new ArrayList<RowBean>(); + List<RowBean> result = new ArrayList<>(); for (ImportRow<RowBean> row : rowImport) { result.add(row.getBean()); } diff --git a/src/test/java/org/nuiton/csv/ImportTest.java b/src/test/java/org/nuiton/csv/ImportTest.java index 2a66fc4..22f0acc 100644 --- a/src/test/java/org/nuiton/csv/ImportTest.java +++ b/src/test/java/org/nuiton/csv/ImportTest.java @@ -69,7 +69,7 @@ public class ImportTest { @Override public Iterable<ExportableColumn<RowBean, Object>> getColumnsForExport() { - ModelBuilder<RowBean> modelBuilder = new ModelBuilder<RowBean>(); + ModelBuilder<RowBean> modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForExport("DATE", "date", Common.DAY); modelBuilder.newColumnForExport("TITLE", "title"); modelBuilder.newColumnForExport("NUMBER", "number", Common.INTEGER); @@ -161,7 +161,7 @@ public class ImportTest { try { Import<RowBean> rowImport = Import.newImport(model, reader); try { - List<RowBean> result = new ArrayList<RowBean>(); + List<RowBean> result = new ArrayList<>(); for (RowBean row : rowImport) { result.add(row); } @@ -200,7 +200,7 @@ public class ImportTest { @SuppressWarnings({"unchecked"}) @Override public Collection<ImportableColumn<RowBean, Object>> getColumnsForImport() { - List<ImportableColumn<RowBean, Object>> result = new ArrayList<ImportableColumn<RowBean, Object>>(); + List<ImportableColumn<RowBean, Object>> result = new ArrayList<>(); // Column types are not checked but safe because Object is necessary, and element type is always Row result.add(getTitleColumn()); result.add(getNumberColumn()); @@ -251,7 +251,7 @@ public class ImportTest { @SuppressWarnings({"UnusedParameters"}) private <T> ValueSetter<RowBean, T> withBeanSetter(String propertyName, Class<T> propertyClass) { // propertyClass is not used but useful to check type - return new BeanProperty<RowBean, T>(propertyName); + return new BeanProperty<>(propertyName); } private ValueParser<Date> withDateParser() { @@ -289,7 +289,7 @@ public class ImportTest { @Override public Collection<ImportableColumn<RowBean, Object>> getColumnsForImport() { - List<ImportableColumn<RowBean, Object>> result = new ArrayList<ImportableColumn<RowBean, Object>>(); + List<ImportableColumn<RowBean, Object>> result = new ArrayList<>(); result.add(getTitleImportable()); result.add(getNumberImportable()); result.add(getDateImportable()); diff --git a/src/test/java/org/nuiton/csv/RowBeanExportModel.java b/src/test/java/org/nuiton/csv/RowBeanExportModel.java index 6218bfa..e97595a 100644 --- a/src/test/java/org/nuiton/csv/RowBeanExportModel.java +++ b/src/test/java/org/nuiton/csv/RowBeanExportModel.java @@ -30,7 +30,7 @@ class RowBeanExportModel implements ExportModel<RowBean> { @Override public Iterable<ExportableColumn<RowBean, Object>> getColumnsForExport() { - ModelBuilder<RowBean> modelBuilder = new ModelBuilder<RowBean>(); + ModelBuilder<RowBean> modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForExport("DATE", "date", Common.DAY); modelBuilder.newColumnForExport("TITLE", "title"); modelBuilder.newColumnForExport("NUMBER", "number", Common.INTEGER); diff --git a/src/test/java/org/nuiton/csv/Utf8WithBomTest.java b/src/test/java/org/nuiton/csv/Utf8WithBomTest.java index 2dc0129..4be551d 100644 --- a/src/test/java/org/nuiton/csv/Utf8WithBomTest.java +++ b/src/test/java/org/nuiton/csv/Utf8WithBomTest.java @@ -54,7 +54,7 @@ public class Utf8WithBomTest { @Override public Iterable<ImportableColumn<ObjectUtils.Null, Object>> getColumnsForImport() { - ModelBuilder<ObjectUtils.Null> builder = new ModelBuilder<ObjectUtils.Null>(); + ModelBuilder<ObjectUtils.Null> builder = new ModelBuilder<>(); builder.newMandatoryColumn("N° 1", "whatever"); builder.newMandatoryColumn("N° 2", "whatever"); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.