sijie closed pull request #3257: Improve service url and service url provider
prompt.
URL: https://github.com/apache/pulsar/pull/3257
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-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java
index d5545cee3d..5e00a30226 100644
---
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java
+++
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java
@@ -45,11 +45,18 @@ public ClientBuilderImpl(ClientConfigurationData conf) {
@Override
public PulsarClient build() throws PulsarClientException {
- if (conf.getServiceUrlProvider() != null &&
StringUtils.isNotBlank(conf.getServiceUrlProvider().getServiceUrl())) {
- conf.setServiceUrl(conf.getServiceUrlProvider().getServiceUrl());
+ if (StringUtils.isBlank(conf.getServiceUrl()) &&
conf.getServiceUrlProvider() == null) {
+ throw new IllegalArgumentException("service URL or service URL
provider needs to be specified on the ClientBuilder object.");
}
- if (conf.getServiceUrl() == null) {
- throw new IllegalArgumentException("service URL or service URL
provider needs to be specified on the ClientBuilder object");
+ if (StringUtils.isNotBlank(conf.getServiceUrl()) &&
conf.getServiceUrlProvider() != null) {
+ throw new IllegalArgumentException("Can only chose one way service
URL or service URL provider.");
+ }
+ if (conf.getServiceUrlProvider() != null) {
+ if
(StringUtils.isBlank(conf.getServiceUrlProvider().getServiceUrl())) {
+ throw new IllegalArgumentException("Cannot get service url
from service url provider.");
+ } else {
+
conf.setServiceUrl(conf.getServiceUrlProvider().getServiceUrl());
+ }
}
PulsarClient client = new PulsarClientImpl(conf);
if (conf.getServiceUrlProvider() != null) {
@@ -72,6 +79,9 @@ public ClientBuilder loadConf(Map<String, Object> config) {
@Override
public ClientBuilder serviceUrl(String serviceUrl) {
+ if (StringUtils.isBlank(serviceUrl)) {
+ throw new IllegalArgumentException("Param serviceUrl must not be
blank.");
+ }
conf.setServiceUrl(serviceUrl);
if (!conf.isUseTls()) {
enableTls(serviceUrl.startsWith("pulsar+ssl") ||
serviceUrl.startsWith("https"));
@@ -81,6 +91,9 @@ public ClientBuilder serviceUrl(String serviceUrl) {
@Override
public ClientBuilder serviceUrlProvider(ServiceUrlProvider
serviceUrlProvider) {
+ if (serviceUrlProvider == null) {
+ throw new IllegalArgumentException("Param serviceUrlProvider must
not be null.");
+ }
conf.setServiceUrlProvider(serviceUrlProvider);
return this;
}
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientBuilderImplTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientBuilderImplTest.java
new file mode 100644
index 0000000000..8cf9b59de1
--- /dev/null
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientBuilderImplTest.java
@@ -0,0 +1,73 @@
+/**
+ * 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.pulsar.client.impl;
+
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.client.api.ServiceUrlProvider;
+import org.testng.annotations.Test;
+
+public class ClientBuilderImplTest {
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testClientBuilderWithServiceUrlAndServiceUrlProviderNotSet()
throws PulsarClientException {
+ PulsarClient.builder().build();
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testClientBuilderWithNullServiceUrl() throws
PulsarClientException {
+ PulsarClient.builder().serviceUrl(null).build();
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testClientBuilderWithNullServiceUrlProvider() throws
PulsarClientException {
+ PulsarClient.builder().serviceUrlProvider(null).build();
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testClientBuilderWithServiceUrlAndServiceUrlProvider() throws
PulsarClientException {
+ PulsarClient.builder().serviceUrlProvider(new ServiceUrlProvider() {
+ @Override
+ public void initialize(PulsarClient client) {
+
+ }
+
+ @Override
+ public String getServiceUrl() {
+ return "pulsar://localhost:6650";
+ }
+ }).serviceUrl("pulsar://localhost:6650").build();
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testClientBuilderWithBlankServiceUrlInServiceUrlProvider()
throws PulsarClientException {
+ PulsarClient.builder().serviceUrlProvider(new ServiceUrlProvider() {
+ @Override
+ public void initialize(PulsarClient client) {
+
+ }
+
+ @Override
+ public String getServiceUrl() {
+ return "";
+ }
+ }).build();
+ }
+
+}
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
