Merge pull request #13368 from gsmet/1.10.0-backports-3

1.10.0 backports 3
quarkusio · Nov 19, 2020 · 39d4acd · 39d4acd
2 parents 8d6e0f5 + 6ec9c4a
commit 39d4acd
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 59 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -88,7 +88,7 @@
         <commons-lang3.version>3.9</commons-lang3.version>
         <commons-codec.version>1.14</commons-codec.version>
         <classmate.version>1.3.4</classmate.version>
-        <hibernate-orm.version>5.4.23.Final</hibernate-orm.version>
+        <hibernate-orm.version>5.4.24.Final</hibernate-orm.version>
         <hibernate-reactive.version>1.0.0.Alpha11</hibernate-reactive.version>
         <hibernate-validator.version>6.1.6.Final</hibernate-validator.version>
         <hibernate-search.version>6.0.0.CR1</hibernate-search.version>

diff --git a/...r-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/codestart.yml b/...r-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/codestart.yml
@@ -5,9 +5,9 @@ language:
   base:
     data:
       resource:
-        class-name: ExampleResource
-        path: "/resteasy/hello"
-        response: "hello"
+        class-name: GreetingResource
+        path: "/hello-resteasy"
+        response: "Hello RESTEasy"
     dependencies:
       - io.quarkus:quarkus-resteasy
 
diff --git a/...esources/codestarts/quarkus-jbang/project/quarkus-jbang/base/README.tpl.qute.md b/...esources/codestarts/quarkus-jbang/project/quarkus-jbang/base/README.tpl.qute.md
@@ -1,5 +1,5 @@
 # JBang Quarkus Project
 
 ```shell script
-./jbang src/ExampleResource.java 
+./jbang src/GreetingResource.java 
 ```
diff --git a/...son/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/codestart.yml b/...son/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/codestart.yml
@@ -7,9 +7,9 @@ language:
     data:
       main:
         class-name: HelloCommando
-      package-name: org.acme.commandmode
+      package-name: org.acme
       greeting:
-        message: "hello"
-        default-name: "commando"
+        message: "Hello"
+        default-name: "Commando"
     dependencies:
       - io.quarkus:quarkus-arc
diff --git a/...r-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/codestart.yml b/...r-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/codestart.yml
@@ -9,10 +9,10 @@ language:
       description: |
         <p>A Hello World RESTEasy resource</p>
       resource:
-        class-name: ExampleResource
-        path: "/resteasy/hello"
-        response: "hello"
-      package-name: org.acme.resteasy
+        class-name: GreetingResource
+        path: "/hello-resteasy"
+        response: "Hello RESTEasy"
+      package-name: org.acme
       guide: https://quarkus.io/guides/rest-json
     dependencies:
       - io.quarkus:quarkus-resteasy

diff --git a/...json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/codestart.yml b/...json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/codestart.yml
@@ -9,10 +9,10 @@ language:
       description: |
         <p>A Hello World Spring Web Controller</p>
       resource:
-        class-name: ExampleController
-        path: "/springweb/hello"
-        response: "hello"
-      package-name: org.acme.spring.web
+        class-name: SpringGreetingController
+        path: "/hello-spring"
+        response: "Hello Spring"
+      package-name: org.acme
       guide: https://quarkus.io/guides/spring-web
     dependencies:
       - io.quarkus:quarkus-spring-web

diff --git a/...c/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java b/...c/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java
@@ -30,7 +30,7 @@ void generateDefaultProject() throws IOException {
         getCatalog().createProject(input).generate(projectDir);
 
         assertThat(projectDir.resolve("jbang")).exists();
-        assertThat(projectDir.resolve("src/ExampleResource.java")).exists();
+        assertThat(projectDir.resolve("src/GreetingResource.java")).exists();
 
     }
 

diff --git a/.../src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java b/.../src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java
@@ -94,7 +94,7 @@ void generateCommandMode() throws IOException {
         checkDockerfiles(projectDir, BuildTool.MAVEN);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/java/org/acme/commandmode/HelloCommando.java")).exists();
+        assertThat(projectDir.resolve("src/main/java/org/acme/HelloCommando.java")).exists();
     }
 
     @Test
@@ -169,18 +169,18 @@ void generateRESTEasySpringWeb() throws IOException {
         checkDockerfiles(projectDir, BuildTool.MAVEN);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/java/org/acme/resteasy/ExampleResource.java")).exists();
-        assertThat(projectDir.resolve("src/test/java/org/acme/resteasy/ExampleResourceTest.java")).exists();
-        assertThat(projectDir.resolve("src/test/java/org/acme/resteasy/NativeExampleResourceIT.java")).exists();
+        assertThat(projectDir.resolve("src/main/java/org/acme/GreetingResource.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/GreetingResourceTest.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/NativeGreetingResourceIT.java")).exists();
 
-        assertThat(projectDir.resolve("src/main/java/org/acme/spring/web/ExampleController.java")).exists();
-        assertThat(projectDir.resolve("src/test/java/org/acme/spring/web/ExampleControllerTest.java")).exists();
-        assertThat(projectDir.resolve("src/test/java/org/acme/spring/web/NativeExampleControllerIT.java")).exists();
+        assertThat(projectDir.resolve("src/main/java/org/acme/SpringGreetingController.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/SpringGreetingControllerTest.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/NativeSpringGreetingControllerIT.java")).exists();
 
         assertThat(projectDir.resolve("src/main/resources/META-INF/resources/index.html")).exists()
-                .satisfies(checkContains("\"/resteasy/hello\""))
+                .satisfies(checkContains("\"/hello-resteasy\""))
                 .satisfies(checkContains("quarkus.io/guides/rest-json"))
-                .satisfies(checkContains("\"/springweb/hello\""))
+                .satisfies(checkContains("\"/hello-spring\""))
                 .satisfies(checkContains("quarkus.io/guides/spring-web"));
     }
 
@@ -287,9 +287,9 @@ void generateMavenDefaultJava() throws IOException {
         checkDockerfiles(projectDir, BuildTool.MAVEN);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/java/org/acme/resteasy/ExampleResource.java")).exists();
-        assertThat(projectDir.resolve("src/test/java/org/acme/resteasy/ExampleResourceTest.java")).exists();
-        assertThat(projectDir.resolve("src/test/java/org/acme/resteasy/NativeExampleResourceIT.java")).exists();
+        assertThat(projectDir.resolve("src/main/java/org/acme/GreetingResource.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/GreetingResourceTest.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/NativeGreetingResourceIT.java")).exists();
     }
 
     @Test
@@ -306,9 +306,9 @@ void generateMavenResteasyJava() throws IOException {
         checkDockerfiles(projectDir, BuildTool.MAVEN);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/java/org/acme/resteasy/ExampleResource.java")).exists();
-        assertThat(projectDir.resolve("src/test/java/org/acme/resteasy/ExampleResourceTest.java")).exists();
-        assertThat(projectDir.resolve("src/test/java/org/acme/resteasy/NativeExampleResourceIT.java")).exists();
+        assertThat(projectDir.resolve("src/main/java/org/acme/GreetingResource.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/GreetingResourceTest.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/NativeGreetingResourceIT.java")).exists();
     }
 
     @Test
@@ -343,9 +343,9 @@ void generateMavenResteasyKotlin() throws IOException {
         checkDockerfiles(projectDir, BuildTool.MAVEN);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/kotlin/org/acme/resteasy/ExampleResource.kt")).exists();
-        assertThat(projectDir.resolve("src/test/kotlin/org/acme/resteasy/ExampleResourceTest.kt")).exists();
-        assertThat(projectDir.resolve("src/test/kotlin/org/acme/resteasy/NativeExampleResourceIT.kt")).exists();
+        assertThat(projectDir.resolve("src/main/kotlin/org/acme/GreetingResource.kt")).exists();
+        assertThat(projectDir.resolve("src/test/kotlin/org/acme/GreetingResourceTest.kt")).exists();
+        assertThat(projectDir.resolve("src/test/kotlin/org/acme/NativeGreetingResourceIT.kt")).exists();
     }
 
     @Test
@@ -363,9 +363,9 @@ void generateMavenResteasyScala() throws IOException {
         checkDockerfiles(projectDir, BuildTool.MAVEN);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/scala/org/acme/resteasy/ExampleResource.scala")).exists();
-        assertThat(projectDir.resolve("src/test/scala/org/acme/resteasy/ExampleResourceTest.scala")).exists();
-        assertThat(projectDir.resolve("src/test/scala/org/acme/resteasy/NativeExampleResourceIT.scala")).exists();
+        assertThat(projectDir.resolve("src/main/scala/org/acme/GreetingResource.scala")).exists();
+        assertThat(projectDir.resolve("src/test/scala/org/acme/GreetingResourceTest.scala")).exists();
+        assertThat(projectDir.resolve("src/test/scala/org/acme/NativeGreetingResourceIT.scala")).exists();
     }
 
     @Test
@@ -384,9 +384,9 @@ void generateGradleResteasyJava() throws IOException {
         checkDockerfiles(projectDir, BuildTool.GRADLE);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/java/org/acme/resteasy/ExampleResource.java")).exists();
-        assertThat(projectDir.resolve("src/test/java/org/acme/resteasy/ExampleResourceTest.java")).exists();
-        assertThat(projectDir.resolve("src/native-test/java/org/acme/resteasy/NativeExampleResourceIT.java")).exists();
+        assertThat(projectDir.resolve("src/main/java/org/acme/GreetingResource.java")).exists();
+        assertThat(projectDir.resolve("src/test/java/org/acme/GreetingResourceTest.java")).exists();
+        assertThat(projectDir.resolve("src/native-test/java/org/acme/NativeGreetingResourceIT.java")).exists();
     }
 
     @Test
@@ -406,9 +406,9 @@ void generateGradleResteasyKotlin() throws IOException {
         checkDockerfiles(projectDir, BuildTool.GRADLE);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/kotlin/org/acme/resteasy/ExampleResource.kt")).exists();
-        assertThat(projectDir.resolve("src/test/kotlin/org/acme/resteasy/ExampleResourceTest.kt")).exists();
-        assertThat(projectDir.resolve("src/native-test/kotlin/org/acme/resteasy/NativeExampleResourceIT.kt")).exists();
+        assertThat(projectDir.resolve("src/main/kotlin/org/acme/GreetingResource.kt")).exists();
+        assertThat(projectDir.resolve("src/test/kotlin/org/acme/GreetingResourceTest.kt")).exists();
+        assertThat(projectDir.resolve("src/native-test/kotlin/org/acme/NativeGreetingResourceIT.kt")).exists();
     }
 
     @Test
@@ -427,9 +427,9 @@ void generateGradleResteasyScala() throws IOException {
         checkDockerfiles(projectDir, BuildTool.GRADLE);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/scala/org/acme/resteasy/ExampleResource.scala")).exists();
-        assertThat(projectDir.resolve("src/test/scala/org/acme/resteasy/ExampleResourceTest.scala")).exists();
-        assertThat(projectDir.resolve("src/native-test/scala/org/acme/resteasy/NativeExampleResourceIT.scala")).exists();
+        assertThat(projectDir.resolve("src/main/scala/org/acme/GreetingResource.scala")).exists();
+        assertThat(projectDir.resolve("src/test/scala/org/acme/GreetingResourceTest.scala")).exists();
+        assertThat(projectDir.resolve("src/native-test/scala/org/acme/NativeGreetingResourceIT.scala")).exists();
     }
 
     @Test
@@ -447,7 +447,7 @@ void generateGradleWithKotlinDslResteasyJava() throws IOException {
         checkDockerfiles(projectDir, BuildTool.GRADLE_KOTLIN_DSL);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/java/org/acme/resteasy/ExampleResource.java")).exists();
+        assertThat(projectDir.resolve("src/main/java/org/acme/GreetingResource.java")).exists();
     }
 
     @Test
@@ -466,7 +466,7 @@ void generateGradleWithKotlinDslResteasyKotlin() throws IOException {
         checkDockerfiles(projectDir, BuildTool.GRADLE_KOTLIN_DSL);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/kotlin/org/acme/resteasy/ExampleResource.kt")).exists();
+        assertThat(projectDir.resolve("src/main/kotlin/org/acme/GreetingResource.kt")).exists();
     }
 
     @Test
@@ -485,7 +485,7 @@ void generateGradleWithKotlinDslResteasyScala() throws IOException {
         checkDockerfiles(projectDir, BuildTool.GRADLE_KOTLIN_DSL);
         checkConfigProperties(projectDir);
 
-        assertThat(projectDir.resolve("src/main/scala/org/acme/resteasy/ExampleResource.scala")).exists();
+        assertThat(projectDir.resolve("src/main/scala/org/acme/GreetingResource.scala")).exists();
     }
 
     @Test

diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java
@@ -109,16 +109,16 @@ public void createRESTEasyAndSpringWeb() throws Exception {
                 .satisfies(checkContains("<artifactId>quarkus-spring-web</artifactId>"))
                 .satisfies(checkContains("<artifactId>quarkus-resteasy</artifactId>"));
 
-        assertThat(projectDir.resolve("src/main/java/org/acme/spring/web/ExampleController.java"))
+        assertThat(projectDir.resolve("src/main/java/org/acme/SpringGreetingController.java"))
                 .exists()
                 .satisfies(checkContains("@RestController"))
-                .satisfies(checkContains("class ExampleController"))
-                .satisfies(checkContains("@RequestMapping(\"/springweb/hello\")"));
+                .satisfies(checkContains("class SpringGreetingController"))
+                .satisfies(checkContains("@RequestMapping(\"/hello-spring\")"));
 
-        assertThat(projectDir.resolve("src/main/java/org/acme/resteasy/ExampleResource.java"))
+        assertThat(projectDir.resolve("src/main/java/org/acme/GreetingResource.java"))
                 .exists()
-                .satisfies(checkContains("class ExampleResource"))
-                .satisfies(checkContains("@Path(\"/resteasy/hello\")"));
+                .satisfies(checkContains("class GreetingResource"))
+                .satisfies(checkContains("@Path(\"/hello-resteasy\")"));
     }
 
     @Test

diff --git a/...hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/TestEndpoint.kt b/...hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/TestEndpoint.kt
@@ -884,7 +884,7 @@ class TestEndpoint {
         Person.deleteAll()
         Assertions.assertEquals(0, Person.count())
 
-        val person: Person = makeSavedPerson()
+        val person: Person = makeSavedPerson("")
         val trackingPerson = person as SelfDirtinessTracker
 
         var dirtyAttributes = trackingPerson.`$$_hibernate_getDirtyAttributes`()

diff --git a/...gration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java b/...gration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java
@@ -1054,7 +1054,7 @@ private void checkMethod(Class<?> klass, String name, Class<?> returnType, Class
     public String testModel1() {
         Assertions.assertEquals(0, Person.count());
 
-        Person person = makeSavedPerson();
+        Person person = makeSavedPerson("");
         SelfDirtinessTracker trackingPerson = (SelfDirtinessTracker) person;
 
         String[] dirtyAttributes = trackingPerson.$$_hibernate_getDirtyAttributes();

diff --git a/...hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java b/...hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java
@@ -1365,7 +1365,7 @@ public Uni<String> testModel1() {
                 .flatMap(count -> {
                     Assertions.assertEquals(0, count);
 
-                    return makeSavedPerson();
+                    return makeSavedPerson("");
                 }).flatMap(person -> {
                     SelfDirtinessTracker trackingPerson = (SelfDirtinessTracker) person;