rdhabalia closed pull request #2257: Fix: function-cli avoid arg-type check and
class-loading for file url
URL: https://github.com/apache/incubator-pulsar/pull/2257
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 2a38c81f93..15aa086515 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
@@ -545,7 +545,14 @@ protected FunctionDetails convert(FunctionConfig
functionConfig)
Class<?>[] typeArgs = null;
if (functionConfig.getRuntime() == FunctionConfig.Runtime.JAVA) {
- typeArgs = Utils.getFunctionTypes(functionConfig);
+ if (functionConfig.getJar().startsWith(Utils.FILE)) {
+ // server derives the arg-type by loading a class
+ if (isBlank(functionConfig.getClassName())) {
+ throw new ParameterException("Class-name must be
present for jar with file-url");
+ }
+ } else {
+ typeArgs = Utils.getFunctionTypes(functionConfig);
+ }
}
FunctionDetails.Builder functionDetailsBuilder =
FunctionDetails.newBuilder();
diff --git
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfig.java
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfig.java
index 42c829c673..bcbdd7205b 100644
---
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfig.java
+++
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfig.java
@@ -69,7 +69,6 @@
@NotNull
private String name;
@NotNull
- @isImplementationOfClasses(implementsClasses = {Function.class,
java.util.function.Function.class})
private String className;
@isListEntryCustom(entryValidatorClasses =
{ValidatorImpls.TopicNameValidator.class})
private Collection<String> inputs;
diff --git
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/validation/ValidatorImpls.java
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/validation/ValidatorImpls.java
index 297a2f27d0..925f7bc4f6 100644
---
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/validation/ValidatorImpls.java
+++
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/validation/ValidatorImpls.java
@@ -502,7 +502,9 @@ public void validateField(String name, Object o) {
FunctionConfig functionConfig = (FunctionConfig) o;
doCommonChecks(functionConfig);
if (functionConfig.getRuntime() == FunctionConfig.Runtime.JAVA) {
- doJavaChecks(functionConfig, name);
+ if (!functionConfig.getJar().startsWith(Utils.FILE)) {
+ doJavaChecks(functionConfig, name);
+ }
} else {
doPythonChecks(functionConfig, name);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
