Merge branch 'master' into codegen_issue_10240

HugoMario · web-flow · commit 80f52ea78872 · 2020-10-29T12:31:34.000-05:00
diff --git a/pom.xml b/pom.xml
@@ -260,7 +260,7 @@
         <felix-version>3.3.0</felix-version>
         <commons-io-version>2.4</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
-        <junit-version>4.8.1</junit-version>
+        <junit-version>4.13.1</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <commons-lang-version>3.4</commons-lang-version>
         <slf4j-version>1.7.12</slf4j-version>
diff --git a/src/main/resources/handlebars/Java/libraries/feign/pom.mustache b/src/main/resources/handlebars/Java/libraries/feign/pom.mustache
@@ -294,7 +294,7 @@
     {{#threetenbp}}
     <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
     {{/threetenbp}}
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <oltu-version>1.0.2</oltu-version>
   </properties>
diff --git a/src/main/resources/handlebars/Java/libraries/jersey2/pom.mustache b/src/main/resources/handlebars/Java/libraries/jersey2/pom.mustache
@@ -321,6 +321,6 @@
     {{/supportJava6}}
     <jackson-version>{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
   </properties>
 </project>
diff --git a/src/main/resources/handlebars/Java/libraries/okhttp-gson/pom.mustache b/src/main/resources/handlebars/Java/libraries/okhttp-gson/pom.mustache
@@ -299,7 +299,7 @@
     <threetenbp-version>1.3.5</threetenbp-version>
     {{/threetenbp}}
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/src/main/resources/handlebars/Java/libraries/resteasy/pom.mustache b/src/main/resources/handlebars/Java/libraries/resteasy/pom.mustache
@@ -249,6 +249,6 @@
     <commons_lang3_version>3.6</commons_lang3_version>
     {{/supportJava6}}
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
   </properties>
 </project>
diff --git a/src/main/resources/handlebars/Java/libraries/resttemplate/pom.mustache b/src/main/resources/handlebars/Java/libraries/resttemplate/pom.mustache
@@ -289,6 +289,6 @@
     <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
     {{/threetenbp}}
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
   </properties>
 </project>
diff --git a/src/main/resources/handlebars/Java/libraries/retrofit/pom.mustache b/src/main/resources/handlebars/Java/libraries/retrofit/pom.mustache
@@ -242,6 +242,6 @@
     <jodatime-version>2.9.9</jodatime-version>
     <oltu-version>1.0.2</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
   </properties>
 </project>
diff --git a/src/main/resources/handlebars/Java/libraries/retrofit2/pom.mustache b/src/main/resources/handlebars/Java/libraries/retrofit2/pom.mustache
@@ -345,6 +345,6 @@
     <threetenbp-version>1.3.5</threetenbp-version>
     {{/threetenbp}}
     <oltu-version>1.0.2</oltu-version>
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
   </properties>
 </project>
diff --git a/src/main/resources/handlebars/Java/pom.mustache b/src/main/resources/handlebars/Java/pom.mustache
@@ -324,6 +324,6 @@
     {{/supportJava6}}
     <jackson-version>{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
   </properties>
 </project>
diff --git a/src/main/resources/handlebars/JavaInflector/pom.mustache b/src/main/resources/handlebars/JavaInflector/pom.mustache
@@ -121,7 +121,7 @@
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <jetty-version>9.4.9.v20180320</jetty-version>
         <logback-version>1.0.1</logback-version>
-        <junit-version>4.8.2</junit-version>
+        <junit-version>4.13.1</junit-version>
         <slf4j-version>1.6.3</slf4j-version>
         <swagger-inflector-version>2.0.0</swagger-inflector-version>
     </properties>
diff --git a/src/main/resources/handlebars/JavaJaxRS/beanValidation.mustache b/src/main/resources/handlebars/JavaJaxRS/beanValidation.mustache
@@ -1,4 +1,16 @@
 {{#required}}
   @NotNull
 {{/required}}
-{{>beanValidationCore}}
+{{#is this 'container'}}
+{{#isNot this 'primitive-type'}}
+{{#isNot this 'enum'}}
+  @Valid
+{{/isNot}}
+{{/isNot}}
+{{/is}}
+{{#isNot this 'container'}}
+{{#isNot this 'primitive-type'}}
+  @Valid
+{{/isNot}}
+{{/isNot}}
+{{>beanValidationCore}}
diff --git a/src/main/resources/handlebars/JavaJaxRS/cxf-cdi/beanValidation.mustache b/src/main/resources/handlebars/JavaJaxRS/cxf-cdi/beanValidation.mustache
@@ -1,4 +1,16 @@
 {{#required}}
   @NotNull
 {{/required}}
-{{>beanValidationCore}}
+{{#isContainer}}
+{{^isPrimitiveType}}
+{{^isEnum}}
+  @Valid
+{{/isEnum}}
+{{/isPrimitiveType}}
+{{/isContainer}}
+{{#isNotContainer}}
+{{^isPrimitiveType}}
+  @Valid
+{{/isPrimitiveType}}
+{{/isNotContainer}}
+{{>beanValidationCore}}
diff --git a/src/main/resources/handlebars/JavaJaxRS/cxf/pom.mustache b/src/main/resources/handlebars/JavaJaxRS/cxf/pom.mustache
@@ -225,7 +225,7 @@
     <swagger-core-version>2.0.0</swagger-core-version>
     {{/useOas2}}
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
 {{#useBeanValidation}}
diff --git a/src/main/resources/handlebars/JavaJaxRS/cxf/server/pom.mustache b/src/main/resources/handlebars/JavaJaxRS/cxf/server/pom.mustache
@@ -286,7 +286,7 @@
     <swagger-core-version>2.0.0</swagger-core-version>
     {{/useOas2}}
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
 {{#useBeanValidation}}
diff --git a/src/main/resources/handlebars/JavaJaxRS/libraries/jersey1/pom.mustache b/src/main/resources/handlebars/JavaJaxRS/libraries/jersey1/pom.mustache
@@ -205,7 +205,7 @@
     <jersey-version>1.19.1</jersey-version>
     <jackson-version>2.8.9</jackson-version>
     <slf4j-version>1.7.21</slf4j-version>
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
     <servlet-api-version>2.5</servlet-api-version>
 {{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
diff --git a/src/main/resources/handlebars/JavaJaxRS/model.mustache b/src/main/resources/handlebars/JavaJaxRS/model.mustache
@@ -16,6 +16,7 @@ import java.io.Serializable;
 {{/serializableModel}}
 {{#useBeanValidation}}
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 {{/useBeanValidation}}
 {{/x-is-composed-model}}
 
diff --git a/src/main/resources/handlebars/JavaJaxRS/pom.mustache b/src/main/resources/handlebars/JavaJaxRS/pom.mustache
@@ -239,7 +239,7 @@
     <commons_io_version>2.5</commons_io_version>
     <commons_lang3_version>3.5</commons_lang3_version>
   {{/supportJava6}}
-    <junit-version>4.12</junit-version>
+    <junit-version>4.13.1</junit-version>
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
 {{#useBeanValidation}}
diff --git a/src/main/resources/handlebars/JavaJaxRS/resteasy/eap/pom.mustache b/src/main/resources/handlebars/JavaJaxRS/resteasy/eap/pom.mustache
@@ -247,7 +247,7 @@
         <jetty-version>9.3.27.v20190418</jetty-version>
         <resteasy-version>3.0.11.Final</resteasy-version>
         <slf4j-version>1.6.3</slf4j-version>
-        <junit-version>4.8.1</junit-version>
+        <junit-version>4.13.1</junit-version>
         <servlet-api-version>2.5</servlet-api-version>
     </properties>
 </project>
diff --git a/src/main/resources/handlebars/JavaJaxRS/resteasy/pom.mustache b/src/main/resources/handlebars/JavaJaxRS/resteasy/pom.mustache
@@ -221,7 +221,7 @@
         <jetty-version>9.3.27.v20190418</jetty-version>
         <resteasy-version>3.0.11.Final</resteasy-version>
         <slf4j-version>1.6.3</slf4j-version>
-        <junit-version>4.8.1</junit-version>
+        <junit-version>4.13.1</junit-version>
         <servlet-api-version>2.5</servlet-api-version>
         {{#java8}}<jackson-version>2.10.1</jackson-version>{{/java8}}
     </properties>
diff --git a/src/main/resources/handlebars/JavaJaxRS/spec/pom.mustache b/src/main/resources/handlebars/JavaJaxRS/spec/pom.mustache
@@ -95,6 +95,6 @@
 {{/useBeanValidation}}
   </dependencies>
   <properties>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.13.1</junit-version>
   </properties>
 </project>
diff --git a/src/main/resources/handlebars/JavaSpring/libraries/spring-mvc/pom.mustache b/src/main/resources/handlebars/JavaSpring/libraries/spring-mvc/pom.mustache
@@ -211,7 +211,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <jetty-version>9.3.28.v20191105</jetty-version>
         <slf4j-version>1.7.21</slf4j-version>
-        <junit-version>4.12</junit-version>
+        <junit-version>4.13.1</junit-version>
         <servlet-api-version>2.5</servlet-api-version>
         {{#useOas2}}
         <springfox-version>2.9.2</springfox-version>
diff --git a/src/main/resources/handlebars/codegen/pom.mustache b/src/main/resources/handlebars/codegen/pom.mustache
@@ -123,7 +123,7 @@
         <swagger-codegen-version>{{swaggerCodegenVersion}}</swagger-codegen-version>
         <swagger-codegen-generators-version>{{swaggerCodegenGeneratorsVersion}}</swagger-codegen-generators-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <junit-version>4.8.1</junit-version>
+        <junit-version>4.13.1</junit-version>
         <build-helper-maven-plugin>3.0.0</build-helper-maven-plugin>
     </properties>
 </project>
diff --git a/src/main/resources/handlebars/scala/client/pom.mustache b/src/main/resources/handlebars/scala/client/pom.mustache
@@ -245,7 +245,7 @@
         <maven-plugin.version>1.0.0</maven-plugin.version>
         <jackson-version>2.9.2</jackson-version>
 
-        <junit-version>4.12</junit-version>
+        <junit-version>4.13.1</junit-version>
         <scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
         <scala-test-version>3.0.4</scala-test-version>
         <swagger-async-httpclient-version>0.3.5</swagger-async-httpclient-version>
