v0.2.1

adrian-palanques-cloudappi · adrian-palanques-cloudappi · commit c906ef588570 · 2022-06-13T15:14:19.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.2.1] - 2022-06-13
+### Changed
+- Downgraded `reflections` version
+- Updated jpa entity relations to always be lazy by default
+- Fix delete endpoint generation to be able to generate no content responses 
+
 ## [0.2.0] - 2022-04-18
 ### Changed
 - Updated spring boot version to `2.6.6`
@@ -23,7 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial functional version of Apigen
 
-[unreleased]: https://github.com/apiaddicts/apigen/releases/tag/v0.2.0...HEAD
+[unreleased]: https://github.com/apiaddicts/apigen/releases/tag/v0.2.1...HEAD
+[0.2.1]: https://github.com/apiaddicts/apigen/releases/tag/v0.2.1
 [0.2.0]: https://github.com/apiaddicts/apigen/releases/tag/v0.2.0
 [0.1.1]: https://github.com/apiaddicts/apigen/releases/tag/v0.1.1
 [0.1.0]: https://github.com/apiaddicts/apigen/releases/tag/v0.1.0
diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md
@@ -10,7 +10,8 @@ In this version Apigen has been updated to be auto documented with `spring-doc`
 - Perform the Spring Boot migration from `2.4.x` to `2.6.x`
 - Remove the property `apigen.documentation.enabled`, now the documentation is managed by the `spring-doc` official properties
 
-[unreleased]: https://github.com/apiaddicts/apigen/releases/tag/v0.2.0...HEAD
+[unreleased]: https://github.com/apiaddicts/apigen/releases/tag/v0.2.1...HEAD
+[0.2.1]: https://github.com/apiaddicts/apigen/releases/tag/v0.2.1
 [0.2.0]: https://github.com/apiaddicts/apigen/releases/tag/v0.2.0
 [0.1.1]: https://github.com/apiaddicts/apigen/releases/tag/v0.1.1
 [0.1.0]: https://github.com/apiaddicts/apigen/releases/tag/v0.1.0
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ CloudAppi is one leader in APIs in global word. See the [CloudAPPi Services](htt
 version: "3.3"
 services:
   apigen:
-    image: "apiaddicts/apitools-apigen:0.2.0"
+    image: "apiaddicts/apitools-apigen:0.2.1"
     ports:
       - "8080:8080"
 ```
diff --git a/apigen-examples/simple-id-models/api-test.yaml b/apigen-examples/simple-id-models/api-test.yaml
@@ -78,12 +78,8 @@ paths:
       parameters:
         - $ref: "#/components/parameters/string_id_param"
       responses:
-        '200':
-          description: Ok
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/standard_response_owner"
+        '204':
+          description: No content
 
   /tags:
     x-apigen-binding:
@@ -181,12 +177,8 @@ paths:
       parameters:
         - $ref: "#/components/parameters/integer_id_param"
       responses:
-        '200':
-          description: Ok
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/standard_response_pet"
+        '204':
+          description: No content
 
   /pets/search:
     x-apigen-binding:
@@ -845,4 +837,4 @@ x-apigen-project:
   version: 1.0.0
   java-properties:
     group-id: the.group
-    artifact-id: app
+    artifact-id: app
diff --git a/archetype-parent-spring-boot/pom.xml b/archetype-parent-spring-boot/pom.xml
@@ -49,7 +49,7 @@
 
     <properties>
 
-        <revision>0.2.0</revision>
+        <revision>0.2.1</revision>
 
         <java.version>1.8</java.version>
         <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/config/extractors/ResponseExtractor.java b/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/config/extractors/ResponseExtractor.java
@@ -25,6 +25,11 @@ public Response getResponse(Operation operation) {
                 .filter(n -> n >= 200 && n <= 400)
                 .sorted()
                 .findFirst().orElse(0);
+
+        if (status == 204) {
+            return null;
+        }
+
         ApiResponse response = operation.getResponses().get(status == 0 ? "default" : String.valueOf(status));
 
         Response endpointResponse = new Response();
diff --git a/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/common/Members.java b/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/common/Members.java
@@ -5,6 +5,7 @@ public class Members {
     public static final String VALUE = "value";
     public static final String NAME = "name";
     public static final String MAPPED_BY = "mappedBy";
+    public static final String FETCH = "fetch";
     public static final String UNIQUE = "unique";
     public static final String SEQUENCE_NAME = "sequenceName";
     public static final String STRATEGY = "strategy";
diff --git a/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/persistence/relations/ManyToOneBuilder.java b/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/persistence/relations/ManyToOneBuilder.java
@@ -3,10 +3,15 @@
 import com.squareup.javapoet.AnnotationSpec;
 import lombok.extern.slf4j.Slf4j;
 
+import javax.persistence.FetchType;
 import javax.persistence.ManyToOne;
 
 import java.util.List;
 
+import static org.apiaddicts.apitools.apigen.generatorcore.generator.common.Formats.ENUM_VALUE;
+import static org.apiaddicts.apitools.apigen.generatorcore.generator.common.Formats.LITERAL;
+import static org.apiaddicts.apitools.apigen.generatorcore.generator.common.Members.FETCH;
+
 @Slf4j
 public class ManyToOneBuilder extends RelatedFieldBuilder {
 
@@ -18,7 +23,9 @@ public ManyToOneBuilder(List<ColumnRelation> columns) {
 
     @Override
     protected void initialize() {
-        annotations.add(AnnotationSpec.builder(ManyToOne.class).build());
+        annotations.add(AnnotationSpec.builder(ManyToOne.class)
+                .addMember(FETCH, ENUM_VALUE, FetchType.class, FetchType.LAZY.name())
+                .build());
         for (ColumnRelation cr : columns) {
             annotations.add(joinColumn(cr.getName(), cr.getReferencedName()));
         }
diff --git a/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/persistence/relations/OneToOneBuilder.java b/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/persistence/relations/OneToOneBuilder.java
@@ -2,9 +2,11 @@
 
 import com.squareup.javapoet.AnnotationSpec;
 
+import javax.persistence.FetchType;
 import javax.persistence.OneToOne;
 
-import static org.apiaddicts.apitools.apigen.generatorcore.generator.common.Formats.STRING;
+import static org.apiaddicts.apitools.apigen.generatorcore.generator.common.Formats.*;
+import static org.apiaddicts.apitools.apigen.generatorcore.generator.common.Members.FETCH;
 import static org.apiaddicts.apitools.apigen.generatorcore.generator.common.Members.MAPPED_BY;
 
 public class OneToOneBuilder extends RelatedFieldBuilder {
@@ -19,6 +21,7 @@ public OneToOneBuilder(String mappedByFieldName) {
     protected void initialize() {
         AnnotationSpec relationAnnotation = AnnotationSpec.builder(OneToOne.class)
                 .addMember(MAPPED_BY, STRING, mappedByFieldName)
+                .addMember(FETCH, ENUM_VALUE, FetchType.class, FetchType.LAZY.name())
                 .build();
         annotations.add(relationAnnotation);
     }
diff --git a/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/persistence/relations/OneToOneOwnerBuilder.java b/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/persistence/relations/OneToOneOwnerBuilder.java
@@ -2,10 +2,15 @@
 
 import com.squareup.javapoet.AnnotationSpec;
 
+import javax.persistence.FetchType;
 import javax.persistence.OneToOne;
 
 import java.util.List;
 
+import static org.apiaddicts.apitools.apigen.generatorcore.generator.common.Formats.ENUM_VALUE;
+import static org.apiaddicts.apitools.apigen.generatorcore.generator.common.Formats.LITERAL;
+import static org.apiaddicts.apitools.apigen.generatorcore.generator.common.Members.FETCH;
+
 public class OneToOneOwnerBuilder extends RelatedFieldBuilder {
 
     private List<ColumnRelation> columns;
@@ -16,7 +21,9 @@ public OneToOneOwnerBuilder(List<ColumnRelation> columns) {
 
     @Override
     protected void initialize() {
-        annotations.add(AnnotationSpec.builder(OneToOne.class).build());
+        annotations.add(AnnotationSpec.builder(OneToOne.class)
+                .addMember(FETCH, ENUM_VALUE, FetchType.class, FetchType.LAZY.name())
+                .build());
         for (ColumnRelation cr : columns) {
             annotations.add(joinColumn(cr.getName(), cr.getReferencedName()));
         }
diff --git a/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/web/controller/endpoints/CustomEndpointBuilder.java b/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/web/controller/endpoints/CustomEndpointBuilder.java
@@ -51,15 +51,17 @@ protected String getMapping() {
 
     @Override
     protected HttpStatus getResponseStatus() {
-        HttpStatus status = HttpStatus.resolve(endpoint.getResponse().getDefaultStatusCode());
+        HttpStatus status;
+        if (endpoint.getResponse() == null) status = HttpStatus.NO_CONTENT;
+        else status = HttpStatus.resolve(endpoint.getResponse().getDefaultStatusCode());
         if (status == null) status = HttpStatus.OK;
         return status;
     }
 
     @Override
     protected TypeName getReturnTypeName() {
         Response response = endpoint.getResponse();
-        if (response.getAttributes() == null) return null;
+        if (response == null || response.getAttributes() == null) return null;
 
         if (response.getIsStandard()) {
             return getStandardTypeName(response);
diff --git a/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/web/controller/endpoints/DeleteEndpointBuilder.java b/generator-core/src/main/java/org/apiaddicts/apitools/apigen/generatorcore/generator/web/controller/endpoints/DeleteEndpointBuilder.java
@@ -4,6 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apiaddicts.apitools.apigen.generatorcore.config.controller.Endpoint;
 import org.apiaddicts.apitools.apigen.generatorcore.utils.Mapping;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.DeleteMapping;
 
 @Slf4j
@@ -21,6 +22,11 @@ protected Class getMappingClass() {
         return DeleteMapping.class;
     }
 
+    @Override
+    protected HttpStatus getResponseStatus() {
+        return HttpStatus.NO_CONTENT;
+    }
+
     @Override
     protected String getMapping() {
         return mapping.getValue();
diff --git a/generator-core/src/test/java/org/apiaddicts/apitools/apigen/generatorcore/generator/persistence/EntitiesGeneratorTest.java b/generator-core/src/test/java/org/apiaddicts/apitools/apigen/generatorcore/generator/persistence/EntitiesGeneratorTest.java
@@ -108,8 +108,10 @@ void generateEntityWith_OneToMany_ManyToOne_Relation() {
 
         assertTrue(generatedEntityOneToMany.fieldSpecs.get(2).annotations.contains(AnnotationSpec.builder(OneToMany.class).addMember("mappedBy", "$S", "manyToOneRelationAttribute").build()), "Checking if Entity1 contains @OneToMany annotation:");
 
-        assertTrue(generatedEntityManyToOne.fieldSpecs.get(0).annotations.contains(AnnotationSpec.builder(ManyToOne.class).build()), "Checking if Entity2 contains @ManyToOne annotation:");
-        assertTrue(generatedEntityManyToOne.fieldSpecs.get(0).annotations.contains(AnnotationSpec.builder(JoinColumn.class).addMember("name", "$S", "manyToOneRelationColumn").build()), "Checking if Entity2 contains @JoinColumn annotation:");
+        assertEquals("[" +
+                "@javax.persistence.ManyToOne(fetch = javax.persistence.FetchType.LAZY)," +
+                " @javax.persistence.JoinColumn(name = \"manyToOneRelationColumn\")" +
+                "]", generatedEntityManyToOne.fieldSpecs.get(0).annotations.toString());
     }
 
     @Test
@@ -149,10 +151,13 @@ void generateEntityWith_OneToOne_Relation() {
         assertEquals(testEntitiesList.get(0).getName(), generatedEntityOneToOneOwner.name, "Checking if Entity name matches given name:");
         assertEquals(testEntitiesList.get(1).getName(), generatedEntityOneToOne.name, "Checking if Entity name matches given name:");
 
-        assertTrue(generatedEntityOneToOneOwner.fieldSpecs.get(0).annotations.contains(AnnotationSpec.builder(OneToOne.class).build()), "Checking if Entity1 contains @OneToOne annotation:");
-        assertTrue(generatedEntityOneToOneOwner.fieldSpecs.get(0).annotations.contains(AnnotationSpec.builder(JoinColumn.class).addMember("name", "$S", "oneToOneOwnerRelationColumn").build()), "Checking if Entity1 contains @JoinColumn annotation:");
-
-        assertTrue(generatedEntityOneToOne.fieldSpecs.get(0).annotations.contains(AnnotationSpec.builder(OneToOne.class).addMember("mappedBy", "$S", "oneToOneOwnerRelationAttribute").build()), "Checking if Entity2 contains @OneToOne annotation:");
+        assertEquals("[" +
+                "@javax.persistence.OneToOne(fetch = javax.persistence.FetchType.LAZY)," +
+                " @javax.persistence.JoinColumn(name = \"oneToOneOwnerRelationColumn\")" +
+                "]", generatedEntityOneToOneOwner.fieldSpecs.get(0).annotations.toString());
+        assertEquals("[" +
+                "@javax.persistence.OneToOne(mappedBy = \"oneToOneOwnerRelationAttribute\", fetch = javax.persistence.FetchType.LAZY)" +
+                "]", generatedEntityOneToOne.fieldSpecs.get(0).annotations.toString());
     }
 
     private TypeSpec setValidationTest() {
diff --git a/generator-core/src/test/java/org/apiaddicts/apitools/apigen/generatorcore/generator/persistence/EntityRelationManagerTest.java b/generator-core/src/test/java/org/apiaddicts/apitools/apigen/generatorcore/generator/persistence/EntityRelationManagerTest.java
@@ -23,9 +23,9 @@ void manyToOne() {
         m.applyRelation("One", entity.getAttributes().get(0), builder);
 
         assertEquals("[" +
-                        "@javax.persistence.ManyToOne, " +
+                        "@javax.persistence.ManyToOne(fetch = javax.persistence.FetchType.LAZY), " +
                         "@javax.persistence.JoinColumn(name = \"column\")" +
                         "]",
                 builder.annotations.toString());
     }
-}
+}
diff --git a/generator-core/src/test/java/org/apiaddicts/apitools/apigen/generatorcore/generator/web/controller/endpoints/DeleteEndpointBuilderTests.java b/generator-core/src/test/java/org/apiaddicts/apitools/apigen/generatorcore/generator/web/controller/endpoints/DeleteEndpointBuilderTests.java
@@ -69,7 +69,7 @@ void givenDeleteEndpointBuilder_whenBuild_thenHaveMethodSpecIsCorrect() {
         AnnotationSpec annotationSpec = methodSpec.annotations.get(0);
         assertEquals("@org.springframework.web.bind.annotation.DeleteMapping(\"/{id}\")", annotationSpec.toString());
         annotationSpec = methodSpec.annotations.get(1);
-        assertEquals("@org.springframework.web.bind.annotation.ResponseStatus(code = org.springframework.http.HttpStatus.OK)", annotationSpec.toString());
+        assertEquals("@org.springframework.web.bind.annotation.ResponseStatus(code = org.springframework.http.HttpStatus.NO_CONTENT)", annotationSpec.toString());
         assertEquals(1, methodSpec.modifiers.size());
         assertEquals("[public]", methodSpec.modifiers.toString());
 
diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
 
     <properties>
 
-        <revision>0.2.0</revision>
+        <revision>0.2.1</revision>
 
         <java.version>1.8</java.version>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -65,7 +65,7 @@
         <swagger-parser.version>2.0.32</swagger-parser.version>
         <beanutils.version>1.9.4</beanutils.version>
         <mapstruct.version>1.3.1.Final</mapstruct.version>
-        <reflections.version>0.10.2</reflections.version>
+        <reflections.version>0.9.11</reflections.version>
         <springdoc.version>1.6.7</springdoc.version>
 
         <jacoco.maven.plugin.version>0.8.8</jacoco.maven.plugin.version>
