Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1A691200B89 for ; Wed, 21 Sep 2016 11:52:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 19261160AEB; Wed, 21 Sep 2016 09:52:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 43C9B160AE2 for ; Wed, 21 Sep 2016 11:52:35 +0200 (CEST) Received: (qmail 60257 invoked by uid 500); 21 Sep 2016 09:52:34 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 60135 invoked by uid 99); 21 Sep 2016 09:52:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Sep 2016 09:52:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1CD25E09C6; Wed, 21 Sep 2016 09:52:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: trohrmann@apache.org To: commits@flink.apache.org Date: Wed, 21 Sep 2016 09:52:38 -0000 Message-Id: <28e82819495d42b2894dfec1edd363d4@git.apache.org> In-Reply-To: <50011b84f8e94b19ac9845fd15a1fafe@git.apache.org> References: <50011b84f8e94b19ac9845fd15a1fafe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/50] [abbrv] flink git commit: [FLINK-4609] [java-api] Remove redundant check for null in CrossOperator archived-at: Wed, 21 Sep 2016 09:52:36 -0000 [FLINK-4609] [java-api] Remove redundant check for null in CrossOperator This closes #2490 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/470b752e Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/470b752e Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/470b752e Branch: refs/heads/flip-6 Commit: 470b752e693ae4292d34fc7fc0c778f95fa04fd9 Parents: 7a25bf5 Author: Alexander Pivovarov Authored: Fri Sep 9 22:24:43 2016 -0700 Committer: Greg Hogan Committed: Tue Sep 20 10:10:20 2016 -0400 ---------------------------------------------------------------------- .../flink/api/java/operators/CrossOperator.java | 23 ++++++-------------- .../api/java/operators/TwoInputOperator.java | 5 +++-- 2 files changed, 10 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/470b752e/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java ---------------------------------------------------------------------- diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java index 36e6c1c..3fdc51d 100644 --- a/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java +++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/CrossOperator.java @@ -20,9 +20,9 @@ package org.apache.flink.api.java.operators; import java.util.Arrays; -import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.Public; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.InvalidProgramException; import org.apache.flink.api.common.functions.CrossFunction; import org.apache.flink.api.common.operators.BinaryOperatorInformation; @@ -124,21 +124,12 @@ public class CrossOperator extends TwoInputUdfOperator extends CrossOperator> { - private final DataSet input1; - private final DataSet input2; - public DefaultCross(DataSet input1, DataSet input2, CrossHint hint, String defaultName) { - super(input1, input2, new DefaultCrossFunction(), - new TupleTypeInfo>(input1.getType(), input2.getType()), - hint, defaultName); - - if (input1 == null || input2 == null) { - throw new NullPointerException(); - } - - this.input1 = input1; - this.input2 = input2; + new TupleTypeInfo>( + Preconditions.checkNotNull(input1, "input1 is null").getType(), + Preconditions.checkNotNull(input2, "input2 is null").getType()), + hint, defaultName); } /** @@ -155,9 +146,9 @@ public class CrossOperator extends TwoInputUdfOperator returnType = TypeExtractor.getCrossReturnTypes(function, input1.getType(), input2.getType(), + TypeInformation returnType = TypeExtractor.getCrossReturnTypes(function, getInput1().getType(), getInput2().getType(), super.getDefaultName(), true); - return new CrossOperator(input1, input2, clean(function), returnType, + return new CrossOperator(getInput1(), getInput2(), clean(function), returnType, getCrossHint(), Utils.getCallLocationName()); } http://git-wip-us.apache.org/repos/asf/flink/blob/470b752e/flink-java/src/main/java/org/apache/flink/api/java/operators/TwoInputOperator.java ---------------------------------------------------------------------- diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/TwoInputOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/TwoInputOperator.java index c64882d..28dec32 100644 --- a/flink-java/src/main/java/org/apache/flink/api/java/operators/TwoInputOperator.java +++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/TwoInputOperator.java @@ -21,6 +21,7 @@ package org.apache.flink.api.java.operators; import org.apache.flink.annotation.Public; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.DataSet; +import org.apache.flink.util.Preconditions; /** * Base class for operations that operates on two input data sets. @@ -37,8 +38,8 @@ public abstract class TwoInputOperator input1, DataSet input2, TypeInformation resultType) { - super(input1.getExecutionEnvironment(), resultType); - + super(Preconditions.checkNotNull(input1, "input1 is null").getExecutionEnvironment(), resultType); + Preconditions.checkNotNull(input2, "input2 is null"); DataSet.checkSameExecutionContext(input1, input2); this.input1 = input1; this.input2 = input2;