From 8b8a3b1aac9560c35e7af6e9400129005cabe19f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 16:12:41 +0000
Subject: [PATCH 1/5] [maven-release-plugin] prepare for next development
iteration
---
commons/pom.xml | 2 +-
library/pom.xml | 2 +-
parent-pom/pom.xml | 4 ++--
polyapi-maven-plugin/pom.xml | 2 +-
pom.xml | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/commons/pom.xml b/commons/pom.xml
index 38d9033a..649472e4 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -4,7 +4,7 @@
io.polyapi
parent-pom
- 0.14.2
+ 0.14.3-SNAPSHOT
../parent-pom
diff --git a/library/pom.xml b/library/pom.xml
index 128d68b7..ae5bb2d6 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -4,7 +4,7 @@
io.polyapi
parent-pom
- 0.14.2
+ 0.14.3-SNAPSHOT
../parent-pom
library
diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
index df89ca71..0111863c 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
io.polyapi
parent-pom
- 0.14.2
+ 0.14.3-SNAPSHOT
pom
Poly API Java parent POM
https://polyapi.io
@@ -28,7 +28,7 @@
scm:git:git@github.com:polyapi/polyapi-java.git
scm:git:git@github.com:polyapi/polyapi-java.git
https://github.com/polyapi/polyapi-java
- polyapi-java-0.14.2
+ HEAD
17
diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml
index a64541cc..62b46457 100644
--- a/polyapi-maven-plugin/pom.xml
+++ b/polyapi-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
io.polyapi
parent-pom
- 0.14.2
+ 0.14.3-SNAPSHOT
../parent-pom
polyapi-maven-plugin
diff --git a/pom.xml b/pom.xml
index 28d7aa91..f3c31c3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
io.polyapi
polyapi-java
- 0.14.2
+ 0.14.3-SNAPSHOT
pom
parent-pom
@@ -34,7 +34,7 @@
scm:git:git@github.com:polyapi/polyapi-java.git
scm:git:git@github.com:polyapi/polyapi-java.git
https://github.com/polyapi/polyapi-java
- polyapi-java-0.14.2
+ HEAD
From 804f87a03442e22df782da6ac081fa84a5c9cb06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20Ortiz?=
Date: Tue, 23 Jul 2024 15:37:52 -0300
Subject: [PATCH 2/5] Updated version in README.md.
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index f1704341..a2c5f50a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# Java Client Library (beta)
-* Latest released version 0.14.1
-* Latest snapshot version 0.14.2-SNAPSHOT
+* Latest released version 0.14.2
+* Latest snapshot version 0.14.3-SNAPSHOT
## Introduction
Welcome my friends! This is the Poly API Java client GitHub page. If you are here, then it means you're familiar with what we do at Poly. If you aren't, you can always check [here](https://github.com/polyapi/poly-alpha).
@@ -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.14.1
+ 0.14.2
From 975ed158e4168e6b8ab000667aff5011000e86ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20Ortiz?=
Date: Tue, 23 Jul 2024 16:21:18 -0300
Subject: [PATCH 3/5] Replaced the "any" object type with an instance of
Object.class for all functions.
---
.../polyapi/plugin/model/type/basic/AnyPolyType.java | 10 ++--------
.../io/polyapi/plugin/model/visitor/TypeVisitor.java | 2 +-
.../polyapi/plugin/service/DeploymentServiceImpl.java | 5 ++---
.../plugin/service/visitor/TypeExtractionVisitor.java | 2 +-
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/type/basic/AnyPolyType.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/type/basic/AnyPolyType.java
index a9ee537b..474b7509 100644
--- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/type/basic/AnyPolyType.java
+++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/type/basic/AnyPolyType.java
@@ -1,18 +1,12 @@
package io.polyapi.plugin.model.type.basic;
import io.polyapi.plugin.model.type.PolyType;
-import io.polyapi.plugin.model.type.complex.MapObjectPolyType;
import io.polyapi.plugin.model.visitor.TypeVisitor;
-public class AnyPolyType extends PolyType implements MapObjectPolyType {
+public class AnyPolyType extends PolyType {
@Override
public void accept(TypeVisitor visitor) {
- visitor.visit(MapObjectPolyType.class.cast(this));
- }
-
- @Override
- public String getTypeName() {
- return "any";
+ visitor.visit(this);
}
}
diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/visitor/TypeVisitor.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/visitor/TypeVisitor.java
index 35f19a9f..9023a5ad 100644
--- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/visitor/TypeVisitor.java
+++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/visitor/TypeVisitor.java
@@ -88,6 +88,6 @@ default void visit(PrimitivePolyType type) {
default void visit(AnyPolyType type) {
log.trace("Visiting AnyPolyType.");
- visit((MapObjectPolyType) type);
+ visit((PolyType) type);
}
}
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 2bb72398..0cbab1c2 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
@@ -36,7 +36,6 @@
import static com.fasterxml.jackson.databind.type.TypeFactory.defaultInstance;
import static java.lang.String.format;
import static java.nio.charset.Charset.defaultCharset;
-import static java.util.function.Predicate.isEqual;
import static java.util.function.Predicate.not;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toSet;
@@ -122,7 +121,7 @@ public List deployFunctions(List functionFilters, boolean
Arrays.stream(method.getParameters()).map(parameter -> {
log.debug("Processing parameter {}", parameter);
PolyFunctionArgument argument = new PolyFunctionArgument();
- if (parameter.getType().equals(Map.class)) {
+ if (parameter.getType().equals(Object.class)) {
argument.setType("any");
} else {
argument.setType(parameter.getParameterizedType().getTypeName());
@@ -141,7 +140,7 @@ public List deployFunctions(List functionFilters, boolean
"java.lang.Short", "java.lang.Byte" -> "number";
case "java.lang.Boolean" -> "boolean";
case "java.lang.String", "java.lang.Character" -> "string";
- case "java.util.Map" -> "any";
+ case "java.util.Object" -> "any";
case "void" -> "void";
default -> "object";
});
diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/visitor/TypeExtractionVisitor.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/visitor/TypeExtractionVisitor.java
index 20c2b5cb..eebe457f 100644
--- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/visitor/TypeExtractionVisitor.java
+++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/visitor/TypeExtractionVisitor.java
@@ -71,7 +71,7 @@ public void visit(PlainPolyType type) {
result = Optional.ofNullable(type)
.map(PlainPolyType::getValue)
.filter(not(isEqual("void")))
- .map(plainType -> new ParsedType(plainType.equals("any")? TypeUtils.parameterize(Map.class, String.class, Object.class) : Object.class))
+ .map(plainType -> new ParsedType(Object.class))
.orElse(new ParsedType(Void.class));
}
From 7fd3bcf2f06adc77e996e52c182db49d81941a48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20Ortiz?=
Date: Tue, 23 Jul 2024 16:22:46 -0300
Subject: [PATCH 4/5] Updated version in README.md.
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index a2c5f50a..4fee7b01 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# Java Client Library (beta)
-* Latest released version 0.14.2
-* Latest snapshot version 0.14.3-SNAPSHOT
+* Latest released version 0.14.3
+* Latest snapshot version 0.14.4-SNAPSHOT
## Introduction
Welcome my friends! This is the Poly API Java client GitHub page. If you are here, then it means you're familiar with what we do at Poly. If you aren't, you can always check [here](https://github.com/polyapi/poly-alpha).
@@ -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.14.2
+ 0.14.3
From f5b960cbf3b26459fbd7bdc3c87d879273196a4e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 19:42:55 +0000
Subject: [PATCH 5/5] [maven-release-plugin] prepare release
polyapi-java-0.14.3
---
commons/pom.xml | 2 +-
library/pom.xml | 2 +-
parent-pom/pom.xml | 4 ++--
polyapi-maven-plugin/pom.xml | 2 +-
pom.xml | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/commons/pom.xml b/commons/pom.xml
index 649472e4..febd294c 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -4,7 +4,7 @@
io.polyapi
parent-pom
- 0.14.3-SNAPSHOT
+ 0.14.3
../parent-pom
diff --git a/library/pom.xml b/library/pom.xml
index ae5bb2d6..946183c1 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -4,7 +4,7 @@
io.polyapi
parent-pom
- 0.14.3-SNAPSHOT
+ 0.14.3
../parent-pom
library
diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
index 0111863c..cccb1998 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
io.polyapi
parent-pom
- 0.14.3-SNAPSHOT
+ 0.14.3
pom
Poly API Java parent POM
https://polyapi.io
@@ -28,7 +28,7 @@
scm:git:git@github.com:polyapi/polyapi-java.git
scm:git:git@github.com:polyapi/polyapi-java.git
https://github.com/polyapi/polyapi-java
- HEAD
+ polyapi-java-0.14.3
17
diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml
index 62b46457..89c5e320 100644
--- a/polyapi-maven-plugin/pom.xml
+++ b/polyapi-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
io.polyapi
parent-pom
- 0.14.3-SNAPSHOT
+ 0.14.3
../parent-pom
polyapi-maven-plugin
diff --git a/pom.xml b/pom.xml
index f3c31c3d..a159a147 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
io.polyapi
polyapi-java
- 0.14.3-SNAPSHOT
+ 0.14.3
pom
parent-pom
@@ -34,7 +34,7 @@
scm:git:git@github.com:polyapi/polyapi-java.git
scm:git:git@github.com:polyapi/polyapi-java.git
https://github.com/polyapi/polyapi-java
- HEAD
+ polyapi-java-0.14.3