From be97275e1bc248f83039e9057adc552440f311a3 Mon Sep 17 00:00:00 2001 From: Sudipta Kumar Date: Wed, 13 Nov 2024 18:38:11 +0600 Subject: [PATCH 1/3] # Feature (2943): Upload original sourceCode for java functions in poly java client - Only source code pass to the poly function --- .../main/java/io/polyapi/plugin/model/function/PolyFunction.java | 1 + .../java/io/polyapi/plugin/service/DeploymentServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunction.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunction.java index 6c80a7cd..47a5b05f 100644 --- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunction.java +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunction.java @@ -23,6 +23,7 @@ public class PolyFunction { private String description; private String context; private String code; + private String sourceCode; private String language = "java"; private String returnType; private Visibility visibility; diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java index 4b7e51df..b382467a 100644 --- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java @@ -114,6 +114,7 @@ public List deployFunctions(List functionFilters, boolean throw new PolyApiMavenPluginException(e); // FIXME: Throw the appropriate exception. } polyFunction.setCode(jsonParser.toJsonString(codeObject)); + polyFunction.setSourceCode(jsonParser.toJsonString(codeObject.getCode())); polyFunction.setContext(Optional.ofNullable(annotation.context()).filter(not(String::isBlank)).orElseGet(declaringClass::getPackageName)); log.debug("Poly function context is '{}'", polyFunction.getContext()); log.debug("Processing parameters."); From f4a834c41a6e0ce4a1f089c9dd78cbf5e770f0a5 Mon Sep 17 00:00:00 2001 From: Sudipta Kumar Date: Fri, 15 Nov 2024 15:04:16 +0600 Subject: [PATCH 2/3] # Feature (2943): Upload original sourceCode for java functions in poly java client - Source code will pass as string, not json stringify --- .../java/io/polyapi/plugin/service/DeploymentServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java index b382467a..67d6b17b 100644 --- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java @@ -114,7 +114,7 @@ public List deployFunctions(List functionFilters, boolean throw new PolyApiMavenPluginException(e); // FIXME: Throw the appropriate exception. } polyFunction.setCode(jsonParser.toJsonString(codeObject)); - polyFunction.setSourceCode(jsonParser.toJsonString(codeObject.getCode())); + polyFunction.setSourceCode(codeObject.getCode()); polyFunction.setContext(Optional.ofNullable(annotation.context()).filter(not(String::isBlank)).orElseGet(declaringClass::getPackageName)); log.debug("Poly function context is '{}'", polyFunction.getContext()); log.debug("Processing parameters."); From 99e6bb13955ce9676428ea3db6e0b951bd2fb92e Mon Sep 17 00:00:00 2001 From: Sudipta Kumar Date: Fri, 15 Nov 2024 17:31:31 +0600 Subject: [PATCH 3/3] # Feature (2943): Upload original sourceCode for java functions in poly java client - Version updated - ChangeLog file added --- CHANGELOG.md | 19 +++++++++++++++++++ README.md | 4 ++-- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 2 +- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..09423886 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,19 @@ +# Changelog + +--- + +## [0.15.4] - 2024-11-15 + +### Added + +- Only source code pass to the poly function with a separate `sourceSode` field + +### Changed + +- + +### Fixed + +- + +--- \ No newline at end of file diff --git a/README.md b/README.md index e874fc58..ee9a7089 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Java Client Library -* Latest released version 0.15.3 +* Latest released version 0.15.4 * Latest snapshot version 0.15.4-SNAPSHOT ## Introduction @@ -55,7 +55,7 @@ Nice to have some customers looking around here! So, you'll need to run the foll 2. **Update the project.** Add the following to your project's `pom.xml`: ```xml - 0.15.3 + 0.15.4 diff --git a/commons/pom.xml b/commons/pom.xml index fb7ef3a6..50f775e1 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index 8c7b2073..2700a956 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 09fb3342..de00371e 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index c1c35f2c..1b4b0d90 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 953f6be4..430978c2 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom