Merge pull request #41934 from gsmet/3.12.3-backports-1

[3.12] 3.12.3 backports 1

.mvn/extensions.xml

@@ -12,7 +12,7 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>quarkus-build-caching-extension</artifactId>
-        <version>1.2</version>
+        <version>1.6</version>
     </extension>
     <extension>
         <groupId>io.quarkus.develocity</groupId>

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java

@@ -788,6 +788,7 @@ public NativeImageInvokerInfo build() {
                  * control its actual inclusion which will depend on the usual analysis.
                  */
                 nativeImageArgs.add("-J--add-exports=java.security.jgss/sun.security.krb5=ALL-UNNAMED");
+                nativeImageArgs.add("-J--add-exports=java.security.jgss/sun.security.jgss=ALL-UNNAMED");
 
                 //address https://github.com/quarkusio/quarkus-quickstarts/issues/993
                 nativeImageArgs.add("-J--add-opens=java.base/java.text=ALL-UNNAMED");

devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/dependency/ConditionalDependenciesEnabler.java

@@ -170,8 +170,7 @@ private void queueConditionalDependency(ExtensionDependency<?> extension, Depend
     private Configuration createConditionalDependenciesConfiguration(Project project, Dependency conditionalDep) {
         // previously we used a detached configuration here but apparently extendsFrom(enforcedPlatforms)
         // wouldn't actually enforce platforms on a detached configuration
-        final String name = conditionalDep.getGroup() + ":" + conditionalDep.getName() + ":" + conditionalDep.getVersion()
-                + "Configuration";
+        var name = getConditionalConfigurationName(conditionalDep);
         var config = project.getConfigurations().findByName(name);
         if (config == null) {
             project.getConfigurations().register(name, configuration -> {
@@ -184,6 +183,31 @@ private Configuration createConditionalDependenciesConfiguration(Project project
         return config;
     }
 
+    private static String getConditionalConfigurationName(Dependency conditionalDep) {
+        var name = new StringBuilder().append("quarkusConditional");
+        appendCapitalized(name, conditionalDep.getGroup());
+        appendCapitalized(name, conditionalDep.getName());
+        appendCapitalized(name, conditionalDep.getVersion());
+        return name.append("Configuration").toString();
+    }
+
+    private static void appendCapitalized(StringBuilder sb, String part) {
+        if (part != null && !part.isEmpty()) {
+            boolean toUpperCase = true;
+            for (int i = 0; i < part.length(); ++i) {
+                var c = part.charAt(i);
+                if (toUpperCase) {
+                    sb.append(Character.toUpperCase(c));
+                    toUpperCase = false;
+                } else if (c == '.' || c == '-') {
+                    toUpperCase = true;
+                } else {
+                    sb.append(c);
+                }
+            }
+        }
+    }
+
     private void enableConditionalDependency(ModuleVersionIdentifier dependency) {
         final Set<ExtensionDependency<?>> extensions = featureVariants.remove(getFeatureKey(dependency));
         if (extensions == null) {

docs/src/main/asciidoc/rest.adoc

@@ -1420,10 +1420,11 @@ public class Person {
     @SecureField(rolesAllowed = "${role:admin}")                 <1>
     private String address;
 
-    public Person(Long id, String first, String last) {
+    public Person(Long id, String first, String last, String address) {
         this.id = id;
         this.first = first;
         this.last = last;
+        this.address = address;
     }
 
     public Long getId() {
@@ -1466,7 +1467,7 @@ import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Response;
 
 @Path("person")
-public class Person {
+public class PersonResource {
 
     @Path("{id}")
     @GET

docs/src/main/asciidoc/security-openid-connect-client-reference.adoc

@@ -363,8 +363,7 @@ import io.quarkus.runtime.StartupEvent;
 import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Observes;
-import jakarta.i
-nject.Inject;
+import jakarta.inject.Inject;
 
 @ApplicationScoped
 public class OidcClientCreator {

extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/AbstractInputCollectionOutputCollection.java

@@ -0,0 +1,20 @@
+package io.quarkus.amazon.lambda.deployment.testing;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+
+import io.quarkus.amazon.lambda.deployment.testing.model.InputPerson;
+import io.quarkus.amazon.lambda.deployment.testing.model.OutputPerson;
+
+public abstract class AbstractInputCollectionOutputCollection implements RequestHandler<List<InputPerson>, List<OutputPerson>> {
+
+    @Override
+    public List<OutputPerson> handleRequest(List<InputPerson> inputPeronList, Context context) {
+        List<OutputPerson> personList = new ArrayList<>();
+        inputPeronList.forEach(person -> personList.add(new OutputPerson(person.getName())));
+        return personList;
+    }
+}

extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/AbstractInputCollectionOutputCollectionLambdaImpl.java

@@ -0,0 +1,5 @@
+package io.quarkus.amazon.lambda.deployment.testing;
+
+public class AbstractInputCollectionOutputCollectionLambdaImpl extends AbstractInputCollectionOutputCollection {
+
+}

extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/AbstractInputCollectionOutputCollectionLambdaImplTest.java

@@ -0,0 +1,46 @@
+package io.quarkus.amazon.lambda.deployment.testing;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.hasEntry;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.amazon.lambda.deployment.testing.model.InputPerson;
+import io.quarkus.amazon.lambda.deployment.testing.model.OutputPerson;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class AbstractInputCollectionOutputCollectionLambdaImplTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap
+            .create(JavaArchive.class)
+            .addClasses(AbstractInputCollectionOutputCollectionLambdaImpl.class, AbstractInputCollectionOutputCollection.class,
+                    InputPerson.class, OutputPerson.class));
+
+    @Test
+    void abstractRequestHandler_InputCollectionInputPerson_OutputCollectionOutputPerson() {
+
+        List<InputPerson> personList = new ArrayList<>();
+        personList.add(new InputPerson("Chris"));
+        personList.add(new InputPerson("Fred"));
+
+        given()
+                .body(personList)
+                .when()
+                .post()
+                .then()
+                .statusCode(200)
+                .body("", hasItem(hasEntry("outputname", "Chris"))) // OutputPerson serializes name with key outputname
+                .body("", hasItem(hasEntry("outputname", "Fred")))
+                .body("", not(hasItem(hasEntry("name", "Chris")))) // make sure that there is no key name
+                .body("", not(hasItem(hasEntry("name", "Fred"))));
+    }
+}

extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/GreetingLambda.java

@@ -3,10 +3,12 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 
-public class GreetingLambda implements RequestHandler<Person, String> {
+import io.quarkus.amazon.lambda.deployment.testing.model.InputPerson;
+
+public class GreetingLambda implements RequestHandler<InputPerson, String> {
 
     @Override
-    public String handleRequest(Person input, Context context) {
+    public String handleRequest(InputPerson input, Context context) {
         return "Hey " + input.getName();
     }
 }

extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/GreetingLambdaTest.java

@@ -0,0 +1,38 @@
+package io.quarkus.amazon.lambda.deployment.testing;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.amazon.lambda.deployment.testing.model.InputPerson;
+import io.quarkus.test.QuarkusUnitTest;
+
+class GreetingLambdaTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap
+            .create(JavaArchive.class)
+            .addClasses(GreetingLambda.class, InputPerson.class));
+
+    @Test
+    public void requestHandler_InputPerson_OutputString() throws Exception {
+        // you test your lambdas by invoking on http://localhost:8081
+        // this works in dev mode too
+
+        InputPerson in = new InputPerson("Stu");
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(in)
+                .when()
+                .post()
+                .then()
+                .statusCode(200)
+                .body(containsString("Hey Stu"));
+    }
+
+}

extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/InputCollectionOutputCollectionLambda.java

@@ -0,0 +1,24 @@
+package io.quarkus.amazon.lambda.deployment.testing;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+
+import io.quarkus.amazon.lambda.deployment.testing.model.InputPerson;
+import io.quarkus.amazon.lambda.deployment.testing.model.OutputPerson;
+
+public class InputCollectionOutputCollectionLambda implements RequestHandler<List<InputPerson>, List<OutputPerson>> {
+
+    @Override
+    public List<OutputPerson> handleRequest(List<InputPerson> people, Context context) {
+
+        List<OutputPerson> outputPeople = new ArrayList<>();
+        people.forEach((person) -> {
+            outputPeople.add(new OutputPerson(person.getName()));
+        });
+
+        return outputPeople;
+    }
+}

extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/InputCollectionOutputCollectionLambdaTest.java

@@ -0,0 +1,45 @@
+package io.quarkus.amazon.lambda.deployment.testing;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.hasEntry;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.amazon.lambda.deployment.testing.model.InputPerson;
+import io.quarkus.amazon.lambda.deployment.testing.model.OutputPerson;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class InputCollectionOutputCollectionLambdaTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap
+            .create(JavaArchive.class)
+            .addClasses(InputCollectionOutputCollectionLambda.class, InputPerson.class, OutputPerson.class));
+
+    @Test
+    void requestHandler_InputCollectionInputPerson_OutputCollectionOutputPerson() {
+
+        List<InputPerson> personList = new ArrayList<>();
+        personList.add(new InputPerson("Chris"));
+        personList.add(new InputPerson("Fred"));
+
+        given()
+                .body(personList)
+                .when()
+                .post()
+                .then()
+                .statusCode(200)
+                .body("", hasItem(hasEntry("outputname", "Chris"))) // OutputPerson serializes name with key outputname
+                .body("", hasItem(hasEntry("outputname", "Fred")))
+                .body("", not(hasItem(hasEntry("name", "Chris")))) // make sure that there is no key name
+                .body("", not(hasItem(hasEntry("name", "Fred"))));
+    }
+}

extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaDevServicesContinuousTestingTestCase.java

@@ -10,6 +10,8 @@
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.amazon.lambda.deployment.testing.model.InputPerson;
+import io.quarkus.amazon.lambda.deployment.testing.model.OutputPerson;
 import io.quarkus.test.ContinuousTestingTestUtils;
 import io.quarkus.test.QuarkusDevModeTest;
 
@@ -21,7 +23,7 @@ public class LambdaDevServicesContinuousTestingTestCase {
                 @Override
                 public JavaArchive get() {
                     return ShrinkWrap.create(JavaArchive.class)
-                            .addClasses(GreetingLambda.class, Person.class)
+                            .addClasses(GreetingLambda.class, InputPerson.class, OutputPerson.class)
                             .addAsResource(
                                     new StringAsset(ContinuousTestingTestUtils.appProperties(
                                             "quarkus.log.category.\"io.quarkus.amazon.lambda.runtime\".level=DEBUG")),
@@ -30,7 +32,7 @@ public JavaArchive get() {
             }).setTestArchiveProducer(new Supplier<>() {
                 @Override
                 public JavaArchive get() {
-                    return ShrinkWrap.create(JavaArchive.class).addClass(LambdaHandlerET.class);
+                    return ShrinkWrap.create(JavaArchive.class).addClass(GreetingLambdaTest.class);
                 }
             });
 
@@ -45,7 +47,7 @@ public void testLambda() throws Exception {
         result = utils.waitForNextCompletion();
         Assertions.assertEquals(0, result.getTotalTestsPassed());
         Assertions.assertEquals(1, result.getTotalTestsFailed());
-        test.modifyTestSourceFile(LambdaHandlerET.class, s -> s.replace("Hey", "Yo"));
+        test.modifyTestSourceFile(GreetingLambdaTest.class, s -> s.replace("Hey", "Yo"));
         result = utils.waitForNextCompletion();
         Assertions.assertEquals(1, result.getTotalTestsPassed());
         Assertions.assertEquals(0, result.getTotalTestsFailed());

extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/model/InputPerson.java

@@ -0,0 +1,22 @@
+package io.quarkus.amazon.lambda.deployment.testing.model;
+
+public class InputPerson {
+
+    public InputPerson() {
+    }
+
+    public InputPerson(String name) {
+        this.name = name;
+    }
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public InputPerson setName(String name) {
+        this.name = name;
+        return this;
+    }
+}