diff --git a/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java b/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java index 1db45a5619015..ae9036256360f 100644 --- a/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java +++ b/flink-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java @@ -125,9 +125,7 @@ public void open(int taskNumber, int numTasks) throws IOException { datumWriter = new SpecificDatumWriter(avroValueType); try { schema = ((org.apache.avro.specific.SpecificRecordBase)avroValueType.newInstance()).getSchema(); - } catch (InstantiationException e) { - throw new RuntimeException(e.getMessage()); - } catch (IllegalAccessException e) { + } catch (InstantiationException | IllegalAccessException e) { throw new RuntimeException(e.getMessage()); } } else { diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java index 945abc81bd1ba..a3f4280c9b9a0 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java @@ -131,9 +131,7 @@ private PojoComparator(PojoComparator toClone) { try { this.serializer = (TypeSerializer) InstantiationUtil.deserializeObject( InstantiationUtil.serializeObject(toClone.serializer), Thread.currentThread().getContextClassLoader()); - } catch (IOException e) { - throw new RuntimeException("Cannot copy serializer", e); - } catch (ClassNotFoundException e) { + } catch (IOException | ClassNotFoundException e) { throw new RuntimeException("Cannot copy serializer", e); } } diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java index 8631c992a1143..067bbfe0707de 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java @@ -51,9 +51,7 @@ public BlockingBackChannel(SerializedUpdateBuffer buffer) { public DataInputView getReadEndAfterSuperstepEnded() { try { return queue.take().switchBuffers(); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } catch (IOException e) { + } catch (InterruptedException | IOException e) { throw new RuntimeException(e); } } diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java index eacb02c7b2f3d..67ca342b0a255 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java @@ -451,12 +451,8 @@ private long insertRecordIntoPartition(T record, InMemoryPartition partition, this.compactionMemory.allocateSegments((int)(newPointer >> this.pageSizeInBits)); } return newPointer; - } - catch (EOFException ex) { - throw new RuntimeException("Memory ran out. Compaction failed. " + - getMemoryConsumptionString() + " Message: " + ex.getMessage()); - } - catch (IndexOutOfBoundsException ex) { + } + catch (EOFException | IndexOutOfBoundsException ex) { throw new RuntimeException("Memory ran out. Compaction failed. " + getMemoryConsumptionString() + " Message: " + ex.getMessage()); } diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/TaskConfig.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/TaskConfig.java index 71c040512ef02..a5decf49c0194 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/TaskConfig.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/TaskConfig.java @@ -286,9 +286,7 @@ public void setStubWrapper(UserCodeWrapper wrapper) { public UserCodeWrapper getStubWrapper(ClassLoader cl) { try { return (UserCodeWrapper) InstantiationUtil.readObjectFromConfig(this.config, STUB_OBJECT, cl); - } catch (ClassNotFoundException e) { - throw new CorruptConfigurationException("Could not read the user code wrapper: " + e.getMessage(), e); - } catch (IOException e) { + } catch (ClassNotFoundException | IOException e) { throw new CorruptConfigurationException("Could not read the user code wrapper: " + e.getMessage(), e); } }