[pulsar] 17/21: [Broker] Change create topic return error to Status.BAD_REQUEST (#12919)

[penghui]

This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit 36f409a85ff0697f710ae935864a662436e2d8fd
Author: congbo <39078850+congbobo...@users.noreply.github.com>
AuthorDate: Tue Jan 18 12:09:21 2022 +0800

    [Broker] Change create topic return error to Status.BAD_REQUEST (#12919)
    
    (cherry picked from commit 2262a5d5dc3b835026ade95c8a5fa953338c6e89)
---
 .../org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java   | 6 +++---
 .../java/org/apache/pulsar/broker/transaction/TransactionTest.java  | 6 +++---
 2 files changed, 6 insertions(+), 6 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 9e8728c..7f5aafc 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
@@ -247,8 +247,8 @@ public class PersistentTopicsBase extends AdminResource {
 
     protected void validateCreateTopic(TopicName topicName) {
         if (isTransactionInternalName(topicName)) {
-            log.warn("Try to create a topic in the system topic format! {}", 
topicName);
-            throw new RestException(Status.CONFLICT, "Cannot create topic in 
system topic format!");
+            log.warn("Forbidden to create transaction internal topic: {}", 
topicName);
+            throw new RestException(Status.BAD_REQUEST, "Cannot create topic 
in system topic format!");
         }
     }
 
@@ -3642,7 +3642,7 @@ public class PersistentTopicsBase extends AdminResource {
             throw e;
         } catch (Exception e) {
             if (e.getCause() instanceof NotAllowedException) {
-                throw new RestException(Status.CONFLICT, e.getCause());
+                throw new RestException(Status.BAD_REQUEST, e.getCause());
             }
             throw new RestException(e.getCause());
         }
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTest.java
index 6fe99a7..d7d9089 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTest.java
@@ -155,7 +155,7 @@ public class TransactionTest extends TransactionTestBase {
         try {
             admin.topics().getSubscriptions(topicName);
             fail();
-        } catch (PulsarAdminException.ConflictException e) {
+        } catch (PulsarAdminException e) {
             assertEquals(e.getMessage(), "Can not create transaction system 
topic " + topicName);
         }
 
@@ -163,7 +163,7 @@ public class TransactionTest extends TransactionTestBase {
         try {
             admin.topics().createPartitionedTopic(topicName, 3);
             fail();
-        } catch (PulsarAdminException.ConflictException e) {
+        } catch (PulsarAdminException e) {
             assertEquals(e.getMessage(), "Cannot create topic in system topic 
format!");
         }
 
@@ -171,7 +171,7 @@ public class TransactionTest extends TransactionTestBase {
         try {
             admin.topics().createNonPartitionedTopic(topicName);
             fail();
-        } catch (PulsarAdminException.ConflictException e) {
+        } catch (PulsarAdminException e) {
             assertEquals(e.getMessage(), "Cannot create topic in system topic 
format!");
         }
     }