[FLINK-17818] Fix argument check of CsvReader.pojoType()

deepfield · Sep 29, 2020 · 6669ae0 · 6669ae0
1 parent 81598d4
commit 6669ae0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/CsvReader.java b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvReader.java
@@ -315,7 +315,7 @@ public CsvReader ignoreInvalidLines(){
  */
  public <T> DataSource<T> pojoType(Class<T> pojoType, String... pojoFields) {
  Preconditions.checkNotNull(pojoType, "The POJO type class must not be null.");
- Preconditions.checkNotNull(pojoFields, "POJO fields must be specified (not null) if output type is a POJO.");
+ Preconditions.checkArgument(pojoFields != null && pojoFields.length > 0, "POJO fields must be specified (not null) if output type is a POJO.");
 
  final TypeInformation<T> ti = TypeExtractor.createTypeInfo(pojoType);
  if (!(ti instanceof PojoTypeInfo)) {

diff --git a/flink-tests/src/test/java/org/apache/flink/test/io/CsvReaderITCase.java b/flink-tests/src/test/java/org/apache/flink/test/io/CsvReaderITCase.java
@@ -89,12 +89,21 @@ public void testPOJOTypeWithFieldsOrder() throws Exception {
  compareResultAsText(result, expected);
  }
 
- @Test(expected = NullPointerException.class)
+ @Test(expected = IllegalArgumentException.class)
  public void testPOJOTypeWithoutFieldsOrder() throws Exception {
  final String inputData = "";
  final String dataPath = createInputData(inputData);
  final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
+ env.readCsvFile(dataPath).pojoType(POJOItem.class);
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testPOJOTypeWitNullFieldsOrder() throws Exception {
+ final String inputData = "";
+ final String dataPath = createInputData(inputData);
+ final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+
  env.readCsvFile(dataPath).pojoType(POJOItem.class, null);
  }