You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2019/05/28 20:52:27 UTC
[pulsar] branch master updated: Remove query parameter
authoritative for partitions API (#4269)
This is an automated email from the ASF dual-hosted git repository.
mmerli 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 46cffb9 Remove query parameter authoritative for partitions API (#4269)
46cffb9 is described below
commit 46cffb9af6b3275572c66420b121c6d613b64f9f
Author: Like <ke...@outlook.com>
AuthorDate: Wed May 29 04:52:22 2019 +0800
Remove query parameter authoritative for partitions API (#4269)
* Remove query parameter authoritative for partitions API
* Fix tests
* Fix test failure
* Fix test
---
.../org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java | 2 +-
.../java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java | 2 +-
.../java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java | 4 ++--
.../java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java | 4 +---
.../java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java | 5 ++---
.../src/test/java/org/apache/pulsar/broker/admin/AdminTest.java | 2 +-
.../java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java | 2 +-
7 files changed, 9 insertions(+), 12 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 2801be7..cc3d138 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
@@ -370,7 +370,7 @@ public class PersistentTopicsBase extends AdminResource {
}
}
- protected void internalCreatePartitionedTopic(int numPartitions, boolean authoritative) {
+ protected void internalCreatePartitionedTopic(int numPartitions) {
validateAdminAccessForTenant(topicName.getTenant());
if (numPartitions <= 1) {
throw new RestException(Status.NOT_ACCEPTABLE, "Number of partitions should be more than 1");
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
index f6d8640..b8eda01 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
@@ -115,7 +115,7 @@ public class NonPersistentTopics extends PersistentTopics {
@ApiResponse(code = 409, message = "Partitioned topic already exist") })
public void createPartitionedTopic(@PathParam("property") String property, @PathParam("cluster") String cluster,
@PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
- int numPartitions, @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
+ int numPartitions) {
validateTopicName(property, cluster, namespace, encodedTopic);
validateAdminAccessForTenant(topicName.getTenant());
if (numPartitions <= 1) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java
index 9766ec6..7d5cbc4 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java
@@ -134,9 +134,9 @@ public class PersistentTopics extends PersistentTopicsBase {
@ApiResponse(code = 409, message = "Partitioned topic already exist") })
public void createPartitionedTopic(@PathParam("property") String property, @PathParam("cluster") String cluster,
@PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
- int numPartitions, @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
+ int numPartitions) {
validateTopicName(property, cluster, namespace, encodedTopic);
- internalCreatePartitionedTopic(numPartitions, authoritative);
+ internalCreatePartitionedTopic(numPartitions);
}
/**
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java
index b8c0d04..3240c8d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java
@@ -41,7 +41,6 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response.Status;
import org.apache.pulsar.broker.PulsarServerException;
-import org.apache.pulsar.broker.service.BrokerService;
import org.apache.pulsar.broker.service.Topic;
import org.apache.pulsar.broker.service.nonpersistent.NonPersistentTopic;
import org.apache.pulsar.broker.web.RestException;
@@ -111,8 +110,7 @@ public class NonPersistentTopics extends PersistentTopics {
@ApiResponse(code = 412, message = "Failed Reason : Name is invalid or Namespace does not have any clusters configured"),
@ApiResponse(code = 503, message = "Failed to validate global cluster configuration")})
public void createPartitionedTopic(@PathParam("tenant") String tenant, @PathParam("namespace") String namespace,
- @PathParam("topic") @Encoded String encodedTopic, int numPartitions,
- @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
+ @PathParam("topic") @Encoded String encodedTopic, int numPartitions) {
validateGlobalNamespaceOwnership(tenant,namespace);
validateTopicName(tenant, namespace, encodedTopic);
validateAdminAccessForTenant(topicName.getTenant());
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
index d62e0c6..837a3cb 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
@@ -133,11 +133,10 @@ public class PersistentTopics extends PersistentTopicsBase {
@ApiResponse(code = 503, message = "Failed to validate global cluster configuration")
})
public void createPartitionedTopic(@PathParam("tenant") String tenant, @PathParam("namespace") String namespace,
- @PathParam("topic") @Encoded String encodedTopic, int numPartitions,
- @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
+ @PathParam("topic") @Encoded String encodedTopic, int numPartitions) {
validateGlobalNamespaceOwnership(tenant,namespace);
validatePartitionedTopicName(tenant, namespace, encodedTopic);
- internalCreatePartitionedTopic(numPartitions, authoritative);
+ internalCreatePartitionedTopic(numPartitions);
}
@PUT
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
index 1cdd954..fc1c49c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
@@ -635,7 +635,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
assertTrue(list.isEmpty());
// create topic
assertEquals(persistentTopics.getPartitionedTopicList(property, cluster, namespace), Lists.newArrayList());
- persistentTopics.createPartitionedTopic(property, cluster, namespace, topic, 5, false);
+ persistentTopics.createPartitionedTopic(property, cluster, namespace, topic, 5);
assertEquals(persistentTopics.getPartitionedTopicList(property, cluster, namespace), Lists
.newArrayList(String.format("persistent://%s/%s/%s/%s", property, cluster, namespace, topic)));
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
index 6efe601..c65005b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
@@ -104,7 +104,7 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
} catch (Exception e) {
Assert.assertEquals("Partitioned Topic not found: persistent://my-tenant/my-namespace/topic-not-found-partition-0 has zero partitions", e.getMessage());
}
- persistentTopics.createPartitionedTopic(testTenant, testNamespace, testLocalTopicName, 3, true);
+ persistentTopics.createPartitionedTopic(testTenant, testNamespace, testLocalTopicName, 3);
try {
persistentTopics.getSubscriptions(testTenant, testNamespace, testLocalTopicName + "-partition-0", true);
} catch (Exception e) {