Merge branch 'dev_javaplugin'

devonfw · Aug 26, 2020 · 85cc269 · 85cc269
2 parents e066379 + 3f7b0e8
commit 85cc269
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin-model/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>javaplugin-model</artifactId>
-  <version>2.2.2</version>
+  <version>2.2.3</version>
   <name>CobiGen Javaplugin Model</name>
   <packaging>jar</packaging>
   <description>CobiGen - Java Plug-in Model</description>

diff --git a/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml b/cobigen/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>javaplugin</artifactId>
   <name>CobiGen - Java Plug-in</name>
-  <version>2.2.2</version>
+  <version>2.2.3</version>
   <packaging>jar</packaging>
   <description>CobiGen - Java Plug-in</description>
 

diff --git a/.../main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableModelBuilder.java b/.../main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableModelBuilder.java
@@ -474,7 +474,7 @@ public void addParameter(FieldDef fieldDef) {
         if (currentMethod != null) {
             jParam.setExecutable(currentMethod);
         } else {
-            jParam.setExecutable(currentMethod);
+            jParam.setExecutable(currentConstructor);
         }
         jParam.setModelWriterFactory(modelWriterFactory);
         addJavaDoc(jParam);

diff --git a/...igen-javaplugin/src/test/resources/testdata/integrationtest/javaSources/SampleEntity.java b/...igen-javaplugin/src/test/resources/testdata/integrationtest/javaSources/SampleEntity.java
@@ -1,10 +1,13 @@
 package io.oasp.gastronomy.restaurant.tablemanagement.dataaccess.api;
 
+import javax.annotation.Nonnull;
 /**
  * Sample Entity without detail variable assignment variables.detail.
  */
 public class SampleEntity {
 
     private List<String> testField;
 
+    public SampleEntity(@Nonnull io.oasp.gastronomy.restaurant.tablemanagement.dataaccess.api.SampleEntity sampleEntity) {
+    }
 }
diff --git a/documentation/master-cobigen.asciidoc b/documentation/master-cobigen.asciidoc
@@ -18,7 +18,7 @@ DISCLAIMER: All Cobigen plugins are compatible with the latest release of Devonf
 ---
 
 * CobiGen v6.1.2
-* CobiGen - Java Plug-in v2.2.2
+* CobiGen - Java Plug-in v2.2.3
 * CobiGen - XML Plug-in v4.2.0
 * CobiGen - TypeScript Plug-in v2.4.3
 * CobiGen - Property Plug-in v2.1.0