Skip to content
This repository has been archived by the owner on Apr 1, 2024. It is now read-only.

Commit

Permalink
[hotfix][minor]Remove tenant/namespace/name from sources and function…
Browse files Browse the repository at this point in the history 
…s REST endpoints (#4553)

`Tenant`, `namespace` and `sourceName` already appear in `PathParam` and shouldn't be a part of `sourceConfigJson`.
  • Loading branch information
@yjshen @sijie
yjshen authored and sijie committed Jun 18, 2019
1 parent 5f5b609 commit 628bdd7
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 36 deletions.
38 changes: 14 additions & 24 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,24 +91,19 @@ public void registerFunction(
" The size of the system resources allowed by the function runtime. The resources include: cpu, ram, disk. \n" +
"className \n" +
" The class name of functions. \n" +
"tenant \n" +
" The tenant of functions. \n" +
"namespace \n" +
" The namespace of functions. \n" +
"name \n" +
" The name of functions. \n" +
"customSchemaInputs \n" +
" The map of input topics to Schema class names (The customSchemaInputs is JSON string). \n" +
" The map of input topics to Schema class names (specified as a JSON object). \n" +
"customSerdeInputs \n" +
" The map of input topics to SerDe class names (The customSerdeInputs is JSON string). \n" +
" The map of input topics to SerDe class names (specified as a JSON object). \n" +
"deadLetterTopic \n" +
" Messages that are not processed successfully are sent to `deadLetterTopic`. \n" +
"runtimeFlags \n" +
" Any flags that you want to pass to the runtime. Note that in thread mode, these flags have no impact. \n" +
"fqfn \n" +
" The Fully Qualified Function Name (FQFN) for the function. \n" +
"inputSpecs \n" +
" A generalized way of specifying inputs. \n" +
" The map of input topics to its consumer configuration, each configuration has schema of " +
" {\"schemaType\": \"type-x\", \"serdeClassName\": \"name-x\", \"isRegexPattern\": true, \"receiverQueueSize\": 5} \n" +
"inputs \n" +
" The input topic or topics (multiple topics can be specified as a comma-separated list) of functions. \n" +
"jar \n" +
Expand Down Expand Up @@ -144,10 +139,10 @@ public void registerFunction(
" The message timeout in milliseconds. \n" +
"topicsPattern \n" +
" The topic pattern to consume from a list of topics under a namespace that match the pattern." +
" [--input] and [--topic-pattern] are mutually exclusive. Add SerDe class name for a " +
" pattern in --custom-serde-inputs (supported for java fun only) \n" +
" [input] and [topic-pattern] are mutually exclusive. Add SerDe class name for a " +
" pattern in customSerdeInputs (supported for java fun only) \n" +
"userConfig \n" +
" User-defined config key/values \n" +
" A map of user-defined configurations (specified as a JSON object). \n" +
"secrets \n" +
" This is a map of secretName(that is how the secret is going to be accessed in the function via context) to an object that" +
" encapsulates how the secret is fetched by the underlying secrets provider. The type of an value here can be found by the" +
Expand Down Expand Up @@ -203,24 +198,19 @@ public void updateFunction(
" The size of the system resources allowed by the function runtime. The resources include: cpu, ram, disk. \n" +
"className \n" +
" The class name of functions. \n" +
"tenant \n" +
" The tenant of functions. \n" +
"namespace \n" +
" The namespace of functions. \n" +
"name \n" +
" The name of functions. \n" +
"customSchemaInputs \n" +
" The map of input topics to Schema class names (The customSchemaInputs is JSON string). \n" +
" The map of input topics to Schema class names (specified as a JSON object). \n" +
"customSerdeInputs \n" +
" The map of input topics to SerDe class names (The customSerdeInputs is JSON string). \n" +
" The map of input topics to SerDe class names (specified as a JSON object). \n" +
"deadLetterTopic \n" +
" Messages that are not processed successfully are sent to `deadLetterTopic`. \n" +
"runtimeFlags \n" +
" Any flags that you want to pass to the runtime. Note that in thread mode, these flags have no impact. \n" +
"fqfn \n" +
" The Fully Qualified Function Name (FQFN) for the function. \n" +
"inputSpecs \n" +
" A generalized way of specifying inputs. \n" +
" The map of input topics to its consumer configuration, each configuration has schema of " +
" {\"schemaType\": \"type-x\", \"serdeClassName\": \"name-x\", \"isRegexPattern\": true, \"receiverQueueSize\": 5} \n" +
"inputs \n" +
" The input topic or topics (multiple topics can be specified as a comma-separated list) of functions. \n" +
"jar \n" +
Expand Down Expand Up @@ -256,10 +246,10 @@ public void updateFunction(
" The message timeout in milliseconds. \n" +
"topicsPattern \n" +
" The topic pattern to consume from a list of topics under a namespace that match the pattern." +
" [--input] and [--topic-pattern] are mutually exclusive. Add SerDe class name for a " +
" pattern in --custom-serde-inputs (supported for java fun only) \n" +
" [input] and [topicsPattern] are mutually exclusive. Add SerDe class name for a " +
" pattern in customSerdeInputs (supported for java fun only) \n" +
"userConfig \n" +
" User-defined config key/values \n" +
" A map of user-defined configurations (specified as a JSON object). \n" +
"secrets \n" +
" This is a map of secretName(that is how the secret is going to be accessed in the function via context) to an object that" +
" encapsulates how the secret is fetched by the underlying secrets provider. The type of an value here can be found by the" +
Expand Down
12 changes: 0 additions & 12 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SourcesBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@ public void registerSource(
final @FormDataParam("url") String functionPkgUrl,
@ApiParam(
value = "A JSON value presenting source configuration payload. An example of the expected functions can be found here. \n" +
"tenant \n" +
" The tenant of source. \n" +
"namespace \n" +
" The namespace of source. \n" +
"name \n" +
" The name of source. \n" +
"classname \n" +
" The source's class name if archive is file-url-path (file://). \n" +
"topicName \n" +
Expand Down Expand Up @@ -163,12 +157,6 @@ public void updateSource(
final @FormDataParam("url") String functionPkgUrl,
@ApiParam(
value = "A JSON value presenting source configuration payload. An example of the expected functions can be found here. \n" +
"tenant \n" +
" The tenant of source. \n" +
"namespace \n" +
" The namespace of source. \n" +
"name \n" +
" The name of source. \n" +
"classname \n" +
" The source's class name if archive is file-url-path (file://). \n" +
"topicName \n" +
Expand Down

0 comments on commit 628bdd7

Please sign in to comment.