Merge pull request #8 from blue-veery-gmbh/version-1.2.5-fixes

Version 1.2.5 fixes
blue-veery-gmbh · Mar 27, 2020 · f1e2123 · f1e2123
2 parents a11d135 + 303eb72
commit f1e2123
Show file tree

Hide file tree

Showing 20 changed files with 137 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -41,34 +41,34 @@ To add a dependency on spring-rest2ts-generator using Maven, use the following:
 <dependency>
     <groupId>com.blue-veery</groupId>
     <artifactId>spring-rest2ts-generator</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
 </dependency>
 <dependency>
     <groupId>com.blue-veery</groupId>
     <artifactId>spring-rest2ts-spring</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
 </dependency>
 <dependency>
     <groupId>com.blue-veery</groupId>
     <artifactId>spring-rest2ts-spring-data</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <!-- only if spring data is used-->
 </dependency>
 <dependency>
     <groupId>com.blue-veery</groupId>
     <artifactId>spring-rest2ts-jackson</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
 </dependency>
 <dependency>
     <groupId>com.blue-veery</groupId>
     <artifactId>spring-rest2ts-jax-rs</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <!-- only if JAX-RS is used-->
 </dependency>
 <dependency>
     <groupId>com.blue-veery</groupId>
     <artifactId>spring-rest2ts-angular2json-impl</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <!-- only if angular2json is used-->
 </dependency>
 ```          
@@ -346,7 +346,7 @@ type name, Java model class must be annotated with `JsonApiModelConfig` annotati
     <dependency>
         <groupId>com.blue-veery</groupId>
         <artifactId>spring-rest2ts-angular2json-api</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </dependency>
 ```
 which needs to be included in Java project. 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.blue-veery</groupId>
     <artifactId>spring-rest2ts</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <packaging>pom</packaging>
 
     <name>spring-rest2ts</name>
@@ -44,7 +44,7 @@
     </developers>
 
     <properties>
-        <spring-rest2ts.version>1.2.4</spring-rest2ts.version>
+        <spring-rest2ts.version>1.2.5</spring-rest2ts.version>
     </properties>
 
 

diff --git a/spring-rest2ts-angular2json/pom.xml b/spring-rest2ts-angular2json/pom.xml
@@ -6,11 +6,21 @@
     <parent>
         <groupId>com.blue-veery</groupId>
         <artifactId>spring-rest2ts</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>spring-rest2ts-angular2json</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
+    <description>
+        Typescript data model and services from rest generator for java spring. It supports generation for Angular and React
+    </description>
+    <url>https://github.com/blue-veery-gmbh/spring-rest-2-ts</url>
+
+    <organization>
+        <url>https://github.com/blue-veery-gmbh</url>
+        <name>blue veery GmbH</name>
+    </organization>
+    <inceptionYear>2019</inceptionYear>
     <packaging>pom</packaging>
     <modules>
         <module>spring-rest2ts-angular2json-api</module>

diff --git a/spring-rest2ts-angular2json/spring-rest2ts-angular2json-api/pom.xml b/spring-rest2ts-angular2json/spring-rest2ts-angular2json-api/pom.xml
@@ -6,9 +6,9 @@
     <parent>
         <groupId>com.blue-veery</groupId>
         <artifactId>spring-rest2ts-angular2json</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>spring-rest2ts-angular2json-api</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
 </project>
diff --git a/spring-rest2ts-angular2json/spring-rest2ts-angular2json-impl/pom.xml b/spring-rest2ts-angular2json/spring-rest2ts-angular2json-impl/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.blue-veery</groupId>
         <artifactId>spring-rest2ts-angular2json</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>spring-rest2ts-angular2json-impl</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <dependencies>
         <dependency>
             <groupId>com.blue-veery</groupId>

diff --git a/spring-rest2ts-examples/pom.xml b/spring-rest2ts-examples/pom.xml
@@ -7,24 +7,34 @@
     <parent>
         <groupId>com.blue-veery</groupId>
         <artifactId>spring-rest2ts</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>spring-rest2ts-examples</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
+    <description>
+        Typescript data model and services from rest generator for java spring. It supports generation for Angular and React
+    </description>
+    <url>https://github.com/blue-veery-gmbh/spring-rest-2-ts</url>
+
+    <organization>
+        <url>https://github.com/blue-veery-gmbh</url>
+        <name>blue veery GmbH</name>
+    </organization>
+    <inceptionYear>2019</inceptionYear>
 
 
 
     <dependencies>
         <dependency>
             <groupId>com.blue-veery</groupId>
             <artifactId>spring-rest2ts-generator</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>com.blue-veery</groupId>
             <artifactId>spring-rest2ts-jackson</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>com.blue-veery</groupId>

diff --git a/...s-examples/src/main/java/com/blueveery/springrest2ts/examples/ctrls/spring/OrderCtrl.java b/...s-examples/src/main/java/com/blueveery/springrest2ts/examples/ctrls/spring/OrderCtrl.java
@@ -31,9 +31,9 @@ public OrderDTO getOrder(@PathVariable int id) {
     }
 
 
-    @RequestMapping(path = "/{id}", method = RequestMethod.PUT, consumes = {"application/json"}, produces = {"application/json"})
+    @PutMapping(path = "/{id}", consumes = {"application/json"}, produces = {"application/json"})
     @ResponseBody
-    public OrderDTO updateOrder(@PathVariable int id, @RequestBody OrderDTO entity) {
+    public OrderDTO updateOrder(@PathVariable(name = "id") int orderId, @RequestBody OrderDTO entity) {
         return entity;
     }
 

diff --git a/spring-rest2ts-examples/src/main/resources/test-webapp/webpack.config.js b/spring-rest2ts-examples/src/main/resources/test-webapp/webpack.config.js
@@ -1,7 +1,7 @@
 var path = require('path');
 module.exports = {
     entry: {
-        services: "./src/app/sdk/services/services.ts"
+        services: "./src/ctrls-spring.ts"
     },
     mode: "development",
     output: {

diff --git a/spring-rest2ts-generator/pom.xml b/spring-rest2ts-generator/pom.xml
@@ -6,11 +6,21 @@
     <parent>
         <groupId>com.blue-veery</groupId>
         <artifactId>spring-rest2ts</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>spring-rest2ts-generator</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
+    <description>
+        Typescript data model and services from rest generator for java spring. It supports generation for Angular and React
+    </description>
+    <url>https://github.com/blue-veery-gmbh/spring-rest-2-ts</url>
+
+    <organization>
+        <url>https://github.com/blue-veery-gmbh</url>
+        <name>blue veery GmbH</name>
+    </organization>
+    <inceptionYear>2019</inceptionYear>
 
     <dependencies>
         <dependency>

diff --git a/...r/src/main/java/com/blueveery/springrest2ts/converters/ModelClassesAbstractConverter.java b/...r/src/main/java/com/blueveery/springrest2ts/converters/ModelClassesAbstractConverter.java
@@ -60,6 +60,7 @@ protected SortedSet<Property> getClassProperties(Class javaClass, ObjectMapper o
                 if(objectMapper.filter(field)) {
                     Property property = new Property(objectMapper.getPropertyName(field), currentIndex++, field);
                     propertyMap.put(property.getName(), property);
+                    objectMapper.setIfIsIgnored(property, field);
                 }
             }
         }
@@ -71,13 +72,15 @@ protected SortedSet<Property> getClassProperties(Class javaClass, ObjectMapper o
                     final int newIndex = currentIndex++;
                     Property property = propertyMap.computeIfAbsent(propertyName, (key) -> new Property(key, newIndex));
                     property.setGetter(method);
+                    objectMapper.setIfIsIgnored(property, method);
                 }
 
                 if(couldBeSetter(method) && objectMapper.filter(method, false)){
                     String propertyName = objectMapper.getPropertyName(method, false);
                     final int newIndex = currentIndex++;
                     Property property = propertyMap.computeIfAbsent(propertyName, (key) -> new Property(key, newIndex));
                     property.setSetter(method);
+                    objectMapper.setIfIsIgnored(property, method);
                 }
 
             }

diff --git a/...-rest2ts-generator/src/main/java/com/blueveery/springrest2ts/converters/ObjectMapper.java b/...-rest2ts-generator/src/main/java/com/blueveery/springrest2ts/converters/ObjectMapper.java
@@ -4,6 +4,7 @@
 import com.blueveery.springrest2ts.tsmodel.TSComplexElement;
 import com.blueveery.springrest2ts.tsmodel.TSField;
 
+import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.List;
@@ -23,4 +24,6 @@ List<TSField> mapJavaPropertyToField(Property property, TSComplexElement tsCompl
     String getPropertyName(Field field);
 
     String getPropertyName(Method method, boolean isGetter);
+
+    void setIfIsIgnored(Property property, AnnotatedElement annotatedElement);
 }
diff --git a/spring-rest2ts-generator/src/main/java/com/blueveery/springrest2ts/converters/Property.java b/spring-rest2ts-generator/src/main/java/com/blueveery/springrest2ts/converters/Property.java
@@ -15,6 +15,7 @@ public class Property implements Comparable<Property>{
     private Field field;
     private Method getter;
     private Method setter;
+    private boolean isIgnored;
     private Class<?> declaringClass;
 
     public Property(String name, int index) {
@@ -55,6 +56,14 @@ public void setSetter(Method setter) {
         declaringClass = setter.getDeclaringClass();
     }
 
+    public boolean isIgnored() {
+        return isIgnored;
+    }
+
+    public void setIgnored(boolean ignored) {
+        isIgnored = ignored;
+    }
+
     public boolean isReadOnly() {
         return field == null && setter == null;
     }

diff --git a/spring-rest2ts-jackson/pom.xml b/spring-rest2ts-jackson/pom.xml
@@ -7,11 +7,21 @@
     <parent>
         <groupId>com.blue-veery</groupId>
         <artifactId>spring-rest2ts</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>spring-rest2ts-jackson</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
+    <description>
+        Typescript data model and services from rest generator for java spring. It supports generation for Angular and React
+    </description>
+    <url>https://github.com/blue-veery-gmbh/spring-rest-2-ts</url>
+
+    <organization>
+        <url>https://github.com/blue-veery-gmbh</url>
+        <name>blue veery GmbH</name>
+    </organization>
+    <inceptionYear>2019</inceptionYear>
 
     <dependencies>
         <dependency>

diff --git a/...2ts-jackson/src/main/java/com/blueveery/springrest2ts/converters/JacksonObjectMapper.java b/...2ts-jackson/src/main/java/com/blueveery/springrest2ts/converters/JacksonObjectMapper.java
@@ -192,6 +192,11 @@ public List<TSField> mapJavaPropertyToField(Property property, TSComplexElement
                                                 ImplementationGenerator implementationGenerator,
                                                 NullableTypesStrategy nullableTypesStrategy) {
         List<TSField> tsFieldList = new ArrayList<>();
+
+        if (property.isIgnored()) {
+            return tsFieldList;
+        }
+
         Type fieldJavaGetterType = property.getGetterType();
         if (fieldJavaGetterType != null) {
             fieldJavaGetterType = applyJsonValue(fieldJavaGetterType);
@@ -262,6 +267,14 @@ public String getPropertyName(Method method, boolean isGetter) {
         return name;
     }
 
+    @Override
+    public void setIfIsIgnored(Property property, AnnotatedElement annotatedElement) {
+        JsonIgnore jsonIgnore = annotatedElement.getDeclaredAnnotation(JsonIgnore.class);
+        if (jsonIgnore != null && jsonIgnore.value()) {
+            property.setIgnored(true);
+        }
+    }
+
     private String cutPrefix(String methodName, String prefix) {
         if (methodName.startsWith(prefix)) {
             return Introspector.decapitalize(methodName.replaceFirst(prefix, ""));
@@ -423,9 +436,6 @@ private boolean commonFilter(AccessibleObject member) {
             return true;
         }
 
-        if (isJsonIgnoreActive(member)){
-            return true;
-        }
         return false;
     }
 
@@ -438,14 +448,6 @@ private boolean containsIgnoreTypeAnnotation(Class<?> type) {
         return jsonIgnoreType != null && jsonIgnoreType.value();
     }
 
-    private boolean isJsonIgnoreActive(AccessibleObject member) {
-        JsonIgnore jsonIgnore = member.getDeclaredAnnotation(JsonIgnore.class);
-        if (jsonIgnore != null && jsonIgnore.value()) {
-            return true;
-        }
-        return false;
-    }
-
     private boolean isDefaultVisibility(JsonAutoDetect.Visibility visibility) {
         return visibility.equals(JsonAutoDetect.Visibility.DEFAULT);
     }

diff --git a/spring-rest2ts-jax-rs/pom.xml b/spring-rest2ts-jax-rs/pom.xml
@@ -6,11 +6,21 @@
     <parent>
         <groupId>com.blue-veery</groupId>
         <artifactId>spring-rest2ts</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>spring-rest2ts-jax-rs</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
+    <description>
+        Typescript data model and services from rest generator for java spring. It supports generation for Angular and React
+    </description>
+    <url>https://github.com/blue-veery-gmbh/spring-rest-2-ts</url>
+
+    <organization>
+        <url>https://github.com/blue-veery-gmbh</url>
+        <name>blue veery GmbH</name>
+    </organization>
+    <inceptionYear>2019</inceptionYear>
 
     <dependencies>
         <dependency>

diff --git a/spring-rest2ts-spring-data/pom.xml b/spring-rest2ts-spring-data/pom.xml
@@ -6,11 +6,21 @@
     <parent>
         <groupId>com.blue-veery</groupId>
         <artifactId>spring-rest2ts</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>spring-rest2ts-spring-data</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
+    <description>
+        Typescript data model and services from rest generator for java spring. It supports generation for Angular and React
+    </description>
+    <url>https://github.com/blue-veery-gmbh/spring-rest-2-ts</url>
+
+    <organization>
+        <url>https://github.com/blue-veery-gmbh</url>
+        <name>blue veery GmbH</name>
+    </organization>
+    <inceptionYear>2019</inceptionYear>
 
     <dependencies>
         <dependency>

diff --git a/...c/main/java/com/blueveery/springrest2ts/converters/SpringDataRestConversionExtension.java b/...c/main/java/com/blueveery/springrest2ts/converters/SpringDataRestConversionExtension.java
@@ -62,7 +62,7 @@ public String generateImplementation(TSParameter tsParameter, String pathParamsL
 
         String forOfTemplate = "for(const %s of %s) {\n%s\n}";
         StringBuilder code = new StringBuilder();
-        code.append(String.format(arrayAssignment, queryParamsList, "number", tsParameter.getName() + ".pageNumber+''"));
+        code.append(String.format(arrayAssignment, queryParamsList, "page", tsParameter.getName() + ".pageNumber+''"));
         code.append(String.format(arrayAssignment, queryParamsList, "size", tsParameter.getName() + ".pageSize+''"));
 
         String sortField = tsParameter.getName() + ".sort.sortOrders";