You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ti...@apache.org on 2022/12/08 10:34:15 UTC
[pulsar] branch master updated: [improve][broker] Change type of `allowAutoTopicCreationType` to TopicType (#18814)
This is an automated email from the ASF dual-hosted git repository.
tison 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 816acc16368 [improve][broker] Change type of `allowAutoTopicCreationType` to TopicType (#18814)
816acc16368 is described below
commit 816acc16368c554d9d5e41d894f9cf6b8b21e75f
Author: Ruguo Yu <ji...@163.com>
AuthorDate: Thu Dec 8 18:34:00 2022 +0800
[improve][broker] Change type of `allowAutoTopicCreationType` to TopicType (#18814)
---
.../apache/pulsar/broker/ServiceConfiguration.java | 4 ++--
.../apache/pulsar/broker/admin/AdminApi2Test.java | 13 ++++++-----
.../apache/pulsar/broker/admin/NamespacesTest.java | 5 +++--
.../pulsar/broker/admin/TopicAutoCreationTest.java | 3 ++-
.../broker/auth/MockedPulsarServiceBaseTest.java | 3 ++-
.../OwnerShipForCurrentServerTestBase.java | 3 ++-
.../broker/service/BacklogQuotaManagerTest.java | 3 ++-
.../pulsar/broker/service/BkEnsemblesTestBase.java | 3 ++-
.../broker/service/BrokerBookieIsolationTest.java | 11 ++++-----
.../BrokerServiceAutoTopicCreationTest.java | 26 +++++++++++-----------
.../pulsar/broker/service/ReplicatorTestBase.java | 3 ++-
.../systopic/PartitionedSystemTopicTest.java | 3 ++-
.../broker/transaction/TransactionTestBase.java | 3 ++-
.../client/api/ClientDeduplicationFailureTest.java | 3 ++-
.../pulsar/client/api/NonPersistentTopicTest.java | 7 +++---
.../common/naming/ServiceConfigurationTest.java | 26 ++++++++++++++++++++++
.../worker/PulsarFunctionE2ESecurityTest.java | 3 ++-
.../worker/PulsarFunctionLocalRunTest.java | 3 ++-
.../worker/PulsarFunctionPublishTest.java | 3 ++-
.../apache/pulsar/io/AbstractPulsarE2ETest.java | 3 ++-
.../org/apache/pulsar/proxy/server/ProxyTest.java | 5 +++--
21 files changed, 90 insertions(+), 46 deletions(-)
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
index 1b6bdc9986d..0060dd42700 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
@@ -1914,7 +1914,7 @@ public class ServiceConfiguration implements PulsarConfiguration {
dynamic = true,
doc = "The type of topic that is allowed to be automatically created.(partitioned/non-partitioned)"
)
- private String allowAutoTopicCreationType = "non-partitioned";
+ private TopicType allowAutoTopicCreationType = TopicType.NON_PARTITIONED;
@FieldContext(
category = CATEGORY_STORAGE_ML,
dynamic = true,
@@ -3201,7 +3201,7 @@ public class ServiceConfiguration implements PulsarConfiguration {
}
public boolean isDefaultTopicTypePartitioned() {
- return TopicType.PARTITIONED.toString().equals(allowAutoTopicCreationType);
+ return TopicType.PARTITIONED.equals(allowAutoTopicCreationType);
}
public int getBrokerDeleteInactiveTopicsMaxInactiveDurationSeconds() {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
index 7bb35cc4d63..a34e0c189bb 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
@@ -110,6 +110,7 @@ import org.apache.pulsar.common.policies.data.RetentionPolicies;
import org.apache.pulsar.common.policies.data.SubscriptionStats;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
import org.apache.pulsar.common.policies.data.TopicStats;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.common.policies.data.impl.BacklogQuotaImpl;
import org.awaitility.Awaitility;
import org.testng.Assert;
@@ -1554,7 +1555,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
@AllArgsConstructor
private static class NamespaceAttr {
private boolean systemTopicEnabled;
- private String autoTopicCreationType;
+ private TopicType autoTopicCreationType;
private int defaultNumPartitions;
private boolean forceDeleteNamespaceAllowed;
}
@@ -1562,9 +1563,9 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
@DataProvider(name = "namespaceAttrs")
public Object[][] namespaceAttributes(){
return new Object[][]{
- {new NamespaceAttr(false, "non-partitioned", 0, false)},
- {new NamespaceAttr(true, "non-partitioned", 0, false)},
- {new NamespaceAttr(true, "partitioned", 3, false)}
+ {new NamespaceAttr(false, TopicType.NON_PARTITIONED, 0, false)},
+ {new NamespaceAttr(true, TopicType.NON_PARTITIONED, 0, false)},
+ {new NamespaceAttr(true, TopicType.PARTITIONED, 3, false)}
};
}
@@ -2071,7 +2072,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
cleanup();
conf.setMaxTopicsPerNamespace(10);
conf.setDefaultNumPartitions(3);
- conf.setAllowAutoTopicCreationType("partitioned");
+ conf.setAllowAutoTopicCreationType(TopicType.PARTITIONED);
setup();
admin.tenants().createTenant("testTenant", tenantInfo);
admin.namespaces().createNamespace("testTenant/ns1", Set.of("test"));
@@ -2089,7 +2090,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
// check producer/consumer auto create non-partitioned topic
cleanup();
conf.setMaxTopicsPerNamespace(3);
- conf.setAllowAutoTopicCreationType("non-partitioned");
+ conf.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
setup();
admin.tenants().createTenant("testTenant", tenantInfo);
admin.namespaces().createNamespace("testTenant/ns1", Set.of("test"));
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
index 8de041e3c64..678bd8652b0 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
@@ -110,6 +110,7 @@ import org.apache.pulsar.common.policies.data.RetentionPolicies;
import org.apache.pulsar.common.policies.data.SubscribeRate;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.common.policies.data.impl.DispatchRateImpl;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.metadata.cache.impl.MetadataCacheImpl;
@@ -1682,7 +1683,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
cleanup();
conf.setMaxTopicsPerNamespace(0);
conf.setDefaultNumPartitions(3);
- conf.setAllowAutoTopicCreationType("partitioned");
+ conf.setAllowAutoTopicCreationType(TopicType.PARTITIONED);
initAndStartBroker();
admin.tenants().createTenant("testTenant", tenantInfo);
@@ -1711,7 +1712,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
cleanup();
conf.setMaxTopicsPerNamespace(0);
conf.setDefaultNumPartitions(1);
- conf.setAllowAutoTopicCreationType("non-partitioned");
+ conf.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
initAndStartBroker();
admin.tenants().createTenant("testTenant", tenantInfo);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java
index 1ed7c2f7121..d447787d1b7 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java
@@ -40,6 +40,7 @@ import org.apache.pulsar.client.impl.LookupService;
import org.apache.pulsar.client.impl.PulsarClientImpl;
import org.apache.pulsar.common.naming.NamespaceName;
import org.apache.pulsar.common.partition.PartitionedTopicMetadata;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -51,7 +52,7 @@ public class TopicAutoCreationTest extends ProducerConsumerBase {
@Override
@BeforeMethod
protected void setup() throws Exception {
- conf.setAllowAutoTopicCreationType("partitioned");
+ conf.setAllowAutoTopicCreationType(TopicType.PARTITIONED);
conf.setAllowAutoTopicCreation(true);
conf.setDefaultNumPartitions(3);
super.internalSetup();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java
index 1a558b63433..f5c389dfc9a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java
@@ -73,6 +73,7 @@ import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.metadata.api.MetadataStoreConfig;
import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended;
@@ -544,7 +545,7 @@ public abstract class MockedPulsarServiceBaseTest extends TestRetrySupport {
configuration.setDefaultNumberOfNamespaceBundles(1);
configuration.setMetadataStoreUrl("zk:localhost:2181");
configuration.setConfigurationMetadataStoreUrl("zk:localhost:3181");
- configuration.setAllowAutoTopicCreationType("non-partitioned");
+ configuration.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
configuration.setBrokerShutdownTimeoutMs(0L);
configuration.setLoadBalancerOverrideBrokerNicSpeedGbps(Optional.of(1.0d));
configuration.setBrokerServicePort(Optional.of(0));
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java
index 65fd9395631..e4331d0b486 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnerShipForCurrentServerTestBase.java
@@ -47,6 +47,7 @@ import org.apache.pulsar.broker.auth.SameThreadOrderedSafeExecutor;
import org.apache.pulsar.broker.intercept.CounterBrokerInterceptor;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended;
import org.apache.pulsar.metadata.impl.ZKMetadataStore;
import org.apache.zookeeper.CreateMode;
@@ -104,7 +105,7 @@ public class OwnerShipForCurrentServerTestBase {
conf.setDefaultNumberOfNamespaceBundles(1);
conf.setMetadataStoreUrl("zk:localhost:2181");
conf.setConfigurationMetadataStoreUrl("zk:localhost:3181");
- conf.setAllowAutoTopicCreationType("non-partitioned");
+ conf.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
conf.setBookkeeperClientExposeStatsToPrometheus(true);
conf.setAcknowledgmentAtBatchIndexLevelEnabled(true);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java
index a7e5dc09480..f3463ee121d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java
@@ -58,6 +58,7 @@ import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.PersistentTopicInternalStats;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
import org.apache.pulsar.common.policies.data.TopicStats;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.common.policies.data.impl.BacklogQuotaImpl;
import org.apache.pulsar.zookeeper.LocalBookkeeperEnsemble;
import org.awaitility.Awaitility;
@@ -125,7 +126,7 @@ public class BacklogQuotaManagerTest {
config.setBacklogQuotaCheckIntervalInSeconds(TIME_TO_CHECK_BACKLOG_QUOTA);
config.setManagedLedgerMaxEntriesPerLedger(MAX_ENTRIES_PER_LEDGER);
config.setManagedLedgerMinLedgerRolloverTimeMinutes(0);
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
config.setSystemTopicEnabled(false);
config.setTopicLevelPoliciesEnabled(false);
config.setForceDeleteNamespaceAllowed(true);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BkEnsemblesTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BkEnsemblesTestBase.java
index 6aea4aa5e9f..9b3d145dea2 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BkEnsemblesTestBase.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BkEnsemblesTestBase.java
@@ -26,6 +26,7 @@ import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.tests.TestRetrySupport;
import org.apache.pulsar.zookeeper.LocalBookkeeperEnsemble;
import org.testng.Assert;
@@ -88,7 +89,7 @@ public abstract class BkEnsemblesTestBase extends TestRetrySupport {
config.setManagedLedgerMaxEntriesPerLedger(5);
config.setManagedLedgerMinLedgerRolloverTimeMinutes(0);
config.setAdvertisedAddress("127.0.0.1");
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
config.setMetadataStoreOperationTimeoutSeconds(10);
config.setNumIOThreads(1);
Properties properties = new Properties();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
index d517f48b97a..36d4053ae49 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
@@ -68,6 +68,7 @@ import org.apache.pulsar.common.policies.data.BookiesRackConfiguration;
import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.EnsemblePlacementPolicyConfig;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.apache.pulsar.zookeeper.LocalBookkeeperEnsemble;
import org.apache.zookeeper.CreateMode;
@@ -160,7 +161,7 @@ public class BrokerBookieIsolationTest {
config.setManagedLedgerDefaultWriteQuorum(2);
config.setManagedLedgerDefaultAckQuorum(2);
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
int totalEntriesPerLedger = 20;
int totalLedgers = totalPublish / totalEntriesPerLedger;
@@ -314,7 +315,7 @@ public class BrokerBookieIsolationTest {
config.setManagedLedgerDefaultWriteQuorum(2);
config.setManagedLedgerDefaultAckQuorum(2);
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
int totalEntriesPerLedger = 20;
int totalLedgers = totalPublish / totalEntriesPerLedger;
@@ -457,7 +458,7 @@ public class BrokerBookieIsolationTest {
config.setManagedLedgerDefaultWriteQuorum(2);
config.setManagedLedgerDefaultAckQuorum(2);
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
int totalEntriesPerLedger = 20;
int totalLedgers = totalPublish / totalEntriesPerLedger;
@@ -613,7 +614,7 @@ public class BrokerBookieIsolationTest {
config.setManagedLedgerDefaultEnsembleSize(2);
config.setManagedLedgerDefaultWriteQuorum(2);
config.setManagedLedgerDefaultAckQuorum(2);
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
int totalEntriesPerLedger = 20;
int totalLedgers = totalPublish / totalEntriesPerLedger;
@@ -754,7 +755,7 @@ public class BrokerBookieIsolationTest {
config.setManagedLedgerDefaultEnsembleSize(2);
config.setManagedLedgerDefaultWriteQuorum(2);
config.setManagedLedgerDefaultAckQuorum(2);
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
config.setManagedLedgerMinLedgerRolloverTimeMinutes(0);
pulsarService = new PulsarService(config);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoTopicCreationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoTopicCreationTest.java
index 60544922bf6..a28b60bbae3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoTopicCreationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceAutoTopicCreationTest.java
@@ -67,7 +67,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
@Test
public void testAutoNonPartitionedTopicCreation() throws Exception{
pulsar.getConfiguration().setAllowAutoTopicCreation(true);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("non-partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
final String topicString = "persistent://prop/ns-abc/non-partitioned-topic";
final String subscriptionName = "non-partitioned-topic-sub";
@@ -80,7 +80,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
@Test
public void testAutoNonPartitionedTopicCreationOnProduce() throws Exception{
pulsar.getConfiguration().setAllowAutoTopicCreation(true);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("non-partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
final String topicString = "persistent://prop/ns-abc/non-partitioned-topic-2";
pulsarClient.newProducer().topic(topicString).create();
@@ -92,7 +92,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
@Test
public void testAutoPartitionedTopicCreation() throws Exception{
pulsar.getConfiguration().setAllowAutoTopicCreation(true);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.PARTITIONED);
pulsar.getConfiguration().setDefaultNumPartitions(3);
final String topicString = "persistent://prop/ns-abc/partitioned-topic";
@@ -108,7 +108,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
@Test
public void testAutoPartitionedTopicCreationOnProduce() throws Exception{
pulsar.getConfiguration().setAllowAutoTopicCreation(true);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.PARTITIONED);
pulsar.getConfiguration().setDefaultNumPartitions(3);
final String topicString = "persistent://prop/ns-abc/partitioned-topic-1";
@@ -138,7 +138,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
@Test
public void testAutoTopicCreationDisableIfNonPartitionedTopicAlreadyExist() throws Exception {
pulsar.getConfiguration().setAllowAutoTopicCreation(true);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.PARTITIONED);
pulsar.getConfiguration().setDefaultNumPartitions(3);
final String topicString = "persistent://prop/ns-abc/test-topic-2";
@@ -162,7 +162,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
@Test
public void testGetPartitionedMetadataWithoutCheckAllowAutoCreation() throws Exception{
pulsar.getConfiguration().setAllowAutoTopicCreation(true);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.PARTITIONED);
pulsar.getConfiguration().setDefaultNumPartitions(3);
final String topicString = "persistent://prop/ns-abc/test-topic-3";
@@ -244,7 +244,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
final TopicName topicName = TopicName.get(topicString);
pulsar.getConfiguration().setAllowAutoTopicCreation(true);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("non-partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
pulsar.getAdminClient().namespaces().setAutoTopicCreation(topicName.getNamespace(),
AutoTopicCreationOverride.builder()
.allowAutoTopicCreation(true)
@@ -267,7 +267,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
final TopicName topicName = TopicName.get(topicString);
pulsar.getConfiguration().setAllowAutoTopicCreation(true);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.PARTITIONED);
pulsar.getConfiguration().setDefaultNumPartitions(2);
pulsar.getAdminClient().namespaces().setAutoTopicCreation(topicName.getNamespace(),
AutoTopicCreationOverride.builder()
@@ -288,7 +288,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
final TopicName topicName = TopicName.get(topicString);
pulsar.getConfiguration().setAllowAutoTopicCreation(true);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.PARTITIONED);
pulsar.getConfiguration().setDefaultNumPartitions(2);
pulsar.getAdminClient().namespaces().setAutoTopicCreation(topicName.getNamespace(),
AutoTopicCreationOverride.builder()
@@ -385,7 +385,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
@Test
public void testMaxNumPartitionsPerPartitionedTopicTopicCreation() {
pulsar.getConfiguration().setAllowAutoTopicCreation(true);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.PARTITIONED);
pulsar.getConfiguration().setDefaultNumPartitions(3);
pulsar.getConfiguration().setMaxNumPartitionsPerPartitionedTopic(2);
@@ -442,7 +442,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
@Test
public void testDynamicConfigurationTopicAutoCreationNonPartitioned() throws PulsarAdminException, PulsarClientException {
pulsar.getConfiguration().setAllowAutoTopicCreation(false);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.PARTITIONED);
final String namespaceName = "prop/ns-abc";
final String topic = "persistent://" + namespaceName + "/test-dynamicConfiguration-topic-auto-creation-"
+ UUID.randomUUID();
@@ -463,7 +463,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
@Test
public void testDynamicConfigurationTopicAutoCreationPartitioned() throws PulsarAdminException, PulsarClientException {
pulsar.getConfiguration().setAllowAutoTopicCreation(false);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("non-partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
pulsar.getConfiguration().setMaxNumPartitionsPerPartitionedTopic(0);
final String namespaceName = "prop/ns-abc";
final String topic = "persistent://" + namespaceName + "/test-dynamicConfiguration-topic-auto-creation-"
@@ -489,7 +489,7 @@ public class BrokerServiceAutoTopicCreationTest extends BrokerTestBase{
@Test
public void testDynamicConfigurationTopicAutoCreationPartitionedWhenDefaultMoreThanMax() throws PulsarAdminException, PulsarClientException {
pulsar.getConfiguration().setAllowAutoTopicCreation(true);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.PARTITIONED);
pulsar.getConfiguration().setMaxNumPartitionsPerPartitionedTopic(0);
final String namespaceName = "prop/ns-abc";
String topic = "persistent://" + namespaceName + "/test-dynamicConfiguration-topic-auto-creation-"
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java
index 11b0b8dd92f..a7752b4a63f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java
@@ -37,6 +37,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.common.policies.data.ClusterData;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.tests.TestRetrySupport;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.api.Consumer;
@@ -233,7 +234,7 @@ public abstract class ReplicatorTestBase extends TestRetrySupport {
config.setTlsTrustCertsFilePath(TLS_SERVER_CERT_FILE_PATH);
config.setBacklogQuotaCheckIntervalInSeconds(TIME_TO_CHECK_BACKLOG_QUOTA);
config.setDefaultNumberOfNamespaceBundles(1);
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
config.setEnableReplicatedSubscriptions(true);
config.setReplicatedSubscriptionsSnapshotFrequencyMillis(1000);
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/PartitionedSystemTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/PartitionedSystemTopicTest.java
index f82badac51e..008c2143a35 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/PartitionedSystemTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/systopic/PartitionedSystemTopicTest.java
@@ -55,6 +55,7 @@ import org.apache.pulsar.common.naming.TopicVersion;
import org.apache.pulsar.common.policies.data.BacklogQuota;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.common.util.FutureUtil;
import org.awaitility.Awaitility;
import org.mockito.Mockito;
@@ -72,7 +73,7 @@ public class PartitionedSystemTopicTest extends BrokerTestBase {
@Override
protected void setup() throws Exception {
conf.setAllowAutoTopicCreation(false);
- conf.setAllowAutoTopicCreationType("partitioned");
+ conf.setAllowAutoTopicCreationType(TopicType.PARTITIONED);
conf.setDefaultNumPartitions(PARTITIONS);
conf.setManagedLedgerMaxEntriesPerLedger(1);
conf.setBrokerDeleteInactiveTopicsEnabled(false);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java
index d48ef901f54..2d8956a6d5a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java
@@ -57,6 +57,7 @@ import org.apache.pulsar.common.naming.SystemTopicNames;
import org.apache.pulsar.common.partition.PartitionedTopicMetadata;
import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended;
import org.apache.pulsar.metadata.impl.ZKMetadataStore;
@@ -166,7 +167,7 @@ public abstract class TransactionTestBase extends TestRetrySupport {
conf.setDefaultNumberOfNamespaceBundles(1);
conf.setMetadataStoreUrl("zk:localhost:2181");
conf.setConfigurationMetadataStoreUrl("zk:localhost:3181");
- conf.setAllowAutoTopicCreationType("non-partitioned");
+ conf.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
conf.setBookkeeperClientExposeStatsToPrometheus(true);
conf.setForceDeleteNamespaceAllowed(true);
conf.setBrokerShutdownTimeoutMs(0L);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationFailureTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationFailureTest.java
index 1c5cf2ee2e7..f5c3c1de1c2 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationFailureTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationFailureTest.java
@@ -53,6 +53,7 @@ import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.RetentionPolicies;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.policies.data.TopicStats;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.zookeeper.LocalBookkeeperEnsemble;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -95,7 +96,7 @@ public class ClientDeduplicationFailureTest {
config.setLoadBalancerEnabled(false);
config.setLoadBalancerAutoUnloadSplitBundlesEnabled(false);
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
pulsar = new PulsarService(config);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java
index d4af84b8469..85274064964 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java
@@ -61,6 +61,7 @@ import org.apache.pulsar.common.policies.data.NonPersistentSubscriptionStats;
import org.apache.pulsar.common.policies.data.NonPersistentTopicStats;
import org.apache.pulsar.common.policies.data.SubscriptionStats;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.zookeeper.LocalBookkeeperEnsemble;
import org.apache.pulsar.zookeeper.ZookeeperServerTest;
import org.slf4j.Logger;
@@ -928,7 +929,7 @@ public class NonPersistentTopicTest extends ProducerConsumerBase {
config1.setLoadBalancerOverrideBrokerNicSpeedGbps(Optional.of(1.0d));
config1.setBrokerServicePort(Optional.of(0));
config1.setBacklogQuotaCheckIntervalInSeconds(TIME_TO_CHECK_BACKLOG_QUOTA);
- config1.setAllowAutoTopicCreationType("non-partitioned");
+ config1.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
pulsar1 = new PulsarService(config1);
pulsar1.start();
ns1 = pulsar1.getBrokerService();
@@ -955,7 +956,7 @@ public class NonPersistentTopicTest extends ProducerConsumerBase {
config2.setLoadBalancerOverrideBrokerNicSpeedGbps(Optional.of(1.0d));
config2.setBrokerServicePort(Optional.of(0));
config2.setBacklogQuotaCheckIntervalInSeconds(TIME_TO_CHECK_BACKLOG_QUOTA);
- config2.setAllowAutoTopicCreationType("non-partitioned");
+ config2.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
pulsar2 = new PulsarService(config2);
pulsar2.start();
ns2 = pulsar2.getBrokerService();
@@ -981,7 +982,7 @@ public class NonPersistentTopicTest extends ProducerConsumerBase {
config3.setBrokerShutdownTimeoutMs(0L);
config3.setLoadBalancerOverrideBrokerNicSpeedGbps(Optional.of(1.0d));
config3.setBrokerServicePort(Optional.of(0));
- config3.setAllowAutoTopicCreationType("non-partitioned");
+ config3.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
pulsar3 = new PulsarService(config3);
pulsar3.start();
ns3 = pulsar3.getBrokerService();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java
index bfa5895409d..21429001947 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java
@@ -22,6 +22,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
@@ -42,6 +43,7 @@ import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.common.configuration.PulsarConfigurationLoader;
import org.apache.pulsar.common.policies.data.InactiveTopicDeleteMode;
import org.apache.pulsar.common.policies.data.OffloadPoliciesImpl;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.testng.annotations.Test;
@Test(groups = "broker-naming")
@@ -343,4 +345,28 @@ public class ServiceConfigurationTest {
assertFalse(configuration.isTransactionBufferSegmentedSnapshotEnabled());
}
}
+
+ @Test
+ public void testAllowAutoTopicCreationType() throws Exception {
+ ServiceConfiguration conf;
+ final Properties properties = new Properties();
+ properties.setProperty("clusterName", "test");
+
+ // set invalid value: partition
+ properties.setProperty("allowAutoTopicCreationType", "partition");
+ try {
+ conf = PulsarConfigurationLoader.create(properties, ServiceConfiguration.class);
+ fail("Invalid value of allowAutoTopicCreationType");
+ } catch (Exception e) {
+ assertTrue(e.getMessage().equals(
+ "failed to initialize allowAutoTopicCreationType field while setting value partition"));
+ }
+ // set valid value: partitioned
+ properties.setProperty("allowAutoTopicCreationType", "partitioned");
+ conf = PulsarConfigurationLoader.create(properties, ServiceConfiguration.class);
+ assertEquals(conf.getAllowAutoTopicCreationType(), TopicType.PARTITIONED);
+ properties.setProperty("allowAutoTopicCreationType", "non-partitioned");
+ conf = PulsarConfigurationLoader.create(properties, ServiceConfiguration.class);
+ assertEquals(conf.getAllowAutoTopicCreationType(), TopicType.NON_PARTITIONED);
+ }
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java
index edaf6b48a2f..e8bf5af51e4 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java
@@ -64,6 +64,7 @@ import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.SubscriptionStats;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.policies.data.TopicStats;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.apache.pulsar.functions.runtime.thread.ThreadRuntimeFactory;
@@ -134,7 +135,7 @@ public class PulsarFunctionE2ESecurityTest {
config.setBrokerServicePort(Optional.of(0));
config.setLoadManagerClassName(SimpleLoadManagerImpl.class.getName());
config.setAdvertisedAddress("localhost");
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
Set<String> providers = new HashSet<>();
providers.add(AuthenticationProviderToken.class.getName());
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
index 4f52c3d507c..a8a1c8384dd 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
@@ -79,6 +79,7 @@ import org.apache.pulsar.common.policies.data.PublisherStats;
import org.apache.pulsar.common.policies.data.SubscriptionStats;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.policies.data.TopicStats;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.apache.pulsar.functions.LocalRunner;
@@ -233,7 +234,7 @@ public class PulsarFunctionLocalRunTest {
"tlsCertFile:" + TLS_CLIENT_CERT_FILE_PATH + "," + "tlsKeyFile:" + TLS_CLIENT_KEY_FILE_PATH);
config.setBrokerClientTrustCertsFilePath(TLS_TRUST_CERT_FILE_PATH);
config.setBrokerClientTlsEnabled(true);
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
workerConfig = createWorkerConfig(config);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java
index 59a3b0a0ba6..f8471de5a5f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java
@@ -67,6 +67,7 @@ import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.FunctionStatsImpl;
import org.apache.pulsar.common.policies.data.SubscriptionStats;
import org.apache.pulsar.common.policies.data.TenantInfo;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.apache.pulsar.functions.runtime.thread.ThreadRuntimeFactory;
@@ -151,7 +152,7 @@ public class PulsarFunctionPublishTest {
"tlsCertFile:" + TLS_CLIENT_CERT_FILE_PATH + "," + "tlsKeyFile:" + TLS_CLIENT_KEY_FILE_PATH);
config.setBrokerClientTrustCertsFilePath(TLS_TRUST_CERT_FILE_PATH);
config.setBrokerClientTlsEnabled(true);
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
functionsWorkerService = createPulsarFunctionWorker(config);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/AbstractPulsarE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/AbstractPulsarE2ETest.java
index 2866de2898e..6e5a6179175 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/AbstractPulsarE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/AbstractPulsarE2ETest.java
@@ -53,6 +53,7 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.impl.auth.AuthenticationTls;
import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.TenantInfo;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.apache.pulsar.functions.runtime.thread.ThreadRuntimeFactory;
@@ -143,7 +144,7 @@ public abstract class AbstractPulsarE2ETest {
"tlsCertFile:" + TLS_CLIENT_CERT_FILE_PATH + "," + "tlsKeyFile:" + TLS_CLIENT_KEY_FILE_PATH);
config.setBrokerClientTrustCertsFilePath(TLS_TRUST_CERT_FILE_PATH);
config.setBrokerClientTlsEnabled(true);
- config.setAllowAutoTopicCreationType("non-partitioned");
+ config.setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
System.setProperty(JAVA_INSTANCE_JAR_PROPERTY,
FutureUtil.class.getProtectionDomain().getCodeSource().getLocation().getPath());
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java
index 43f79cfb23a..6c9a834bb04 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java
@@ -54,6 +54,7 @@ import org.apache.pulsar.common.api.proto.ProtocolVersion;
import org.apache.pulsar.common.configuration.PulsarConfigurationLoader;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
+import org.apache.pulsar.common.policies.data.TopicType;
import org.apache.pulsar.common.schema.SchemaInfo;
import org.apache.pulsar.common.util.netty.EventLoopUtil;
import org.apache.pulsar.metadata.impl.ZKMetadataStore;
@@ -194,7 +195,7 @@ public class ProxyTest extends MockedPulsarServiceBaseTest {
public void testAutoCreateTopic() throws Exception{
int defaultPartition = 2;
int defaultNumPartitions = pulsar.getConfiguration().getDefaultNumPartitions();
- pulsar.getConfiguration().setAllowAutoTopicCreationType("partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.PARTITIONED);
pulsar.getConfiguration().setDefaultNumPartitions(defaultPartition);
try {
@Cleanup
@@ -205,7 +206,7 @@ public class ProxyTest extends MockedPulsarServiceBaseTest {
List<String> partitionNames = partitionNamesFuture.get(30000, TimeUnit.MILLISECONDS);
Assert.assertEquals(partitionNames.size(), defaultPartition);
} finally {
- pulsar.getConfiguration().setAllowAutoTopicCreationType("non-partitioned");
+ pulsar.getConfiguration().setAllowAutoTopicCreationType(TopicType.NON_PARTITIONED);
pulsar.getConfiguration().setDefaultNumPartitions(defaultNumPartitions);
}
}