You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by zh...@apache.org on 2019/04/03 02:28:58 UTC
[pulsar] branch master updated: Remove deprecated PersistentTopics
in favor of Topics (#3943)
This is an automated email from the ASF dual-hosted git repository.
zhaijia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new b51e435 Remove deprecated PersistentTopics in favor of Topics (#3943)
b51e435 is described below
commit b51e435a7dc4d4961c0eec469f1c42150480b08e
Author: Like <li...@163.com>
AuthorDate: Wed Apr 3 10:28:53 2019 +0800
Remove deprecated PersistentTopics in favor of Topics (#3943)
The PersistentTopics was been deprecated in 2.0, which can be replaced with Topics completely. Remove it in favor of topics.
---
.../broker/admin/impl/PersistentTopicsBase.java | 4 ++--
.../pulsar/broker/admin/AdminApiOffloadTest.java | 18 +++++++++---------
.../broker/admin/BrokerAdminClientTlsAuthTest.java | 2 +-
.../broker/service/ReplicatorGlobalNSTest.java | 2 +-
.../pulsar/client/admin/PersistentTopics.java | 22 ----------------------
.../apache/pulsar/client/admin/PulsarAdmin.java | 9 ---------
.../pulsar/client/admin/internal/TopicsImpl.java | 4 +---
.../pulsar/admin/cli/PulsarAdminToolTest.java | 5 ++---
.../pulsar/admin/cli/CmdPersistentTopics.java | 10 +++++-----
9 files changed, 21 insertions(+), 55 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
index c7af055..dd2ca4a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
@@ -463,7 +463,7 @@ public class PersistentTopicsBase extends AdminResource {
try {
for (int i = 0; i < numPartitions; i++) {
TopicName topicNamePartition = topicName.getPartition(i);
- pulsar().getAdminClient().persistentTopics().deleteAsync(topicNamePartition.toString(), force)
+ pulsar().getAdminClient().topics().deleteAsync(topicNamePartition.toString(), force)
.whenComplete((r, ex) -> {
if (ex != null) {
if (ex instanceof NotFoundException) {
@@ -937,7 +937,7 @@ public class PersistentTopicsBase extends AdminResource {
AtomicInteger failureCount = new AtomicInteger(0);
for (int i = 0; i < partitionMetadata.partitions; i++) {
- admin.persistentTopics()
+ admin.topics()
.createSubscriptionAsync(topicName.getPartition(i).toString(), subscriptionName, messageId)
.handle((result, ex) -> {
if (ex != null) {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
index 63b4d84..e4b889e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
@@ -96,16 +96,16 @@ public class AdminApiOffloadTest extends MockedPulsarServiceBaseTest {
ManagedLedgerInfo info = pulsar.getManagedLedgerFactory().getManagedLedgerInfo(mlName);
Assert.assertEquals(info.ledgers.size(), 2);
- Assert.assertEquals(admin.persistentTopics().offloadStatus(topicName).status,
+ Assert.assertEquals(admin.topics().offloadStatus(topicName).status,
LongRunningProcessStatus.Status.NOT_RUN);
- admin.persistentTopics().triggerOffload(topicName, currentId);
+ admin.topics().triggerOffload(topicName, currentId);
- Assert.assertEquals(admin.persistentTopics().offloadStatus(topicName).status,
+ Assert.assertEquals(admin.topics().offloadStatus(topicName).status,
LongRunningProcessStatus.Status.RUNNING);
try {
- admin.persistentTopics().triggerOffload(topicName, currentId);
+ admin.topics().triggerOffload(topicName, currentId);
Assert.fail("Should have failed");
} catch (ConflictException e) {
// expected
@@ -114,19 +114,19 @@ public class AdminApiOffloadTest extends MockedPulsarServiceBaseTest {
// fail first time
promise.completeExceptionally(new Exception("Some random failure"));
- Assert.assertEquals(admin.persistentTopics().offloadStatus(topicName).status,
+ Assert.assertEquals(admin.topics().offloadStatus(topicName).status,
LongRunningProcessStatus.Status.ERROR);
- Assert.assertTrue(admin.persistentTopics().offloadStatus(topicName).lastError.contains("Some random failure"));
+ Assert.assertTrue(admin.topics().offloadStatus(topicName).lastError.contains("Some random failure"));
// Try again
doReturn(CompletableFuture.completedFuture(null))
.when(offloader).offload(anyObject(), anyObject(), anyObject());
- admin.persistentTopics().triggerOffload(topicName, currentId);
+ admin.topics().triggerOffload(topicName, currentId);
- Assert.assertEquals(admin.persistentTopics().offloadStatus(topicName).status,
+ Assert.assertEquals(admin.topics().offloadStatus(topicName).status,
LongRunningProcessStatus.Status.SUCCESS);
- MessageIdImpl firstUnoffloaded = admin.persistentTopics().offloadStatus(topicName).firstUnoffloadedMessage;
+ MessageIdImpl firstUnoffloaded = admin.topics().offloadStatus(topicName).firstUnoffloadedMessage;
// First unoffloaded is the first entry of current ledger
Assert.assertEquals(firstUnoffloaded.getLedgerId(), info.ledgers.get(1).ledgerId);
Assert.assertEquals(firstUnoffloaded.getEntryId(), 0);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java
index 7edf18a..505b994 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BrokerAdminClientTlsAuthTest.java
@@ -154,7 +154,7 @@ public class BrokerAdminClientTlsAuthTest extends MockedPulsarServiceBaseTest {
policies.replication_clusters = ImmutableSet.of("test");
admin.namespaces().createNamespace("tenant/ns", policies);
try {
- admin.persistentTopics().getList("tenant/ns");
+ admin.topics().getList("tenant/ns");
} catch (PulsarAdminException ex) {
ex.printStackTrace();
fail("Should not have thrown an exception");
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
index f6611fd..cc53831 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
@@ -115,7 +115,7 @@ public class ReplicatorGlobalNSTest extends ReplicatorTestBase {
.enableBatching(false).messageRoutingMode(MessageRoutingMode.SinglePartition).create();
producer1.close();
- admin1.persistentTopics().delete(topicName, true);
+ admin1.topics().delete(topicName, true);
MockedPulsarServiceBaseTest
.retryStrategically((test) -> !pulsar1.getBrokerService().getTopics().containsKey(topicName), 5, 150);
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PersistentTopics.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PersistentTopics.java
deleted file mode 100644
index 6fee2ff..0000000
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PersistentTopics.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * 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.admin;
-
-@Deprecated
-public interface PersistentTopics extends Topics {}
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java
index deb9722..e83c1c0 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/PulsarAdmin.java
@@ -338,15 +338,6 @@ public class PulsarAdmin implements Closeable {
* @deprecated Since 2.0. See {@link #topics()}
*/
@Deprecated
- public PersistentTopics persistentTopics() {
- return topics;
- }
-
- /**
- * @return the persistentTopics management object
- * @deprecated Since 2.0. See {@link #topics()}
- */
- @Deprecated
public NonPersistentTopics nonPersistentTopics() {
return nonPersistentTopics;
}
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java
index 91991c6..a042867 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java
@@ -51,7 +51,6 @@ import javax.ws.rs.core.Response.Status;
import org.apache.pulsar.client.admin.LongRunningProcessStatus;
import org.apache.pulsar.client.admin.OffloadProcessStatus;
-import org.apache.pulsar.client.admin.PersistentTopics;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.admin.PulsarAdminException.NotFoundException;
import org.apache.pulsar.client.admin.Topics;
@@ -78,8 +77,7 @@ import org.apache.pulsar.common.util.Codec;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@SuppressWarnings("deprecation")
-public class TopicsImpl extends BaseResource implements Topics, PersistentTopics {
+public class TopicsImpl extends BaseResource implements Topics {
private final WebTarget adminTopics;
private final WebTarget adminV2Topics;
private final String BATCH_HEADER = "X-Pulsar-num-batch-message";
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
index 8a733a1..9df9491 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
@@ -37,7 +37,6 @@ import org.apache.pulsar.client.admin.Clusters;
import org.apache.pulsar.client.admin.Lookup;
import org.apache.pulsar.client.admin.Namespaces;
import org.apache.pulsar.client.admin.NonPersistentTopics;
-import org.apache.pulsar.client.admin.PersistentTopics;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.ResourceQuotas;
import org.apache.pulsar.client.admin.Tenants;
@@ -648,8 +647,8 @@ public class PulsarAdminToolTest {
@Test
void persistentTopics() throws Exception {
PulsarAdmin admin = Mockito.mock(PulsarAdmin.class);
- PersistentTopics mockTopics = mock(PersistentTopics.class);
- when(admin.persistentTopics()).thenReturn(mockTopics);
+ Topics mockTopics = mock(Topics.class);
+ when(admin.topics()).thenReturn(mockTopics);
CmdPersistentTopics topics = new CmdPersistentTopics(admin);
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPersistentTopics.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPersistentTopics.java
index 2314ae6..9df331f 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPersistentTopics.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdPersistentTopics.java
@@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import org.apache.pulsar.client.admin.LongRunningProcessStatus;
-import org.apache.pulsar.client.admin.PersistentTopics;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.PulsarAdminException;
+import org.apache.pulsar.client.admin.Topics;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.impl.BatchMessageIdImpl;
@@ -44,14 +44,14 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
-@SuppressWarnings("deprecation")
-@Parameters(commandDescription = "Operations on persistent topics", hidden = true)
+@Parameters(commandDescription = "Operations on persistent topics. The persistent-topics " +
+ "has been deprecated in favor of topics", hidden = true)
public class CmdPersistentTopics extends CmdBase {
- private final PersistentTopics persistentTopics;
+ private final Topics persistentTopics;
public CmdPersistentTopics(PulsarAdmin admin) {
super("persistent", admin);
- persistentTopics = admin.persistentTopics();
+ persistentTopics = admin.topics();
jcommander.addCommand("list", new ListCmd());
jcommander.addCommand("list-partitioned-topics", new PartitionedTopicListCmd());