You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by je...@apache.org on 2018/05/31 23:19:44 UTC
[incubator-pulsar] branch master updated: If tenant/namespace are
not specified, infer public/default (#1879)
This is an automated email from the ASF dual-hosted git repository.
jerrypeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new ec535b6 If tenant/namespace are not specified, infer public/default (#1879)
ec535b6 is described below
commit ec535b6551b8f1174e3096b6c5507c77913eb52f
Author: Sanjeev Kulkarni <sa...@gmail.com>
AuthorDate: Thu May 31 16:19:42 2018 -0700
If tenant/namespace are not specified, infer public/default (#1879)
---
.../org/apache/pulsar/admin/cli/CmdFunctions.java | 24 ++++++++++++++++++----
.../java/org/apache/pulsar/admin/cli/CmdSinks.java | 10 +++++++--
.../org/apache/pulsar/admin/cli/CmdSources.java | 10 +++++++--
3 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
index 9b45f3c..c4648e9 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -121,11 +121,21 @@ public class CmdFunctions extends CmdBase {
*/
@Getter
abstract class NamespaceCommand extends BaseCommand {
- @Parameter(names = "--tenant", description = "The function's tenant", required = true)
+ @Parameter(names = "--tenant", description = "The function's tenant")
protected String tenant;
- @Parameter(names = "--namespace", description = "The function's namespace", required = true)
+ @Parameter(names = "--namespace", description = "The function's namespace")
protected String namespace;
+
+ @Override
+ public void processArguments() {
+ if (tenant == null) {
+ tenant = PUBLIC_TENANT;
+ }
+ if (namespace == null) {
+ namespace = DEFAULT_NAMESPACE;
+ }
+ }
}
/**
@@ -167,9 +177,15 @@ public class CmdFunctions extends CmdBase {
namespace = fqfnParts[1];
functionName = fqfnParts[2];
} else {
- if (null == tenant || null == namespace || null == functionName) {
+ if (tenant == null) {
+ tenant = PUBLIC_TENANT;
+ }
+ if (namespace == null) {
+ namespace = DEFAULT_NAMESPACE;
+ }
+ if (null == functionName) {
throw new RuntimeException(
- "You must specify a tenant, namespace, and name for the function or a Fully Qualified Function Name (FQFN)");
+ "You must specify a name for the function or a Fully Qualified Function Name (FQFN)");
}
}
}
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
index 822d600..2579c41 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
@@ -358,9 +358,15 @@ public class CmdSinks extends CmdBase {
@Override
void processArguments() throws Exception {
super.processArguments();
- if (null == tenant || null == namespace || null == name) {
+ if (null == name) {
throw new RuntimeException(
- "You must specify a tenant, namespace, and name for the sink");
+ "You must specify a name for the sink");
+ }
+ if (tenant == null) {
+ tenant = PUBLIC_TENANT;
+ }
+ if (namespace == null) {
+ namespace = DEFAULT_NAMESPACE;
}
}
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
index d16fb5b..5536bf5 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
@@ -340,9 +340,15 @@ public class CmdSources extends CmdBase {
@Override
void processArguments() throws Exception {
super.processArguments();
- if (null == tenant || null == namespace || null == name) {
+ if (null == name) {
throw new RuntimeException(
- "You must specify a tenant, namespace, and name for the source");
+ "You must specify a name for the source");
+ }
+ if (tenant == null) {
+ tenant = PUBLIC_TENANT;
+ }
+ if (namespace == null) {
+ namespace = DEFAULT_NAMESPACE;
}
}
--
To stop receiving notification emails like this one, please contact
jerrypeng@apache.org.