Added missing 'type' property to specs.json (#10)

* Added missing 'type' property to specs.json

* Fixed version

* Fixed type for server variables

---------

Co-authored-by: Gastón Ortiz <gaston.ortiz@hotovo.com>

Author: wladimiiir

README.md

@@ -1,5 +1,5 @@
 # Java Client Library (beta)
-### v0.3.2
+### v0.3.3
 
 ## 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).
@@ -53,7 +53,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
 <properties>
-  <poly.version>0.3.2</poly.version>
+  <poly.version>0.3.3</poly.version>
 </properties>
 <dependencies>
   <dependency>
@@ -347,17 +347,17 @@ Comparing to its Typescript counterpart, the Java library is still missing the f
 These features will be added in the future releases.
 
 ## Changelog
+### v0.3.3
+- Fixed 'type' property for Server variables
+- Added missing 'type' property to specs.json
 ### v0.3.2
 - Fixed bug in deploy-functions where inner classes weren't taken into consideration.
 - Refactored deploy-functions to be reflection based instead of reading source code.
-
 ### v0.3.1
 - Fixed bug in deploy-functions where generics weren't taken into consideration.
-
 ### v0.3.0
 - Added deploy-functions MOJO.
 - Added functionality to add maven dependencies to executions.
-
 ### v0.2.5
 - Fixed bug where enums were generated as inner classes.
 - Fixed bug in generation of custom functions.

polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/specification/Specification.java

@@ -29,7 +29,8 @@
 @Setter
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
-        property = "type"
+        property = "type",
+        visible = true
 )
 @JsonSubTypes({
         @JsonSubTypes.Type(value = ApiFunctionSpecification.class, name = "apiFunction"),
@@ -41,6 +42,7 @@
 })
 public abstract class Specification implements Generable {
     private String id;
+    private String type;
     private String context;
     private String name;
     private String description;

polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/specification/variable/ServerVariableSpecification.java

@@ -22,7 +22,7 @@ protected String getTypePackage() {
         return "variable.server";
     }
 
-    public String getType() {
+    public String getValueType() {
         return variable.getValueType().getType(getClassName());
     }
 

polyapi-maven-plugin/src/main/resources/templates/ServerVariableSpecification.hbs

@@ -5,14 +5,14 @@ import io.polyapi.client.api.model.PolyMetadata;
 import io.polyapi.client.api.model.variable.{{~#if variable.secret}}ServerVariable{{~else}}RetrievableServerVariable{{/if}}Handler;
 
 @PolyEntity("{{id}}")
-@PolyMetadata(paramTypes = "{{{type}}}")
-public interface {{className}}Handler extends{{~#if variable.secret}} ServerVariable{{~else}} RetrievableServerVariable{{/if}}Handler<{{type}}> {
+@PolyMetadata(paramTypes = "{{{valueType}}}")
+public interface {{className}}Handler extends{{~#if variable.secret}} ServerVariable{{~else}} RetrievableServerVariable{{/if}}Handler<{{valueType}}> {
 {{~#if variable.secret}}
 {{~else}}
     @Override
-    {{type}} get();
+    {{valueType}} get();
 {{/if}}
 
     @Override
-    void update({{type}} value);
+    void update({{valueType}} value);
 }

polyapi-maven-plugin/src/main/resources/templates/Vari.hbs

@@ -19,7 +19,7 @@ public final class Vari extends PolyContext {
 {{~#each specifications}}
     {{~#ifIsType this "ServerVariableSpecification"}}
         @PolyEntity("{{id}}")
-        private static final {{type}} {{name}};
+        private static final {{valueType}} {{name}};
     {{~/ifIsType}}
 {{~/each}}
 {{#each subcontexts}}
@@ -30,7 +30,7 @@ static {
 var vari = new Vari();
 {{~#each specifications}}
     {{~#ifIsType this "ServerVariableSpecification"}}
-        {{name}} = vari.createServerVariable("{{{type}}}", "{{{packageName}}}");
+        {{name}} = vari.createServerVariable("{{{valueType}}}", "{{{packageName}}}");
     {{~/ifIsType}}
 {{~/each}}
 {{#each subcontexts}}
@@ -39,13 +39,13 @@ var vari = new Vari();
 }
 
 {{~#ifIsType this "ServerVariableSpecification"}}
-    public static void update{{{className}}}Variable({{{type}}} value) {
+    public static void update{{{className}}}Variable({{{valueType}}} value) {
         this.{{name}}Handler.update(value);
     }
 
     {{~#if variable.secret}}
     {{~else}}
-    public static {{{type}}} get{{{className}}}Variable() {
+    public static {{{valueType}}} get{{{className}}}Variable() {
         return this.{{name}}Handler.get();
     }
     {{/if}}