From commits-return-18168-archive-asf-public=cust-asf.ponee.io@pulsar.apache.org Tue Nov 27 03:30:34 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id EA3C5180677 for ; Tue, 27 Nov 2018 03:30:33 +0100 (CET) Received: (qmail 67846 invoked by uid 500); 27 Nov 2018 02:30:32 -0000 Mailing-List: contact commits-help@pulsar.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pulsar.apache.org Delivered-To: mailing list commits@pulsar.apache.org Received: (qmail 67837 invoked by uid 99); 27 Nov 2018 02:30:32 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Nov 2018 02:30:32 +0000 From: GitBox To: commits@pulsar.apache.org Subject: [GitHub] sijie closed pull request #3063: [Pulsar-Flink] Extends Validations Message-ID: <154328583231.15266.17932237909666851801.gitbox@gitbox.apache.org> Date: Tue, 27 Nov 2018 02:30:32 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit sijie closed pull request #3063: [Pulsar-Flink] Extends Validations URL: https://github.com/apache/pulsar/pull/3063 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/FlinkPulsarProducer.java b/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/FlinkPulsarProducer.java index 48bc0f1b6b..bced297228 100644 --- a/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/FlinkPulsarProducer.java +++ b/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/FlinkPulsarProducer.java @@ -18,6 +18,7 @@ */ package org.apache.flink.streaming.connectors.pulsar; +import org.apache.commons.lang3.StringUtils; import org.apache.flink.api.common.functions.RuntimeContext; import org.apache.flink.api.common.serialization.SerializationSchema; import org.apache.flink.api.java.ClosureCleaner; @@ -40,6 +41,7 @@ import java.util.function.Function; +import static org.apache.flink.util.Preconditions.checkArgument; import static org.apache.flink.util.Preconditions.checkNotNull; /** @@ -121,8 +123,10 @@ public FlinkPulsarProducer(String serviceUrl, SerializationSchema serializationSchema, ProducerConfiguration producerConfig, PulsarKeyExtractor keyExtractor) { - this.serviceUrl = checkNotNull(serviceUrl, "Service url not set"); - this.defaultTopicName = checkNotNull(defaultTopicName, "TopicName not set"); + checkArgument(StringUtils.isNotBlank(serviceUrl), "Service url cannot be blank"); + checkArgument(StringUtils.isNotBlank(defaultTopicName), "TopicName cannot be blank"); + this.serviceUrl = serviceUrl; + this.defaultTopicName = defaultTopicName; this.schema = checkNotNull(serializationSchema, "Serialization Schema not set"); this.producerConfig = checkNotNull(producerConfig, "Producer Config is not set"); this.flinkPulsarKeyExtractor = getOrNullKeyExtractor(keyExtractor); diff --git a/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/PulsarConsumerSource.java b/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/PulsarConsumerSource.java index 0d01def8f0..84e0e50664 100644 --- a/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/PulsarConsumerSource.java +++ b/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/PulsarConsumerSource.java @@ -66,7 +66,6 @@ private final long acknowledgementBatchSize; private long batchCount; - private long totalMessageCount; private transient volatile boolean isRunning; @@ -147,14 +146,12 @@ private void emitCheckpointing(SourceContext context, Message message) throws return; } context.collect(deserialize(message)); - totalMessageCount++; } } private void emitAutoAcking(SourceContext context, Message message) throws IOException { context.collect(deserialize(message)); batchCount++; - totalMessageCount++; if (batchCount >= acknowledgementBatchSize) { LOG.info("processed {} messages acknowledging messageId {}", batchCount, message.getMessageId()); consumer.acknowledgeCumulative(message.getMessageId()); diff --git a/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/PulsarSourceBuilder.java b/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/PulsarSourceBuilder.java index 33969839b0..9605f079a3 100644 --- a/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/PulsarSourceBuilder.java +++ b/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/PulsarSourceBuilder.java @@ -18,6 +18,7 @@ */ package org.apache.flink.streaming.connectors.pulsar; +import org.apache.commons.lang3.StringUtils; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.streaming.api.functions.source.SourceFunction; @@ -29,9 +30,9 @@ @PublicEvolving public class PulsarSourceBuilder { - static final String SERVICE_URL = "pulsar://localhost:6650"; - static final long ACKNOWLEDGEMENT_BATCH_SIZE = 100; - static final long MAX_ACKNOWLEDGEMENT_BATCH_SIZE = 1000; + private static final String SERVICE_URL = "pulsar://localhost:6650"; + private static final long ACKNOWLEDGEMENT_BATCH_SIZE = 100; + private static final long MAX_ACKNOWLEDGEMENT_BATCH_SIZE = 1000; final DeserializationSchema deserializationSchema; String serviceUrl = SERVICE_URL; @@ -50,7 +51,7 @@ private PulsarSourceBuilder(DeserializationSchema deserializationSchema) { * @return this builder */ public PulsarSourceBuilder serviceUrl(String serviceUrl) { - Preconditions.checkNotNull(serviceUrl); + Preconditions.checkArgument(StringUtils.isNotBlank(serviceUrl), "serviceUrl cannot be blank"); this.serviceUrl = serviceUrl; return this; } @@ -66,7 +67,7 @@ private PulsarSourceBuilder(DeserializationSchema deserializationSchema) { * @return this builder */ public PulsarSourceBuilder topic(String topic) { - Preconditions.checkNotNull(topic); + Preconditions.checkArgument(StringUtils.isNotBlank(topic), "topic cannot be blank"); this.topic = topic; return this; } @@ -78,7 +79,8 @@ private PulsarSourceBuilder(DeserializationSchema deserializationSchema) { * @return this builder */ public PulsarSourceBuilder subscriptionName(String subscriptionName) { - Preconditions.checkNotNull(subscriptionName); + Preconditions.checkArgument(StringUtils.isNotBlank(subscriptionName), + "subscriptionName cannot be blank"); this.subscriptionName = subscriptionName; return this; } @@ -112,7 +114,7 @@ private PulsarSourceBuilder(DeserializationSchema deserializationSchema) { * @return a builder */ public static PulsarSourceBuilder builder(DeserializationSchema deserializationSchema) { - Preconditions.checkNotNull(deserializationSchema); + Preconditions.checkNotNull(deserializationSchema, "deserializationSchema cannot be null"); return new PulsarSourceBuilder<>(deserializationSchema); } } diff --git a/pulsar-flink/src/test/java/org/apache/flink/streaming/connectors/pulsar/PulsarSourceBuilderTest.java b/pulsar-flink/src/test/java/org/apache/flink/streaming/connectors/pulsar/PulsarSourceBuilderTest.java new file mode 100644 index 0000000000..5a916e8809 --- /dev/null +++ b/pulsar-flink/src/test/java/org/apache/flink/streaming/connectors/pulsar/PulsarSourceBuilderTest.java @@ -0,0 +1,104 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.flink.streaming.connectors.pulsar; + +import org.apache.flink.api.common.serialization.DeserializationSchema; +import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.streaming.api.functions.source.SourceFunction; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.io.IOException; + +/** + * Tests for PulsarSourceBuilder + */ +public class PulsarSourceBuilderTest { + + private PulsarSourceBuilder pulsarSourceBuilder; + + @Before + public void before() { + pulsarSourceBuilder = PulsarSourceBuilder.builder(new TestDeserializationSchema()); + } + + @Test + public void testBuild() { + SourceFunction sourceFunction = pulsarSourceBuilder + .serviceUrl("testServiceUrl") + .topic("testTopic") + .subscriptionName("testSubscriptionName") + .build(); + Assert.assertNotNull(sourceFunction); + } + + @Test(expected = NullPointerException.class) + public void testBuildWithoutSettingRequiredProperties() { + pulsarSourceBuilder.build(); + } + + @Test(expected = IllegalArgumentException.class) + public void testServiceUrlWithNull() { + pulsarSourceBuilder.serviceUrl(null); + } + + @Test(expected = IllegalArgumentException.class) + public void testServiceUrlWithBlank() { + pulsarSourceBuilder.serviceUrl(" "); + } + + @Test(expected = IllegalArgumentException.class) + public void testTopicWithNull() { + pulsarSourceBuilder.topic(null); + } + + @Test(expected = IllegalArgumentException.class) + public void testTopicWithBlank() { + pulsarSourceBuilder.topic(" "); + } + + @Test(expected = IllegalArgumentException.class) + public void testSubscriptionNameWithNull() { + pulsarSourceBuilder.subscriptionName(null); + } + + @Test(expected = IllegalArgumentException.class) + public void testSubscriptionNameWithBlank() { + pulsarSourceBuilder.subscriptionName(" "); + } + + private class TestDeserializationSchema implements DeserializationSchema { + + @Override + public T deserialize(byte[] bytes) throws IOException { + return null; + } + + @Override + public boolean isEndOfStream(T t) { + return false; + } + + @Override + public TypeInformation getProducedType() { + return null; + } + } +} ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services