Datasets:

tiginamaria

/

bug-localization

like 2

quarkusio/quarkus/6675/6519

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/6519

https://github.com/quarkusio/quarkus/pull/6675

https://github.com/quarkusio/quarkus/pull/6675

resolves

Qute - fix default template extensions for java.util.Map

`Map.get()` and `Map.containsKey()` are not handled correctly. A workaround exists: ```java @TemplateExtension static Object get(Map<?, ?> map, Object key) { return map.get(key); } @TemplateExtension static boolean containsKey(Map<?, ?> map, Object key) { return map.containsKey(key); } ```

3398d3663dbd2e88322e5ae488505ec436e9e4a8

40e102084eacb3b63ff582148c4da8a0533a5675

https://github.com/quarkusio/quarkus/compare/3398d3663dbd2e88322e5ae488505ec436e9e4a8...40e102084eacb3b63ff582148c4da8a0533a5675

diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java index 3ee57fc28ec..8179de01cf6 100644 --- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java +++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java @@ -82,7 +82,7 @@ import io.quarkus.qute.deployment.TemplatesAnalysisBuildItem.TemplateAnalysis; import io.quarkus.qute.generator.ExtensionMethodGenerator; import io.quarkus.qute.generator.ValueResolverGenerator; -import io.quarkus.qute.runtime.DefaultTemplateExtensions; +import io.quarkus.qute.runtime.BuiltinTemplateExtensions; import io.quarkus.qute.runtime.EngineProducer; import io.quarkus.qute.runtime.QuteConfig; import io.quarkus.qute.runtime.QuteRecorder; @@ -145,7 +145,7 @@ AdditionalBeanBuildItem additionalBeans() { return AdditionalBeanBuildItem.builder() .setUnremovable() .addBeanClasses(EngineProducer.class, TemplateProducer.class, VariantTemplateProducer.class, ResourcePath.class, - Template.class, TemplateInstance.class, DefaultTemplateExtensions.class) + Template.class, TemplateInstance.class, BuiltinTemplateExtensions.class) .build(); } diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateExtensionMethodsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateExtensionMethodsTest.java index 55e99c70c52..9b3a16dcca4 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateExtensionMethodsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateExtensionMethodsTest.java @@ -5,6 +5,8 @@ import java.math.BigDecimal; import java.math.RoundingMode; +import java.util.HashMap; +import java.util.Map; import javax.inject.Inject; @@ -57,6 +59,19 @@ public void testMatchAnyWithParameter() { engine.getTemplate("any.txt").data("anyInt", 10).render()); } + @Test + public void testBuiltinExtensions() { + Map<String, String> map = new HashMap<String, String>(); + map.put("alpha", "1"); + map.put("bravo", "2"); + map.put("charlie", "3"); + assertEquals("3:1:NOT_FOUND:1:false:true", + engine.parse( + "{myMap.size}:{myMap.alpha}:{myMap.missing}:{myMap.get(key)}:{myMap.empty}:{myMap.containsKey('charlie')}") + .data("myMap", map).data("key", "alpha").render()); + + } + @TemplateExtension public static class Extensions { diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/DefaultTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/BuiltinTemplateExtensions.java similarity index 62% rename from extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/DefaultTemplateExtensions.java rename to extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/BuiltinTemplateExtensions.java index 068b6962ad1..5db9fb017a7 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/DefaultTemplateExtensions.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/BuiltinTemplateExtensions.java @@ -7,11 +7,12 @@ import io.quarkus.qute.Results.Result; import io.quarkus.qute.TemplateExtension; -public class DefaultTemplateExtensions { +@TemplateExtension +public class BuiltinTemplateExtensions { - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) @TemplateExtension(matchName = ANY) - public static Object map(Map map, String name) { + static Object map(Map map, String name) { Object val = map.get(name); if (val != null) { return val; @@ -27,13 +28,17 @@ public static Object map(Map map, String name) { case "empty": case "isEmpty": return map.isEmpty(); - case "get": - return map.get(name); - case "containsKey": - return map.containsKey(name); default: - return Result.NOT_FOUND; + return map.getOrDefault(name, Result.NOT_FOUND); } } + static Object get(Map<?, ?> map, Object key) { + return map.get(key); + } + + static boolean containsKey(Map<?, ?> map, Object key) { + return map.containsKey(key); + } + } diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolvers.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolvers.java index a4b30207dc4..874d06faee5 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolvers.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolvers.java @@ -193,9 +193,6 @@ private static Object entryResolve(Entry<?, ?> entry, String name) { @SuppressWarnings("rawtypes") private static CompletionStage<Object> mapResolveAsync(EvalContext context) { Map map = (Map) context.getBase(); - if (map.containsKey(context.getName())) { - return CompletableFuture.completedFuture(map.get(context.getName())); - } switch (context.getName()) { case "keys": case "keySet": @@ -220,7 +217,8 @@ private static CompletionStage<Object> mapResolveAsync(EvalContext context) { }); } default: - return Results.NOT_FOUND; + return map.containsKey(context.getName()) ? CompletableFuture.completedFuture(map.get(context.getName())) + : Results.NOT_FOUND; } }

['extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/DefaultTemplateExtensions.java', 'independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolvers.java', 'extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateExtensionMethodsTest.java', 'extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java']

{'.java': 4}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/6643/6641

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/6641

https://github.com/quarkusio/quarkus/pull/6643

https://github.com/quarkusio/quarkus/pull/6643

fixes

Panache entites are not marked as dirty after deserialization with Jackson

**Describe the bug** Using Jackson for JSON-Deserializiation Panache entities (w/out explicit setters) is problematic because generated getters & setters are marked "synthetic" by Quarkus and Jackson skips synthetic methods, i.e. it uses just the public fields. But that means that Hibernate's dirty tracking is bypassed and the (changed) entities are not persisted. **Expected behavior** Panache entity is persistable (aka. dirty) after deserialization with Jackson. **Actual behavior** Panache entity is not marked as dirty after deserialization with Jackson. **To Reproduce** Steps to reproduce the behavior: 1. Use Jackson for JSON handling 2. Deserialize a Panache entity w/out explicit getters & setters 3. Try to persist this entity **Solution** As discussed with @FroMage on the chat, the synthetic flag should be removed to make this work as it is not relevant for any (known) use case right now (see getter & setter generation in PanacheEntityEnhancer).

bcd95553beb5e40ff824bb232f271eae815565d7

6ee371b5c336b5171d8443855085ee8ca321c92e

https://github.com/quarkusio/quarkus/compare/bcd95553beb5e40ff824bb232f271eae815565d7...6ee371b5c336b5171d8443855085ee8ca321c92e

diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheEntityEnhancer.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheEntityEnhancer.java index c26c31e49c7..59583cedb0c 100644 --- a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheEntityEnhancer.java +++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheEntityEnhancer.java @@ -185,7 +185,7 @@ private void generateAccessors() { String getterName = field.getGetterName(); String getterDescriptor = "()" + field.descriptor; if (!methods.contains(getterName + "/" + getterDescriptor)) { - MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_SYNTHETIC, + MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC, getterName, getterDescriptor, field.signature == null ? null : "()" + field.signature, null); mv.visitCode(); mv.visitIntInsn(Opcodes.ALOAD, 0); @@ -204,7 +204,7 @@ private void generateAccessors() { String setterName = field.getSetterName(); String setterDescriptor = "(" + field.descriptor + ")V"; if (!methods.contains(setterName + "/" + setterDescriptor)) { - MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_SYNTHETIC, + MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC, setterName, setterDescriptor, field.signature == null ? null : "(" + field.signature + ")V", null); mv.visitCode(); mv.visitIntInsn(Opcodes.ALOAD, 0);

['extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheEntityEnhancer.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/6602/6600

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/6600

https://github.com/quarkusio/quarkus/pull/6602

https://github.com/quarkusio/quarkus/pull/6602

resolves

Simple scheduler CRON triggers do not work correctly with JDK9+

It seems that since JDK9 the `ZonedDateTime.now()` method works with microsecond precision. This breaks our scheduling logic which expects milliseconds precision (JDK8 behavior). We need to make the extension logic more robust. NOTE: This bug does not apply to quartz extension which is using a different mechanism to evaluate triggers.

3ab105c87613119f492c297d34a51bf31ee4a5b0

fa93c3b58ab26f1159b8988d10592228abf9e52b

https://github.com/quarkusio/quarkus/compare/3ab105c87613119f492c297d34a51bf31ee4a5b0...fa93c3b58ab26f1159b8988d10592228abf9e52b

diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java index 28c0d73c088..ae723f248b0 100644 --- a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java +++ b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java @@ -42,6 +42,7 @@ public class SimpleScheduler implements Scheduler { private static final Logger LOGGER = Logger.getLogger(SimpleScheduler.class); + // milliseconds private static final long CHECK_PERIOD = 1000L; private final ScheduledExecutorService scheduledExecutor; @@ -111,19 +112,23 @@ void checkTriggers() { ZonedDateTime now = ZonedDateTime.now(); for (ScheduledTask task : scheduledTasks) { - LOGGER.tracef("Evaluate trigger %s", task.trigger.id); + LOGGER.tracef("Evaluate trigger %s", task.trigger); ZonedDateTime scheduledFireTime = task.trigger.evaluate(now); if (scheduledFireTime != null) { try { executor.execute(new Runnable() { @Override public void run() { - task.invoker.invoke(new SimpleScheduledExecution(now, scheduledFireTime, task.trigger)); + try { + task.invoker.invoke(new SimpleScheduledExecution(now, scheduledFireTime, task.trigger)); + } catch (Throwable t) { + LOGGER.errorf(t, "Error occured while executing task for trigger %s", task.trigger); + } } }); - LOGGER.debugf("Executing scheduled task for trigger %s", task.trigger.id); + LOGGER.debugf("Executing scheduled task for trigger %s", task.trigger); } catch (RejectedExecutionException e) { - LOGGER.warnf("Rejected execution of a scheduled task for trigger %s", task.trigger.id); + LOGGER.warnf("Rejected execution of a scheduled task for trigger %s", task.trigger); } } } @@ -231,12 +236,12 @@ ZonedDateTime evaluate(ZonedDateTime now) { } if (lastFireTime == null) { // First execution - lastFireTime = now; + lastFireTime = now.truncatedTo(ChronoUnit.SECONDS); return now; } if (ChronoUnit.MILLIS.between(lastFireTime, now) >= interval) { ZonedDateTime scheduledFireTime = lastFireTime.plus(Duration.ofMillis(interval)); - lastFireTime = now; + lastFireTime = now.truncatedTo(ChronoUnit.SECONDS); return scheduledFireTime; } return null; @@ -252,14 +257,26 @@ public Instant getPreviousFireTime() { return lastFireTime.toInstant(); } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("IntervalTrigger [id=").append(getId()).append(", interval=").append(interval).append("]"); + return builder.toString(); + } + } static class CronTrigger extends SimpleTrigger { + // microseconds + private static final long DIFF_THRESHOLD = CHECK_PERIOD * 1000; + + private final Cron cron; private final ExecutionTime executionTime; public CronTrigger(String id, ZonedDateTime start, Cron cron) { super(id, start); + this.cron = cron; this.executionTime = ExecutionTime.forCron(cron); } @@ -285,14 +302,23 @@ ZonedDateTime evaluate(ZonedDateTime now) { if (now.isBefore(trunc)) { return null; } - long diff = ChronoUnit.MILLIS.between(trunc, now); - if (diff <= CHECK_PERIOD) { + // Use microseconds precision to workaround incompatibility between jdk8 and jdk9+ + long diff = ChronoUnit.MICROS.between(trunc, now); + if (diff <= DIFF_THRESHOLD) { + LOGGER.debugf("%s fired, diff=%s μs", this, diff); return trunc; } } return null; } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("CronTrigger [id=").append(getId()).append(", cron=").append(cron.asString()).append("]"); + return builder.toString(); + } + } static class SimpleScheduledExecution implements ScheduledExecution {

['extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/6583/6566

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/6566

https://github.com/quarkusio/quarkus/pull/6583

https://github.com/quarkusio/quarkus/pull/6583

fixes

PanacheMongoRepository does not deal well with instants

When using the PanacheMongoRepository to query the database using Instants the Inventory does not find any results unless the query is written in mongo syntax. `fun getByCreationInstantBefore(time: Instant) = list("endAt < ?1", time)` Should return the Commands present in the database with endAt < time but returns an empty list. Steps to reproduce the behavior: 1. Create a Database populated with entries with time 2. Try to query by time like above `fun getByCreationInstantBefore(time: Instant) = list("{endAt : { \\$lte : ISODate(?1) }}", time)` works well

64067b91deb0311c6833d93f49ec41fa91d06121

4c49673ece0d0d366a6e0c6530a9fba1b8be6bcc

https://github.com/quarkusio/quarkus/compare/64067b91deb0311c6833d93f49ec41fa91d06121...4c49673ece0d0d366a6e0c6530a9fba1b8be6bcc

diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/CommonQueryBinder.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/CommonQueryBinder.java index 8ab9230ad6d..f63874a48b4 100644 --- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/CommonQueryBinder.java +++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/CommonQueryBinder.java @@ -1,8 +1,10 @@ package io.quarkus.mongodb.panache.runtime; import java.text.SimpleDateFormat; +import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.Date; @@ -34,6 +36,10 @@ static String escape(Object value) { LocalDateTime dateValue = (LocalDateTime) value; return "ISODate('" + DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(dateValue) + "')"; } + if (value instanceof Instant) { + Instant dateValue = (Instant) value; + return "ISODate('" + DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(dateValue.atZone(ZoneOffset.UTC)) + "')"; + } return "'" + value.toString().replace("\\\\", "\\\\\\\\").replace("'", "\\\\'") + "'"; } } diff --git a/extensions/panache/mongodb-panache/runtime/src/test/java/io/quarkus/mongodb/panache/runtime/MongoOperationsTest.java b/extensions/panache/mongodb-panache/runtime/src/test/java/io/quarkus/mongodb/panache/runtime/MongoOperationsTest.java index f8dc5d55b1d..b7bab77eba3 100644 --- a/extensions/panache/mongodb-panache/runtime/src/test/java/io/quarkus/mongodb/panache/runtime/MongoOperationsTest.java +++ b/extensions/panache/mongodb-panache/runtime/src/test/java/io/quarkus/mongodb/panache/runtime/MongoOperationsTest.java @@ -5,6 +5,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.Date; import org.bson.codecs.pojo.annotations.BsonProperty; @@ -35,6 +36,10 @@ public void testBindShorthandQuery() { query = MongoOperations.bindQuery(Object.class, "field", new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1) }); assertEquals("{'field':ISODate('2019-03-04T01:01:01')}", query); + query = MongoOperations.bindQuery(Object.class, "field", + new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1).toInstant(ZoneOffset.UTC) }); + assertEquals("{'field':ISODate('2019-03-04T01:01:01')}", query); + query = MongoOperations.bindQuery(Object.class, "field", new Object[] { toDate(LocalDateTime.of(2019, 3, 4, 1, 1, 1)) }); assertEquals("{'field':ISODate('2019-03-04T01:01:01.000')}", query); @@ -68,6 +73,10 @@ public void testBindNativeQueryByIndex() { new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1) }); assertEquals("{'field': ISODate('2019-03-04T01:01:01')}", query); + query = MongoOperations.bindQuery(Object.class, "{'field': ?1}", + new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1).toInstant(ZoneOffset.UTC) }); + assertEquals("{'field': ISODate('2019-03-04T01:01:01')}", query); + query = MongoOperations.bindQuery(Object.class, "{'field': ?1}", new Object[] { toDate(LocalDateTime.of(2019, 3, 4, 1, 1, 1)) }); assertEquals("{'field': ISODate('2019-03-04T01:01:01.000')}", query); @@ -99,6 +108,10 @@ public void testBindNativeQueryByName() { Parameters.with("field", LocalDateTime.of(2019, 3, 4, 1, 1, 1)).map()); assertEquals("{'field': ISODate('2019-03-04T01:01:01')}", query); + query = MongoOperations.bindQuery(Object.class, "{'field': :field}", + Parameters.with("field", LocalDateTime.of(2019, 3, 4, 1, 1, 1).toInstant(ZoneOffset.UTC)).map()); + assertEquals("{'field': ISODate('2019-03-04T01:01:01')}", query); + query = MongoOperations.bindQuery(Object.class, "{'field': :field}", Parameters.with("field", toDate(LocalDateTime.of(2019, 3, 4, 1, 1, 1))).map()); assertEquals("{'field': ISODate('2019-03-04T01:01:01.000')}", query); @@ -127,6 +140,10 @@ public void testBindEnhancedQueryByIndex() { query = MongoOperations.bindQuery(Object.class, "field = ?1", new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1) }); assertEquals("{'field':ISODate('2019-03-04T01:01:01')}", query); + query = MongoOperations.bindQuery(Object.class, "field = ?1", + new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1).toInstant(ZoneOffset.UTC) }); + assertEquals("{'field':ISODate('2019-03-04T01:01:01')}", query); + query = MongoOperations.bindQuery(Object.class, "field = ?1", new Object[] { toDate(LocalDateTime.of(2019, 3, 4, 1, 1, 1)) }); assertEquals("{'field':ISODate('2019-03-04T01:01:01.000')}", query); @@ -180,6 +197,10 @@ public void testBindEnhancedQueryByName() { Parameters.with("field", LocalDateTime.of(2019, 3, 4, 1, 1, 1)).map()); assertEquals("{'field':ISODate('2019-03-04T01:01:01')}", query); + query = MongoOperations.bindQuery(Object.class, "field = :field", + Parameters.with("field", LocalDateTime.of(2019, 3, 4, 1, 1, 1).toInstant(ZoneOffset.UTC)).map()); + assertEquals("{'field':ISODate('2019-03-04T01:01:01')}", query); + query = MongoOperations.bindQuery(Object.class, "field = :field", Parameters.with("field", toDate(LocalDateTime.of(2019, 3, 4, 1, 1, 1))).map()); assertEquals("{'field':ISODate('2019-03-04T01:01:01.000')}", query);

['extensions/panache/mongodb-panache/runtime/src/test/java/io/quarkus/mongodb/panache/runtime/MongoOperationsTest.java', 'extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/CommonQueryBinder.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/6504/6485

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/6485

https://github.com/quarkusio/quarkus/pull/6504

https://github.com/quarkusio/quarkus/pull/6504

fixes

Adding Groovy plugin to Gradle project fails quarkusDev

When adding the Groovy plugin like: ``` plugins { id "java" id "groovy" id "io.quarkus" } ``` then `quarkusDev` fails with: ``` ❯ ./gradlew clean quarkusDev > Task :compileJava Note: Some input files use unchecked or unsafe operations. Note: Recompile with -Xlint:unchecked for details. > Task :quarkusDev FAILED FAILURE: Build failed with an exception. * What went wrong: Some problems were found with the configuration of task ':quarkusDev' (type 'QuarkusDev'). > Directory '/Users/marceloverdijk/workspace/demo-backend-quarkus/build/classes/groovy/main' specified for property 'workingDir' does not exist. > Directory '/Users/marceloverdijk/workspace/demo-backend-quarkus/src/main/groovy' specified for property 'sourceDir' does not exist. ``` It seems the `src/main/groovy` folder is expected. I'm only adding Groovy to run Spock tests from `/src/test/groovy`. When creating an empty `src/main/groovy` folder it keeps complaining about `build/classes/groovy/main`.

8c8670d1c0124575a160f7a7b1aec06cddf84609

e5e6e1e7d6d4392d55fd12b7c24920eda165aad6

https://github.com/quarkusio/quarkus/compare/8c8670d1c0124575a160f7a7b1aec06cddf84609...e5e6e1e7d6d4392d55fd12b7c24920eda165aad6

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java index 3e3a0c27bfe..d48acd6ec7d 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java @@ -108,7 +108,9 @@ public AppModelResolver resolveAppModel() { private File getLastFile(FileCollection fileCollection) { File result = null; for (File f : fileCollection) { - result = f; + if (result == null || f.exists()) { + result = f; + } } return result; }

['devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5607/3721

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/3721

https://github.com/quarkusio/quarkus/pull/5607

https://github.com/quarkusio/quarkus/pull/5607

fixes

Unable to Run tests with non-standard maven settings

**Describe the bug** When using non-standard maven settings, typically the user maven repository is no configured at `$HOME/.m2`, the test fails with exception unable to find the project artifact at $HOME/.m2/repository **Expected behavior** Test should run successfully **Actual behavior** Test fails with the following exception ``` [INFO] ------------------------------------------------------- [INFO] T E S T S [INFO] ------------------------------------------------------- [INFO] Running org.acme.quarkus.sample.HelloResourceTest [ERROR] Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.499 s <<< FAILURE! - in org.acme.quarkus.sample.HelloResourceTest [ERROR] testHelloEndpoint Time elapsed: 0.009 s <<< ERROR! org.junit.jupiter.api.extension.TestInstantiationException: TestInstanceFactory [io.quarkus.test.junit.QuarkusTestExtension] failed to instantiate test class [org.acme.quarkus.sample.HelloResourceTest]: Failed to create the boostrap class loader Caused by: java.lang.IllegalStateException: Failed to create the boostrap class loader Caused by: io.quarkus.bootstrap.BootstrapException: Failed to create the deployment classloader for org.acme.quarkus.sample:my-quarkus-project::jar:1.0-SNAPSHOT Caused by: io.quarkus.bootstrap.resolver.AppModelResolverException: Failed to read descriptor of org.acme.quarkus.sample:my-quarkus-project:jar:1.0-SNAPSHOT Caused by: org.eclipse.aether.resolution.ArtifactDescriptorException: Failed to read artifact descriptor for org.acme.quarkus.sample:my-quarkus-project:jar:1.0-SNAPSHOT Caused by: org.apache.maven.model.resolution.UnresolvableModelException: Could not transfer artifact io.quarkus:quarkus-bom:pom:0.21.1 from/to central (https://repo.maven.apache.org/maven2): /.m2/repository/io/quarkus/quarkus-bom/0.21.1/quarkus-bom-0.21.1.pom.part.lock (No such file or directory) Caused by: org.eclipse.aether.resolution.ArtifactResolutionException: Could not transfer artifact io.quarkus:quarkus-bom:pom:0.21.1 from/to central (https://repo.maven.apache.org/maven2): /.m2/repository/io/quarkus/quarkus-bom/0.21.1/quarkus-bom-0.21.1.pom.part.lock (No such file or directory) Caused by: org.eclipse.aether.transfer.ArtifactTransferException: Could not transfer artifact io.quarkus:quarkus-bom:pom:0.21.1 from/to central (https://repo.maven.apache.org/maven2): /.m2/repository/io/quarkus/quarkus-bom/0.21.1/quarkus-bom-0.21.1.pom.part.lock (No such file or directory) Caused by: java.io.FileNotFoundException: /.m2/repository/io/quarkus/quarkus-bom/0.21.1/quarkus-bom-0.21.1.pom.part.lock (No such file or directory) ``` **To Reproduce** Steps to reproduce the behavior: 1. Delete the maven settings at ~/.m2/settings.xml 2. Configure global maven settings $MAVEN_HOME/settings.xml to have `localRepository` configured at anyother place than $HOME/.m2/repository 3. Create or take any Quarkus quickstart projects and run the `mvn clean test` **Configuration** Maven configuration as mentioned above **Environment (please complete the following information):** - Output of `uname -a` or `ver`: all supported OS - Output of `java -version`: 1.8(openjdk) - GraalVM version (if different from Java): 19.1.1 - Quarkus version or git rev: 0.21.1

1cfe29a8ea5030dbfbb078ad171ae4173e9d8f6e

6f4d610ea504fcbcfa253bc79a71e90859357ce8

https://github.com/quarkusio/quarkus/compare/1cfe29a8ea5030dbfbb078ad171ae4173e9d8f6e...6f4d610ea504fcbcfa253bc79a71e90859357ce8

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java index c88d79b6a6c..f002c3d65f8 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java @@ -77,13 +77,13 @@ public class MavenRepoInitializer { private static final String BASEDIR = "basedir"; private static final String MAVEN_CMD_LINE_ARGS = "MAVEN_CMD_LINE_ARGS"; private static final String DOT_M2 = ".m2"; - private static final String MAVEN_HOME = "maven.home"; - private static final String M2_HOME = "M2_HOME"; + private static final String MAVEN_DOT_HOME = "maven.home"; + private static final String MAVEN_HOME = "MAVEN_HOME"; private static final String SETTINGS_XML = "settings.xml"; private static final String userHome = PropertyUtils.getUserHome(); private static final File userMavenConfigurationHome = new File(userHome, DOT_M2); - private static final String envM2Home = System.getenv(M2_HOME); + private static final String envM2Home = System.getenv(MAVEN_HOME); private static final File USER_SETTINGS_FILE; private static final File GLOBAL_SETTINGS_FILE; @@ -109,7 +109,7 @@ public class MavenRepoInitializer { File f = userSettings != null ? resolveUserSettings(userSettings) : new File(userMavenConfigurationHome, SETTINGS_XML); USER_SETTINGS_FILE = f != null && f.exists() ? f : null; - f = globalSettings != null ? resolveUserSettings(globalSettings) : new File(PropertyUtils.getProperty(MAVEN_HOME, envM2Home != null ? envM2Home : ""), "conf/settings.xml"); + f = globalSettings != null ? resolveUserSettings(globalSettings) : new File(PropertyUtils.getProperty(MAVEN_DOT_HOME, envM2Home != null ? envM2Home : ""), "conf/settings.xml"); GLOBAL_SETTINGS_FILE = f != null && f.exists() ? f : null; }

['independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5573/5569

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5569

https://github.com/quarkusio/quarkus/pull/5573

https://github.com/quarkusio/quarkus/pull/5573

fixes

MicroProfile TCK OpenTracing failures

I just stumbled upon this test failure in the TCK run on CI: ``` [ERROR] Failures: [ERROR] OpenTracingClassMethodNameClientTests>Arquillian.run:138->OpenTracingClientBaseTests.testNestedSpans:414->OpenTracingBaseTests.testNestedSpans:385->OpenTracingBaseTests.assertEqualTrees:227 expected [[ { span: "{ operationName: GET:org.eclipse.microprofile.opentracing.tck.application.TestServerWebServices.nested, tags: [component=jaxrs, http.method=GET, http.status_code=200, http.url=http://localhost:8081/rest/testServices/nested?nestDepth=1&nestBreadth=2&async=false&data=201&failNest=false, span.kind=server], logEntries: []}", children: [ { span: "{ operationName: GET, tags: [component=jaxrs, http.method=GET, http.status_code=200, http.url=http://localhost:8081/rest/testServices/nested?nestDepth=0&nestBreadth=1&async=false&data=201&failNest=false, span.kind=client], logEntries: []}", children: [ { span: "{ operationName: GET:org.eclipse.microprofile.opentracing.tck.application.TestServerWebServices.nested, tags: [component=jaxrs, http.method=GET, http.status_code=200, http.url=http://localhost:8081/rest/testServices/nested?nestDepth=0&nestBreadth=1&async=false&data=201&failNest=false, span.kind=server], logEntries: []}" } ] }, { span: "{ operationName: GET, tags: [component=jaxrs, http.method=GET, http.status_code=200, http.url=http://localhost:8081/rest/testServices/nested?nestDepth=0&nestBreadth=1&async=false&data=201&failNest=false, span.kind=client], logEntries: []}", children: [ { span: "{ operationName: GET:org.eclipse.microprofile.opentracing.tck.application.TestServerWebServices.nested, tags: [component=jaxrs, http.method=GET, http.status_code=200, http.url=http://localhost:8081/rest/testServices/nested?nestDepth=0&nestBreadth=1&async=false&data=201&failNest=false, span.kind=server], logEntries: []}" } ] } ] } ] ] but found [[ { span: "{ operationName: GET, tags: [component=jaxrs, http.method=GET, http.status_code=200, http.url=http://localhost:8081/rest/testServices/nested?nestDepth=0&nestBreadth=1&async=false&data=201&failNest=false, span.kind=client], logEntries: []}", children: [ { span: "{ operationName: GET:org.eclipse.microprofile.opentracing.tck.application.TestServerWebServices.nested, tags: [component=jaxrs, http.method=GET, http.status_code=200, http.url=http://localhost:8081/rest/testServices/nested?nestDepth=0&nestBreadth=1&async=false&data=201&failNest=false, span.kind=server], logEntries: []}" } ] }, { span: "{ operationName: GET, tags: [component=jaxrs, http.method=GET, http.status_code=200, http.url=http://localhost:8081/rest/testServices/nested?nestDepth=0&nestBreadth=1&async=false&data=201&failNest=false, span.kind=client], logEntries: []}", children: [ { span: "{ operationName: GET:org.eclipse.microprofile.opentracing.tck.application.TestServerWebServices.nested, tags: [component=jaxrs, http.method=GET, http.status_code=200, http.url=http://localhost:8081/rest/testServices/nested?nestDepth=0&nestBreadth=1&async=false&data=201&failNest=false, span.kind=server], logEntries: []}" } ] } ] ] ``` @stuartwdouglas I wonder if it could be related to your changes or not?

1eb0423ee4ece41e025b3e74cb1028f00cca0c7a

6a4c53d1a5d63b19912ca036d53fc23f20844b16

https://github.com/quarkusio/quarkus/compare/1eb0423ee4ece41e025b3e74cb1028f00cca0c7a...6a4c53d1a5d63b19912ca036d53fc23f20844b16

diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpRequest.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpRequest.java index 1560a717b0b..a54586a1cfe 100644 --- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpRequest.java +++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpRequest.java @@ -8,6 +8,7 @@ import java.util.Iterator; import java.util.Map; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; import javax.ws.rs.ServiceUnavailableException; import javax.ws.rs.container.AsyncResponse; @@ -262,11 +263,7 @@ public boolean resume(Object entity) { return false; done = true; requestContext.activate(requestContextState); - try { - return internalResume(entity, t -> vertxFlush()); - } finally { - requestContext.terminate(); - } + return internalResume(entity, new FlushTask()); } } @@ -279,11 +276,7 @@ public boolean resume(Throwable ex) { return false; done = true; requestContext.activate(requestContextState); - try { - return internalResume(ex, t -> vertxFlush()); - } finally { - requestContext.terminate(); - } + return internalResume(ex, new FlushTask()); } } @@ -299,11 +292,7 @@ public boolean cancel() { done = true; cancelled = true; requestContext.activate(requestContextState); - try { - return internalResume(Response.status(Response.Status.SERVICE_UNAVAILABLE).build(), t -> vertxFlush()); - } finally { - requestContext.terminate(); - } + return internalResume(Response.status(Response.Status.SERVICE_UNAVAILABLE).build(), new FlushTask()); } } @@ -317,14 +306,10 @@ public boolean cancel(int retryAfter) { done = true; cancelled = true; requestContext.activate(requestContextState); - try { - return internalResume( - Response.status(Response.Status.SERVICE_UNAVAILABLE).header(HttpHeaders.RETRY_AFTER, retryAfter) - .build(), - t -> vertxFlush()); - } finally { - requestContext.terminate(); - } + return internalResume( + Response.status(Response.Status.SERVICE_UNAVAILABLE).header(HttpHeaders.RETRY_AFTER, retryAfter) + .build(), + new FlushTask()); } } @@ -393,6 +378,17 @@ protected void handleTimeout() { return; resume(new ServiceUnavailableException()); } + + private class FlushTask implements Consumer<Throwable> { + @Override + public void accept(Throwable t) { + try { + requestContext.terminate(); + } finally { + VertxHttpAsyncResponse.this.vertxFlush(); + } + } + } } } } diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java index d57c8a4563e..d676b8ab814 100644 --- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java +++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java @@ -117,20 +117,17 @@ private void dispatch(RoutingContext routingContext, InputStream is, VertxOutput boolean suspended = vertxRequest.getAsyncContext().isSuspended(); boolean requestContextActive = requestContext.isActive(); - if (requestContextActive) { - //it is possible that there was an async response, that then finished in the same thread - //the async response will have terminated the request context in this case - currentVertxRequest.initialInvocationComplete(suspended); - } if (!suspended) { try { - vertxResponse.finish(); - } catch (IOException e) { - log.error("Unexpected failure", e); - } finally { if (requestContextActive) { requestContext.terminate(); } + } finally { + try { + vertxResponse.finish(); + } catch (IOException e) { + log.debug("IOException writing JAX-RS response", e); + } } } else { //we need the request context to stick around diff --git a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TracingTest.java b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TracingTest.java index 1fb5563107f..9ab1d26d7b9 100644 --- a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TracingTest.java +++ b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TracingTest.java @@ -1,9 +1,7 @@ package io.quarkus.smallrye.opentracing.deployment; import java.util.List; -import java.util.Set; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import org.awaitility.Awaitility; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -48,15 +46,13 @@ public static void afterAll() { } @Test - public void testSingleServerRequest() throws InterruptedException { + public void testSingleServerRequest() { try { RestAssured.defaultParser = Parser.TEXT; RestAssured.when().get("/hello") .then() .statusCode(200); - //inherently racy, tracer is completed after response is sent back to the client - Awaitility.await().atMost(5, TimeUnit.SECONDS) - .until(() -> mockTracer.finishedSpans().size() == 1); + Assertions.assertEquals(1, mockTracer.finishedSpans().size()); Assertions.assertEquals("GET:io.quarkus.smallrye.opentracing.deployment.TestResource.hello", mockTracer.finishedSpans().get(0).operationName()); } finally { @@ -65,15 +61,12 @@ public void testSingleServerRequest() throws InterruptedException { } @Test - public void testCDI() throws InterruptedException { + public void testCDI() { try { RestAssured.defaultParser = Parser.TEXT; RestAssured.when().get("/cdi") .then() .statusCode(200); - //inherently racy, tracer is completed after response is sent back to the client - Awaitility.await().atMost(5, TimeUnit.SECONDS) - .until(() -> mockTracer.finishedSpans().size() == 2); Assertions.assertEquals(2, mockTracer.finishedSpans().size()); Assertions.assertEquals("io.quarkus.smallrye.opentracing.deployment.Service.foo", mockTracer.finishedSpans().get(0).operationName()); @@ -85,24 +78,18 @@ public void testCDI() throws InterruptedException { } @Test - public void testMPRestClient() throws InterruptedException { + public void testMPRestClient() { try { RestAssured.defaultParser = Parser.TEXT; RestAssured.when().get("/restClient") .then() .statusCode(200); - //inherently racy, tracer is completed after response is sent back to the client - Awaitility.await().atMost(5, TimeUnit.SECONDS) - .until(() -> mockTracer.finishedSpans().size() == 3); Assertions.assertEquals(3, mockTracer.finishedSpans().size()); - //these can come in any order, as the 'hello' span is finished after the request is sent back. - //this means the client might have already dealt with the response before the hello span is finished - //in practice this means that the spans might be in any order, as they are ordered by the time - //they are completed rather than the time they are started - Set<String> results = mockTracer.finishedSpans().stream().map(MockSpan::operationName).collect(Collectors.toSet()); - Assertions.assertTrue(results.contains("GET:io.quarkus.smallrye.opentracing.deployment.TestResource.hello")); - Assertions.assertTrue(results.contains("GET")); - Assertions.assertTrue(results.contains("GET:io.quarkus.smallrye.opentracing.deployment.TestResource.restClient")); + Assertions.assertEquals("GET:io.quarkus.smallrye.opentracing.deployment.TestResource.hello", + mockTracer.finishedSpans().get(0).operationName()); + Assertions.assertEquals("GET", mockTracer.finishedSpans().get(1).operationName()); + Assertions.assertEquals("GET:io.quarkus.smallrye.opentracing.deployment.TestResource.restClient", + mockTracer.finishedSpans().get(2).operationName()); } finally { RestAssured.reset(); } diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java index 2ce0f0b01aa..36c586228f5 100644 --- a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java +++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java @@ -16,6 +16,7 @@ import io.opentracing.contrib.jaxrs2.internal.SpanWrapper; import io.opentracing.tag.Tags; import io.quarkus.vertx.http.runtime.CurrentVertxRequest; +import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; @Provider @@ -39,31 +40,21 @@ CurrentVertxRequest request() { @Override public void filter(ContainerRequestContext requestContext) throws IOException { - request().addRequestDoneListener(new CurrentVertxRequest.Listener() { + RoutingContext routingContext = request().getCurrent(); + routingContext.addHeadersEndHandler(new Handler<Void>() { @Override - public void initialInvocationComplete(RoutingContext routingContext, boolean goingAsync) { + public void handle(Void event) { SpanWrapper wrapper = routingContext.get(SpanWrapper.PROPERTY_NAME); if (wrapper != null) { wrapper.getScope().close(); + Tags.HTTP_STATUS.set(wrapper.get(), routingContext.response().getStatusCode()); + if (routingContext.failure() != null) { + addExceptionLogs(wrapper.get(), routingContext.failure()); + } + wrapper.finish(); } } - - @Override - public void responseComplete(RoutingContext routingContext) { - SpanWrapper wrapper = routingContext.get(SpanWrapper.PROPERTY_NAME); - if (wrapper == null) { - return; - } - - Tags.HTTP_STATUS.set(wrapper.get(), routingContext.response().getStatusCode()); - if (routingContext.failure() != null) { - addExceptionLogs(wrapper.get(), routingContext.failure()); - } - wrapper.finish(); - - } }); - } private static void addExceptionLogs(Span span, Throwable throwable) { diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java index 1537a5b69ea..f9e7394440a 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java @@ -460,7 +460,6 @@ public T call(HttpServerExchange exchange, C context) throws Exception { if (exchange == null) { return action.call(exchange, context); } - boolean vertxFirst = false; ManagedContext requestContext = beanContainer.requestContext(); if (requestContext.isActive()) { return action.call(exchange, context); @@ -469,7 +468,6 @@ public T call(HttpServerExchange exchange, C context) throws Exception { .getAttachment(REQUEST_CONTEXT); try { requestContext.activate(existingRequestContext); - vertxFirst = existingRequestContext == null; VertxHttpExchange delegate = (VertxHttpExchange) exchange.getDelegate(); RoutingContext rc = (RoutingContext) delegate.getContext(); @@ -479,9 +477,6 @@ public T call(HttpServerExchange exchange, C context) throws Exception { ServletRequestContext src = exchange .getAttachment(ServletRequestContext.ATTACHMENT_KEY); HttpServletRequestImpl req = src.getOriginalRequest(); - if (vertxFirst) { - currentVertxRequest.initialInvocationComplete(req.isAsyncStarted()); - } if (req.isAsyncStarted()) { exchange.putAttachment(REQUEST_CONTEXT, requestContext.getState()); requestContext.deactivate(); diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java index e7dd3617c32..2588f1a1348 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java @@ -1,23 +1,14 @@ package io.quarkus.vertx.http.runtime; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.PreDestroy; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Produces; -import org.jboss.logging.Logger; - import io.vertx.ext.web.RoutingContext; @RequestScoped public class CurrentVertxRequest { - private final Logger log = Logger.getLogger(CurrentVertxRequest.class); - public RoutingContext current; - private List<Listener> doneListeners; @Produces @RequestScoped @@ -30,51 +21,4 @@ public CurrentVertxRequest setCurrent(RoutingContext current) { return this; } - public void addRequestDoneListener(Listener doneListener) { - if (doneListeners == null) { - doneListeners = new ArrayList<>(); - } - doneListeners.add(doneListener); - } - - public void initialInvocationComplete(boolean goingAsync) { - - if (current == null) { - return; - } - if (doneListeners != null) { - for (Listener i : doneListeners) { - try { - i.initialInvocationComplete(current, goingAsync); - } catch (Throwable t) { - log.errorf(t, "Failed to process invocation listener %s", i); - } - } - } - } - - @PreDestroy - void done() { - if (current == null) { - return; - } - if (doneListeners != null) { - for (Listener i : doneListeners) { - try { - i.responseComplete(current); - } catch (Throwable t) { - log.errorf(t, "Failed to process done listener %s", i); - } - } - } - } - - public interface Listener { - - void initialInvocationComplete(RoutingContext routingContext, boolean goingAsync); - - void responseComplete(RoutingContext routingContext); - - } - }

['extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java', 'extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpRequest.java', 'extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java', 'extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java', 'extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java', 'extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TracingTest.java']

{'.java': 6}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/3869/3790

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/3790

https://github.com/quarkusio/quarkus/pull/3869

https://github.com/quarkusio/quarkus/pull/3869

fixes

NPE in ArcTestRequestScopeProvider.setup() in native mode with dependency on deployment test jar

while working on the quarkus vault extension, I encountered a NPE in ArcTestRequestScopeProvider in native mode, after adding a test jar (which contains helper classes to start and configure vault for integration testing) as a test dependency of integration test jpa-postgresql. may be the issue is in the way I developed the vault extension, and specifically the test jar. or may be there is a lack of robustness in the quarkus test framework (ie: protecting from NPE), or there is a situation that is not handled when testing native, and an improvement could be done in the test framework. **To Reproduce** go to branch: https://github.com/vsevel/quarkus/tree/issue_NPE_ArcTestRequestScopeProvider and execute: ``` docker run -d --rm --publish 5432:5432 --name build-postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -d postgres:10.5 ./mvnw -am clean install \\ --settings azure-mvn-settings.xml \\ -Dnative-image.docker-build -Dtest-postgresql -Dtest-elasticsearch -Dtest-dynamodb -Ddynamodb-local.port=8000 -Dnative-image.xmx=6g -Dnative -Dno-format \\ -pl integration-tests/jpa-postgresql ``` **Expected behavior** the build should pass **Actual behavior** the build fails with: ``` [INFO] Running io.quarkus.it.jpa.postgresql.JPAFunctionalityInGraalITCase [ERROR] Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.001 s <<< FAILURE! - in io.quarkus.it.jpa.postgresql.JPAFunctionalityInGraalITCase [ERROR] testJPAFunctionalityFromServlet Time elapsed: 0 s <<< ERROR! java.lang.NullPointerException at io.quarkus.arc.deployment.ArcTestRequestScopeProvider.setup(ArcTestRequestScopeProvider.java:12) at io.quarkus.test.common.TestScopeManager.tearDown(TestScopeManager.java:27) at io.quarkus.test.junit.QuarkusTestExtension.beforeEach(QuarkusTestExtension.java:308) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.lambda$invokeBeforeEachCallbacks$1(TestMethodTestDescriptor.java:151) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.lambda$invokeBeforeMethodsOrCallbacksUntilExceptionOccurs$5(TestMethodTestDescriptor.java:187) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.invokeBeforeMethodsOrCallbacksUntilExceptionOccurs(TestMethodTestDescriptor.java:187) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.invokeBeforeEachCallbacks(TestMethodTestDescriptor.java:150) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:129) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:69) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$5(NodeTestTask.java:135) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:125) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:135) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:123) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:122) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:80) at java.util.ArrayList.forEach(ArrayList.java:1257) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:38) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$5(NodeTestTask.java:139) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:125) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:135) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:123) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:122) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:80) at java.util.ArrayList.forEach(ArrayList.java:1257) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:38) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$5(NodeTestTask.java:139) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:125) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:135) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:123) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:122) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:80) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:32) at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:57) at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:51) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:170) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:154) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:90) at org.apache.maven.surefire.junitplatform.JUnitPlatformProvider.invokeAllTests(JUnitPlatformProvider.java:142) at org.apache.maven.surefire.junitplatform.JUnitPlatformProvider.invoke(JUnitPlatformProvider.java:117) at org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:383) at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:344) at org.apache.maven.surefire.booter.ForkedBooter.execute(ForkedBooter.java:125) at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:417) ``` **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Linux quarkus-fedora 4.15.0-1040-gcp #42~16.04.1-Ubuntu SMP Wed Aug 7 16:42:41 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux - Output of `java -version`: openjdk version "1.8.0_222" OpenJDK Runtime Environment (build 1.8.0_222-8u222-b10-1ubuntu1~16.04.1-b10) OpenJDK 64-Bit Server VM (build 25.222-b10, mixed mode) - GraalVM version (if different from Java): /home/vvsevel/graalvm-ce-19.1.1/bin/java -version openjdk version "1.8.0_222" OpenJDK Runtime Environment (build 1.8.0_222-20190711120915.buildslave.jdk8u-src-tar--b08) OpenJDK 64-Bit GraalVM CE 19.1.1 (build 25.222-b08-jvmci-19.1-b01, mixed mode) - Quarkus version or git rev: **Additional context** In the meantime, to workaround the issue in the vault extension, I changed the code to: https://github.com/vsevel/quarkus/blob/master/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestRequestScopeProvider.java#L13-L31

383767c14ae7705ba21aa81b1256914106e38f6a

ef82c09bfe08cde8f1942d141c459cacccf5cad7

https://github.com/quarkusio/quarkus/compare/383767c14ae7705ba21aa81b1256914106e38f6a...ef82c09bfe08cde8f1942d141c459cacccf5cad7

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/test/TestScopeSetup.java b/core/deployment/src/main/java/io/quarkus/deployment/test/TestScopeSetup.java index 3663d099a3e..29388b6b8ba 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/test/TestScopeSetup.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/test/TestScopeSetup.java @@ -2,7 +2,7 @@ public interface TestScopeSetup { - void setup(); + void setup(boolean isSubstrateTest); - void tearDown(); + void tearDown(boolean isSubstrateTest); } diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestRequestScopeProvider.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestRequestScopeProvider.java index 08e68fb13cd..692967f5685 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestRequestScopeProvider.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestRequestScopeProvider.java @@ -1,21 +1,39 @@ package io.quarkus.arc.deployment; +import org.jboss.logging.Logger; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.deployment.test.TestScopeSetup; public class ArcTestRequestScopeProvider implements TestScopeSetup { + private static final Logger LOGGER = Logger.getLogger(ArcTestRequestScopeProvider.class); + @Override - public void setup() { + public void setup(boolean isSubstrateTest) { + if (isSubstrateTest) { + return; + } ArcContainer container = Arc.container(); - container.requestContext().activate(); + if (container == null) { + LOGGER.warn("Container not available, ignoring setup"); + } else { + container.requestContext().activate(); + } } @Override - public void tearDown() { + public void tearDown(boolean isSubstrateTest) { + if (isSubstrateTest) { + return; + } ArcContainer container = Arc.container(); - container.requestContext().terminate(); + if (container == null) { + LOGGER.warn("Container not available, ignoring tearDown"); + } else { + container.requestContext().terminate(); + } } } diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/TestScopeManager.java b/test-framework/common/src/main/java/io/quarkus/test/common/TestScopeManager.java index 6cd26b25aec..f0851e42d8a 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/TestScopeManager.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/TestScopeManager.java @@ -8,23 +8,23 @@ public class TestScopeManager { - private static final List<TestScopeSetup> scopeManagers = new ArrayList<>(); + private static final List<TestScopeSetup> SCOPE_MANAGERS = new ArrayList<>(); static { for (TestScopeSetup i : ServiceLoader.load(TestScopeSetup.class)) { - scopeManagers.add(i); + SCOPE_MANAGERS.add(i); } } - public static void setup() { - for (TestScopeSetup i : scopeManagers) { - i.setup(); + public static void setup(boolean isSubstrateTest) { + for (TestScopeSetup i : SCOPE_MANAGERS) { + i.setup(isSubstrateTest); } } - public static void tearDown() { - for (TestScopeSetup i : scopeManagers) { - i.tearDown(); + public static void tearDown(boolean isSubstrateTest) { + for (TestScopeSetup i : SCOPE_MANAGERS) { + i.tearDown(isSubstrateTest); } } } diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java index b063cd5bd67..275c41b6c46 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java @@ -298,14 +298,16 @@ private URLClassLoader createQuarkusBuildClassLoader(Path appClassLocation) { @Override public void afterEach(ExtensionContext context) throws Exception { + boolean substrateTest = context.getRequiredTestClass().isAnnotationPresent(SubstrateTest.class); restAssuredURLManager.clearURL(); - TestScopeManager.tearDown(); + TestScopeManager.tearDown(substrateTest); } @Override public void beforeEach(ExtensionContext context) throws Exception { + boolean substrateTest = context.getRequiredTestClass().isAnnotationPresent(SubstrateTest.class); restAssuredURLManager.setURL(); - TestScopeManager.setup(); + TestScopeManager.setup(substrateTest); } @Override

['test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java', 'core/deployment/src/main/java/io/quarkus/deployment/test/TestScopeSetup.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestRequestScopeProvider.java', 'test-framework/common/src/main/java/io/quarkus/test/common/TestScopeManager.java']

{'.java': 4}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4274/4248

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4248

https://github.com/quarkusio/quarkus/pull/4274

https://github.com/quarkusio/quarkus/pull/4274

fix

Native image - ClassNotFoundException: org.conscrypt.BufferAllocator

**Describe the bug** When upgrading from Quarkus 0.19.0 to 0.23.1 (GraalVM 19.0.2 to 19.2.0.1) I'm getting this error at native-image compilation: ``` [2019-09-26T17:55:00.105Z] [INFO] [io.quarkus.creator.phase.nativeimage.NativeImagePhase] Running Quarkus native-image plugin on OpenJDK 64-Bit GraalVM CE 19.2.0.1 [2019-09-26T17:55:00.105Z] [INFO] [io.quarkus.creator.phase.nativeimage.NativeImagePhase] /opt/graalvm/bin/native-image -J-Dsun.nio.ch.maxUpdateArraySize=100 -J-Dio.netty.noUnsafe=true -J-Dvertx.logger-delegate-factory-class-name=io.quarkus.vertx.core.runtime.VertxLogDelegateFactory -J-Dio.netty.leakDetection.level=DISABLED -J-Djava.util.logging.manager=org.jboss.logmanager.LogManager -J-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize=true -J-Dvertx.disableDnsResolver=true --initialize-at-build-time= -H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime -jar ojf-quarkus-packaging-runner.jar -J-Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -H:FallbackThreshold=0 -H:+ReportUnsupportedElementsAtRuntime -H:+ReportExceptionStackTraces -H:+PrintAnalysisCallTree -H:-AddAllCharsets -H:EnableURLProtocols=http -H:+JNI --no-server -H:-UseServiceLoaderFeature -H:+StackTrace [2019-09-26T17:55:26.895Z] [quarkus-packaging-runner:1115] classlist: 23,885.64 ms [2019-09-26T17:55:26.895Z] [quarkus-packaging-runner:1115] setup: 520.25 ms [2019-09-26T17:55:26.895Z] Fatal error: java.lang.NoClassDefFoundError [2019-09-26T17:55:26.895Z] at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) [2019-09-26T17:55:26.895Z] at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) [2019-09-26T17:55:26.895Z] at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) [2019-09-26T17:55:26.895Z] at java.lang.reflect.Constructor.newInstance(Constructor.java:423) [2019-09-26T17:55:26.896Z] at java.util.concurrent.ForkJoinTask.getThrowableException(ForkJoinTask.java:598) [2019-09-26T17:55:26.896Z] at java.util.concurrent.ForkJoinTask.get(ForkJoinTask.java:1005) [2019-09-26T17:55:26.896Z] at com.oracle.svm.hosted.NativeImageGenerator.run(NativeImageGenerator.java:461) [2019-09-26T17:55:26.896Z] at com.oracle.svm.hosted.NativeImageGeneratorRunner.buildImage(NativeImageGeneratorRunner.java:310) [2019-09-26T17:55:26.896Z] at com.oracle.svm.hosted.NativeImageGeneratorRunner.build(NativeImageGeneratorRunner.java:448) [2019-09-26T17:55:26.896Z] at com.oracle.svm.hosted.NativeImageGeneratorRunner.main(NativeImageGeneratorRunner.java:113) [2019-09-26T17:55:26.896Z] Caused by: java.lang.NoClassDefFoundError: org/conscrypt/BufferAllocator [2019-09-26T17:55:26.896Z] at java.lang.Class.getDeclaredMethods0(Native Method) [2019-09-26T17:55:26.896Z] at java.lang.Class.privateGetDeclaredMethods(Class.java:2701) [2019-09-26T17:55:26.896Z] at java.lang.Class.getDeclaredMethods(Class.java:1975) [2019-09-26T17:55:26.896Z] at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.handleDeletedClass(AnnotationSubstitutionProcessor.java:437) [2019-09-26T17:55:26.896Z] at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.handleClass(AnnotationSubstitutionProcessor.java:270) [2019-09-26T17:55:26.896Z] at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.init(AnnotationSubstitutionProcessor.java:230) [2019-09-26T17:55:26.896Z] at com.oracle.svm.hosted.NativeImageGenerator.createDeclarativeSubstitutionProcessor(NativeImageGenerator.java:875) [2019-09-26T17:55:26.896Z] at com.oracle.svm.hosted.NativeImageGenerator.setupNativeImage(NativeImageGenerator.java:824) [2019-09-26T17:55:26.896Z] at com.oracle.svm.hosted.NativeImageGenerator.doRun(NativeImageGenerator.java:524) [2019-09-26T17:55:26.896Z] at com.oracle.svm.hosted.NativeImageGenerator.lambda$run$0(NativeImageGenerator.java:444) [2019-09-26T17:55:26.896Z] at java.util.concurrent.ForkJoinTask$AdaptedRunnableAction.exec(ForkJoinTask.java:1386) [2019-09-26T17:55:26.896Z] at java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:289) [2019-09-26T17:55:26.896Z] at java.util.concurrent.ForkJoinPool$WorkQueue.runTask(ForkJoinPool.java:1056) [2019-09-26T17:55:26.896Z] at java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1692) [2019-09-26T17:55:26.896Z] at java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:157) [2019-09-26T17:55:26.896Z] Caused by: java.lang.ClassNotFoundException: org.conscrypt.BufferAllocator [2019-09-26T17:55:26.896Z] at java.net.URLClassLoader.findClass(URLClassLoader.java:382) [2019-09-26T17:55:26.896Z] at java.lang.ClassLoader.loadClass(ClassLoader.java:424) [2019-09-26T17:55:26.896Z] at java.lang.ClassLoader.loadClass(ClassLoader.java:357) [2019-09-26T17:55:26.896Z] ... 15 more [2019-09-26T17:55:26.896Z] Error: Image build request failed with exit status 1 ``` I tried to zgrep for conscrypt or org.conscrypt.BufferAllocator in target/lib, but didn't find any references in any jar. **Expected behavior** Should compile (was fine on Quarkus 0.19.0 + GraalVM 19.0.2). **To Reproduce** I don't have a reproducer I can share, but: - I'm using the docker image quay.io/quarkus/centos-quarkus-maven:19.2.0.1 to build. - My application uses the following extensions: quarkus-undertow, quarkus-spring-di, quarkus-resteasy, and a custom one with a servlet and some Arc beans. **Environment (please complete the following information):** - Output of `uname -a` or `ver`: `Linux 8e5961cd5b12 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 13 10:46:25 EDT 2017 x86_64 x86_64 x86_64 GNU/Linux` - Output of `java -version`: `openjdk version "1.8.0_222"` `OpenJDK Runtime Environment (build 1.8.0_222-20190711120915.buildslave.jdk8u-src-tar--b08) OpenJDK 64-Bit GraalVM CE 19.2.0.1 (build 25.222-b08-jvmci-19.2-b02, mixed mode)` - GraalVM version (if different from Java): `GraalVM CE 19.2.0.1` - Quarkus version or git rev: 0.23.1 **Additional context** I've only seen the same error mentioned in https://github.com/apache/camel-quarkus/issues/132

00f961719a1bdabd286bd900b263a77c79d0a903

5958a040c9fea55b6751a65eae656a549a0b0df3

https://github.com/quarkusio/quarkus/compare/00f961719a1bdabd286bd900b263a77c79d0a903...5958a040c9fea55b6751a65eae656a549a0b0df3

diff --git a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java index ab2bb428f41..da0521e7f6e 100644 --- a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java +++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java @@ -12,11 +12,11 @@ import javax.net.ssl.TrustManagerFactory; import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.jdk.JDK11OrLater; +import com.oracle.svm.core.jdk.JDK8OrEarlier; import io.netty.bootstrap.AbstractBootstrapConfig; import io.netty.bootstrap.ChannelFactory; @@ -92,11 +92,6 @@ final class Target_io_netty_handler_ssl_SslHandler$SslEngineType { } } -@Delete -@TargetClass(className = "io.netty.handler.ssl.ConscryptAlpnSslEngine") -final class Target_io_netty_handler_ssl_ConscryptAlpnSslEngine { -} - @TargetClass(className = "io.netty.handler.ssl.JdkAlpnApplicationProtocolNegotiator$AlpnWrapper", onlyWith = JDK11OrLater.class) final class Target_io_netty_handler_ssl_JdkAlpnApplicationProtocolNegotiator_AlpnWrapper { @Substitute @@ -107,6 +102,43 @@ public SSLEngine wrapSslEngine(SSLEngine engine, ByteBufAllocator alloc, } +@TargetClass(className = "io.netty.handler.ssl.JdkAlpnApplicationProtocolNegotiator$AlpnWrapper", onlyWith = JDK8OrEarlier.class) +final class Target_io_netty_handler_ssl_JdkAlpnApplicationProtocolNegotiator_AlpnWrapperJava8 { + @Substitute + public SSLEngine wrapSslEngine(SSLEngine engine, ByteBufAllocator alloc, + JdkApplicationProtocolNegotiator applicationNegotiator, boolean isServer) { + if (Target_io_netty_handler_ssl_JettyAlpnSslEngine.isAvailable()) { + return isServer + ? (SSLEngine) (Object) Target_io_netty_handler_ssl_JettyAlpnSslEngine.newServerEngine(engine, + applicationNegotiator) + : (SSLEngine) (Object) Target_io_netty_handler_ssl_JettyAlpnSslEngine.newClientEngine(engine, + applicationNegotiator); + } + throw new RuntimeException("Unable to wrap SSLEngine of type " + engine.getClass().getName()); + } + +} + +@TargetClass(className = "io.netty.handler.ssl.JettyAlpnSslEngine", onlyWith = JDK8OrEarlier.class) +final class Target_io_netty_handler_ssl_JettyAlpnSslEngine { + @Alias + static boolean isAvailable() { + return false; + } + + @Alias + static Target_io_netty_handler_ssl_JettyAlpnSslEngine newClientEngine(SSLEngine engine, + JdkApplicationProtocolNegotiator applicationNegotiator) { + return null; + } + + @Alias + static Target_io_netty_handler_ssl_JettyAlpnSslEngine newServerEngine(SSLEngine engine, + JdkApplicationProtocolNegotiator applicationNegotiator) { + return null; + } +} + @TargetClass(className = "io.netty.handler.ssl.Java9SslEngine", onlyWith = JDK11OrLater.class) final class Target_io_netty_handler_ssl_Java9SslEngine { @Alias

['extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4753/4745

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4745

https://github.com/quarkusio/quarkus/pull/4753

https://github.com/quarkusio/quarkus/pull/4753

fixes

gradle wrapper not created when creating projects on windows

**Describe the bug** CreateProjectMojo calls gradle instead of gradle.bat/cmd thus on windows gradle wrappers are never created. https://github.com/quarkusio/quarkus/blob/8582422fd071d3ef152d861ab50de5ca1064e8cf/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java#L219

ea828fc47fbb02ec8073fb5044dfd33a6cc0c76b

0abfeafcba9b512a71a11a516d5e5cfb0ccb2356

https://github.com/quarkusio/quarkus/compare/ea828fc47fbb02ec8073fb5044dfd33a6cc0c76b...0abfeafcba9b512a71a11a516d5e5cfb0ccb2356

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java index 140e28bd265..7e089cd769d 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java @@ -18,6 +18,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -58,6 +59,8 @@ @Mojo(name = "create", requiresProject = false) public class CreateProjectMojo extends AbstractMojo { + final private static boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows"); + private static String pluginKey; public static String getPluginKey() { @@ -216,7 +219,8 @@ public void execute() throws MojoExecutionException { private void createGradleWrapper(File projectDirectory) { try { - ProcessBuilder pb = new ProcessBuilder("gradle", "wrapper", + String gradleName = IS_WINDOWS ? "gradle.bat" : "gradle"; + ProcessBuilder pb = new ProcessBuilder(gradleName, "wrapper", "--gradle-version=" + MojoUtils.getGradleWrapperVersion()).directory(projectDirectory) .inheritIO(); Process x = pb.start(); @@ -224,7 +228,7 @@ private void createGradleWrapper(File projectDirectory) { x.waitFor(); if (x.exitValue() != 0) { - getLog().error("Unable to install the Gradle wrapper (./gradlew) in project. See log for details."); + getLog().warn("Unable to install the Gradle wrapper (./gradlew) in project. See log for details."); } } catch (InterruptedException | IOException e) {

['devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4752/4749

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4749

https://github.com/quarkusio/quarkus/pull/4752

https://github.com/quarkusio/quarkus/pull/4752

fixes

Bootstrap maven repo initializer should take into account maven.repo.local property

At this point the local repository location can be configured using settings.xml and QUARKUS_LOCAL_REPO env var with the default pointing to the `~/.m2/repository`. It should also consult `maven.repo.local` system property.

ea828fc47fbb02ec8073fb5044dfd33a6cc0c76b

b03fca06dab05eec08be59de97998ec6418eca71

https://github.com/quarkusio/quarkus/compare/ea828fc47fbb02ec8073fb5044dfd33a6cc0c76b...b03fca06dab05eec08be59de97998ec6418eca71

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java index d064ba697d0..c88d79b6a6c 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java @@ -437,11 +437,15 @@ public static Settings getSettings() throws AppModelResolverException { } public static String getLocalRepo(Settings settings) { - String env = System.getenv("QUARKUS_LOCAL_REPO"); - if(env != null) { - return env; + String localRepo = System.getenv("QUARKUS_LOCAL_REPO"); + if(localRepo != null) { + return localRepo; } - final String localRepo = settings.getLocalRepository(); + localRepo = PropertyUtils.getProperty("maven.repo.local"); + if(localRepo != null) { + return localRepo; + } + localRepo = settings.getLocalRepository(); return localRepo == null ? getDefaultLocalRepo() : localRepo; }

['independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4727/4683

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4683

https://github.com/quarkusio/quarkus/pull/4727

https://github.com/quarkusio/quarkus/pull/4727

fixes

Class io.quarkus.kafka.client.serialization.JsonbSerializer not included in native image

**Describe the bug** After packaging/building my kafka producer-consumer application, when trying to run the docker container that contains the native application, I am facing the error: **Class io.quarkus.kafka.client.serialization.JsonbSerializer could not be found** > Note: running in dev mode and docker with JVM mode the app works fine **Expected behavior** My application should start normally without the error above **Actual behavior** Here is the stacktrace ``` ERROR [io.sma.rea.mes.imp.ConfiguredChannelFactory] (main) Unable to create the publisher or subscriber during initialization: org.apache.kafka.common.config.ConfigException: Invalid value io.quarkus.kafka.client.serialization.JsonbSerializer for configuration value.serializer: Class io.quarkus.kafka.client.serialization.JsonbSerializer could not be found. at org.apache.kafka.common.config.ConfigDef.parseType(ConfigDef.java:718) at org.apache.kafka.common.config.ConfigDef.parseValue(ConfigDef.java:471) at org.apache.kafka.common.config.ConfigDef.parse(ConfigDef.java:464) at org.apache.kafka.common.config.AbstractConfig.<init>(AbstractConfig.java:62) at org.apache.kafka.common.config.AbstractConfig.<init>(AbstractConfig.java:75) at org.apache.kafka.clients.producer.ProducerConfig.<init>(ProducerConfig.java:396) at org.apache.kafka.clients.producer.KafkaProducer.<init>(KafkaProducer.java:327) at org.apache.kafka.clients.producer.KafkaProducer.<init>(KafkaProducer.java:271) at io.vertx.kafka.client.producer.impl.KafkaWriteStreamImpl.create(KafkaWriteStreamImpl.java:52) at io.vertx.kafka.client.producer.KafkaWriteStream.create(KafkaWriteStream.java:92) at io.smallrye.reactive.messaging.kafka.KafkaSink.<init>(KafkaSink.java:50) at io.smallrye.reactive.messaging.kafka.KafkaConnector.getSubscriberBuilder(KafkaConnector.java:73) at io.smallrye.reactive.messaging.kafka.KafkaConnector_ClientProxy.getSubscriberBuilder(KafkaConnector_ClientProxy.zig:283) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.createSubscriberBuilder(ConfiguredChannelFactory.java:156) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.lambda$register$5(ConfiguredChannelFactory.java:124) at java.util.HashMap.forEach(HashMap.java:1289) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.register(ConfiguredChannelFactory.java:124) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.initialize(ConfiguredChannelFactory.java:118) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory_ClientProxy.initialize(ConfiguredChannelFactory_ClientProxy.zig:195) at java.util.Iterator.forEachRemaining(Iterator.java:116) at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801) at java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:647) at io.smallrye.reactive.messaging.extension.MediatorManager.initializeAndRun(MediatorManager.java:132) at io.smallrye.reactive.messaging.extension.MediatorManager_ClientProxy.initializeAndRun(MediatorManager_ClientProxy.zig:100) at io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle.onApplicationStart(SmallRyeReactiveMessagingLifecycle.java:20) at io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle_Observer_onApplicationStart_4e8937813d9e8faff65c3c07f88fa96615b70e70.notify(SmallRyeReactiveMessagingLifecycle_Observer_onApplicationStart_4e8937813d9e8faff65c3c07f88fa96615b70e70.zig:51) at io.quarkus.arc.EventImpl$Notifier.notify(EventImpl.java:228) at io.quarkus.arc.EventImpl.fire(EventImpl.java:69) at io.quarkus.arc.runtime.LifecycleEventRunner.fireStartupEvent(LifecycleEventRunner.java:23) at io.quarkus.arc.runtime.ArcRecorder.handleLifecycleEvents(ArcRecorder.java:103) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent32.deploy_0(LifecycleEventsBuildStep$startupEvent32.zig:77) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent32.deploy(LifecycleEventsBuildStep$startupEvent32.zig:36) at io.quarkus.runner.ApplicationImpl1.doStart(ApplicationImpl1.zig:161) at io.quarkus.runtime.Application.start(Application.java:93) at io.quarkus.runtime.Application.run(Application.java:213) at io.quarkus.runner.GeneratedMain.main(GeneratedMain.zig:34) javax.enterprise.inject.spi.DeploymentException: org.apache.kafka.common.config.ConfigException: Invalid value io.quarkus.kafka.client.serialization.JsonbSerializer for configuration value.serializer: Class io.quarkus.kafka.client.serialization.JsonbSerializer could not be found. at io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle.onApplicationStart(SmallRyeReactiveMessagingLifecycle.java:22) at io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle_Observer_onApplicationStart_4e8937813d9e8faff65c3c07f88fa96615b70e70.notify(SmallRyeReactiveMessagingLifecycle_Observer_onApplicationStart_4e8937813d9e8faff65c3c07f88fa96615b70e70.zig:51) at io.quarkus.arc.EventImpl$Notifier.notify(EventImpl.java:228) at io.quarkus.arc.EventImpl.fire(EventImpl.java:69) at io.quarkus.arc.runtime.LifecycleEventRunner.fireStartupEvent(LifecycleEventRunner.java:23) at io.quarkus.arc.runtime.ArcRecorder.handleLifecycleEvents(ArcRecorder.java:103) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent32.deploy_0(LifecycleEventsBuildStep$startupEvent32.zig:77) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent32.deploy(LifecycleEventsBuildStep$startupEvent32.zig:36) at io.quarkus.runner.ApplicationImpl1.doStart(ApplicationImpl1.zig:161) at io.quarkus.runtime.Application.start(Application.java:93) at io.quarkus.runtime.Application.run(Application.java:213) at io.quarkus.runner.GeneratedMain.main(GeneratedMain.zig:34) Caused by: org.apache.kafka.common.config.ConfigException: Invalid value io.quarkus.kafka.client.serialization.JsonbSerializer for configuration value.serializer: Class io.quarkus.kafka.client.serialization.JsonbSerializer could not be found. at org.apache.kafka.common.config.ConfigDef.parseType(ConfigDef.java:718) at org.apache.kafka.common.config.ConfigDef.parseValue(ConfigDef.java:471) at org.apache.kafka.common.config.ConfigDef.parse(ConfigDef.java:464) at org.apache.kafka.common.config.AbstractConfig.<init>(AbstractConfig.java:62) at org.apache.kafka.common.config.AbstractConfig.<init>(AbstractConfig.java:75) at org.apache.kafka.clients.producer.ProducerConfig.<init>(ProducerConfig.java:396) at org.apache.kafka.clients.producer.KafkaProducer.<init>(KafkaProducer.java:327) at org.apache.kafka.clients.producer.KafkaProducer.<init>(KafkaProducer.java:271) at io.vertx.kafka.client.producer.impl.KafkaWriteStreamImpl.create(KafkaWriteStreamImpl.java:52) at io.vertx.kafka.client.producer.KafkaWriteStream.create(KafkaWriteStream.java:92) at io.smallrye.reactive.messaging.kafka.KafkaSink.<init>(KafkaSink.java:50) at io.smallrye.reactive.messaging.kafka.KafkaConnector.getSubscriberBuilder(KafkaConnector.java:73) at io.smallrye.reactive.messaging.kafka.KafkaConnector_ClientProxy.getSubscriberBuilder(KafkaConnector_ClientProxy.zig:283) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.createSubscriberBuilder(ConfiguredChannelFactory.java:156) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.lambda$register$5(ConfiguredChannelFactory.java:124) at java.util.HashMap.forEach(HashMap.java:1289) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.register(ConfiguredChannelFactory.java:124) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.initialize(ConfiguredChannelFactory.java:118) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory_ClientProxy.initialize(ConfiguredChannelFactory_ClientProxy.zig:195) at java.util.Iterator.forEachRemaining(Iterator.java:116) at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801) at java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:647) at io.smallrye.reactive.messaging.extension.MediatorManager.initializeAndRun(MediatorManager.java:132) at io.smallrye.reactive.messaging.extension.MediatorManager_ClientProxy.initializeAndRun(MediatorManager_ClientProxy.zig:100) at io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle.onApplicationStart(SmallRyeReactiveMessagingLifecycle.java:20) ... 11 more INFO [io.sma.rea.mes.ext.MediatorManager] (main) Cancel subscriptions Exception in thread "main" java.lang.RuntimeException: Failed to start quarkus at io.quarkus.runner.ApplicationImpl1.doStart(ApplicationImpl1.zig:185) at io.quarkus.runtime.Application.start(Application.java:93) at io.quarkus.runtime.Application.run(Application.java:213) at io.quarkus.runner.GeneratedMain.main(GeneratedMain.zig:34) Caused by: javax.enterprise.inject.spi.DeploymentException: org.apache.kafka.common.config.ConfigException: Invalid value io.quarkus.kafka.client.serialization.JsonbSerializer for configuration value.serializer: Class io.quarkus.kafka.client.serialization.JsonbSerializer could not be found. at io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle.onApplicationStart(SmallRyeReactiveMessagingLifecycle.java:22) at io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle_Observer_onApplicationStart_4e8937813d9e8faff65c3c07f88fa96615b70e70.notify(SmallRyeReactiveMessagingLifecycle_Observer_onApplicationStart_4e8937813d9e8faff65c3c07f88fa96615b70e70.zig:51) at io.quarkus.arc.EventImpl$Notifier.notify(EventImpl.java:228) at io.quarkus.arc.EventImpl.fire(EventImpl.java:69) at io.quarkus.arc.runtime.LifecycleEventRunner.fireStartupEvent(LifecycleEventRunner.java:23) at io.quarkus.arc.runtime.ArcRecorder.handleLifecycleEvents(ArcRecorder.java:103) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent32.deploy_0(LifecycleEventsBuildStep$startupEvent32.zig:77) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent32.deploy(LifecycleEventsBuildStep$startupEvent32.zig:36) at io.quarkus.runner.ApplicationImpl1.doStart(ApplicationImpl1.zig:161) ... 3 more Caused by: org.apache.kafka.common.config.ConfigException: Invalid value io.quarkus.kafka.client.serialization.JsonbSerializer for configuration value.serializer: Class io.quarkus.kafka.client.serialization.JsonbSerializer could not be found. at org.apache.kafka.common.config.ConfigDef.parseType(ConfigDef.java:718) at org.apache.kafka.common.config.ConfigDef.parseValue(ConfigDef.java:471) at org.apache.kafka.common.config.ConfigDef.parse(ConfigDef.java:464) at org.apache.kafka.common.config.AbstractConfig.<init>(AbstractConfig.java:62) at org.apache.kafka.common.config.AbstractConfig.<init>(AbstractConfig.java:75) at org.apache.kafka.clients.producer.ProducerConfig.<init>(ProducerConfig.java:396) at org.apache.kafka.clients.producer.KafkaProducer.<init>(KafkaProducer.java:327) at org.apache.kafka.clients.producer.KafkaProducer.<init>(KafkaProducer.java:271) at io.vertx.kafka.client.producer.impl.KafkaWriteStreamImpl.create(KafkaWriteStreamImpl.java:52) at io.vertx.kafka.client.producer.KafkaWriteStream.create(KafkaWriteStream.java:92) at io.smallrye.reactive.messaging.kafka.KafkaSink.<init>(KafkaSink.java:50) at io.smallrye.reactive.messaging.kafka.KafkaConnector.getSubscriberBuilder(KafkaConnector.java:73) at io.smallrye.reactive.messaging.kafka.KafkaConnector_ClientProxy.getSubscriberBuilder(KafkaConnector_ClientProxy.zig:283) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.createSubscriberBuilder(ConfiguredChannelFactory.java:156) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.lambda$register$5(ConfiguredChannelFactory.java:124) at java.util.HashMap.forEach(HashMap.java:1289) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.register(ConfiguredChannelFactory.java:124) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory.initialize(ConfiguredChannelFactory.java:118) at io.smallrye.reactive.messaging.impl.ConfiguredChannelFactory_ClientProxy.initialize(ConfiguredChannelFactory_ClientProxy.zig:195) at java.util.Iterator.forEachRemaining(Iterator.java:116) at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801) at java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:647) at io.smallrye.reactive.messaging.extension.MediatorManager.initializeAndRun(MediatorManager.java:132) at io.smallrye.reactive.messaging.extension.MediatorManager_ClientProxy.initializeAndRun(MediatorManager_ClientProxy.zig:100) at io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle.onApplicationStart(SmallRyeReactiveMessagingLifecycle.java:20) ... 11 more ``` **To Reproduce** Steps to reproduce the behavior: 1. Create a project with kafka and JSON-B serialization 2. Build it using native mode 3. Start it. The error will be during the startup **Configuration** ```properties mp.messaging.outgoing.news.connector=smallrye-kafka mp.messaging.outgoing.news.topic=quarkus.news.json #mp.messaging.outgoing.news.bootstrap.servers=${KAFKA_HOST:localhost}:${KAFKA_PORT:9092} %dev.mp.messaging.outgoing.news.bootstrap.servers=localhost:9092 mp.messaging.outgoing.news.bootstrap.servers=kafka:9092 mp.messaging.outgoing.news.value.serializer=io.quarkus.kafka.client.serialization.JsonbSerializer ``` **Screenshots** (If applicable, add screenshots to help explain your problem.) **Environment (please complete the following information):** - Output of `uname -a` or `ver`: - Output of `java -version`: ``` openjdk version "1.8.0_222" OpenJDK Runtime Environment (build 1.8.0_222-20190711112007.graal.jdk8u-src-tar-gz-b08) OpenJDK 64-Bit GraalVM CE 19.2.0.1 (build 25.222-b08-jvmci-19.2-b02, mixed mode) ``` - GraalVM version (if different from Java): - Quarkus version or git rev: `0.25.0` **Additional context** (Add any other context about the problem here.)

4def43577e1ac5353643b96d4599a191bb549398

b174c671bef5843afc1521ed65459a2e3b56957e

https://github.com/quarkusio/quarkus/compare/4def43577e1ac5353643b96d4599a191bb549398...b174c671bef5843afc1521ed65459a2e3b56957e

diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java index 69405b8b022..1f10d4f4273 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java +++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java @@ -43,6 +43,8 @@ import io.quarkus.gizmo.ClassOutput; import io.quarkus.gizmo.MethodCreator; import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.kafka.client.serialization.JsonbDeserializer; +import io.quarkus.kafka.client.serialization.JsonbSerializer; public class KafkaProcessor { @@ -57,6 +59,7 @@ public class KafkaProcessor { ByteBufferSerializer.class, StringSerializer.class, FloatSerializer.class, + JsonbSerializer.class, //deserializers ShortDeserializer.class, @@ -68,6 +71,7 @@ public class KafkaProcessor { ByteBufferDeserializer.class, StringDeserializer.class, FloatDeserializer.class, + JsonbDeserializer.class, }; static final String TARGET_JAVA_9_CHECKSUM_FACTORY = "io.quarkus.kafka.client.generated.Target_Java9ChecksumFactory";

['extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4652/4645

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4645

https://github.com/quarkusio/quarkus/pull/4652

https://github.com/quarkusio/quarkus/pull/4652

fixes

ClassLoader not closed

**Describe the bug** During builds, a classloader created by the quarkus maven plugin is not closed completely, thus not releasing the jars after the build. This can cause problems when embedding maven. This mainly happens when using concurrent builds and a maven daemon (this always occurs the second time). This means that a reference to a zip file is not released correctly (even though the classloader created by quarkus is correctly closed). **Expected behavior** The classloader is closed. **Actual behavior** ``` Caused by: java.util.zip.ZipException: ZipFile invalid LOC header (bad signature) at java.base/java.util.zip.ZipFile$ZipFileInputStream.initDataOffset(ZipFile.java:1003) at java.base/java.util.zip.ZipFile$ZipFileInputStream.read(ZipFile.java:1013) at java.base/java.util.zip.ZipFile$ZipFileInflaterInputStream.fill(ZipFile.java:468) at java.base/java.util.zip.InflaterInputStream.read(InflaterInputStream.java:159) ```

381e7df4439f5dd9f7a83ae9ec2a5a7469512c1c

e463a4af098546fd2e2482a701fbc4ac3ab0d97e

https://github.com/quarkusio/quarkus/compare/381e7df4439f5dd9f7a83ae9ec2a5a7469512c1c...e463a4af098546fd2e2482a701fbc4ac3ab0d97e

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/ServiceUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/ServiceUtil.java index d57d632b8cd..6ab6e390232 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/util/ServiceUtil.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/util/ServiceUtil.java @@ -7,6 +7,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; +import java.net.URLConnection; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.NoSuchFileException; @@ -39,7 +40,9 @@ public static Set<String> classNamesNamedIn(ClassLoader classLoader, String file while (resources.hasMoreElements()) { final URL url = resources.nextElement(); - try (InputStream is = url.openStream()) { + URLConnection con = url.openConnection(); + con.setUseCaches(false); + try (InputStream is = con.getInputStream()) { try (BufferedInputStream bis = new BufferedInputStream(is)) { try (InputStreamReader isr = new InputStreamReader(bis, StandardCharsets.UTF_8)) { try (BufferedReader br = new BufferedReader(isr)) { @@ -47,6 +50,8 @@ public static Set<String> classNamesNamedIn(ClassLoader classLoader, String file } } } + } catch (IOException e) { + throw new IOException("Error reading " + url, e); } }

['core/deployment/src/main/java/io/quarkus/deployment/util/ServiceUtil.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4567/4565

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4565

https://github.com/quarkusio/quarkus/pull/4567

https://github.com/quarkusio/quarkus/pull/4567

fixes

BuildStep utilizing InterceptorBindingRegistrarBuildItem results in IllegalArgumentException

**Describe the bug** I followed the example from the CDI guide for implementing [additional interceptor bindings](https://quarkus.io/guides/cdi-reference#additional-interceptor-bindings). It fails with: ``` java.lang.IllegalArgumentException: Build item class must be leaf (final) types: class io.quarkus.arc.deployment.InterceptorBindingRegistrarBuildItem at io.quarkus.builder.item.BuildItem.<init>(BuildItem.java:22) at io.quarkus.builder.item.MultiBuildItem.<init>(MultiBuildItem.java:8) at io.quarkus.arc.deployment.InterceptorBindingRegistrarBuildItem.<init>(InterceptorBindingRegistrarBuildItem.java:9) ``` Presumably `InterceptorBindingRegistrarBuildItem` should be declared as `final` like the other `BuildItem` implementations? **Expected behavior** `InterceptorBindingRegistrarBuildItem` successfully registers the interceptor binding.

f0375704930b06f7b9fa5ae50e648c2b0dbd88bc

3d21f2d3d87a799b6b555aaefa802c20be247f49

https://github.com/quarkusio/quarkus/compare/f0375704930b06f7b9fa5ae50e648c2b0dbd88bc...3d21f2d3d87a799b6b555aaefa802c20be247f49

diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/InterceptorBindingRegistrarBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/InterceptorBindingRegistrarBuildItem.java index cf48e4cf6b3..a399b05f5bb 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/InterceptorBindingRegistrarBuildItem.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/InterceptorBindingRegistrarBuildItem.java @@ -3,7 +3,7 @@ import io.quarkus.arc.processor.InterceptorBindingRegistrar; import io.quarkus.builder.item.MultiBuildItem; -public class InterceptorBindingRegistrarBuildItem extends MultiBuildItem { +public final class InterceptorBindingRegistrarBuildItem extends MultiBuildItem { private final InterceptorBindingRegistrar registrar; public InterceptorBindingRegistrarBuildItem(InterceptorBindingRegistrar registrar) {

['extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/InterceptorBindingRegistrarBuildItem.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4546/4545

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4545

https://github.com/quarkusio/quarkus/pull/4546

https://github.com/quarkusio/quarkus/pull/4546

resolves

Shared lifecycle interceptor instances use wrong CreationalContext

Each interceptor instance should receive a new child `CreationalContext` from the CC of the intercepted bean. This issue follows up on #3530.

51c3476e97efc5b82f4689db4ece30b5ed945130

8f2b288b9b5c74398108225ea23829847826f252

https://github.com/quarkusio/quarkus/compare/51c3476e97efc5b82f4689db4ece30b5ed945130...8f2b288b9b5c74398108225ea23829847826f252

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java index 31f2824a9c8..7a75c1d6662 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java @@ -854,9 +854,11 @@ protected void implementCreate(ClassOutput classOutput, ClassCreator beanCreator create.getThis()); ResultHandle interceptorProvider = create.invokeInterfaceMethod( MethodDescriptors.SUPPLIER_GET, interceptorProviderSupplier); + ResultHandle childCtxHandle = create.invokeStaticMethod(MethodDescriptors.CREATIONAL_CTX_CHILD, + create.getMethodParam(0)); ResultHandle interceptorInstanceHandle = create.invokeInterfaceMethod( MethodDescriptors.INJECTABLE_REF_PROVIDER_GET, interceptorProvider, - create.getMethodParam(0)); + childCtxHandle); interceptorToResultHandle.put(interceptor, interceptorInstanceHandle); ResultHandle wrapHandle = create.invokeStaticMethod( MethodDescriptor.ofMethod(InitializedInterceptor.class, "of", diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InterceptedBeanMetadataProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InterceptedBeanMetadataProvider.java index c8955d6ab59..f1b37b7c3cf 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InterceptedBeanMetadataProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InterceptedBeanMetadataProvider.java @@ -14,10 +14,11 @@ public class InterceptedBeanMetadataProvider implements InjectableReferenceProvi @Override public Contextual<?> get(CreationalContext<Contextual<?>> creationalContext) { + // First attempt to obtain the creational context of the interceptor bean and then the creational context of the intercepted bean CreationalContextImpl<?> parent = unwrap(creationalContext).getParent(); if (parent != null) { - // Intercepted bean creational context - return parent.getContextual(); + parent = parent.getParent(); + return parent != null ? parent.getContextual() : null; } return null; } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java index ea212c46c98..ca5c43a3b18 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java @@ -5,6 +5,7 @@ import io.quarkus.arc.Arc; import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.Dependent; import javax.enterprise.inject.spi.Bean; import javax.inject.Inject; import org.junit.jupiter.api.Test; @@ -14,7 +15,7 @@ public class InterceptedBeanInjectionTest { @RegisterExtension public ArcTestContainer container = new ArcTestContainer(Simple.class, - SimpleInterceptor.class, InterceptedBean.class); + SimpleInterceptor.class, InterceptedBean.class, InterceptedDependent.class); @Test public void testInterception() { @@ -22,6 +23,12 @@ public void testInterception() { assertEquals(InterceptedBean.class.getName() + InterceptedBean.class.getName(), bean.ping()); assertEquals(InterceptedBean.class.getName(), SimpleInterceptor.aroundConstructResult); assertEquals(InterceptedBean.class.getName(), SimpleInterceptor.postConstructResult); + assertEquals( + InterceptedBean.class.getName() + InterceptedDependent.class.getName() + InterceptedDependent.class.getName(), + bean.pong()); + InterceptedDependent dependent = Arc.container().instance(InterceptedDependent.class).get(); + assertEquals(InterceptedDependent.class.getName() + InterceptedDependent.class.getName(), + dependent.pong()); } @ApplicationScoped @@ -31,10 +38,27 @@ static class InterceptedBean { @Inject Bean<?> bean; - public String ping() { + @Inject + InterceptedDependent dependent; + + String ping() { return bean.getBeanClass().getName(); } + String pong() { + return dependent.pong(); + } + + } + + @Dependent + static class InterceptedDependent { + + @Simple + String pong() { + return InterceptedDependent.class.getName(); + } + } }

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java', 'independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java', 'independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InterceptedBeanMetadataProvider.java']

{'.java': 3}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4501/4499

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4499

https://github.com/quarkusio/quarkus/pull/4501

https://github.com/quarkusio/quarkus/pull/4501

fixes

quarkus.application.name is not taken into account in stop message

If I add this to my `application.properties`: ``` quarkus.application.name=MyApp ``` Startup message is OK: ``` 2019-10-10 14:39:15,327 INFO [io.quarkus] (main) MyApp 1.0-SNAPSHOT (running on Quarkus 999-SNAPSHOT) started in 0.612s. Listening on: http://0.0.0.0:8080 2019-10-10 14:39:15,333 INFO [io.quarkus] (main) Profile prod activated. 2019-10-10 14:39:15,334 INFO [io.quarkus] (main) Installed features: [agroal, cdi, narayana-jta, resteasy, security, security-jdbc] ``` But not the shutdown message: ``` ^C2019-10-10 14:39:17,713 INFO [io.quarkus] (main) Quarkus stopped in 0.029s ``` We should fix the shutdown message to be consistent. Also we need to find a place to document this feature properly. But I couldn't find an obvious place. Initial PR with the startup name: https://github.com/quarkusio/quarkus/pull/4302

239b5c7294f76af99244ea65cb59ec8ad41c9342

10df14c488bbca2d5a3bd6b85a00839672f12217

https://github.com/quarkusio/quarkus/compare/239b5c7294f76af99244ea65cb59ec8ad41c9342...10df14c488bbca2d5a3bd6b85a00839672f12217

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java index 3c812874270..af9a314a80f 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java @@ -234,6 +234,11 @@ MainClassBuildItem build(List<StaticBytecodeRecorderBuildItem> staticInitTasks, mv.setModifiers(Modifier.PUBLIC | Modifier.STATIC); final ResultHandle appClassInstance = mv.newInstance(ofConstructor(appClassName)); + + // Set the application name + mv.invokeVirtualMethod(ofMethod(Application.class, "setName", void.class, String.class), appClassInstance, + mv.load(applicationInfo.getName())); + // run the app mv.invokeVirtualMethod(ofMethod(Application.class, "run", void.class, String[].class), appClassInstance, mv.getMethodParam(0)); diff --git a/core/runtime/src/main/java/io/quarkus/runtime/Application.java b/core/runtime/src/main/java/io/quarkus/runtime/Application.java index a0e8b2d721b..8cc773f7613 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/Application.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/Application.java @@ -36,6 +36,7 @@ public abstract class Application { private final Lock stateLock = Locks.reentrantLock(); private final Condition stateCond = stateLock.newCondition(); + private String name; private int state = ST_INITIAL; private volatile boolean shutdownRequested; private static volatile Application currentApplication; @@ -164,7 +165,7 @@ public final void stop() { stateLock.lock(); try { state = ST_STOPPED; - Timing.printStopTime(); + Timing.printStopTime(name); stateCond.signalAll(); } finally { stateLock.unlock(); @@ -178,6 +179,10 @@ public static Application currentApplication() { protected abstract void doStop(); + public void setName(String name) { + this.name = name; + } + /** * Run the application as if it were in a standalone JVM. */ diff --git a/core/runtime/src/main/java/io/quarkus/runtime/Timing.java b/core/runtime/src/main/java/io/quarkus/runtime/Timing.java index 60a993947bb..e834ae4ea71 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/Timing.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/Timing.java @@ -58,8 +58,8 @@ public static void printStartupTime(String name, String version, String quarkusV final Logger logger = Logger.getLogger("io.quarkus"); //Use a BigDecimal so we can render in seconds with 3 digits precision, as requested: final BigDecimal secondsRepresentation = convertToBigDecimalSeconds(bootTimeNanoSeconds); - String safeAppName = (name == null || name.isEmpty()) ? UNSET_VALUE : name; - String safeAppVersion = (version == null || version.isEmpty()) ? UNSET_VALUE : version; + String safeAppName = (name == null || name.trim().isEmpty()) ? UNSET_VALUE : name; + String safeAppVersion = (version == null || version.trim().isEmpty()) ? UNSET_VALUE : version; if (UNSET_VALUE.equals(safeAppName) || UNSET_VALUE.equals(safeAppVersion)) { logger.infof("Quarkus %s started in %ss. %s", quarkusVersion, secondsRepresentation, httpServerInfo); } else { @@ -71,11 +71,13 @@ public static void printStartupTime(String name, String version, String quarkusV bootStartTime = -1; } - public static void printStopTime() { + public static void printStopTime(String name) { final long stopTimeNanoSeconds = System.nanoTime() - bootStopTime; final Logger logger = Logger.getLogger("io.quarkus"); final BigDecimal secondsRepresentation = convertToBigDecimalSeconds(stopTimeNanoSeconds); - logger.infof("Quarkus stopped in %ss", secondsRepresentation); + logger.infof("%s stopped in %ss", + (UNSET_VALUE.equals(name) || name == null || name.trim().isEmpty()) ? "Quarkus" : name, + secondsRepresentation); bootStopTime = -1; }

['core/runtime/src/main/java/io/quarkus/runtime/Timing.java', 'core/runtime/src/main/java/io/quarkus/runtime/Application.java', 'core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java']

{'.java': 3}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4476/4469

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4469

https://github.com/quarkusio/quarkus/pull/4476

https://github.com/quarkusio/quarkus/pull/4476

fixes

CNFE on scope defining annotations in the default package

**Describe the bug** Quarkus fails ungracefully with scope-defining annotations on beans in the default package. The error: https://gist.github.com/michalszynkiewicz/c489af90ed958b4ff43c7236f4a1b09a **Expected behavior** Either just work or produce a user-friendly message. **To Reproduce** Steps to reproduce the behavior: 1. clone https://github.com/michalszynkiewicz/quarkus-krakow/tree/failing-scope-on-default/ads 2. `mvn clean compile quarkus:dev` or `mvn clean package && java -jar target/*-runner.jar` CC @manovotn

409c1009303e76f2a116937ed63fb6d9c4fda79d

4e13d22e9b479351184f913b3fdf6bbb4de1af2e

https://github.com/quarkusio/quarkus/compare/409c1009303e76f2a116937ed63fb6d9c4fda79d...4e13d22e9b479351184f913b3fdf6bbb4de1af2e

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java index e29f8dc6219..d3ba8c05e78 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java @@ -81,8 +81,8 @@ protected String getPackageName(BeanInfo bean) { } } String packageName = DotNames.packageName(providerTypeName); - if (packageName.startsWith("java.")) { - // It is not possible to place a class in a JDK package + if (packageName.isEmpty() || packageName.startsWith("java.")) { + // It is not possible to place a class in a JDK package or in default package packageName = DEFAULT_PACKAGE; } return packageName;

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4255/1893

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/1893

https://github.com/quarkusio/quarkus/pull/4255

https://github.com/quarkusio/quarkus/pull/4255

fixes

WWW-Authenticate Header missing

Given a protected method in a JAX-RS resource: @GET @Produces(MediaType.TEXT_HTML) @RolesAllowed("user-monitor") public String returnBootstrapHTML() { ... and Elytron configured to use the embedded Auth: quarkus.security.embedded.enabled=true ... ... ... quarkus.security.embedded.auth-mechanism=BASIC the curl request doesn't receive the correct header "WWW-Authenticate" that start the http challenge: curl -v http://localhost:8080/gestione-ordini-bar * Trying ::1... * TCP_NODELAY set * Connected to localhost (::1) port 8080 (#0) > GET /gestione-ordini-bar HTTP/1.1 > Host: localhost:8080 > User-Agent: curl/7.54.0 > Accept: */* > < HTTP/1.1 401 Unauthorized < Connection: keep-alive < Content-Type: text/html;charset=UTF-8 < Content-Length: 14 < Date: Fri, 05 Apr 2019 14:59:18 GMT < * Connection #0 to host localhost left intact

055bf49b117782130b5ccbe17509490b5defd80e

92232816ca786b8bdf6986854b662ac15eb16445

https://github.com/quarkusio/quarkus/compare/055bf49b117782130b5ccbe17509490b5defd80e...92232816ca786b8bdf6986854b662ac15eb16445

diff --git a/extensions/elytron-security/deployment/src/test/java/io/quarkus/security/test/BasicAuthTestCase.java b/extensions/elytron-security/deployment/src/test/java/io/quarkus/security/test/BasicAuthTestCase.java index 4324f093db7..8cc8c2e98e2 100644 --- a/extensions/elytron-security/deployment/src/test/java/io/quarkus/security/test/BasicAuthTestCase.java +++ b/extensions/elytron-security/deployment/src/test/java/io/quarkus/security/test/BasicAuthTestCase.java @@ -1,5 +1,6 @@ package io.quarkus.security.test; +import static org.hamcrest.Matchers.containsStringIgnoringCase; import static org.hamcrest.Matchers.equalTo; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -54,6 +55,7 @@ public void testSecureAccessSuccess() { @Test public void testJaxrsGetFailure() { RestAssured.when().get("/jaxrs-secured/rolesClass").then() + .header("www-authenticate", containsStringIgnoringCase("basic")) .statusCode(401); } diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/RequestFailer.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/RequestFailer.java index 0cef204bceb..057331085f0 100644 --- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/RequestFailer.java +++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/RequestFailer.java @@ -1,16 +1,67 @@ package io.quarkus.resteasy.runtime; +import java.lang.reflect.Method; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.core.Response; +import org.jboss.resteasy.core.ResteasyContext; + +import io.quarkus.security.identity.CurrentIdentityAssociation; +import io.quarkus.security.identity.SecurityIdentity; +import io.quarkus.vertx.http.runtime.security.HttpAuthenticator; +import io.vertx.ext.web.RoutingContext; + /** * Helper class for JAXRS request failure responses. */ public class RequestFailer { + //Servlet API may not be present + private static final Class<?> HTTP_SERVLET_REQUEST; + private static final Class<?> HTTP_SERVLET_RESPONSE; + private static final Method AUTHENTICATE; + + static { + Class<?> httpServletReq = null; + Class<?> httpServletResp = null; + Method auth = null; + try { + httpServletReq = Class.forName("javax.servlet.http.HttpServletRequest"); + httpServletResp = Class.forName("javax.servlet.http.HttpServletResponse"); + auth = httpServletReq.getMethod("authenticate", httpServletResp); + } catch (Exception e) { + + } + AUTHENTICATE = auth; + HTTP_SERVLET_REQUEST = httpServletReq; + HTTP_SERVLET_RESPONSE = httpServletResp; + } + public static void fail(ContainerRequestContext requestContext) { if (requestContext.getSecurityContext().getUserPrincipal() == null) { - respond(requestContext, 401, "Not authorized"); + + SecurityIdentity identity = CurrentIdentityAssociation.current(); + if (HTTP_SERVLET_REQUEST != null) { + Object httpServletRequest = ResteasyContext.getContextData(HTTP_SERVLET_REQUEST); + if (httpServletRequest != null) { + Object httpServletResponse = ResteasyContext.getContextData(HTTP_SERVLET_RESPONSE); + try { + AUTHENTICATE.invoke(httpServletRequest, httpServletResponse); + } catch (Exception e) { + throw new RuntimeException(e); + } + return; + } + } + HttpAuthenticator authenticator = identity.getAttribute(HttpAuthenticator.class.getName()); + RoutingContext context = ResteasyContext.getContextData(RoutingContext.class); + if (authenticator != null && context != null) { + authenticator.sendChallenge(context, null); + } else { + respond(requestContext, 401, "Not authorized"); + } + } else { respond(requestContext, 403, "Access forbidden: role not allowed"); } @@ -21,6 +72,7 @@ private static void respond(ContainerRequestContext context, int status, String .entity(message) .type("text/html;charset=UTF-8") .build(); + context.abortWith(response); } } diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java index b3549900e27..e7bd300e68e 100644 --- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java +++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java @@ -75,14 +75,15 @@ private void dispatchRequestContext(RoutingContext request, InputStream is, Vert association.setIdentity(user.getSecurityIdentity()); } try { - dispatch(request.request(), is, output); + dispatch(request, is, output); } finally { requestContext.terminate(); } } - private void dispatch(HttpServerRequest request, InputStream is, VertxOutput output) { + private void dispatch(RoutingContext routingContext, InputStream is, VertxOutput output) { Context ctx = vertx.getOrCreateContext(); + HttpServerRequest request = routingContext.request(); ResteasyUriInfo uriInfo = VertxUtil.extractUriInfo(request, servletMappingPrefix); ResteasyHttpHeaders headers = VertxUtil.extractHttpHeaders(request); HttpServerResponse response = request.response(); @@ -93,6 +94,7 @@ private void dispatch(HttpServerRequest request, InputStream is, VertxOutput out vertxRequest.setInputStream(is); try { ResteasyContext.pushContext(SecurityContext.class, new QuarkusResteasySecurityContext(request)); + ResteasyContext.pushContext(RoutingContext.class, routingContext); dispatcher.service(ctx, request, response, vertxRequest, vertxResponse, true); } catch (Failure e1) { vertxResponse.setStatus(e1.getErrorCode());

['extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java', 'extensions/elytron-security/deployment/src/test/java/io/quarkus/security/test/BasicAuthTestCase.java', 'extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/RequestFailer.java']

{'.java': 3}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4242/4241

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4241

https://github.com/quarkusio/quarkus/pull/4242

https://github.com/quarkusio/quarkus/pull/4242

fixes

100% CPU in epoll_wait

**Describe the bug** In some environments, using native image, all threads reading I/O can spend 100% CPU time polling `epoll_wait(..., timeout=0)`. Turns out this is an effect of `static final io.netty.util.concurrent.ScheduledFutureTask.START_TIME` being set to system-dependent `System.nanoTime()` during compilation and the NioEventLoop behaving in an unexpected way. Note that this behaviour cannot be reproduced when compiling and running on the same machine, due to the nature of `System.nanoTime()` base value.

c5daa866fb976baf2faa88ea7fb1c184f7a011fd

a80f970853e67a52e63b5082fe1a8a578584fc19

https://github.com/quarkusio/quarkus/compare/c5daa866fb976baf2faa88ea7fb1c184f7a011fd...a80f970853e67a52e63b5082fe1a8a578584fc19

diff --git a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java index bcea7cd2864..eb190661974 100644 --- a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java +++ b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java @@ -18,6 +18,7 @@ import io.quarkus.deployment.builditem.JniBuildItem; import io.quarkus.deployment.builditem.SystemPropertyBuildItem; import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.RuntimeReinitializedClassBuildItem; import io.quarkus.deployment.builditem.substrate.SubstrateConfigBuildItem; import io.quarkus.deployment.builditem.substrate.SubstrateSystemPropertyBuildItem; import io.quarkus.netty.BossEventLoopGroup; @@ -162,4 +163,10 @@ void createExecutors(BuildProducer<RuntimeBeanBuildItem> runtimeBeanBuildItemBui .build()); } + @BuildStep + public RuntimeReinitializedClassBuildItem reinitScheduledFutureTask() { + return new RuntimeReinitializedClassBuildItem( + "io.quarkus.netty.runtime.graal.Holder_io_netty_util_concurrent_ScheduledFutureTask"); + } + } diff --git a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java index da0521e7f6e..27b179bb9a7 100644 --- a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java +++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java @@ -12,6 +12,7 @@ import javax.net.ssl.TrustManagerFactory; import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; @@ -333,6 +334,33 @@ final class Target_io_netty_util_AbstractReferenceCounted { private static long REFCNT_FIELD_OFFSET; } +// This class is runtime-initialized by NettyProcessor +final class Holder_io_netty_util_concurrent_ScheduledFutureTask { + static final long START_TIME = System.nanoTime(); +} + +@TargetClass(className = "io.netty.util.concurrent.ScheduledFutureTask") +final class Target_io_netty_util_concurrent_ScheduledFutureTask { + @Delete + public static long START_TIME = 0; + + @Substitute + static long nanoTime() { + return System.nanoTime() - Holder_io_netty_util_concurrent_ScheduledFutureTask.START_TIME; + } + + @Alias + public long deadlineNanos() { + return 0; + } + + @Substitute + public long delayNanos(long currentTimeNanos) { + return Math.max(0, + deadlineNanos() - (currentTimeNanos - Holder_io_netty_util_concurrent_ScheduledFutureTask.START_TIME)); + } +} + class NettySubstitutions { }

['extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java', 'extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4240/4239

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4239

https://github.com/quarkusio/quarkus/pull/4240

https://github.com/quarkusio/quarkus/pull/4240

fixes

High contention on @Transactional annotated methods

The interceptor we use to implement the `@Transactional` does a lookup of the TransactionManager on each need. Narayana implements this lookup with a synchronized method; however it should be totally fine to cache this lookup even in a constant.

9b52fcf67d0cace1a450485b8aed748a8a5d8061

89abf612d4fcc1732238fb0f8edbf27287426036

https://github.com/quarkusio/quarkus/compare/9b52fcf67d0cace1a450485b8aed748a8a5d8061...89abf612d4fcc1732238fb0f8edbf27287426036

diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java index 2f0b8ee5cda..22b9f8c5feb 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java @@ -18,6 +18,9 @@ @Dependent public class NarayanaJtaProducers { + private static final javax.transaction.UserTransaction USER_TRANSACTION = UserTransaction.userTransaction(); + private static final javax.transaction.TransactionManager TRANSACTION_MANAGER = TransactionManager.transactionManager(); + @Produces @ApplicationScoped public UserTransactionRegistry userTransactionRegistry() { @@ -27,14 +30,13 @@ public UserTransactionRegistry userTransactionRegistry() { @Produces @ApplicationScoped public javax.transaction.UserTransaction userTransaction() { - return UserTransaction.userTransaction(); + return USER_TRANSACTION; } @Produces @ApplicationScoped public XAResourceRecoveryRegistry xaResourceRecoveryRegistry() { return new RecoveryManagerService(); - } @Produces @@ -46,7 +48,7 @@ public TransactionSynchronizationRegistry transactionSynchronizationRegistry() { @Produces @ApplicationScoped public javax.transaction.TransactionManager transactionManager() { - return TransactionManager.transactionManager(); + return TRANSACTION_MANAGER; } @Produces

['extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4179/4178

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4178

https://github.com/quarkusio/quarkus/pull/4179

https://github.com/quarkusio/quarkus/pull/4179

fixes

ClientProxyGenerator - handle thrown exception types correctly

Currently, we only expect a `ClassType`: https://github.com/quarkusio/quarkus/blob/0.22.0/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java#L100

112ca87e55200ea80a3c48727eea361bc3963fd1

7739aa495e6c64b2d5f15a216c75a52dd01c41b4

https://github.com/quarkusio/quarkus/compare/112ca87e55200ea80a3c48727eea361bc3963fd1...7739aa495e6c64b2d5f15a216c75a52dd01c41b4

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java index 4079941d1af..29f0e8172a5 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java @@ -98,13 +98,7 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName, ReflectionReg // Exceptions for (Type exception : method.exceptions()) { - if (exception.kind() == Type.Kind.CLASS) { - forward.addException(exception.asClassType().toString()); - } else if (exception.kind() == Type.Kind.TYPE_VARIABLE) { - forward.addException(exception.asTypeVariable().bounds().get(0).asClassType().toString()); - } else { - throw new IllegalArgumentException("Unknown exception type " + exception); - } + forward.addException(exception.toString()); } // Method params ResultHandle[] params = new ResultHandle[method.parameters().size()];

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4153/4151

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4151

https://github.com/quarkusio/quarkus/pull/4153

https://github.com/quarkusio/quarkus/pull/4153

fixes

Can't run devmode with application which uses a ServletBuildItem

Happens on current master (ca11b856). To reproduce, simply add an extension that uses a `ServletBuildItem`, for example `smallrye-metrics`. Here a list of URL mappings is wrapped into unmodifiable list https://github.com/quarkusio/quarkus/blob/ca11b856b1dc82ae3ee5e33199ed116ebdbf2700/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/ServletBuildItem.java#L29 but that turns it into `java.util.Collections$UnmodifiableRandomAccessList` which doesn't have a default constructor, and because there is a call to `io.quarkus.resteasy.runtime.ExceptionMapperRecorder` (https://github.com/quarkusio/quarkus/blob/ca11b856b1dc82ae3ee5e33199ed116ebdbf2700/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ExceptionMapperRecorder.java#L16) with the list within its argument, and the `BytecodeRecorderImpl` does not know how to construct it if it is within a different collection, the recording breaks. Full error ``` 09:54:05,587 ERROR [io.qua.dev.DevModeMain] Failed to start quarkus: java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.deployment.steps.MainClassBuildStep#build threw an exception: java.lang.RuntimeException: Unable to serialize objects of type class java.util.Collections$UnmodifiableRandomAccessList to bytecode as it has no default constructor at io.quarkus.deployment.recording.BytecodeRecorderImpl$53.createValue(BytecodeRecorderImpl.java:1241) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredArrayStoreParameter$1.write(BytecodeRecorderImpl.java:1548) at io.quarkus.deployment.recording.BytecodeRecorderImpl$FixedMethodContext.writeInstruction(BytecodeRecorderImpl.java:1646) at io.quarkus.deployment.recording.BytecodeRecorderImpl$SplitMethodContext.writeInstruction(BytecodeRecorderImpl.java:1603) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredArrayStoreParameter.doPrepare(BytecodeRecorderImpl.java:1545) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredParameter.prepare(BytecodeRecorderImpl.java:1524) at io.quarkus.deployment.recording.BytecodeRecorderImpl$54.doPrepare(BytecodeRecorderImpl.java:1257) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredParameter.prepare(BytecodeRecorderImpl.java:1524) at io.quarkus.deployment.recording.BytecodeRecorderImpl$48.prepare(BytecodeRecorderImpl.java:1025) at io.quarkus.deployment.recording.BytecodeRecorderImpl$54.doPrepare(BytecodeRecorderImpl.java:1260) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredParameter.prepare(BytecodeRecorderImpl.java:1524) at io.quarkus.deployment.recording.BytecodeRecorderImpl.writeBytecode(BytecodeRecorderImpl.java:394) at io.quarkus.deployment.steps.MainClassBuildStep.build(MainClassBuildStep.java:103) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at io.quarkus.deployment.ExtensionLoader$1.execute(ExtensionLoader.java:840) at io.quarkus.builder.BuildContext.run(BuildContext.java:415) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2011) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1535) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1426) at java.lang.Thread.run(Thread.java:748) at org.jboss.threads.JBossThread.run(JBossThread.java:479) at io.quarkus.runner.RuntimeRunner.run(RuntimeRunner.java:149) at io.quarkus.dev.DevModeMain.doStart(DevModeMain.java:180) at io.quarkus.dev.DevModeMain.start(DevModeMain.java:94) at io.quarkus.dev.DevModeMain.main(DevModeMain.java:66) Caused by: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.deployment.steps.MainClassBuildStep#build threw an exception: java.lang.RuntimeException: Unable to serialize objects of type class java.util.Collections$UnmodifiableRandomAccessList to bytecode as it has no default constructor at io.quarkus.deployment.recording.BytecodeRecorderImpl$53.createValue(BytecodeRecorderImpl.java:1241) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredArrayStoreParameter$1.write(BytecodeRecorderImpl.java:1548) at io.quarkus.deployment.recording.BytecodeRecorderImpl$FixedMethodContext.writeInstruction(BytecodeRecorderImpl.java:1646) at io.quarkus.deployment.recording.BytecodeRecorderImpl$SplitMethodContext.writeInstruction(BytecodeRecorderImpl.java:1603) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredArrayStoreParameter.doPrepare(BytecodeRecorderImpl.java:1545) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredParameter.prepare(BytecodeRecorderImpl.java:1524) at io.quarkus.deployment.recording.BytecodeRecorderImpl$54.doPrepare(BytecodeRecorderImpl.java:1257) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredParameter.prepare(BytecodeRecorderImpl.java:1524) at io.quarkus.deployment.recording.BytecodeRecorderImpl$48.prepare(BytecodeRecorderImpl.java:1025) at io.quarkus.deployment.recording.BytecodeRecorderImpl$54.doPrepare(BytecodeRecorderImpl.java:1260) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredParameter.prepare(BytecodeRecorderImpl.java:1524) at io.quarkus.deployment.recording.BytecodeRecorderImpl.writeBytecode(BytecodeRecorderImpl.java:394) at io.quarkus.deployment.steps.MainClassBuildStep.build(MainClassBuildStep.java:103) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at io.quarkus.deployment.ExtensionLoader$1.execute(ExtensionLoader.java:840) at io.quarkus.builder.BuildContext.run(BuildContext.java:415) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2011) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1535) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1426) at java.lang.Thread.run(Thread.java:748) at org.jboss.threads.JBossThread.run(JBossThread.java:479) at io.quarkus.builder.Execution.run(Execution.java:108) at io.quarkus.builder.BuildExecutionBuilder.execute(BuildExecutionBuilder.java:121) at io.quarkus.deployment.QuarkusAugmentor.run(QuarkusAugmentor.java:115) at io.quarkus.runner.RuntimeRunner.run(RuntimeRunner.java:110) ... 3 more Caused by: java.lang.RuntimeException: Unable to serialize objects of type class java.util.Collections$UnmodifiableRandomAccessList to bytecode as it has no default constructor at io.quarkus.deployment.recording.BytecodeRecorderImpl$53.createValue(BytecodeRecorderImpl.java:1241) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredArrayStoreParameter$1.write(BytecodeRecorderImpl.java:1548) at io.quarkus.deployment.recording.BytecodeRecorderImpl$FixedMethodContext.writeInstruction(BytecodeRecorderImpl.java:1646) at io.quarkus.deployment.recording.BytecodeRecorderImpl$SplitMethodContext.writeInstruction(BytecodeRecorderImpl.java:1603) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredArrayStoreParameter.doPrepare(BytecodeRecorderImpl.java:1545) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredParameter.prepare(BytecodeRecorderImpl.java:1524) at io.quarkus.deployment.recording.BytecodeRecorderImpl$54.doPrepare(BytecodeRecorderImpl.java:1257) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredParameter.prepare(BytecodeRecorderImpl.java:1524) at io.quarkus.deployment.recording.BytecodeRecorderImpl$48.prepare(BytecodeRecorderImpl.java:1025) at io.quarkus.deployment.recording.BytecodeRecorderImpl$54.doPrepare(BytecodeRecorderImpl.java:1260) at io.quarkus.deployment.recording.BytecodeRecorderImpl$DeferredParameter.prepare(BytecodeRecorderImpl.java:1524) at io.quarkus.deployment.recording.BytecodeRecorderImpl.writeBytecode(BytecodeRecorderImpl.java:394) at io.quarkus.deployment.steps.MainClassBuildStep.build(MainClassBuildStep.java:103) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at io.quarkus.deployment.ExtensionLoader$1.execute(ExtensionLoader.java:840) at io.quarkus.builder.BuildContext.run(BuildContext.java:415) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2011) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1535) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1426) at java.lang.Thread.run(Thread.java:748) at org.jboss.threads.JBossThread.run(JBossThread.java:479) ```

c972f05e0893ecd056e2af635324d3ac0fe04fe2

7387ff39b16535269677462412717ae6941bd62a

https://github.com/quarkusio/quarkus/compare/c972f05e0893ecd056e2af635324d3ac0fe04fe2...7387ff39b16535269677462412717ae6941bd62a

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java index c5ec1b6d1df..a46ffa5f482 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java @@ -21,6 +21,7 @@ import java.util.HashSet; import java.util.IdentityHashMap; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.ListIterator; import java.util.Map; @@ -29,6 +30,8 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import java.util.stream.Collectors; @@ -1231,12 +1234,16 @@ ResultHandle createValue(MethodContext context, MethodCreator method, ResultHand out = method.newInstance(ofConstructor(param.getClass())); } catch (NoSuchMethodException e) { //fallback for collection types, such as unmodifiableMap - if (expectedType == Map.class) { + if (SortedMap.class.isAssignableFrom(expectedType)) { + out = method.newInstance(ofConstructor(TreeMap.class)); + } else if (Map.class.isAssignableFrom(expectedType)) { out = method.newInstance(ofConstructor(LinkedHashMap.class)); - } else if (expectedType == List.class) { + } else if (List.class.isAssignableFrom(expectedType)) { out = method.newInstance(ofConstructor(ArrayList.class)); - } else if (expectedType == Set.class) { - out = method.newInstance(ofConstructor(Set.class)); + } else if (SortedSet.class.isAssignableFrom(expectedType)) { + out = method.newInstance(ofConstructor(TreeSet.class)); + } else if (Set.class.isAssignableFrom(expectedType)) { + out = method.newInstance(ofConstructor(LinkedHashSet.class)); } else { throw new RuntimeException("Unable to serialize objects of type " + param.getClass() + " to bytecode as it has no default constructor"); diff --git a/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java b/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java index 9a1d3a1ddc0..d09e14a6c07 100644 --- a/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java +++ b/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java @@ -15,7 +15,9 @@ import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Optional; +import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; import java.util.function.Consumer; @@ -143,6 +145,40 @@ public void testLargeCollection() throws Exception { }, beans); } + @Test + public void testUnmodifiableMapWithinAMap() throws Exception { + Map<Integer, Map<Integer, TestJavaBean>> outerMap = new HashMap<>(); + outerMap.put(1, Collections.unmodifiableMap( + Collections.singletonMap(1, new TestJavaBean()))); + + runTest(generator -> { + TestRecorder recorder = generator.getRecordingProxy(TestRecorder.class); + recorder.map(outerMap); + }, outerMap); + } + + @Test + public void testUnmodifiableListWithinAMap() throws Exception { + Map<Integer, List<TestJavaBean>> map = new HashMap<>(); + map.put(1, Collections.unmodifiableList(Collections.singletonList(new TestJavaBean()))); + + runTest(generator -> { + TestRecorder recorder = generator.getRecordingProxy(TestRecorder.class); + recorder.map(map); + }, map); + } + + @Test + public void testUnmodifiableSetWithinAMap() throws Exception { + Map<Integer, Set<TestJavaBean>> map = new HashMap<>(); + map.put(1, Collections.unmodifiableSet(Collections.singleton(new TestJavaBean()))); + + runTest(generator -> { + TestRecorder recorder = generator.getRecordingProxy(TestRecorder.class); + recorder.map(map); + }, map); + } + @Test public void testLargeArray() throws Exception {

['core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java', 'core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4101/4100

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4100

https://github.com/quarkusio/quarkus/pull/4101

https://github.com/quarkusio/quarkus/pull/4101

fixes

java.lang.IllegalStateException: Shutdown in progress exception while destroying Quarkus app

**Describe the bug** When CTRL+C'ing a Quarkus app, the following stacktrace appears in the console: ``` ^C2019-09-18 18:07:28,429 ERROR [io.qua.run.StartupContext] (main) Running a shutdown task failed: java.lang.IllegalStateException: Shutdown in progress at java.lang.ApplicationShutdownHooks.add(ApplicationShutdownHooks.java:66) at java.lang.Runtime.addShutdownHook(Runtime.java:211) at io.vertx.core.file.impl.FileResolver.setupCacheDir(FileResolver.java:351) at io.vertx.core.file.impl.FileResolver.<init>(FileResolver.java:87) at io.vertx.core.impl.VertxImpl.<init>(VertxImpl.java:165) at io.vertx.core.impl.VertxImpl.vertx(VertxImpl.java:92) at io.vertx.core.impl.VertxFactoryImpl.vertx(VertxFactoryImpl.java:40) at io.vertx.core.impl.VertxFactoryImpl.vertx(VertxFactoryImpl.java:32) at io.vertx.core.Vertx.vertx(Vertx.java:85) at io.quarkus.vertx.core.runtime.VertxCoreRecorder.initialize(VertxCoreRecorder.java:133) at io.quarkus.vertx.core.runtime.VertxCoreRecorder$1.get(VertxCoreRecorder.java:52) at io.quarkus.vertx.core.runtime.VertxCoreRecorder$1.get(VertxCoreRecorder.java:45) at io.quarkus.vertx.core.runtime.VertxCoreRecorder.destroy(VertxCoreRecorder.java:168) at io.quarkus.vertx.core.runtime.VertxCoreRecorder$2.run(VertxCoreRecorder.java:64) at io.quarkus.runtime.StartupContext.close(StartupContext.java:43) at io.quarkus.runner.ApplicationImpl1.doStop(ApplicationImpl1.zig:172) at io.quarkus.runtime.Application.stop(Application.java:158) at io.quarkus.runtime.Application.run(Application.java:211) at io.quarkus.runner.GeneratedMain.main(GeneratedMain.zig:34) ``` **Expected behavior** No stacktrace **Actual behavior** Shows stacktrace **To Reproduce** Steps to reproduce the behavior: 1. Any Quarkus app running latest master 2. Press Ctrl +C 3. Stacktrace is shown **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Linux ggastald-laptop 5.2.13-200.fc30.x86_64 #1 SMP Fri Sep 6 14:30:40 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux - Output of `java -version`: openjdk version "1.8.0_212" OpenJDK Runtime Environment (AdoptOpenJDK)(build 1.8.0_212-b03) OpenJDK 64-Bit Server VM (AdoptOpenJDK)(build 25.212-b03, mixed mode) - GraalVM version (if different from Java): - Quarkus version or git rev: bf2440135785244b174ff19432aa46a1f873b7ea **Additional context** (Add any other context about the problem here.) Doesn't happen with 0.22.0

2cb0ceeb2cfb0216cce0d290445c744d7f2ee99e

2f7010895a147d199730eaff3137de5dbc141ec2

https://github.com/quarkusio/quarkus/compare/2cb0ceeb2cfb0216cce0d290445c744d7f2ee99e...2f7010895a147d199730eaff3137de5dbc141ec2

diff --git a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java index 2df951413de..93d245f891e 100644 --- a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java +++ b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java @@ -36,25 +36,13 @@ public class VertxCoreRecorder { public static final String ENABLE_JSON = "quarkus-internal.vertx.enabled-json"; - static volatile Supplier<Vertx> vertx; + static volatile VertxSupplier vertx; //temporary vertx instance to work around a JAX-RS problem static volatile Vertx webVertx; public Supplier<Vertx> configureVertx(BeanContainer container, VertxConfiguration config, LaunchMode launchMode, ShutdownContext shutdown) { - vertx = new Supplier<Vertx>() { - - Vertx v; - - @Override - public synchronized Vertx get() { - if (v == null) { - v = initialize(config); - } - return v; - } - }; - + vertx = new VertxSupplier(config); VertxCoreProducer producer = container.instance(VertxCoreProducer.class); producer.initialize(vertx); if (launchMode != LaunchMode.DEVELOPMENT) { @@ -162,10 +150,10 @@ private static VertxOptions convertToVertxOptions(VertxConfiguration conf) { } void destroy() { - if (vertx != null) { + if (vertx != null && vertx.v != null) { CountDownLatch latch = new CountDownLatch(1); AtomicReference<Throwable> problem = new AtomicReference<>(); - vertx.get().close(ar -> { + vertx.v.close(ar -> { if (ar.failed()) { problem.set(ar.cause()); } @@ -303,7 +291,7 @@ public Supplier<EventLoopGroup> bossSupplier() { return new Supplier<EventLoopGroup>() { @Override public EventLoopGroup get() { - return ((VertxImpl) vertx).getAcceptorEventLoopGroup(); + return ((VertxImpl) vertx.get()).getAcceptorEventLoopGroup(); } }; } @@ -316,4 +304,21 @@ public EventLoopGroup get() { } }; } + + static class VertxSupplier implements Supplier<Vertx> { + final VertxConfiguration config; + Vertx v; + + VertxSupplier(VertxConfiguration config) { + this.config = config; + } + + @Override + public synchronized Vertx get() { + if (v == null) { + v = initialize(config); + } + return v; + } + } } diff --git a/extensions/vertx-core/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java b/extensions/vertx-core/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java index fdda5a95bfb..b585e6a9603 100644 --- a/extensions/vertx-core/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java +++ b/extensions/vertx-core/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java @@ -54,12 +54,7 @@ public void shouldNotFailWithDefaultConfig() { configuration.workerPoolSize = 10; configuration.warningExceptionTime = Duration.ofSeconds(1); configuration.internalBlockingPoolSize = 5; - VertxCoreRecorder.vertx = new Supplier<Vertx>() { - @Override - public Vertx get() { - return VertxCoreRecorder.initialize(configuration); - } - }; + VertxCoreRecorder.vertx = new VertxCoreRecorder.VertxSupplier(configuration); producer.initialize(VertxCoreRecorder.vertx); verifyProducer(); }

['extensions/vertx-core/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java', 'extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4096/4094

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4094

https://github.com/quarkusio/quarkus/pull/4096

https://github.com/quarkusio/quarkus/pull/4096

fixes

Random HTTP port is shown as zero in the startup logs

**Describe the bug** Quarkus 0.22.0 allowed starting a service in a random port by specifying 0 as the HTTP port. Quarkus 999-SNAPSHOT does not. **Expected behavior** The Quarkus application should start in a random port **Actual behavior** It starts in port 0 (?) and doesn't show the assigned port **To Reproduce** Steps to reproduce the behavior: 1. `mvn io.quarkus:quarkus-maven-plugin:0.22.0:create -DprojectGroupId=org.acme -DprojectArtifactId=getting-started -DclassName="org.acme.quickstart.GreetingResource" -Dpath="/hello"` 2. Add `quarkus.http.port=0` to application.properties 3. Look at the logs **Configuration** ```properties quarkus.http.port=0 ``` **Environment (please complete the following information):** - Output of `uname -a` or `ver`: `Linux ggastald-laptop 5.2.13-200.fc30.x86_64 #1 SMP Fri Sep 6 14:30:40 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux` - Output of `java -version`: ``` openjdk version "1.8.0_212" OpenJDK Runtime Environment (AdoptOpenJDK)(build 1.8.0_212-b03) OpenJDK 64-Bit Server VM (AdoptOpenJDK)(build 25.212-b03, mixed mode) ``` - GraalVM version (if different from Java): - Quarkus version or git rev: bf2440135785244b174ff19432aa46a1f873b7ea (master branch) **Additional context** This is the output in Quarkus 0.22.0: ``` 2019-09-18 16:29:09,130 INFO [io.quarkus] (main) Quarkus 0.22.0 started in 0.954s. Listening on: http://[::]:36127 ``` This is the output in Quarkus 999-SNAPSHOT: ``` 2019-09-18 16:28:44,116 INFO [io.quarkus] (main) Quarkus 999-SNAPSHOT started in 1.080s. Listening on: http://0.0.0.0:0 ```

3e01d6a96e8fa96e1e71f6edeccbc20573a2707d

6424196dc664805897e8c6ca1e6a70f1a57b9b21

https://github.com/quarkusio/quarkus/compare/3e01d6a96e8fa96e1e71f6edeccbc20573a2707d...6424196dc664805897e8c6ca1e6a70f1a57b9b21

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java index 8f70d6b801d..c6c2e278fa9 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java @@ -375,18 +375,24 @@ public WebDeploymentVerticle(int port, int httpsPort, String host, HttpServerOpt @Override public void start(Future<Void> startFuture) throws Exception { final AtomicInteger remainingCount = new AtomicInteger(httpsOptions != null ? 2 : 1); - Handler<AsyncResult<HttpServer>> doneHandler = event -> { + httpServer = vertx.createHttpServer(httpOptions); + httpServer.requestHandler(router); + httpServer.listen(port, host, event -> { + // Port may be random, so set the actual port + httpOptions.setPort(event.result().actualPort()); if (remainingCount.decrementAndGet() == 0) { startFuture.complete(); } - }; - httpServer = vertx.createHttpServer(httpOptions); - httpServer.requestHandler(router); - httpServer.listen(port, host, doneHandler); + }); if (httpsOptions != null) { httpsServer = vertx.createHttpServer(httpsOptions); httpsServer.requestHandler(router); - httpsServer.listen(httpsPort, host, doneHandler); + httpsServer.listen(httpsPort, host, event -> { + httpsOptions.setPort(event.result().actualPort()); + if (remainingCount.decrementAndGet() == 0) { + startFuture.complete(); + } + }); } }

['extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4058/4049

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4049

https://github.com/quarkusio/quarkus/pull/4058

https://github.com/quarkusio/quarkus/pull/4058

resolves

@Produces annotated methods that are not consumed not ignored and result in failed build

**Describe the bug** Issue described [here](https://github.com/quarkusio/quarkus/issues/2770) persists under 0.20.0. **Expected behavior** When using a class with method annotated with `@Produces`, even if never "produced", expect successful build. **Actual behavior** Build fails with misleading error message: ``` [ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:0.20.0:build (default) on project injector-jira-service: Failed to build a runnable JAR: Failed to build a runner jar: Failed to augment application classes: Build failure: Build failed due to errors [ERROR] [error]: Build step io.quarkus.arc.deployment.ArcProcessor#generateResources threw an exception: java.lang.IllegalArgumentException: Must be a Class or String, got null [ERROR] -> [Help 1] [ERROR] ``` **To Reproduce** Steps to reproduce the behavior: Simple reproducer: ``` package service; @ApplicationScoped public class SomeResource { @Inject SomeService someService; public void doSomething() { } } ``` ``` package service; import client.SomeProvider; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; @ApplicationScoped public class SomeService { @Inject @RequestScoped SomeProvider someProvider; // as a workaround, the "produced" but unused bean can be instantiated but ignored to silence this error // @Inject // @RequestScoped // SomeClient someClient; public void doSomething() { } } ``` ``` package client; import java.net.URI; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Produces; import org.eclipse.microprofile.rest.client.RestClientBuilder; @RequestScoped public class SomeProvider { @Produces @RequestScoped public SomeClient getClient() { return RestClientBuilder .newBuilder() .baseUri(URI.create("http://example.com")) .build(SomeClient.class); } } ``` ``` package com.cloudbees.sdm.injector.jira.client; import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; @Consumes("application/json") @Produces("application/json") public interface SomeClient { @GET @Path("/rest/api/lols") void getLols(); } ``` Add classes to project and build with maven. **Configuration** N/A **Environment (please complete the following information):** - Output of `uname -a` or `ver`: ``` $ uname -a Darwin ip-192-168-1-137.ec2.internal 18.2.0 Darwin Kernel Version 18.2.0: Mon Nov 12 20:24:46 PST 2018; root:xnu-4903.231.4~2/RELEASE_X86_64 x86_64 ``` - Output of `java -version`: ``` $ java -version java version "1.8.0_221" Java(TM) SE Runtime Environment (build 1.8.0_221-b11) Java HotSpot(TM) 64-Bit GraalVM EE 19.1.1 (build 25.221-b11-jvmci-19.1-b01, mixed mode) ``` - Quarkus version or git rev: 0.20.0

cf95687fc330a60972a1a76536052a9f9ea1c86a

65bae95137c63fb4ae9cbceaf9d7b4bee430e279

https://github.com/quarkusio/quarkus/compare/cf95687fc330a60972a1a76536052a9f9ea1c86a...65bae95137c63fb4ae9cbceaf9d7b4bee430e279

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java index 0bec4732f01..82e2e66e3a0 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java @@ -217,6 +217,7 @@ void init() { long removalStart = System.currentTimeMillis(); Set<BeanInfo> removable = new HashSet<>(); Set<BeanInfo> unusedProducers = new HashSet<>(); + Set<BeanInfo> unusedButDeclaresProducer = new HashSet<>(); List<BeanInfo> producers = beans.stream().filter(b -> b.isProducerMethod() || b.isProducerField()) .collect(Collectors.toList()); List<InjectionPointInfo> instanceInjectionPoints = injectionPoints.stream() @@ -245,10 +246,6 @@ void init() { if (declaresObserver.contains(bean)) { continue test; } - // Declares a producer - see also second pass - if (declaresProducer.contains(bean)) { - continue test; - } // Instance<Foo> for (InjectionPointInfo injectionPoint : instanceInjectionPoints) { if (Beans.hasQualifiers(bean, injectionPoint.getRequiredQualifiers()) && Beans.matchesType(bean, @@ -256,6 +253,11 @@ void init() { continue test; } } + // Declares a producer - see also second pass + if (declaresProducer.contains(bean)) { + unusedButDeclaresProducer.add(bean); + continue test; + } if (bean.isProducerField() || bean.isProducerMethod()) { // This bean is very likely an unused producer unusedProducers.add(bean); @@ -267,9 +269,10 @@ void init() { Map<BeanInfo, List<BeanInfo>> declaringMap = producers.stream() .collect(Collectors.groupingBy(BeanInfo::getDeclaringBean)); for (Entry<BeanInfo, List<BeanInfo>> entry : declaringMap.entrySet()) { - if (unusedProducers.containsAll(entry.getValue())) { + BeanInfo declaringBean = entry.getKey(); + if (unusedButDeclaresProducer.contains(declaringBean) && unusedProducers.containsAll(entry.getValue())) { // All producers declared by this bean are unused - removable.add(entry.getKey()); + removable.add(declaringBean); } } } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java index d4984102055..a15b4289aea 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java @@ -255,6 +255,9 @@ private void addBean(MethodCreator getComponents, ResultHandle beanIdToBeanSuppl Map<BeanInfo, LazyValue<ResultHandle>> beanToResultSupplierHandle) { String beanType = beanToGeneratedName.get(bean); + if (beanType == null) { + throw new IllegalStateException("No bean type found for: " + bean); + } List<InjectionPointInfo> injectionPoints = bean.getInjections().stream().flatMap(i -> i.injectionPoints.stream()) .filter(ip -> !BuiltinBean.resolvesTo(ip)).collect(toList()); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java index 6c6886ab838..5bdf077e87a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java @@ -8,6 +8,7 @@ import io.quarkus.arc.ArcContainer; import io.quarkus.arc.test.ArcTestContainer; import java.math.BigDecimal; +import java.math.BigInteger; import javax.annotation.PostConstruct; import javax.annotation.Priority; import javax.enterprise.context.Dependent; @@ -27,7 +28,8 @@ public class RemoveUnusedBeansTest { @Rule public ArcTestContainer container = ArcTestContainer.builder() .beanClasses(HasObserver.class, Foo.class, FooAlternative.class, HasName.class, UnusedProducers.class, - InjectedViaInstance.class, InjectedViaProvider.class, Excluded.class, UsedProducers.class) + InjectedViaInstance.class, InjectedViaProvider.class, Excluded.class, UsedProducers.class, + UnusedProducerButInjected.class, UsedViaInstanceWithUnusedProducer.class, UsesBeanViaInstance.class) .removeUnusedBeans(true) .addRemovalExclusion(b -> b.getBeanClass().toString().equals(Excluded.class.getName())) .build(); @@ -49,6 +51,12 @@ public void testRemoval() { assertTrue(foo.provider.get().isValid()); assertEquals(1, container.beanManager().getBeans(Foo.class).size()); assertEquals("pong", container.instance(Excluded.class).get().ping()); + // Producer is unused but declaring bean is injected + assertTrue(container.instance(UnusedProducerButInjected.class).isAvailable()); + assertFalse(container.instance(BigInteger.class).isAvailable()); + // Producer is unused, declaring bean is only used via Instance + assertTrue(container.instance(UsedViaInstanceWithUnusedProducer.class).isAvailable()); + assertFalse(container.instance(Long.class).isAvailable()); } @Dependent @@ -71,6 +79,9 @@ static class Foo { @Inject Provider<InjectedViaProvider> provider; + @Inject + UnusedProducerButInjected injected; + String ping() { return getClass().getName(); } @@ -140,4 +151,28 @@ String ping() { } + @Singleton + static class UnusedProducerButInjected { + + @Produces + BigInteger unusedNumber() { + return BigInteger.ZERO; + } + + } + + @Singleton + static class UsedViaInstanceWithUnusedProducer { + + @Produces + Long unusedLong = new Long(0); + } + + @Singleton + static class UsesBeanViaInstance { + + @Inject + Instance<UsedViaInstanceWithUnusedProducer> instance; + } + }

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java', 'independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java']

{'.java': 3}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/3982/3908

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/3908

https://github.com/quarkusio/quarkus/pull/3982

https://github.com/quarkusio/quarkus/pull/3982

fixes

MP CP integration doesn't allow for user defined custom contexts

I came across this while investigating execution of MP CP TCK on Quarkus. What the TCK does is define custom contexts (`ThreadContextProvider`s) that are registered via service loader mechanism. Here is a [link](https://github.com/eclipse/microprofile-context-propagation/blob/master/tck/src/main/java/org/eclipse/microprofile/context/tck/ThreadContextTest.java#L113) to those TCK tests. However, our current SR CP integration does an early initialization of `SmallRyeContextManager` with set of discovered contexts that is determined before user application is inspected. The integration happens [here](https://github.com/quarkusio/quarkus/blob/master/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java#L41-L49) and is executed as `STATIC_INIT` which is too early, at least for TCK case. I am not sure how this would affect actual Quarkus app where users would attempt to do similar thing - I suspect it would be the same. We are going to need some way to make a second round of `ThreadContextProvider` discovery, or perhaps feed that information directly into `SmallRyeContextManager`? Ccing @FroMage

c431989b599ac3e68ccf42079c420128a102a0f3

7bddfa01156575bf218ea286f367f5ac9ac8b206

https://github.com/quarkusio/quarkus/compare/c431989b599ac3e68ccf42079c420128a102a0f3...7bddfa01156575bf218ea286f367f5ac9ac8b206

diff --git a/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java b/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java index 8d68e10e984..2bb1531edd0 100644 --- a/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java +++ b/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java @@ -38,7 +38,7 @@ void buildStatic(SmallRyeContextPropagationRecorder recorder) throws ClassNotFoundException, IOException { List<ThreadContextProvider> discoveredProviders = new ArrayList<>(); List<ContextManagerExtension> discoveredExtensions = new ArrayList<>(); - for (Class<?> provider : ServiceUtil.classesNamedIn(SmallRyeContextPropagationRecorder.class.getClassLoader(), + for (Class<?> provider : ServiceUtil.classesNamedIn(Thread.currentThread().getContextClassLoader(), "META-INF/services/" + ThreadContextProvider.class.getName())) { try { discoveredProviders.add((ThreadContextProvider) provider.newInstance()); @@ -47,7 +47,7 @@ void buildStatic(SmallRyeContextPropagationRecorder recorder) e); } } - for (Class<?> extension : ServiceUtil.classesNamedIn(SmallRyeContextPropagationRecorder.class.getClassLoader(), + for (Class<?> extension : ServiceUtil.classesNamedIn(Thread.currentThread().getContextClassLoader(), "META-INF/services/" + ContextManagerExtension.class.getName())) { try { discoveredExtensions.add((ContextManagerExtension) extension.newInstance());

['extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4813/4812

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4812

https://github.com/quarkusio/quarkus/pull/4813

https://github.com/quarkusio/quarkus/pull/4813

fixes

Hibernate ORM with Panache not shown as installed features

**Describe the bug** When using Hibernate ORM with Panache extension, the Installed features list displayed on the log didn't show `hibernate_orm-panache`. **Expected behavior** `hibernate_orm-panache` extension is shown in the extension list **To Reproduce** Steps to reproduce the behavior: 1. Start an apps with Hibernate ORM with Panache **Environment (please complete the following information):** - Quarkus version or git rev: 0.25.0 or master **Additional context** The deployment module of Hibernate ORM with Panache is missing a `FeatureBuildItem`. I will provide a PR to fix this.

a225ca1494dd8d12932e081a6c35f2cfda4c9c3a

5c08f49046bce710fdd792a92d10711080272547

https://github.com/quarkusio/quarkus/compare/a225ca1494dd8d12932e081a6c35f2cfda4c9c3a...5c08f49046bce710fdd792a92d10711080272547

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/FeatureBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/FeatureBuildItem.java index f5c16e4b988..f5bf2d9f167 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/FeatureBuildItem.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/FeatureBuildItem.java @@ -17,6 +17,7 @@ public final class FeatureBuildItem extends MultiBuildItem { public static final String ELASTICSEARCH_REST_CLIENT = "elasticsearch-rest-client"; public static final String FLYWAY = "flyway"; public static final String HIBERNATE_ORM = "hibernate-orm"; + public static final String HIBERNATE_ORM_PANACHE = "hibernate-orm-panache"; public static final String HIBERNATE_VALIDATOR = "hibernate-validator"; public static final String HIBERNATE_SEARCH_ELASTICSEARCH = "hibernate-search-elasticsearch"; public static final String INFINISPAN_CLIENT = "infinispan-client"; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheResourceProcessor.java b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheResourceProcessor.java index eb88f820552..bbfb8146778 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheResourceProcessor.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheResourceProcessor.java @@ -19,6 +19,7 @@ import io.quarkus.deployment.builditem.ApplicationIndexBuildItem; import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.hibernate.orm.deployment.AdditionalJpaModelBuildItem; import io.quarkus.hibernate.orm.deployment.HibernateEnhancersRegisteredBuildItem; import io.quarkus.hibernate.orm.panache.PanacheEntity; @@ -40,6 +41,11 @@ public final class PanacheResourceProcessor { private static final Set<DotName> UNREMOVABLE_BEANS = Collections.singleton( DotName.createSimple(EntityManager.class.getName())); + @BuildStep + FeatureBuildItem featureBuildItem() { + return new FeatureBuildItem(FeatureBuildItem.HIBERNATE_ORM_PANACHE); + } + @BuildStep List<AdditionalJpaModelBuildItem> produceModel() { // only useful for the index resolution: hibernate will register it to be transformed, but BuildMojo

['extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheResourceProcessor.java', 'core/deployment/src/main/java/io/quarkus/deployment/builditem/FeatureBuildItem.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4840/4838

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4838

https://github.com/quarkusio/quarkus/pull/4840

https://github.com/quarkusio/quarkus/pull/4840

fixes

HttpAuthenticationMechanism.ChallengeSender.apply - return true instead of null

HttpAuthenticationMechanism.ChallengeSender.apply should probably return `true` instead of `null` Issue for the discussion https://github.com/quarkusio/quarkus/commit/8f39da48551c27b6e3debc7b5683a704c74f8957#r35642382

7e5a87ab42e602949233a4f74b4879010fb7f2d4

0329b94b464bc81a5f98f5c1fa0357f33275ba4f

https://github.com/quarkusio/quarkus/compare/7e5a87ab42e602949233a4f74b4879010fb7f2d4...0329b94b464bc81a5f98f5c1fa0357f33275ba4f

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticationMechanism.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticationMechanism.java index 47af0f20216..fccef05e13d 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticationMechanism.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticationMechanism.java @@ -37,7 +37,7 @@ public Boolean apply(ChallengeData challengeData) { if (challengeData.headerName != null) { context.response().headers().set(challengeData.headerName, challengeData.headerContent); } - return null; + return true; } } }

['extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticationMechanism.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4899/4778

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4778

https://github.com/quarkusio/quarkus/pull/4899

https://github.com/quarkusio/quarkus/pull/4899

fixes

gradle listExtensions displays mvn instructions

**Describe the bug** In a project generated with Gradle, run `gradle listExtensions`. You should see in the end the following message: ``` To get more information, append -Dquarkus.extension.format=full to your command line. Add an extension to your project by adding the dependency to your project or use `mvn quarkus:add-extension -Dextensions="artifactId"` ``` **Expected behavior** The message should be: ``` To get more information, append <something> to your command line. Add an extension to your project by adding the dependency to your project or use `gradle addExtension --extensions="artifactId"` ``` **Actual behavior** It is not **To Reproduce** Steps to reproduce the behavior: 1. ``` mvn io.quarkus:quarkus-maven-plugin:999-SNAPSHOT:create -DprojectGroupId=org.acme -DprojectArtifactId=foo -DclassName="org.acme.quickstart.GreetingResource" -Dpath="/hello" -Dextensions="resteasy" -DbuildTool=gradle ``` 2. `cd foo & ./gradlew listExtensions` **Environment (please complete the following information):** - Output of `uname -a` or `ver`: ``` Linux ggastald-laptop 5.3.6-200.fc30.x86_64 #1 SMP Mon Oct 14 13:11:01 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` - Output of `java -version`: ``` openjdk version "1.8.0_212" OpenJDK Runtime Environment (AdoptOpenJDK)(build 1.8.0_212-b03) OpenJDK 64-Bit Server VM (AdoptOpenJDK)(build 25.212-b03, mixed mode) ``` - GraalVM version (if different from Java): unused - Quarkus version or git rev: master **Additional context** The stacktrace shown in the beginning is already covered in #4705

c6625e95d46fc3b3510b443291d85215fa072624

f6388e08841129df8a50a92ad0bd0498b9a35660

https://github.com/quarkusio/quarkus/compare/c6625e95d46fc3b3510b443291d85215fa072624...f6388e08841129df8a50a92ad0bd0498b9a35660

diff --git a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/ListExtensions.java b/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/ListExtensions.java index bcbd5c86433..96baee635ac 100644 --- a/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/ListExtensions.java +++ b/independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/ListExtensions.java @@ -16,6 +16,7 @@ import org.apache.maven.model.Dependency; import io.quarkus.cli.commands.file.BuildFile; +import io.quarkus.cli.commands.file.GradleBuildFile; import io.quarkus.dependencies.Extension; public class ListExtensions { @@ -63,11 +64,22 @@ public void listExtensions(boolean all, String format, String search) throws IOE loadedExtensions.forEach(extension -> display(extension, installed, all, currentFormatter)); if ("concise".equalsIgnoreCase(format)) { - System.out.println("\\nTo get more information, append -Dquarkus.extension.format=full to your command line."); + if (this.buildFile instanceof GradleBuildFile) { + System.out.println("\\nTo get more information, append --format=full to your command line."); + } + else { + System.out.println("\\nTo get more information, append -Dquarkus.extension.format=full to your command line."); + } } - System.out.println("\\nAdd an extension to your project by adding the dependency to your " + - "project or use `mvn quarkus:add-extension -Dextensions=\\"artifactId\\"`"); + if (this.buildFile instanceof GradleBuildFile) { + System.out.println("\\nAdd an extension to your project by adding the dependency to your " + + "build.gradle or use `./gradlew addExtension --extensions=\\"artifactId\\"`"); + } + else { + System.out.println("\\nAdd an extension to your project by adding the dependency to your " + + "pom.xml or use `./mvnw quarkus:add-extension -Dextensions=\\"artifactId\\"`"); + } } }

['independent-projects/tools/common/src/main/java/io/quarkus/cli/commands/ListExtensions.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5502/5501

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5501

https://github.com/quarkusio/quarkus/pull/5502

https://github.com/quarkusio/quarkus/pull/5502

fixes

Platform resolver fails in offline mode when the local repo contains metadata but not the artifacts

In that case, the resolver is able to determine the latest version of the platform but fails to actually resolve it. Unless the user has requested explicitly the desired platform coordinates, the agreed upon behavior in this case is to log a warn and fallback to the platform bundled with the tools.

18b4bd11e39530ab0fb134f6c0e06e79a9758dbe

44b0146b90ce83269c30c1e6df7ac597b13e24f3

https://github.com/quarkusio/quarkus/compare/18b4bd11e39530ab0fb134f6c0e06e79a9758dbe...44b0146b90ce83269c30c1e6df7ac597b13e24f3

diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java b/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java index 28a289f6320..f1e0da1587b 100644 --- a/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java +++ b/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java @@ -206,8 +206,8 @@ private QuarkusPlatformDescriptor resolveJsonDescriptor(AppModelResolver artifac return resolveJsonArtifactFromArgs(artifactResolver); } catch (VersionNotAvailableException e) { final QuarkusPlatformDescriptor platform = resolveJsonArtifactFromBom(artifactResolver); - log.warn(e.getLocalizedMessage() + ", falling back to bundled " + platform.getBomGroupId() - + ":" + platform.getBomArtifactId() + "::pom:" + platform.getBomVersion() + " based on Quarkus " + log.warn(e.getLocalizedMessage() + ", falling back to the bundled platform based on " + platform.getBomGroupId() + + ":" + platform.getBomArtifactId() + "::pom:" + platform.getBomVersion() + " and Quarkus version " + platform.getQuarkusVersion()); return platform; } @@ -221,11 +221,21 @@ private QuarkusPlatformDescriptor resolveJsonArtifactFromArgs(AppModelResolver a String jsonGroupId = this.jsonGroupId; String jsonArtifactId = this.jsonArtifactId; String jsonVersion = this.jsonVersion; + // If some of the coordinates are missing, we are trying the default ones + int defaultCoords = 0; if (jsonGroupId == null) { - jsonGroupId = getProperty(PROP_PLATFORM_JSON_GROUP_ID, ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID); + jsonGroupId = getProperty(PROP_PLATFORM_JSON_GROUP_ID); + if(jsonGroupId == null) { + jsonGroupId = ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID; + ++defaultCoords; + } } if (jsonArtifactId == null) { - jsonArtifactId = getProperty(PROP_PLATFORM_JSON_ARTIFACT_ID, ToolsConstants.DEFAULT_PLATFORM_BOM_ARTIFACT_ID); + jsonArtifactId = getProperty(PROP_PLATFORM_JSON_ARTIFACT_ID); + if(jsonArtifactId == null) { + jsonArtifactId = ToolsConstants.DEFAULT_PLATFORM_BOM_ARTIFACT_ID; + ++defaultCoords; + } } if (jsonVersion == null) { if (jsonVersionRange != null) { @@ -240,11 +250,21 @@ private QuarkusPlatformDescriptor resolveJsonArtifactFromArgs(AppModelResolver a } else { jsonVersion = getProperty(PROP_PLATFORM_JSON_VERSION); if (jsonVersion == null) { - jsonVersion = resolveLatestJsonVersion(artifactResolver, jsonGroupId, jsonArtifactId, jsonVersionRange); + jsonVersion = resolveLatestJsonVersion(artifactResolver, jsonGroupId, jsonArtifactId, null); + ++defaultCoords; } } } - return loadFromJsonArtifact(artifactResolver, new AppArtifact(jsonGroupId, jsonArtifactId, null, "json", jsonVersion)); + try { + return loadFromJsonArtifact(artifactResolver, + new AppArtifact(jsonGroupId, jsonArtifactId, null, "json", jsonVersion)); + } catch (VersionNotAvailableException e) { + if(defaultCoords == 3) { + // complete coords were the default ones, so we can re-throw and try the bundled platform + throw e; + } + throw new IllegalStateException("Failed to resolve the JSON artifact with the requested coordinates", e); + } } private QuarkusPlatformDescriptor resolveJsonArtifactFromBom(AppModelResolver artifactResolver) throws PlatformDescriptorLoadingException { @@ -264,31 +284,56 @@ private QuarkusPlatformDescriptor resolveJsonArtifactFromBom(AppModelResolver ar String bomVersion = this.bomVersion; try { return loadFromBomCoords(artifactResolver, bomGroupId, bomArtifactId, bomVersion, null); - } catch(Exception e) { + } catch(VersionNotAvailableException e) { if (!tryingDefaultCoords) { - throw e; + throw new IllegalStateException("Failed to resolve the platform BOM using the provided coordinates", e); } - log.debug("Failed to resolve the default BOM coordinates, falling back to the bundled platform artifacts"); + log.debug("Failed to resolve Quarkus platform BOM using the default coordinates, falling back to the bundled Quarkus platform artifacts"); } Model bundledBom = loadBundledPom(); - bomGroupId = this.bomGroupId == null ? getGroupId(bundledBom) : this.bomGroupId; + bomGroupId = this.bomGroupId; + if(bomGroupId != null) { + if(!bomGroupId.equals(getGroupId(bundledBom))) { + throw new IllegalStateException("Failed to resolve Quarkus platform BOM with the requested groupId " + bomGroupId); + } + } else { + bomGroupId = getGroupId(bundledBom); + } if(bomGroupId == null) { failedDetermineDefaultPlatformCoords(); } - bomArtifactId = this.bomArtifactId == null ? getArtifactId(bundledBom) : this.bomArtifactId; + + bomArtifactId = this.bomArtifactId; + if(bomArtifactId != null) { + if(!bomArtifactId.equals(getArtifactId(bundledBom))) { + throw new IllegalStateException("Failed to resolve Quarkus platform BOM with the requested artifactId " + bomArtifactId); + } + } else { + bomArtifactId = getArtifactId(bundledBom); + } if(bomArtifactId == null) { failedDetermineDefaultPlatformCoords(); } + bomVersion = this.bomVersion; - if(bomVersion == null && this.bomVersionRange == null) { + if(bomVersion != null) { + if(!bomVersion.equals(getVersion(bundledBom))) { + throw new IllegalStateException("Failed to resolve Quarkus platform BOM with the requested version " + bomVersion); + } + } else if(this.bomVersionRange == null) { bomVersion = getVersion(bundledBom); } - return loadFromBomCoords(artifactResolver, bomGroupId, bomArtifactId, bomVersion, bundledBom); + try { + return loadFromBomCoords(artifactResolver, bomGroupId, bomArtifactId, bomVersion, bundledBom); + } catch (VersionNotAvailableException e) { + // this should never happen + throw new IllegalStateException("Failed to load the bundled platform artifacts", e); + } } private QuarkusPlatformDescriptor loadFromBomCoords(AppModelResolver artifactResolver, String bomGroupId, - String bomArtifactId, String bomVersion, Model bundledBom) throws PlatformDescriptorLoadingException { + String bomArtifactId, String bomVersion, Model bundledBom) throws PlatformDescriptorLoadingException, VersionNotAvailableException { if(bomVersion == null) { String bomVersionRange = this.bomVersionRange; if(bomVersionRange == null) { @@ -299,13 +344,13 @@ private QuarkusPlatformDescriptor loadFromBomCoords(AppModelResolver artifactRes try { bomVersion = artifactResolver.getLatestVersionFromRange(bomArtifact, bomVersionRange); } catch (AppModelResolverException e) { - throw new IllegalStateException("Failed to resolve the latest version of " + bomArtifact, e); + throw new VersionNotAvailableException("Failed to resolve the latest version of " + bomArtifact, e); } if(bomVersion == null) { - throw new IllegalStateException("Failed to resolve the latest version of " + bomArtifact); + throw new VersionNotAvailableException("Failed to resolve the latest version of " + bomArtifact); } } - log.debug("Resolving Quarkus platform descriptor from %s:%s::pom:%s", bomGroupId, bomArtifactId, bomVersion); + log.debug("Resolving Quarkus platform BOM %s:%s::pom:%s", bomGroupId, bomArtifactId, bomVersion); bundledBom = loadBundledPomIfNull(bundledBom); // Check whether the BOM on the classpath is matching the requested one @@ -338,11 +383,10 @@ private QuarkusPlatformDescriptor loadFromBomCoords(AppModelResolver artifactRes log.debug("Failed to locate quarkus.properties on the classpath"); } } else { - log.debug("Failed to locate Quarkus JSON platform descriptor on the classpath"); + log.debug("Failed to locate Quarkus platform descriptor on the classpath"); } } - // first we are looking for the same GAV as the BOM but with JSON type return loadFromJsonArtifact(artifactResolver, new AppArtifact(bomGroupId, bomArtifactId, null, "json", bomVersion)); } @@ -350,21 +394,24 @@ private void failedDetermineDefaultPlatformCoords() { throw new IllegalStateException("Failed to determine the Maven coordinates of the default Quarkus platform"); } - private QuarkusPlatformDescriptor loadFromJsonArtifact(AppModelResolver artifactResolver, AppArtifact jsonArtifact) { + private QuarkusPlatformDescriptor loadFromJsonArtifact(AppModelResolver artifactResolver, AppArtifact jsonArtifact) throws VersionNotAvailableException { try { - log.debug("Attempting to resolve Quarkus JSON platform descriptor as %s", jsonArtifact); + log.debug("Attempting to resolve Quarkus platform descriptor %s", jsonArtifact); return loadFromFile(artifactResolver.resolve(jsonArtifact)); } catch(PlatformDescriptorLoadingException e) { - throw new IllegalStateException("Failed to load Quarkus platform descriptor from " + jsonArtifact, e); + // the artifact was successfully resolved but processing of it has failed + throw new IllegalStateException("Failed to load Quarkus platform descriptor " + jsonArtifact, e); } catch (Exception e) { - log.debug("Failed to resolve %s due to %s", jsonArtifact, e); + log.debug("Failed to load %s due to %s", jsonArtifact, e.getLocalizedMessage()); // it didn't work, now we are trying artifactId-descriptor-json final AppArtifact fallbackArtifact = new AppArtifact(jsonArtifact.getGroupId(), jsonArtifact.getArtifactId() + "-descriptor-json", null, "json", jsonArtifact.getVersion()); - log.debug("Attempting to resolve Quarkus JSON platform descriptor as %s", fallbackArtifact); + log.debug("Attempting to resolve Quarkus platform descriptor %s", fallbackArtifact); try { return loadFromFile(artifactResolver.resolve(fallbackArtifact)); - } catch (Exception e1) { - throw new IllegalStateException("Failed to resolve the JSON descriptor artifact as " + jsonArtifact, e); + } catch (AppModelResolverException e1) { + throw new VersionNotAvailableException("Failed to resolve Quarkus platform descriptor " + jsonArtifact, e); + } catch(Exception e2) { + throw new IllegalStateException("Failed to load Quarkus platform descriptor " + jsonArtifact, e); } } } @@ -399,7 +446,7 @@ private QuarkusPlatformDescriptor loadPlatformDescriptor(AppModelResolver mvn, f boolean externalLoader = false; if(jsonDescrLoaderCl == null) { final AppArtifact jsonDescrArtifact = new AppArtifact(ToolsConstants.IO_QUARKUS, "quarkus-platform-descriptor-json", null, "jar", quarkusCoreVersion); - log.debug("Resolving Quarkus JSON platform descriptor loader from %s", jsonDescrArtifact); + log.debug("Resolving Quarkus JSON platform descriptor loader %s", jsonDescrArtifact); final URL jsonDescrUrl; try { final Path path = mvn.resolve(jsonDescrArtifact); @@ -500,7 +547,7 @@ private String resolveLatestJsonVersion(AppModelResolver artifactResolver, Strin private String resolveLatestFromVersionRange(AppModelResolver mvn, String groupId, String artifactId, String classifier, String type, final String versionRange) throws AppModelResolverException, VersionNotAvailableException { final AppArtifact appArtifact = new AppArtifact(groupId, artifactId, classifier, type, versionRange); - log.debug("Resolving the latest version of " + appArtifact); + log.debug("Resolving the latest version of %s", appArtifact); final String latestVersion = mvn.getLatestVersionFromRange(appArtifact, versionRange); if(latestVersion == null) { throw new VersionNotAvailableException("Failed to resolve the latest version of " + appArtifact);

['independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5466/3311

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/3311

https://github.com/quarkusio/quarkus/pull/5466

https://github.com/quarkusio/quarkus/pull/5466

resolves

ArC removes indirect referenced beans

Quarkus in version 19.1 removes indirect referenced beans. Lets have following scenario. You define an interface for your strategies and an services that depending on any argument, returns the appropriate strategy. These strategies are defined as beans. As these beans are not referenced directly with injections, but only through the interface, the are removed by ArC. The only way to fix it, is by setting `quarkus.arc.remove-unused-beans=false` ```java public interface Exporter<T extends Exportable> { boolean accept(Class<T> clazz); String export(T object); } @ApplicationScoped public class ApplicationExporter implements Exporter<Application> { boolean accept(Class<Application> clazz) { return clazz instanceof Application; } String export(Application application) { ... } } @ApplicationScoped public class ExporterService { @Inject Instance<Exporter<? extends Exportable>> exporters; public <T>Exporter<T> getExporter(Class<T> exporterClazz) { // BUG: exporters are empty! return StreamSupport.stream(exporters.spliterator(), false) .filter(exporter -> exporter.accept(exporterClazz)) .findFirst().orElseThrow(...); } } ``` If there is an `@Inject javax.enterprise.inject.Instance<T>` Quarkus (ArC) should keep all classes implementing `T`.

fe5a40bd9dcab5dfc70421ee3a2f5095679fd639

d7397dfd82e6ed2ff9a4830d00dda4c295070e78

https://github.com/quarkusio/quarkus/compare/fe5a40bd9dcab5dfc70421ee3a2f5095679fd639...d7397dfd82e6ed2ff9a4830d00dda4c295070e78

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java index f2e494f0000..ee0aac6d692 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java @@ -125,6 +125,8 @@ boolean matchesNoBoxing(Type requiredType, Type beanType) { } return true; } + } else if (WILDCARD_TYPE.equals(requiredType.kind())) { + return parametersMatch(requiredType, beanType); } return false; } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java index fc3f720bebe..974fde05bdb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java @@ -28,7 +28,9 @@ public class RemoveUnusedBeansTest { @RegisterExtension public ArcTestContainer container = ArcTestContainer.builder() .beanClasses(HasObserver.class, Foo.class, FooAlternative.class, HasName.class, UnusedProducers.class, - InjectedViaInstance.class, InjectedViaProvider.class, Excluded.class, UsedProducers.class, + InjectedViaInstance.class, InjectedViaInstanceWithWildcard.class, InjectedViaInstanceWithWildcard2.class, + InjectedViaProvider.class, Excluded.class, + UsedProducers.class, UnusedProducerButInjected.class, UsedViaInstanceWithUnusedProducer.class, UsesBeanViaInstance.class) .removeUnusedBeans(true) .addRemovalExclusion(b -> b.getBeanClass().toString().equals(Excluded.class.getName())) @@ -40,6 +42,8 @@ public void testRemoval() { assertTrue(container.instance(HasObserver.class).isAvailable()); assertTrue(container.instance(HasName.class).isAvailable()); assertTrue(container.instance(InjectedViaInstance.class).isAvailable()); + assertTrue(container.instance(InjectedViaInstanceWithWildcard.class).isAvailable()); + assertTrue(container.instance(InjectedViaInstanceWithWildcard2.class).isAvailable()); assertTrue(container.instance(InjectedViaProvider.class).isAvailable()); assertTrue(container.instance(String.class).isAvailable()); assertTrue(container.instance(UsedProducers.class).isAvailable()); @@ -96,6 +100,12 @@ static class FooAlternative extends Foo { @Inject Instance<InjectedViaInstance> instance; + @Inject + Instance<? extends InjectedViaInstanceWithWildcard> instanceWildcard; + + @Inject + Instance<Comparable<? extends Foo>> instanceWildcard2; + @Inject String foo; @@ -106,6 +116,21 @@ static class InjectedViaInstance { } + @Singleton + static class InjectedViaInstanceWithWildcard { + + } + + @Singleton + static class InjectedViaInstanceWithWildcard2 implements Comparable<FooAlternative> { + + @Override + public int compareTo(FooAlternative o) { + return 0; + } + + } + @Singleton static class InjectedViaProvider {

['independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5415/5406

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5406

https://github.com/quarkusio/quarkus/pull/5415

https://github.com/quarkusio/quarkus/pull/5415

fixes

Spring data Jpa extension : sort with Pageable does not work

When I use the extension of spring data Jpa, the sort with Pageable does not work. This is my exp: ``` @GET @Produces("application/json") public List<Fruit> findAll() { return fruitRepository.findAll(PageRequest.of(0,3, Sort.by(Sort.Direction.DESC, "id"))).getContent(); } ``` the method sort does not work as if it does not exist

c4f1b99bcbe7f7fd5811e463f4a4af76f35dceb1

09bc0f97c7308d47c2730594c99bdc6eda6fc812

https://github.com/quarkusio/quarkus/compare/c4f1b99bcbe7f7fd5811e463f4a4af76f35dceb1...09bc0f97c7308d47c2730594c99bdc6eda6fc812

diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java index 5f2dae7036f..a5b7438866c 100644 --- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java +++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java @@ -10,6 +10,8 @@ import org.jboss.jandex.IndexView; import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import io.quarkus.gizmo.ClassCreator; import io.quarkus.gizmo.FieldDescriptor; @@ -106,6 +108,16 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr methodCreator.getMethodParam(sortParameterIndex)); } else if (parseResult.getSort() != null) { finalQuery += JpaOperations.toOrderBy(parseResult.getSort()); + } else if (pageableParameterIndex != null) { + ResultHandle pageable = methodCreator.getMethodParam(pageableParameterIndex); + ResultHandle pageableSort = methodCreator.invokeInterfaceMethod( + MethodDescriptor.ofMethod(Pageable.class, "getSort", Sort.class), + pageable); + sort = methodCreator.invokeStaticMethod( + MethodDescriptor.ofMethod(TypesConverter.class, "toPanacheSort", + io.quarkus.panache.common.Sort.class, + org.springframework.data.domain.Sort.class), + pageableSort); } // call JpaOperations.find() diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java index 5da885919f0..6ab5c4bf3fd 100644 --- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java +++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java @@ -33,6 +33,7 @@ import org.springframework.data.domain.Sort; import io.quarkus.deployment.bean.JavaBeanUtil; +import io.quarkus.gizmo.AssignableResultHandle; import io.quarkus.gizmo.BranchResult; import io.quarkus.gizmo.BytecodeCreator; import io.quarkus.gizmo.ClassCreator; @@ -544,17 +545,44 @@ private void generateFindAllWithPageable(ClassCreator classCreator, FieldDescrip "(Lorg/springframework/data/domain/Pageable;)Lorg/springframework/data/domain/Page<L%s;>;", entityTypeStr.replace('.', '/'))); - ResultHandle page = findAll.invokeStaticMethod( + ResultHandle pageable = findAll.getMethodParam(0); + ResultHandle pageableSort = findAll.invokeInterfaceMethod( + MethodDescriptor.ofMethod(Pageable.class, "getSort", Sort.class), + pageable); + + ResultHandle panachePage = findAll.invokeStaticMethod( MethodDescriptor.ofMethod(TypesConverter.class, "toPanachePage", io.quarkus.panache.common.Page.class, Pageable.class), - findAll.getMethodParam(0)); - ResultHandle panacheQuery = findAll.invokeStaticMethod( + pageable); + ResultHandle panacheSort = findAll.invokeStaticMethod( + MethodDescriptor.ofMethod(TypesConverter.class, "toPanacheSort", + io.quarkus.panache.common.Sort.class, + org.springframework.data.domain.Sort.class), + pageableSort); + + // depending on whether there was a io.quarkus.panache.common.Sort returned, we need to execute a different findAll method + BranchResult sortNullBranch = findAll.ifNull(panacheSort); + BytecodeCreator sortNullTrue = sortNullBranch.trueBranch(); + BytecodeCreator sortNullFalse = sortNullBranch.falseBranch(); + AssignableResultHandle panacheQueryVar = findAll.createVariable(PanacheQuery.class); + + ResultHandle panacheQueryWithoutSort = sortNullTrue.invokeStaticMethod( ofMethod(JpaOperations.class, "findAll", PanacheQuery.class, Class.class), - findAll.readInstanceField(entityClassFieldDescriptor, findAll.getThis())); - panacheQuery = findAll.invokeInterfaceMethod( + sortNullTrue.readInstanceField(entityClassFieldDescriptor, sortNullTrue.getThis())); + sortNullTrue.assign(panacheQueryVar, panacheQueryWithoutSort); + sortNullTrue.breakScope(); + + ResultHandle panacheQueryWithSort = sortNullFalse.invokeStaticMethod( + ofMethod(JpaOperations.class, "findAll", PanacheQuery.class, Class.class, + io.quarkus.panache.common.Sort.class), + sortNullFalse.readInstanceField(entityClassFieldDescriptor, sortNullFalse.getThis()), panacheSort); + sortNullFalse.assign(panacheQueryVar, panacheQueryWithSort); + sortNullFalse.breakScope(); + + ResultHandle panacheQuery = findAll.invokeInterfaceMethod( MethodDescriptor.ofMethod(PanacheQuery.class, "page", PanacheQuery.class, io.quarkus.panache.common.Page.class), - panacheQuery, page); + panacheQueryVar, panachePage); ResultHandle list = findAll.invokeInterfaceMethod( MethodDescriptor.ofMethod(PanacheQuery.class, "list", List.class), panacheQuery); diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java index 85b35b227ae..4a7ef5cde54 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java @@ -2,6 +2,7 @@ import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; import javax.persistence.NoResultException; import javax.ws.rs.GET; @@ -36,6 +37,14 @@ public String page(@PathParam("size") int pageSize, @PathParam("num") int pageNu return page.hasPrevious() + " - " + page.hasNext() + " / " + page.getNumberOfElements(); } + @GET + @Path("/page-sorted/{size}/{num}") + @Produces("text/plain") + public String pageSorted(@PathParam("size") int pageSize, @PathParam("num") int pageNum) { + Page<Country> page = countryRepository.findAll(PageRequest.of(pageNum, pageSize, Sort.by(Sort.Direction.DESC, "id"))); + return page.stream().map(Country::getId).map(Object::toString).collect(Collectors.joining(",")); + } + @GET @Path("/new/{name}/{iso3}") @Produces("application/json") diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepository.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepository.java index b72e83d7ae5..7d1a90dafe0 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepository.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepository.java @@ -17,6 +17,8 @@ public interface PersonRepository extends CrudRepository<Person, Long>, PersonFr List<Person> findByName(String name); + List<Person> findByName(String name, Pageable pageable); + List<Person> findByName(String name, Sort sort); Page<Person> findByNameOrderByJoined(String name, Pageable pageable); diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java index 1968e34fa28..0d5f1554f42 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java @@ -122,6 +122,14 @@ public List<Person> byName(@PathParam("name") String name) { return personRepository.findByName(name); } + @GET + @Path("/name-pageable/{name}") + @Produces("text/plain") + public String byNamePageable(@PathParam("name") String name) { + return personRepository.findByName(name, PageRequest.of(0, 2, Sort.by(new Sort.Order(Sort.Direction.DESC, "id")))) + .stream().map(Person::getId).map(Object::toString).collect(Collectors.joining(",")); + } + @GET @Path("/name/joinedOrder/{name}/page/{size}/{num}") public String byNamePage(@PathParam("name") String name, @PathParam("size") int pageSize, @PathParam("num") int pageNum) { diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceTest.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceTest.java index 7627826f415..d7325850560 100644 --- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceTest.java +++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceTest.java @@ -9,9 +9,11 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import org.junit.jupiter.api.Test; @@ -53,6 +55,15 @@ void testPage() { .body(is("true - false / 0")); } + @Test + void testPageSorted() { + String response = when().get("/country/page-sorted/2/0").then() + .statusCode(200) + .extract().response().asString(); + assertThat(Arrays.stream(response.split(",")).map(Long::parseLong).collect(Collectors.toList())) + .isSortedAccordingTo(Comparator.reverseOrder()); + } + @Test void testGetOne() { when().get("/country/getOne/1").then() diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceTest.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceTest.java index 1e0308fd469..7e5a7cdc8a3 100644 --- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceTest.java +++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceTest.java @@ -7,6 +7,7 @@ import static org.hamcrest.Matchers.is; import java.util.Arrays; +import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -73,6 +74,15 @@ void testFindByName() { .body("size()", is(3)); } + @Test + void testFindByNamePageSorted() { + String response = when().get("/person/name-pageable/DeMar").then() + .statusCode(200) + .extract().response().asString(); + assertThat(Arrays.stream(response.split(",")).map(Long::parseLong).collect(Collectors.toList())) + .isSortedAccordingTo(Comparator.reverseOrder()); + } + @Test void testFindBySortedByJoinedDesc() { List<Person> people = when().get("/person/name/DeMar/order/joined").then()

['extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java', 'integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceTest.java', 'integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceTest.java', 'integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java', 'integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepository.java', 'extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java', 'integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java']

{'.java': 7}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5396/5373

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5373

https://github.com/quarkusio/quarkus/pull/5396

https://github.com/quarkusio/quarkus/pull/5396

resolves

@InterceptorBinding no longer recognized/fired when they have additional fields

This interceptor binding is working fine, if there is an interceptor (having @Priority annotation or not, @AroundInvoke gets fired wherever @StorageThreadSession is annotated): ``` @Target({TYPE, METHOD}) @Retention(RUNTIME) @InterceptorBinding public @interface StorageThreadSession { } ``` adding a field to the binding definition, @AroundInvoke stops working, it seems the interceptor binding is not recognized at all in this case: ``` @Target({TYPE, METHOD}) @Retention(RUNTIME) @InterceptorBinding public @interface StorageThreadSession { Class qualifier() default Object.class; } ``` I can split up my annotation but I don't think that this is the desired behaviour.

17faac6ceef7c286bd94be0c82c814a7a6f28b82

3bddda8d432754a505a37ac88ffd16c73bce7fff

https://github.com/quarkusio/quarkus/compare/17faac6ceef7c286bd94be0c82c814a7a6f28b82...3bddda8d432754a505a37ac88ffd16c73bce7fff

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java index a56248fa9f4..03b31e778f7 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java @@ -81,7 +81,7 @@ private boolean isInterceptorBinding(AnnotationInstance interceptorBinding, Anno String annotationField = value.name(); if (!interceptorBindingClass.method(annotationField).hasAnnotation(DotNames.NONBINDING) && !nonBindingFields.contains(annotationField) - && !value.equals(interceptorBinding.value(annotationField))) { + && !value.equals(interceptorBinding.valueWithDefault(beanDeployment.getIndex(), annotationField))) { matches = false; break; } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java index ef050f8241c..04e98fc52a5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java @@ -37,7 +37,7 @@ String ping() { } - @MyTransactional("alpha") + @MyTransactional @Priority(1) @Interceptor public static class AlphaInterceptor {

['independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5347/5317

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5317

https://github.com/quarkusio/quarkus/pull/5347

https://github.com/quarkusio/quarkus/pull/5347

fixes

Exception when using a custom interface in Spring Data JPA

Mentioned in #4104, the issue is still in 1.0.0.CR1. Repository codes https://github.com/hantsy/quarkus-sandbox/blob/master/spring-post-service/src/main/java/com/example/PostRepository.java#L6 ```bash 12:31:52,971 ERROR [io.qua.dev.DevModeMain] Failed to start Quarkus: java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.arc.deployment.ArcProcessor#validate threw an exception: javax.enterprise.inject.spi.DeploymentException: javax.enterprise.inject.AmbiguousResolutionException: Ambiguous dependencies for type com.example.PostRepositoryImpl and qualifiers [@Default] - java member: com.example.PostRepositoryImpl#customImplClass1 - declared on CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - available beans: - CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - CLASS bean [types=[com.example.PostRepositoryImpl, java.lang.Object, com.example.PostRepositoryCustom], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] at io.quarkus.arc.processor.BeanDeployment.processErrors(BeanDeployment.java:850) at io.quarkus.arc.processor.BeanDeployment.init(BeanDeployment.java:220) at io.quarkus.arc.processor.BeanProcessor.initialize(BeanProcessor.java:106) at io.quarkus.arc.deployment.ArcProcessor.validate(ArcProcessor.java:251) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at io.quarkus.deployment.ExtensionLoader$1.execute(ExtensionLoader.java:941) at io.quarkus.builder.BuildContext.run(BuildContext.java:415) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2011) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1535) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1426) at java.base/java.lang.Thread.run(Thread.java:834) at org.jboss.threads.JBossThread.run(JBossThread.java:479) Caused by: javax.enterprise.inject.AmbiguousResolutionException: Ambiguous dependencies for type com.example.PostRepositoryImpl and qualifiers [@Default] - java member: com.example.PostRepositoryImpl#customImplClass1 - declared on CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - available beans: - CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - CLASS bean [types=[com.example.PostRepositoryImpl, java.lang.Object, com.example.PostRepositoryCustom], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] at io.quarkus.arc.processor.Beans.resolveInjectionPoint(Beans.java:487) at io.quarkus.arc.processor.BeanInfo.init(BeanInfo.java:404) at io.quarkus.arc.processor.BeanDeployment.init(BeanDeployment.java:212) ... 14 more at io.quarkus.runner.RuntimeRunner.run(RuntimeRunner.java:157) at io.quarkus.dev.DevModeMain.doStart(DevModeMain.java:177) at io.quarkus.dev.DevModeMain.start(DevModeMain.java:95) at io.quarkus.dev.DevModeMain.main(DevModeMain.java:66) Caused by: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.arc.deployment.ArcProcessor#validate threw an exception: javax.enterprise.inject.spi.DeploymentException: javax.enterprise.inject.AmbiguousResolutionException: Ambiguous dependencies for type com.example.PostRepositoryImpl and qualifiers [@Default] - java member: com.example.PostRepositoryImpl#customImplClass1 - declared on CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - available beans: - CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - CLASS bean [types=[com.example.PostRepositoryImpl, java.lang.Object, com.example.PostRepositoryCustom], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] at io.quarkus.arc.processor.BeanDeployment.processErrors(BeanDeployment.java:850) at io.quarkus.arc.processor.BeanDeployment.init(BeanDeployment.java:220) at io.quarkus.arc.processor.BeanProcessor.initialize(BeanProcessor.java:106) at io.quarkus.arc.deployment.ArcProcessor.validate(ArcProcessor.java:251) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at io.quarkus.deployment.ExtensionLoader$1.execute(ExtensionLoader.java:941) at io.quarkus.builder.BuildContext.run(BuildContext.java:415) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2011) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1535) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1426) at java.base/java.lang.Thread.run(Thread.java:834) at org.jboss.threads.JBossThread.run(JBossThread.java:479) Caused by: javax.enterprise.inject.AmbiguousResolutionException: Ambiguous dependencies for type com.example.PostRepositoryImpl and qualifiers [@Default] - java member: com.example.PostRepositoryImpl#customImplClass1 - declared on CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - available beans: - CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - CLASS bean [types=[com.example.PostRepositoryImpl, java.lang.Object, com.example.PostRepositoryCustom], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] at io.quarkus.arc.processor.Beans.resolveInjectionPoint(Beans.java:487) at io.quarkus.arc.processor.BeanInfo.init(BeanInfo.java:404) at io.quarkus.arc.processor.BeanDeployment.init(BeanDeployment.java:212) ... 14 more at io.quarkus.builder.Execution.run(Execution.java:108) at io.quarkus.builder.BuildExecutionBuilder.execute(BuildExecutionBuilder.java:121) at io.quarkus.deployment.QuarkusAugmentor.run(QuarkusAugmentor.java:130) at io.quarkus.runner.RuntimeRunner.run(RuntimeRunner.java:111) ... 3 more Caused by: javax.enterprise.inject.spi.DeploymentException: javax.enterprise.inject.AmbiguousResolutionException: Ambiguous dependencies for type com.example.PostRepositoryImpl and qualifiers [@Default] - java member: com.example.PostRepositoryImpl#customImplClass1 - declared on CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - available beans: - CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - CLASS bean [types=[com.example.PostRepositoryImpl, java.lang.Object, com.example.PostRepositoryCustom], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] at io.quarkus.arc.processor.BeanDeployment.processErrors(BeanDeployment.java:850) at io.quarkus.arc.processor.BeanDeployment.init(BeanDeployment.java:220) at io.quarkus.arc.processor.BeanProcessor.initialize(BeanProcessor.java:106) at io.quarkus.arc.deployment.ArcProcessor.validate(ArcProcessor.java:251) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at io.quarkus.deployment.ExtensionLoader$1.execute(ExtensionLoader.java:941) at io.quarkus.builder.BuildContext.run(BuildContext.java:415) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2011) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1535) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1426) at java.base/java.lang.Thread.run(Thread.java:834) at org.jboss.threads.JBossThread.run(JBossThread.java:479) Caused by: javax.enterprise.inject.AmbiguousResolutionException: Ambiguous dependencies for type com.example.PostRepositoryImpl and qualifiers [@Default] - java member: com.example.PostRepositoryImpl#customImplClass1 - declared on CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - available beans: - CLASS bean [types=[com.example.PostRepositoryImpl, org.springframework.data.jpa.repository.JpaRepository<com.example.Post, java.lang.String>, org.springframework.data.repository.query.QueryByExampleExecutor<com.example.Post>, org.springframework.data.repository.CrudRepository<com.example.Post, java.lang.String>, com.example.PostRepository, org.springframework.data.repository.Repository<com.example.Post, java.lang.String>, java.lang.Object, com.example.PostRepositoryCustom, org.springframework.data.repository.PagingAndSortingRepository<com.example.Post, java.lang.String>], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] - CLASS bean [types=[com.example.PostRepositoryImpl, java.lang.Object, com.example.PostRepositoryCustom], qualifiers=[@Default, @Any], target=com.example.PostRepositoryImpl] at io.quarkus.arc.processor.Beans.resolveInjectionPoint(Beans.java:487) at io.quarkus.arc.processor.BeanInfo.init(BeanInfo.java:404) at io.quarkus.arc.processor.BeanDeployment.init(BeanDeployment.java:212) ... 14 more ```

60be0d9a6c03fe71a572e535bcd041140e58b592

e476a74d8dad90035ba2d3b811898261e7cad3aa

https://github.com/quarkusio/quarkus/compare/60be0d9a6c03fe71a572e535bcd041140e58b592...e476a74d8dad90035ba2d3b811898261e7cad3aa

diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java index 7ae0f5aa90c..582a6d404bd 100644 --- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java +++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java @@ -19,6 +19,7 @@ import org.jboss.jandex.IndexView; import org.jboss.jandex.Type; +import io.quarkus.deployment.util.HashUtil; import io.quarkus.deployment.util.JandexUtil; import io.quarkus.gizmo.ClassCreator; import io.quarkus.gizmo.ClassOutput; @@ -73,10 +74,11 @@ public void implementCrudRepository(ClassInfo repositoryToImplement) { } Map<String, FieldDescriptor> fragmentImplNameToFieldDescriptor = new HashMap<>(); - String generatedClassName = repositoryToImplement.name().toString() + "Impl"; + String repositoryToImplementStr = repositoryToImplement.name().toString(); + String generatedClassName = repositoryToImplementStr + "_" + HashUtil.sha1(repositoryToImplementStr) + "Impl"; try (ClassCreator classCreator = ClassCreator.builder().classOutput(classOutput) .className(generatedClassName) - .interfaces(repositoryToImplement.name().toString()) + .interfaces(repositoryToImplementStr) .build()) { classCreator.addAnnotation(ApplicationScoped.class); diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonFragmentImpl.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepositoryImpl.java similarity index 87% rename from integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonFragmentImpl.java rename to integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepositoryImpl.java index e05ceab2dc6..9495f483384 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonFragmentImpl.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepositoryImpl.java @@ -5,7 +5,7 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -public class PersonFragmentImpl implements PersonFragment, PersonFragment2 { +public class PersonRepositoryImpl implements PersonFragment, PersonFragment2 { @PersistenceContext EntityManager entityManager;

['extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java', 'integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonFragmentImpl.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5328/5318

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5318

https://github.com/quarkusio/quarkus/pull/5328

https://github.com/quarkusio/quarkus/pull/5328

fixes

Unexpected behavior of path matching for configuration-based security policies

If I have a permission for a path like `quarkus.http.auth.permission.mypermission.paths=/a/*` Then requests to `/a/anything` should be matched to it, but they are not. If I change it to `quarkus.http.auth.permission.mypermission.paths=/a*` Only then requests to `/a/anything` will start getting authorization checks. This is contradictory to what is described in the documentation https://quarkus.io/guides/security#matching-on-paths-methods

5fea8c0bda93f85d403295eb0f5cb4b8791be0c6

fcbf465251be30a38c9b173a66c446e2ad4b4fde

https://github.com/quarkusio/quarkus/compare/5fea8c0bda93f85d403295eb0f5cb4b8791be0c6...fcbf465251be30a38c9b173a66c446e2ad4b4fde

diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/RolesAllowedTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/RolesAllowedTestCase.java index 7278e611a42..614fe67f4c8 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/RolesAllowedTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/RolesAllowedTestCase.java @@ -20,9 +20,9 @@ public class RolesAllowedTestCase { "quarkus.http.auth.basic=true\\n" + "quarkus.http.auth.policy.r1.roles-allowed=test\\n" + "quarkus.http.auth.policy.r2.roles-allowed=admin\\n" + - "quarkus.http.auth.permission.roles1.paths=/roles1,/deny,/permit,/combined\\n" + + "quarkus.http.auth.permission.roles1.paths=/roles1,/deny,/permit,/combined,/wildcard1/*,/wildcard2*\\n" + "quarkus.http.auth.permission.roles1.policy=r1\\n" + - "quarkus.http.auth.permission.roles2.paths=/roles2,/deny,/permit/combined\\n" + + "quarkus.http.auth.permission.roles2.paths=/roles2,/deny,/permit/combined,/wildcard3/*\\n" + "quarkus.http.auth.permission.roles2.policy=r2\\n" + "quarkus.http.auth.permission.permit1.paths=/permit\\n" + "quarkus.http.auth.permission.permit1.policy=permit\\n" + @@ -178,4 +178,94 @@ public void testRolesAllowedCombinedWithDenyAll() { .assertThat() .statusCode(403); } + + @Test + public void testWildcardMatchingWithSlash() { + RestAssured + .given() + .auth() + .preemptive() + .basic("test", "test") + .when() + .get("/wildcard1/a") + .then() + .assertThat() + .statusCode(200); + + RestAssured + .given() + .auth() + .preemptive() + .basic("test", "test") + .when() + .get("/wildcard1/a/") + .then() + .assertThat() + .statusCode(200); + + RestAssured + .given() + .when() + .get("/wildcard1/a") + .then() + .assertThat() + .statusCode(401); + + RestAssured + .given() + .when() + .get("/wildcard1/a/") + .then() + .assertThat() + .statusCode(401); + + RestAssured + .given() + .when() + .get("/wildcard3XXX") + .then() + .assertThat() + .statusCode(200); + } + + @Test + public void testWildcardMatchingWithoutSlash() { + RestAssured + .given() + .auth() + .preemptive() + .basic("test", "test") + .when() + .get("/wildcard2/a") + .then() + .assertThat() + .statusCode(200); + + RestAssured + .given() + .auth() + .preemptive() + .basic("test", "test") + .when() + .get("/wildcard2") + .then() + .assertThat() + .statusCode(200); + + RestAssured + .given() + .when() + .get("/wildcard2") + .then() + .assertThat() + .statusCode(401); + + RestAssured + .given() + .when() + .get("/wildcard2/a") + .then() + .assertThat() + .statusCode(401); + } } diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java index 1d1b754453a..24badd42743 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java @@ -93,7 +93,10 @@ void init(HttpBuildTimeConfig config, Map<String, Supplier<HttpSecurityPolicy>> List<HttpMatcher> perms = new ArrayList<>(); tempMap.put(path, perms); perms.add(m); - if (path.endsWith("*")) { + if (path.endsWith("/*")) { + String stripped = path.substring(0, path.length() - 2); + pathMatcher.addPrefixPath(stripped.isEmpty() ? "/" : stripped, perms); + } else if (path.endsWith("*")) { pathMatcher.addPrefixPath(path.substring(0, path.length() - 1), perms); } else { pathMatcher.addExactPath(path, perms);

['extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/RolesAllowedTestCase.java', 'extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5232/5231

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5231

https://github.com/quarkusio/quarkus/pull/5232

https://github.com/quarkusio/quarkus/pull/5232

fixes

Mailer extension replyTo doesn't work

**Describe the bug** If you call `setReplyTo` in a `Mail` object, the `ReactiveMailerImpl` doesn't add the corresponding header. **Expected behavior** The `ReactiveMailerImpl ` should add the replyTo attribute of `Mail` to the corresponding `MailMessage`, allowing mail clients (such as Outlook or Gmail) to reply to the correct address. **Actual behavior** The header is not added, and replies are always sent to the sender (`Mail#from`). **Additional context** The issue is caused by the lack of a replyTo field in `io.vertx.ext.mail.MailMessage`. As a temporary workaround you can set the reply-to as a header, calling `Mail.addHeader("Reply-To", replyToAddress);` and it will work as expected. For consistency, Quarkus Mailer sould either remove the attribute replyTo from the `Mail` class, or modify the `ReactiveMailerImpl` to add the field as a header (preferably the later).

1c6d3aa1046ef72d590581686b72021a86f4b532

d616d51e91c60357afd3b342f6c4eb7145122e54

https://github.com/quarkusio/quarkus/compare/1c6d3aa1046ef72d590581686b72021a86f4b532...d616d51e91c60357afd3b342f6c4eb7145122e54

diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/ReactiveMailerImpl.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/ReactiveMailerImpl.java index 42e62ca9655..50eacf66a7b 100644 --- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/ReactiveMailerImpl.java +++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/ReactiveMailerImpl.java @@ -73,7 +73,7 @@ public CompletionStage<Void> send(Mail... mails) { private CompletionStage<Void> send(Mail mail, MailMessage message) { if (mock) { - LOGGER.infof("Sending email {} from {} to {}, text body: \\n{}\\nhtml body: \\n{}", + LOGGER.infof("Sending email %s from %s to %s, text body: \\n%s\\nhtml body: \\n%s", message.getSubject(), message.getFrom(), message.getTo(), message.getText(), message.getHtml()); return mockMailbox.send(mail); @@ -98,7 +98,6 @@ private CompletionStage<MailMessage> toMailMessage(Mail mail) { } else { message.setFrom(this.from); } - message.setTo(mail.getTo()); message.setCc(mail.getCc()); message.setBcc(mail.getBcc()); @@ -106,6 +105,9 @@ private CompletionStage<MailMessage> toMailMessage(Mail mail) { message.setText(mail.getText()); message.setHtml(mail.getHtml()); message.setHeaders(toMultimap(mail.getHeaders())); + if (mail.getReplyTo() != null) { + message.addHeader("Reply-To", mail.getReplyTo()); + } List<CompletionStage<?>> stages = new ArrayList<>(); List<MailAttachment> attachments = new CopyOnWriteArrayList<>(); diff --git a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java index 414c0d3402e..73f794af8c4 100644 --- a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java +++ b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java @@ -197,6 +197,18 @@ void testAttachments() throws MessagingException, IOException { assertThat(value).isEqualTo("Hello 2"); } + @Test + void testReplyToHeaderIsSet() throws MessagingException { + mailer.send(Mail.withText(TO, "Test", "testHeaders") + .setReplyTo("reply-to@quarkus.io")) + .toCompletableFuture().join(); + assertThat(wiser.getMessages()).hasSize(1); + WiserMessage actual = wiser.getMessages().get(0); + MimeMessage msg = actual.getMimeMessage(); + assertThat(msg.getHeader("Reply-To")).containsExactly("reply-to@quarkus.io"); + assertThat(msg.getReplyTo()).containsExactly(InternetAddress.parse("reply-to@quarkus.io")); + } + private String getContent(WiserMessage msg) { try { return getTextFromMimeMultipart((MimeMultipart) msg.getMimeMessage().getContent());

['extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/ReactiveMailerImpl.java', 'extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5228/5224

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5224

https://github.com/quarkusio/quarkus/pull/5228

https://github.com/quarkusio/quarkus/pull/5228

fixes

Cannot add extensions to Gradle project with comma-separated extensions list

**Describe the bug** In the guide: https://quarkus.io/guides/gradle-tooling#dealing-with-extensions it looks like we can add extensions in a comma-separated list like so: `./gradlew addExtension --extensions="quarkus-artemis-jms,quarkus-vertx"` However, for my Gradle project, I get this message: ``` > Task :addExtension ❌ Cannot find a dependency matching 'quarkus-artemis-jms,quarkus-vertx', maybe a typo? ``` I took those extensions from the list provided with ./gradlew listExtensions. **Expected behavior** Should be able to install each extension in the comma-separated list **Actual behavior** I get the error message above **To Reproduce** Steps to reproduce the behavior: 1. Create a new Gradle project using the Quarkus Maven plugin (as explained in the guide) 2. Create Gradle wrapper using `gradle wrapper` (I'm using Gradle 5.6.4) 3. Run `./gradlew addExtension --extensions="quarkus-artemis-jms,quarkus-vertx"` Step 2 is optional, the extensions don't install whether or not I use the wrapper. **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Linux unused-10-15-17-2.yyz.redhat.com 5.0.17-300.fc30.x86_64 #1 SMP Mon May 20 15:36:26 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux - Output of `java -version`: openjdk version "1.8.0_212" OpenJDK Runtime Environment (build 1.8.0_212-b04) OpenJDK 64-Bit Server VM (build 25.212-b04, mixed mode) - Quarkus version or git rev: 0.28.1

25fcaffdab0a965f9bec3468ce16986a1b7b8f85

a975e478bddf9b58984e10aa1ba936b2fd15e238

https://github.com/quarkusio/quarkus/compare/25fcaffdab0a965f9bec3468ce16986a1b7b8f85...a975e478bddf9b58984e10aa1ba936b2fd15e238

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java index ebb5051c2cc..9639f52ccfe 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java @@ -1,7 +1,9 @@ package io.quarkus.gradle.tasks; +import static java.util.Arrays.stream; +import static java.util.stream.Collectors.toSet; + import java.io.IOException; -import java.util.HashSet; import java.util.List; import java.util.Set; @@ -37,10 +39,13 @@ public List<String> getExtensionsToAdd() { @TaskAction public void addExtension() { - setupPlatformDescriptor(); - Set<String> extensionsSet = new HashSet<>(getExtensionsToAdd()); + Set<String> extensionsSet = getExtensionsToAdd() + .stream() + .flatMap(ext -> stream(ext.split(","))) + .map(String::trim) + .collect(toSet()); try { new AddExtensions(new GradleBuildFile(new FileProjectWriter(getProject().getProjectDir()))) .addExtensions(extensionsSet);

['devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5187/5186

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5186

https://github.com/quarkusio/quarkus/pull/5187

https://github.com/quarkusio/quarkus/pull/5187

fixes

Unable to change debug port in dev mode

**Describe the bug** The DevMojo no longer respects the `debug` option when setting up the debug port it dev mode. Looks to be a result of commit https://github.com/quarkusio/quarkus/commit/66d25b78f0cd386b6deb7a3eeb20e3fb665bb01e **Expected behavior** `mvn compile quarkus:dev -Ddebug=5006` should listen on port 5006 for debugger connections. **Actual behavior** Dev mode always listens to port 5005 for debugger connections. **To Reproduce** Steps to reproduce the behavior: 1. Create a Quarkus project using at least version 0.27.0 2. Start the project with a debug port of something other than 5005 3. Note in the console that it uses 5005 instead of the specified value **Environment (please complete the following information):** - Output of `uname -a` or `ver`: ``` Linux vm 5.0.0-32-generic #34-Ubuntu SMP Wed Oct 2 02:06:48 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` - Output of `java -version`: ``` openjdk version "11.0.4" 2019-07-16 OpenJDK Runtime Environment (build 11.0.4+11-post-Ubuntu-1ubuntu219.04) OpenJDK 64-Bit Server VM (build 11.0.4+11-post-Ubuntu-1ubuntu219.04, mixed mode, sharing) ``` - GraalVM version (if different from Java): n/a - Quarkus version or git rev: 0.28.0

a69d94e99f4d522b4f8d1ea1d8559f250dad650d

6228504c9aedce3a5485f55a8125bfe9592d329d

https://github.com/quarkusio/quarkus/compare/a69d94e99f4d522b4f8d1ea1d8559f250dad650d...6228504c9aedce3a5485f55a8125bfe9592d329d

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java index e70d77a2c6d..a0d0607fa1d 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java @@ -264,15 +264,6 @@ public void execute() throws MojoFailureException, MojoExecutionException { suspend = "n"; } - boolean useDebugMode = true; - // debug mode not specified - // make sure 5005 is not used, we don't want to just fail if something else is using it - try (Socket socket = new Socket(InetAddress.getByAddress(new byte[] { 127, 0, 0, 1 }), 5005)) { - getLog().error("Port 5005 in use, not starting in debug mode"); - useDebugMode = false; - } catch (IOException e) { - } - if (jvmArgs != null) { args.addAll(Arrays.asList(jvmArgs.split(" "))); } @@ -283,7 +274,7 @@ public void execute() throws MojoFailureException, MojoExecutionException { args.add("-Xverify:none"); } - DevModeRunner runner = new DevModeRunner(args, useDebugMode); + DevModeRunner runner = new DevModeRunner(args); runner.prepare(); runner.run(); @@ -308,7 +299,7 @@ public void execute() throws MojoFailureException, MojoExecutionException { } } if (changed) { - DevModeRunner newRunner = new DevModeRunner(args, useDebugMode); + DevModeRunner newRunner = new DevModeRunner(args); try { newRunner.prepare(); } catch (Exception e) { @@ -414,11 +405,9 @@ class DevModeRunner { private final List<String> args; private Process process; private Set<Path> pomFiles = new HashSet<>(); - private final boolean useDebugMode; - DevModeRunner(List<String> args, boolean useDebugMode) { + DevModeRunner(List<String> args) { this.args = new ArrayList<>(args); - this.useDebugMode = useDebugMode; } /** @@ -426,6 +415,14 @@ class DevModeRunner { */ void prepare() throws Exception { if (debug == null) { + boolean useDebugMode = true; + // debug mode not specified + // make sure 5005 is not used, we don't want to just fail if something else is using it + try (Socket socket = new Socket(InetAddress.getByAddress(new byte[] { 127, 0, 0, 1 }), 5005)) { + getLog().error("Port 5005 in use, not starting in debug mode"); + useDebugMode = false; + } catch (IOException e) { + } if (useDebugMode) { args.add("-Xdebug"); args.add("-Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=" + suspend);

['devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5179/5176

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5176

https://github.com/quarkusio/quarkus/pull/5179

https://github.com/quarkusio/quarkus/pull/5179

fixes

quarkus.vertx.max-worker-execute-time not picking up

**Describe the bug** The property `quarkus.vertx.max-worker-execute-time` is not recognized by the quarkus application. **Expected behavior** I would expect to see a the configuted value as time limit in the logs of the quarkus application. **Actual behavior** Still getting the warning with the default (?) value of 60000ms. ``` 2019-11-04 15:13:56,641 WARNING [io.ver.cor.imp.BlockedThreadChecker] (vertx-blocked-thread-checker) Thread Thread[vert.x-worker-thread-5,5,main]=Thread[vert.x-worker-thread-5,5,main] has been blocked for 78245 ms, time limit is 60000 ms: ``` **To Reproduce** Steps to reproduce the behavior: 1. build a 'standard app' 2. add the mentioned property 3. try to run in a timeout **Configuration** ```properties # Add your application.properties here, if applicable. #quarkus.vertx.max-worker-execute-time=100 quarkus.vertx.max-worker-execute-time=100s ``` **Screenshots** (If applicable, add screenshots to help explain your problem.) **Environment (please complete the following information):** openjdk version "1.8.0_222" OpenJDK Runtime Environment (build 1.8.0_222-8u222-b10-1ubuntu1~18.04.1-b10) OpenJDK 64-Bit Server VM (build 25.222-b10, mixed mode) quarkus: 0.27.0 **Additional context** (Add any other context about the problem here.)

83e11852a2dad6a4769bb807f5166c09827fa8c5

4e3aec02d7517028da32fb64f62f421da9baad23

https://github.com/quarkusio/quarkus/compare/83e11852a2dad6a4769bb807f5166c09827fa8c5...4e3aec02d7517028da32fb64f62f421da9baad23

diff --git a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java index d86ffbe4544..e6af79f7d06 100644 --- a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java +++ b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java @@ -3,10 +3,13 @@ import static io.vertx.core.file.impl.FileResolver.CACHE_DIR_BASE_PROP_NAME; import java.io.File; +import java.time.Duration; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; import java.util.regex.Pattern; @@ -143,16 +146,27 @@ private static VertxOptions convertToVertxOptions(VertxConfiguration conf) { .setFileCacheDir(fileCacheDir) .setClassPathResolvingEnabled(conf.classpathResolving)); options.setWorkerPoolSize(conf.workerPoolSize); - options.setBlockedThreadCheckInterval(conf.warningExceptionTime.toMillis()); options.setInternalBlockingPoolSize(conf.internalBlockingPoolSize); + + options.setBlockedThreadCheckInterval(conf.warningExceptionTime.toMillis()); if (conf.eventLoopsPoolSize.isPresent()) { options.setEventLoopPoolSize(conf.eventLoopsPoolSize.getAsInt()); } else { options.setEventLoopPoolSize(calculateDefaultIOThreads()); } - // TODO - Add the ability to configure these times in ns when long will be supported - // options.setMaxEventLoopExecuteTime(conf.maxEventLoopExecuteTime) - // .setMaxWorkerExecuteTime(conf.maxWorkerExecuteTime) + + Optional<Duration> maxEventLoopExecuteTime = conf.maxEventLoopExecuteTime; + if (maxEventLoopExecuteTime.isPresent()) { + options.setMaxEventLoopExecuteTime(maxEventLoopExecuteTime.get().toMillis()); + options.setMaxEventLoopExecuteTimeUnit(TimeUnit.MILLISECONDS); + } + + Optional<Duration> maxWorkerExecuteTime = conf.maxWorkerExecuteTime; + if (maxWorkerExecuteTime.isPresent()) { + options.setMaxWorkerExecuteTime(maxWorkerExecuteTime.get().toMillis()); + options.setMaxWorkerExecuteTimeUnit(TimeUnit.MILLISECONDS); + } + options.setWarningExceptionTime(conf.warningExceptionTime.toNanos()); return options; diff --git a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxOptionsBuilder.java b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxOptionsBuilder.java deleted file mode 100644 index 5099fdec8fe..00000000000 --- a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxOptionsBuilder.java +++ /dev/null @@ -1,144 +0,0 @@ -package io.quarkus.vertx.core.runtime; - -import static io.vertx.core.file.impl.FileResolver.CACHE_DIR_BASE_PROP_NAME; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -import io.quarkus.vertx.core.runtime.config.ClusterConfiguration; -import io.quarkus.vertx.core.runtime.config.EventBusConfiguration; -import io.quarkus.vertx.core.runtime.config.VertxConfiguration; -import io.vertx.core.VertxOptions; -import io.vertx.core.eventbus.EventBusOptions; -import io.vertx.core.file.FileSystemOptions; -import io.vertx.core.http.ClientAuth; -import io.vertx.core.net.JksOptions; -import io.vertx.core.net.PemKeyCertOptions; -import io.vertx.core.net.PemTrustOptions; -import io.vertx.core.net.PfxOptions; - -public class VertxOptionsBuilder { - - private static final Pattern COMMA_PATTERN = Pattern.compile(","); - - static VertxOptions buildVertxOptions(VertxConfiguration conf) { - VertxOptions options = new VertxOptions(); - - // Order matters, as the cluster options modifies the event bus options. - buildEventBusOptions(conf, options); - buildClusterOptions(conf, options); - buildFileSystemOptions(conf, options); - - options.setWorkerPoolSize(conf.workerPoolSize); - options.setInternalBlockingPoolSize(conf.internalBlockingPoolSize); - - options.setBlockedThreadCheckInterval(conf.warningExceptionTime.toMillis()); - options.setWarningExceptionTime(conf.warningExceptionTime.toNanos()); - conf.maxEventLoopExecuteTime.ifPresent(d -> options.setMaxEventLoopExecuteTime(d.toMillis())); - conf.maxWorkerExecuteTime.ifPresent(d -> options.setMaxWorkerExecuteTime(d.toMillis())); - - conf.eventLoopsPoolSize.ifPresent(options::setEventLoopPoolSize); - - return options; - } - - private static void buildFileSystemOptions(VertxConfiguration conf, VertxOptions options) { - String fileCacheDir = System.getProperty(CACHE_DIR_BASE_PROP_NAME, - System.getProperty("java.io.tmpdir", ".") + File.separator + "quarkus-vertx-cache"); - - options.setFileSystemOptions(new FileSystemOptions() - .setFileCacheDir(fileCacheDir) - .setFileCachingEnabled(conf.caching) - .setClassPathResolvingEnabled(conf.classpathResolving)); - } - - private static void buildClusterOptions(VertxConfiguration conf, VertxOptions options) { - ClusterConfiguration cluster = conf.cluster; - EventBusOptions eb = options.getEventBusOptions(); - eb.setClustered(cluster.clustered); - eb.setClusterPingReplyInterval(cluster.pingReplyInterval.toMillis()); - eb.setClusterPingInterval(cluster.pingInterval.toMillis()); - if (cluster.host != null) { - eb.setHost(cluster.host); - } - cluster.port.ifPresent(eb::setPort); - cluster.publicHost.ifPresent(eb::setClusterPublicHost); - cluster.publicPort.ifPresent(eb::setClusterPublicPort); - } - - private static void buildEventBusOptions(VertxConfiguration conf, VertxOptions options) { - EventBusConfiguration eb = conf.eventbus; - EventBusOptions opts = new EventBusOptions(); - opts.setAcceptBacklog(eb.acceptBacklog.orElse(-1)); - opts.setClientAuth(ClientAuth.valueOf(eb.clientAuth.toUpperCase())); - opts.setConnectTimeout((int) (Math.min(Integer.MAX_VALUE, eb.connectTimeout.toMillis()))); - opts.setIdleTimeout( - eb.idleTimeout.map(d -> Math.max(1, (int) Math.min(Integer.MAX_VALUE, d.getSeconds()))).orElse(0)); - opts.setSendBufferSize(eb.sendBufferSize.orElse(-1)); - opts.setSoLinger(eb.soLinger.orElse(-1)); - opts.setSsl(eb.ssl); - opts.setReceiveBufferSize(eb.receiveBufferSize.orElse(-1)); - opts.setReconnectAttempts(eb.reconnectAttempts); - opts.setReconnectInterval(eb.reconnectInterval.toMillis()); - opts.setReuseAddress(eb.reuseAddress); - opts.setReusePort(eb.reusePort); - opts.setTrafficClass(eb.trafficClass.orElse(-1)); - opts.setTcpKeepAlive(eb.tcpKeepAlive); - opts.setTcpNoDelay(eb.tcpNoDelay); - opts.setTrustAll(eb.trustAll); - - // Certificates and trust. - if (eb.keyCertificatePem != null) { - List<String> certs = new ArrayList<>(); - List<String> keys = new ArrayList<>(); - eb.keyCertificatePem.certs.ifPresent( - s -> certs.addAll(COMMA_PATTERN.splitAsStream(s).map(String::trim).collect(Collectors.toList()))); - eb.keyCertificatePem.keys.ifPresent( - s -> keys.addAll(COMMA_PATTERN.splitAsStream(s).map(String::trim).collect(Collectors.toList()))); - PemKeyCertOptions o = new PemKeyCertOptions() - .setCertPaths(certs) - .setKeyPaths(keys); - opts.setPemKeyCertOptions(o); - } - - if (eb.keyCertificateJks != null) { - JksOptions o = new JksOptions(); - eb.keyCertificateJks.path.ifPresent(o::setPath); - eb.keyCertificateJks.password.ifPresent(o::setPassword); - opts.setKeyStoreOptions(o); - } - - if (eb.keyCertificatePfx != null) { - PfxOptions o = new PfxOptions(); - eb.keyCertificatePfx.path.ifPresent(o::setPath); - eb.keyCertificatePfx.password.ifPresent(o::setPassword); - opts.setPfxKeyCertOptions(o); - } - - if (eb.trustCertificatePem != null) { - eb.trustCertificatePem.certs.ifPresent(s -> { - PemTrustOptions o = new PemTrustOptions(); - COMMA_PATTERN.splitAsStream(s).map(String::trim).forEach(o::addCertPath); - opts.setPemTrustOptions(o); - }); - } - - if (eb.trustCertificateJks != null) { - JksOptions o = new JksOptions(); - eb.trustCertificateJks.path.ifPresent(o::setPath); - eb.trustCertificateJks.password.ifPresent(o::setPassword); - opts.setTrustStoreOptions(o); - } - - if (eb.trustCertificatePfx != null) { - PfxOptions o = new PfxOptions(); - eb.trustCertificatePfx.path.ifPresent(o::setPath); - eb.trustCertificatePfx.password.ifPresent(o::setPassword); - opts.setPfxTrustOptions(o); - } - options.setEventBusOptions(opts); - } -} diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java index af047494241..f2e12b96710 100644 --- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java +++ b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java @@ -161,11 +161,6 @@ private void registerCodecs(Map<Class<?>, Class<?>> codecByClass) { } } - private void registerCodec(Class<?> typeToAdd, MessageCodec codec) { - EventBus eventBus = vertx.eventBus(); - eventBus.registerDefaultCodec(typeToAdd, codec); - } - public RuntimeValue<Vertx> forceStart(Supplier<Vertx> vertx) { return new RuntimeValue<>(vertx.get()); }

['extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java', 'extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxOptionsBuilder.java', 'extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java']

{'.java': 3}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5159/5158

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5158

https://github.com/quarkusio/quarkus/pull/5159

https://github.com/quarkusio/quarkus/pull/5159

fixes

Please add null check for LambdaHttpHandler.java line 84 -> request.getMultiValueHeaders()

Hi There, Could you please add a null value check in LambdaHttpHandler.java line 84 -> request.getMultiValueHeaders() I able to send a request with out any http headers from AWS Api gateway and it fails in the above mentioned class with null pointer exception. Thanks, Ravi

08e8878616c1fbb7d90daebb41a345892eeb5d19

92d296ea94e70df23418996b46b5d009b4cef303

https://github.com/quarkusio/quarkus/compare/08e8878616c1fbb7d90daebb41a345892eeb5d19...92d296ea94e70df23418996b46b5d009b4cef303

diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java index b09b474a58a..2169542d9e1 100644 --- a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java +++ b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java @@ -84,8 +84,10 @@ private AwsProxyResponse nettyDispatch(VirtualClientConnection connection, AwsPr } DefaultHttpRequest nettyRequest = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.valueOf(request.getHttpMethod()), path); - for (Map.Entry<String, List<String>> header : request.getMultiValueHeaders().entrySet()) { - nettyRequest.headers().add(header.getKey(), header.getValue()); + if (request.getMultiValueHeaders() != null) { //apparently this can be null if no headers are sent + for (Map.Entry<String, List<String>> header : request.getMultiValueHeaders().entrySet()) { + nettyRequest.headers().add(header.getKey(), header.getValue()); + } } if (!nettyRequest.headers().contains(HttpHeaderNames.HOST)) { nettyRequest.headers().add(HttpHeaderNames.HOST, "localhost");

['extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5112/5110

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5110

https://github.com/quarkusio/quarkus/pull/5112

https://github.com/quarkusio/quarkus/pull/5112

fixes

Native build fails when additionalBuildArg is commented out

Native build fails when `additionalBuildArg` is commented out. Thrown exception is: Failed to generate a native image: Failed to augment application classes: Property quarkus.native.additional-build-args not found It's happening with 0.26.1, 0.27.0 and master when using quarkus-maven-plugin - native-image goal definition in pom.xml. Wasn't happening with 0.25.0 and earlier versions. Snippet from pom.xml: ```xml <configuration> <enableHttpUrlHandler>true</enableHttpUrlHandler> <additionalBuildArgs> <!-- <additionalBuildArg>-Dfoo</additionalBuildArg> --> </additionalBuildArgs> </configuration> ``` Workaround: Comment out or remove whole `<additionalBuildArgs>` Stacktrace: ``` [ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:0.27.0:native-image (default) on project getting-started: Failed to generate a native image: Failed to augment application classes: Property quarkus.native.additional-build-args not found -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal io.quarkus:quarkus-maven-plugin:0.27.0:native-image (default) on project getting-started: Failed to generate a native image at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:215) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:156) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:148) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:117) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:81) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build (SingleThreadedBuilder.java:56) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute (LifecycleStarter.java:128) at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:305) at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:192) at org.apache.maven.DefaultMaven.execute (DefaultMaven.java:105) at org.apache.maven.cli.MavenCli.execute (MavenCli.java:956) at org.apache.maven.cli.MavenCli.doMain (MavenCli.java:288) at org.apache.maven.cli.MavenCli.main (MavenCli.java:192) at sun.reflect.NativeMethodAccessorImpl.invoke0 (Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke (NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke (DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke (Method.java:498) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced (Launcher.java:282) at org.codehaus.plexus.classworlds.launcher.Launcher.launch (Launcher.java:225) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode (Launcher.java:406) at org.codehaus.plexus.classworlds.launcher.Launcher.main (Launcher.java:347) Caused by: org.apache.maven.plugin.MojoExecutionException: Failed to generate a native image at io.quarkus.maven.NativeImageMojo.execute (NativeImageMojo.java:305) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo (DefaultBuildPluginManager.java:137) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:210) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:156) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:148) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:117) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:81) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build (SingleThreadedBuilder.java:56) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute (LifecycleStarter.java:128) at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:305) at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:192) at org.apache.maven.DefaultMaven.execute (DefaultMaven.java:105) at org.apache.maven.cli.MavenCli.execute (MavenCli.java:956) at org.apache.maven.cli.MavenCli.doMain (MavenCli.java:288) at org.apache.maven.cli.MavenCli.main (MavenCli.java:192) at sun.reflect.NativeMethodAccessorImpl.invoke0 (Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke (NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke (DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke (Method.java:498) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced (Launcher.java:282) at org.codehaus.plexus.classworlds.launcher.Launcher.launch (Launcher.java:225) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode (Launcher.java:406) at org.codehaus.plexus.classworlds.launcher.Launcher.main (Launcher.java:347) Caused by: io.quarkus.creator.AppCreatorException: Failed to augment application classes at io.quarkus.creator.phase.augment.AugmentTask.run (AugmentTask.java:190) at io.quarkus.creator.phase.augment.AugmentTask.run (AugmentTask.java:48) at io.quarkus.creator.CuratedApplicationCreator.runTask (CuratedApplicationCreator.java:139) at io.quarkus.maven.NativeImageMojo.execute (NativeImageMojo.java:303) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo (DefaultBuildPluginManager.java:137) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:210) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:156) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:148) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:117) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:81) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build (SingleThreadedBuilder.java:56) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute (LifecycleStarter.java:128) at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:305) at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:192) at org.apache.maven.DefaultMaven.execute (DefaultMaven.java:105) at org.apache.maven.cli.MavenCli.execute (MavenCli.java:956) at org.apache.maven.cli.MavenCli.doMain (MavenCli.java:288) at org.apache.maven.cli.MavenCli.main (MavenCli.java:192) at sun.reflect.NativeMethodAccessorImpl.invoke0 (Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke (NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke (DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke (Method.java:498) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced (Launcher.java:282) at org.codehaus.plexus.classworlds.launcher.Launcher.launch (Launcher.java:225) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode (Launcher.java:406) at org.codehaus.plexus.classworlds.launcher.Launcher.main (Launcher.java:347) Caused by: java.util.NoSuchElementException: Property quarkus.native.additional-build-args not found at io.smallrye.config.SmallRyeConfig.propertyNotFound (SmallRyeConfig.java:221) at io.smallrye.config.SmallRyeConfig.getValues (SmallRyeConfig.java:87) at io.smallrye.config.SmallRyeConfig.getValues (SmallRyeConfig.java:72) at io.quarkus.runtime.configuration.ConfigUtils.getValues (ConfigUtils.java:113) at io.quarkus.deployment.configuration.ObjectListConfigType.acceptConfigurationValueIntoGroup (ObjectListConfigType.java:102) at io.quarkus.deployment.configuration.GroupConfigType.acceptConfigurationValueIntoLeaf (GroupConfigType.java:238) at io.quarkus.deployment.configuration.ObjectListConfigType.acceptConfigurationValue (ObjectListConfigType.java:48) at io.quarkus.deployment.configuration.ConfigDefinition.loadConfiguration (ConfigDefinition.java:501) at io.quarkus.deployment.ExtensionLoader.loadStepsFrom (ExtensionLoader.java:229) at io.quarkus.deployment.QuarkusAugmentor.run (QuarkusAugmentor.java:85) at io.quarkus.creator.phase.augment.AugmentTask.run (AugmentTask.java:181) at io.quarkus.creator.phase.augment.AugmentTask.run (AugmentTask.java:48) at io.quarkus.creator.CuratedApplicationCreator.runTask (CuratedApplicationCreator.java:139) at io.quarkus.maven.NativeImageMojo.execute (NativeImageMojo.java:303) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo (DefaultBuildPluginManager.java:137) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:210) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:156) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:148) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:117) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:81) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build (SingleThreadedBuilder.java:56) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute (LifecycleStarter.java:128) at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:305) at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:192) at org.apache.maven.DefaultMaven.execute (DefaultMaven.java:105) at org.apache.maven.cli.MavenCli.execute (MavenCli.java:956) at org.apache.maven.cli.MavenCli.doMain (MavenCli.java:288) at org.apache.maven.cli.MavenCli.main (MavenCli.java:192) at sun.reflect.NativeMethodAccessorImpl.invoke0 (Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke (NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke (DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke (Method.java:498) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced (Launcher.java:282) at org.codehaus.plexus.classworlds.launcher.Launcher.launch (Launcher.java:225) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode (Launcher.java:406) at org.codehaus.plexus.classworlds.launcher.Launcher.main (Launcher.java:347) ``` Steps to reproduce: ``` mvn io.quarkus:quarkus-maven-plugin:0.26.0:create -DprojectGroupId=org.acme -DprojectArtifactId=getting-started -DclassName="org.acme.quickstart.GreetingResource" -Dpath="/hello" cd getting-started sed -i "" "s/0.26.0/0.27.0/g" pom.xml code pom.xml ## adjust configuration to match above snippet mvn clean verify -Dnative ```

84f50ef4834507997b27be461ab40ed268c954df

5061c0bdd5d538d8c27b91dc1f277383585e0f64

https://github.com/quarkusio/quarkus/compare/84f50ef4834507997b27be461ab40ed268c954df...5061c0bdd5d538d8c27b91dc1f277383585e0f64

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java index 5b9f3462fab..6bf9329ffaa 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java @@ -434,7 +434,7 @@ public void accept(ConfigBuilder configBuilder) { configs.add("quarkus.native.add-all-charsets", addAllCharsets); - if (additionalBuildArgs != null) { + if (additionalBuildArgs != null && !additionalBuildArgs.isEmpty()) { configs.add("quarkus.native.additional-build-args", additionalBuildArgs.stream() .map(val -> val.replace("\\\\", "\\\\\\\\")) @@ -448,9 +448,9 @@ public void accept(ConfigBuilder configBuilder) { configs.add("quarkus.native.debug-symbols", debugSymbols); configs.add("quarkus.native.enable-reports", enableReports); - if (containerRuntime != null) { + if (containerRuntime != null && !containerRuntime.trim().isEmpty()) { configs.add("quarkus.native.container-runtime", containerRuntime); - } else if (dockerBuild != null) { + } else if (dockerBuild != null && !dockerBuild.trim().isEmpty()) { if (!dockerBuild.isEmpty() && !dockerBuild.toLowerCase().equals("false")) { if (dockerBuild.toLowerCase().equals("true")) { configs.add("quarkus.native.container-runtime", "docker"); @@ -459,7 +459,7 @@ public void accept(ConfigBuilder configBuilder) { } } } - if (containerRuntimeOptions != null) { + if (containerRuntimeOptions != null && !containerRuntimeOptions.trim().isEmpty()) { configs.add("quarkus.native.container-runtime-options", containerRuntimeOptions); } configs.add("quarkus.native.dump-proxies", dumpProxies); @@ -479,10 +479,10 @@ public void accept(ConfigBuilder configBuilder) { configs.add("quarkus.native.full-stack-traces", fullStackTraces); - if (graalvmHome != null) { + if (graalvmHome != null && !graalvmHome.trim().isEmpty()) { configs.add("quarkus.native.graalvm-home", graalvmHome); } - if (nativeImageXmx != null) { + if (nativeImageXmx != null && !nativeImageXmx.trim().isEmpty()) { configs.add("quarkus.native.native-image-xmx", nativeImageXmx); } configs.add("quarkus.native.report-errors-at-runtime", reportErrorsAtRuntime); diff --git a/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java index e832f9b692c..7678980dc51 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java @@ -324,7 +324,7 @@ public void accept(ConfigBuilder configBuilder) { if (addAllCharsets != null) { configs.add("quarkus.native.add-all-charsets", addAllCharsets.toString()); } - if (additionalBuildArgs != null) { + if (additionalBuildArgs != null && !additionalBuildArgs.isEmpty()) { configs.add("quarkus.native.additional-build-args", additionalBuildArgs); } if (autoServiceLoaderRegistration != null) { @@ -345,10 +345,10 @@ public void accept(ConfigBuilder configBuilder) { if (enableReports != null) { configs.add("quarkus.native.enable-reports", enableReports.toString()); } - if (containerRuntime != null) { + if (containerRuntime != null && !containerRuntime.trim().isEmpty()) { configs.add("quarkus.native.container-runtime", containerRuntime); - } else if (dockerBuild != null) { - if (!dockerBuild.isEmpty() && !dockerBuild.toLowerCase().equals("false")) { + } else if (dockerBuild != null && !dockerBuild.trim().isEmpty()) { + if (!dockerBuild.toLowerCase().equals("false")) { if (dockerBuild.toLowerCase().equals("true")) { configs.add("quarkus.native.container-runtime", "docker"); } else { @@ -356,7 +356,7 @@ public void accept(ConfigBuilder configBuilder) { } } } - if (containerRuntimeOptions != null) { + if (containerRuntimeOptions != null && !containerRuntimeOptions.trim().isEmpty()) { configs.add("quarkus.native.container-runtime-options", containerRuntimeOptions); } if (dumpProxies != null) { @@ -395,13 +395,13 @@ public void accept(ConfigBuilder configBuilder) { if (fullStackTraces != null) { configs.add("quarkus.native.full-stack-traces", fullStackTraces.toString()); } - if (graalvmHome != null) { + if (graalvmHome != null && !graalvmHome.trim().isEmpty()) { configs.add("quarkus.native.graalvm-home", graalvmHome.toString()); } - if (javaHome != null) { + if (javaHome != null && !javaHome.toString().isEmpty()) { configs.add("quarkus.native.java-home", javaHome.toString()); } - if (nativeImageXmx != null) { + if (nativeImageXmx != null && !nativeImageXmx.trim().isEmpty()) { configs.add("quarkus.native.native-image-xmx", nativeImageXmx.toString()); } if (reportErrorsAtRuntime != null) {

['devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java', 'devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/5077/5063

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/5063

https://github.com/quarkusio/quarkus/pull/5077

https://github.com/quarkusio/quarkus/pull/5077

resolves

ComponentsProviderGenerator - break the generated getComponents() method for large deployments into multiple methods

Otherwise we end up with `org.objectweb.asm.MethodTooLargeException`. `BytecodeRecorderImpl` already has something similar implemented.

cbdc08edf435b0048272e75ccef15369a3424ddb

ca77890b3277b6e1e7f567e290f1f1ad52e247c6

https://github.com/quarkusio/quarkus/compare/cbdc08edf435b0048272e75ccef15369a3424ddb...ca77890b3277b6e1e7f567e290f1f1ad52e247c6

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java index 4f8c40e307d..8a638e6ad37 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java @@ -144,7 +144,7 @@ Collection<Resource> generateSyntheticBean(BeanInfo bean, ReflectionRegistration // Foo_Bean implements InjectableBean<T> ClassCreator beanCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName) - .interfaces(InjectableBean.class).build(); + .interfaces(InjectableBean.class, Supplier.class).build(); // Fields FieldCreator beanTypes = beanCreator.getFieldCreator(FIELD_NAME_BEAN_TYPES, Set.class) @@ -195,6 +195,7 @@ Collection<Resource> generateSyntheticBean(BeanInfo bean, ReflectionRegistration constructor.returnValue(null); implementGetIdentifier(bean, beanCreator); + implementSupplierGet(beanCreator); if (!bean.hasDefaultDestroy()) { implementDestroy(bean, beanCreator, providerTypeName, Collections.emptyMap(), reflectionRegistration, isApplicationClass, baseName); @@ -246,7 +247,7 @@ Collection<Resource> generateClassBean(BeanInfo bean, ClassInfo beanClass, Refle // Foo_Bean implements InjectableBean<T> ClassCreator beanCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName) - .interfaces(InjectableBean.class).build(); + .interfaces(InjectableBean.class, Supplier.class).build(); // Fields FieldCreator beanTypes = beanCreator.getFieldCreator(FIELD_NAME_BEAN_TYPES, Set.class) @@ -275,6 +276,7 @@ Collection<Resource> generateClassBean(BeanInfo bean, ClassInfo beanClass, Refle annotationLiterals); implementGetIdentifier(bean, beanCreator); + implementSupplierGet(beanCreator); if (!bean.hasDefaultDestroy()) { implementDestroy(bean, beanCreator, providerTypeName, injectionPointToProviderSupplierField, reflectionRegistration, isApplicationClass, baseName); @@ -341,7 +343,7 @@ Collection<Resource> generateProducerMethodBean(BeanInfo bean, MethodInfo produc // Foo_Bean implements InjectableBean<T> ClassCreator beanCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName) - .interfaces(InjectableBean.class).build(); + .interfaces(InjectableBean.class, Supplier.class).build(); // Fields FieldCreator beanTypes = beanCreator.getFieldCreator(FIELD_NAME_BEAN_TYPES, Set.class) @@ -369,6 +371,7 @@ Collection<Resource> generateProducerMethodBean(BeanInfo bean, MethodInfo produc annotationLiterals); implementGetIdentifier(bean, beanCreator); + implementSupplierGet(beanCreator); if (!bean.hasDefaultDestroy()) { implementDestroy(bean, beanCreator, providerTypeName, injectionPointToProviderField, reflectionRegistration, isApplicationClass, baseName); @@ -426,7 +429,7 @@ Collection<Resource> generateProducerFieldBean(BeanInfo bean, FieldInfo producer // Foo_Bean implements InjectableBean<T> ClassCreator beanCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName) - .interfaces(InjectableBean.class).build(); + .interfaces(InjectableBean.class, Supplier.class).build(); // Fields FieldCreator beanTypes = beanCreator.getFieldCreator(FIELD_NAME_BEAN_TYPES, Set.class) @@ -450,6 +453,7 @@ Collection<Resource> generateProducerFieldBean(BeanInfo bean, FieldInfo producer annotationLiterals); implementGetIdentifier(bean, beanCreator); + implementSupplierGet(beanCreator); if (!bean.hasDefaultDestroy()) { implementDestroy(bean, beanCreator, providerTypeName, null, reflectionRegistration, isApplicationClass, baseName); } @@ -1514,6 +1518,11 @@ protected void implementGetName(BeanInfo bean, ClassCreator beanCreator) { } } + protected void implementSupplierGet(ClassCreator beanCreator) { + MethodCreator get = beanCreator.getMethodCreator("get", Object.class).setModifiers(ACC_PUBLIC); + get.returnValue(get.getThis()); + } + private String getProxyTypeName(BeanInfo bean, String baseName) { return getPackageName(bean) + "." + baseName + ClientProxyGenerator.CLIENT_PROXY_SUFFIX; } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java index 232dd3c348e..8c6c60da26b 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java @@ -1,12 +1,12 @@ package io.quarkus.arc.processor; import static java.util.stream.Collectors.toList; +import static org.objectweb.asm.Opcodes.ACC_PRIVATE; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; import io.quarkus.arc.Arc; import io.quarkus.arc.Components; import io.quarkus.arc.ComponentsProvider; -import io.quarkus.arc.impl.LazyValue; import io.quarkus.arc.processor.ResourceOutput.Resource; import io.quarkus.gizmo.ClassCreator; import io.quarkus.gizmo.MethodCreator; @@ -38,8 +38,9 @@ public class ComponentsProviderGenerator extends AbstractGenerator { static final String COMPONENTS_PROVIDER_SUFFIX = "_ComponentsProvider"; - static final String SETUP_PACKAGE = Arc.class.getPackage().getName() + ".setup"; + static final String ADD_OBSERVERS = "addObservers"; + static final String ADD_BEANS = "addBeans"; protected final AnnotationLiteralProcessor annotationLiterals; @@ -67,51 +68,73 @@ Collection<Resource> generate(String name, BeanDeployment beanDeployment, Map<Be MethodCreator getComponents = componentsProvider.getMethodCreator("getComponents", Components.class) .setModifiers(ACC_PUBLIC); - // Map<String, Supplier<InjectableBean<?>>> beanIdToBeanSupplier = new HashMap<>(); - ResultHandle beanIdToBeanSupplierHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(HashMap.class)); - + // Maps a bean to all injection points it is resolved to // Bar -> Foo, Baz // Foo -> Baz // Interceptor -> Baz - Map<BeanInfo, List<BeanInfo>> beanToInjections = new HashMap<>(); - for (BeanInfo bean : beanDeployment.getBeans()) { - if (bean.isProducerMethod() || bean.isProducerField()) { - beanToInjections.computeIfAbsent(bean.getDeclaringBean(), d -> new ArrayList<>()).add(bean); - } - for (Injection injection : bean.getInjections()) { - for (InjectionPointInfo injectionPoint : injection.injectionPoints) { - if (!BuiltinBean.resolvesTo(injectionPoint)) { - beanToInjections.computeIfAbsent(injectionPoint.getResolvedBean(), d -> new ArrayList<>()).add(bean); - } - } - } - if (bean.getDisposer() != null) { - for (InjectionPointInfo injectionPoint : bean.getDisposer().getInjection().injectionPoints) { - if (!BuiltinBean.resolvesTo(injectionPoint)) { - beanToInjections.computeIfAbsent(injectionPoint.getResolvedBean(), d -> new ArrayList<>()).add(bean); - } - } - } - for (InterceptorInfo interceptor : bean.getBoundInterceptors()) { - beanToInjections.computeIfAbsent(interceptor, d -> new ArrayList<>()).add(bean); - } + Map<BeanInfo, List<BeanInfo>> beanToInjections = initBeanToInjections(beanDeployment); + + // Break bean processing into multiple addBeans() methods + // Map<String, InjectableBean<?>> + ResultHandle beanIdToBeanHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(HashMap.class)); + processBeans(componentsProvider, getComponents, beanIdToBeanHandle, beanToInjections, beanToGeneratedName, + beanDeployment); + + // Break observers processing into multiple ddObservers() methods + ResultHandle observersHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(ArrayList.class)); + processObservers(componentsProvider, getComponents, beanDeployment, beanIdToBeanHandle, observersHandle, + observerToGeneratedName); + + // Custom contexts + ResultHandle contextsHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(ArrayList.class)); + for (Entry<ScopeInfo, Function<MethodCreator, ResultHandle>> entry : beanDeployment.getCustomContexts().entrySet()) { + ResultHandle contextHandle = entry.getValue().apply(getComponents); + getComponents.invokeInterfaceMethod(MethodDescriptors.LIST_ADD, contextsHandle, contextHandle); } - // Also process interceptors injection points - for (InterceptorInfo interceptor : beanDeployment.getInterceptors()) { - for (Injection injection : interceptor.getInjections()) { - for (InjectionPointInfo injectionPoint : injection.injectionPoints) { - if (!BuiltinBean.resolvesTo(injectionPoint)) { - beanToInjections.computeIfAbsent(injectionPoint.getResolvedBean(), d -> new ArrayList<>()) - .add(interceptor); - } - } + + ResultHandle transitiveBindingsHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(HashMap.class)); + for (Entry<DotName, Set<AnnotationInstance>> entry : beanDeployment.getTransitiveInterceptorBindings().entrySet()) { + ResultHandle bindingsHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); + for (AnnotationInstance binding : entry.getValue()) { + // Create annotation literals first + ClassInfo bindingClass = beanDeployment.getInterceptorBinding(binding.name()); + getComponents.invokeInterfaceMethod(MethodDescriptors.SET_ADD, bindingsHandle, + annotationLiterals.process(getComponents, classOutput, bindingClass, binding, + SETUP_PACKAGE)); } + getComponents.invokeInterfaceMethod(MethodDescriptors.MAP_PUT, transitiveBindingsHandle, + getComponents.loadClass(entry.getKey().toString()), bindingsHandle); } - Map<BeanInfo, LazyValue<ResultHandle>> beanToResultSupplierHandle = new HashMap<>(); - List<BeanInfo> processed = new ArrayList<>(); + ResultHandle beansHandle = getComponents.invokeInterfaceMethod( + MethodDescriptor.ofMethod(Map.class, "values", Collection.class), + beanIdToBeanHandle); + + ResultHandle componentsHandle = getComponents.newInstance( + MethodDescriptor.ofConstructor(Components.class, Collection.class, Collection.class, Collection.class, + Map.class), + beansHandle, observersHandle, contextsHandle, transitiveBindingsHandle); + getComponents.returnValue(componentsHandle); + + // Finally write the bytecode + componentsProvider.close(); + + List<Resource> resources = new ArrayList<>(); + for (Resource resource : classOutput.getResources()) { + resources.add(resource); + resources.add(ResourceImpl.serviceProvider(ComponentsProvider.class.getName(), + (resource.getName().replace('/', '.')).getBytes(Charset.forName("UTF-8")))); + } + return resources; + } + + private void processBeans(ClassCreator componentsProvider, MethodCreator getComponents, ResultHandle beanIdToBeanHandle, + Map<BeanInfo, List<BeanInfo>> beanToInjections, + Map<BeanInfo, String> beanToGeneratedName, BeanDeployment beanDeployment) { + + Set<BeanInfo> processed = new HashSet<>(); + BeanAdder beanAdder = new BeanAdder(componentsProvider, getComponents, processed); - // At this point we are going to fill the beanIdToBeanSupplier map // - iterate over beanToInjections entries and process beans for which all dependencies are already present in the map // - when a bean is processed the map entry is removed // - if we're stuck and the map is not empty ISE is thrown @@ -129,12 +152,12 @@ Collection<Resource> generate(String name, BeanDeployment beanDeployment, Map<Be } stuck = true; // First try to proces beans that are not dependencies - stuck = addBeans(beanToInjections, processed, beanToResultSupplierHandle, getComponents, beanIdToBeanSupplierHandle, + stuck = addBeans(beanAdder, beanToInjections, processed, beanIdToBeanHandle, beanToGeneratedName, b -> !isDependency(b, beanToInjections)); if (stuck) { // It seems we're stuck but we can try to process normal scoped beans that can prevent a circular dependency - stuck = addBeans(beanToInjections, processed, beanToResultSupplierHandle, getComponents, - beanIdToBeanSupplierHandle, beanToGeneratedName, + stuck = addBeans(beanAdder, beanToInjections, processed, beanIdToBeanHandle, + beanToGeneratedName, b -> { // Try to process non-producer beans first, including declaring beans of producers if (b.isProducerField() || b.isProducerMethod()) { @@ -143,8 +166,8 @@ Collection<Resource> generate(String name, BeanDeployment beanDeployment, Map<Be return b.getScope().isNormal() || !isDependency(b, beanToInjections); }); if (stuck) { - stuck = addBeans(beanToInjections, processed, beanToResultSupplierHandle, getComponents, - beanIdToBeanSupplierHandle, beanToGeneratedName, + stuck = addBeans(beanAdder, beanToInjections, processed, + beanIdToBeanHandle, beanToGeneratedName, b -> !isDependency(b, beanToInjections) || b.getScope().isNormal()); } } @@ -152,97 +175,78 @@ Collection<Resource> generate(String name, BeanDeployment beanDeployment, Map<Be // Finally process beans and interceptors that are not dependencies for (BeanInfo bean : beanDeployment.getBeans()) { if (!processed.contains(bean)) { - addBean(getComponents, beanIdToBeanSupplierHandle, bean, beanToGeneratedName, beanToResultSupplierHandle); + beanAdder.addBean(bean, beanIdToBeanHandle, beanToGeneratedName); } } for (BeanInfo interceptor : beanDeployment.getInterceptors()) { if (!processed.contains(interceptor)) { - addBean(getComponents, beanIdToBeanSupplierHandle, interceptor, beanToGeneratedName, - beanToResultSupplierHandle); + beanAdder.addBean(interceptor, beanIdToBeanHandle, beanToGeneratedName); } } - // Observers - ResultHandle observersHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(ArrayList.class)); - for (ObserverInfo observer : beanDeployment.getObservers()) { - String observerType = observerToGeneratedName.get(observer); - List<InjectionPointInfo> injectionPoints = observer.getInjection().injectionPoints.stream() - .filter(ip -> !BuiltinBean.resolvesTo(ip)) - .collect(toList()); - List<ResultHandle> params = new ArrayList<>(); - List<String> paramTypes = new ArrayList<>(); + // Make sure the last addBeans() method is closed properly + beanAdder.close(); + } - ResultHandle resultSupplierHandle = beanToResultSupplierHandle.get(observer.getDeclaringBean()).get(); - params.add(resultSupplierHandle); - paramTypes.add(Type.getDescriptor(Supplier.class)); - for (InjectionPointInfo injectionPoint : injectionPoints) { - resultSupplierHandle = beanToResultSupplierHandle.get(injectionPoint.getResolvedBean()).get(); - params.add(resultSupplierHandle); - paramTypes.add(Type.getDescriptor(Supplier.class)); + private void processObservers(ClassCreator componentsProvider, MethodCreator getComponents, BeanDeployment beanDeployment, + ResultHandle beanIdToBeanHandle, ResultHandle observersHandle, Map<ObserverInfo, String> observerToGeneratedName) { + try (ObserverAdder observerAdder = new ObserverAdder(componentsProvider, getComponents)) { + for (ObserverInfo observer : beanDeployment.getObservers()) { + observerAdder.addObserver(observer, beanIdToBeanHandle, observersHandle, observerToGeneratedName); } - ResultHandle observerInstance = getComponents.newInstance( - MethodDescriptor.ofConstructor(observerType, paramTypes.toArray(new String[0])), - params.toArray(new ResultHandle[0])); - getComponents.invokeInterfaceMethod(MethodDescriptors.LIST_ADD, observersHandle, observerInstance); - } - - // Custom contexts - ResultHandle contextsHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(ArrayList.class)); - for (Entry<ScopeInfo, Function<MethodCreator, ResultHandle>> entry : beanDeployment.getCustomContexts().entrySet()) { - ResultHandle contextHandle = entry.getValue().apply(getComponents); - getComponents.invokeInterfaceMethod(MethodDescriptors.LIST_ADD, contextsHandle, contextHandle); } + } - ResultHandle transitiveBindingsHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(HashMap.class)); - for (Entry<DotName, Set<AnnotationInstance>> entry : beanDeployment.getTransitiveInterceptorBindings().entrySet()) { - ResultHandle bindingsHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); - for (AnnotationInstance binding : entry.getValue()) { - // Create annotation literals first - ClassInfo bindingClass = beanDeployment.getInterceptorBinding(binding.name()); - getComponents.invokeInterfaceMethod(MethodDescriptors.SET_ADD, bindingsHandle, - annotationLiterals.process(getComponents, classOutput, bindingClass, binding, - SETUP_PACKAGE)); + private Map<BeanInfo, List<BeanInfo>> initBeanToInjections(BeanDeployment beanDeployment) { + Map<BeanInfo, List<BeanInfo>> beanToInjections = new HashMap<>(); + for (BeanInfo bean : beanDeployment.getBeans()) { + if (bean.isProducerMethod() || bean.isProducerField()) { + beanToInjections.computeIfAbsent(bean.getDeclaringBean(), d -> new ArrayList<>()).add(bean); + } + for (Injection injection : bean.getInjections()) { + for (InjectionPointInfo injectionPoint : injection.injectionPoints) { + if (!BuiltinBean.resolvesTo(injectionPoint)) { + beanToInjections.computeIfAbsent(injectionPoint.getResolvedBean(), d -> new ArrayList<>()).add(bean); + } + } + } + if (bean.getDisposer() != null) { + for (InjectionPointInfo injectionPoint : bean.getDisposer().getInjection().injectionPoints) { + if (!BuiltinBean.resolvesTo(injectionPoint)) { + beanToInjections.computeIfAbsent(injectionPoint.getResolvedBean(), d -> new ArrayList<>()).add(bean); + } + } + } + for (InterceptorInfo interceptor : bean.getBoundInterceptors()) { + beanToInjections.computeIfAbsent(interceptor, d -> new ArrayList<>()).add(bean); } - getComponents.invokeInterfaceMethod(MethodDescriptors.MAP_PUT, transitiveBindingsHandle, - getComponents.loadClass(entry.getKey().toString()), bindingsHandle); } - - // final Collection beans = beanIdToBeanSupplier.values(); - ResultHandle beansHandle = getComponents.invokeInterfaceMethod( - MethodDescriptor.ofMethod(Map.class, "values", Collection.class), - beanIdToBeanSupplierHandle); - - ResultHandle componentsHandle = getComponents.newInstance( - MethodDescriptor.ofConstructor(Components.class, Collection.class, Collection.class, Collection.class, - Map.class), - beansHandle, observersHandle, contextsHandle, transitiveBindingsHandle); - getComponents.returnValue(componentsHandle); - - // Finally write the bytecode - componentsProvider.close(); - - List<Resource> resources = new ArrayList<>(); - for (Resource resource : classOutput.getResources()) { - resources.add(resource); - // TODO proper name conversion - resources.add(ResourceImpl.serviceProvider(ComponentsProvider.class.getName(), - (resource.getName().replace('/', '.')).getBytes(Charset.forName("UTF-8")))); + // Also process interceptors injection points + for (InterceptorInfo interceptor : beanDeployment.getInterceptors()) { + for (Injection injection : interceptor.getInjections()) { + for (InjectionPointInfo injectionPoint : injection.injectionPoints) { + if (!BuiltinBean.resolvesTo(injectionPoint)) { + beanToInjections.computeIfAbsent(injectionPoint.getResolvedBean(), d -> new ArrayList<>()) + .add(interceptor); + } + } + } } - return resources; + // Note that we do not have to process observer injection points because observers are always processed after all beans are ready + return beanToInjections; } - private boolean addBeans(Map<BeanInfo, List<BeanInfo>> beanToInjections, List<BeanInfo> processed, - Map<BeanInfo, LazyValue<ResultHandle>> beanToResultSupplierHandle, MethodCreator getComponents, - ResultHandle beanIdToBeanSupplierHandle, Map<BeanInfo, String> beanToGeneratedName, Predicate<BeanInfo> filter) { + private boolean addBeans(BeanAdder beanAdder, + Map<BeanInfo, List<BeanInfo>> beanToInjections, Set<BeanInfo> processed, + ResultHandle beanIdToBeanHandle, Map<BeanInfo, String> beanToGeneratedName, Predicate<BeanInfo> filter) { boolean stuck = true; for (Iterator<Entry<BeanInfo, List<BeanInfo>>> iterator = beanToInjections.entrySet().iterator(); iterator .hasNext();) { Entry<BeanInfo, List<BeanInfo>> entry = iterator.next(); BeanInfo bean = entry.getKey(); if (filter.test(bean)) { - addBean(getComponents, beanIdToBeanSupplierHandle, bean, beanToGeneratedName, - beanToResultSupplierHandle); iterator.remove(); + beanAdder.addBean(bean, beanIdToBeanHandle, beanToGeneratedName); processed.add(bean); stuck = false; } @@ -250,75 +254,192 @@ private boolean addBeans(Map<BeanInfo, List<BeanInfo>> beanToInjections, List<Be return stuck; } - private void addBean(MethodCreator getComponents, ResultHandle beanIdToBeanSupplierHandle, BeanInfo bean, - Map<BeanInfo, String> beanToGeneratedName, - Map<BeanInfo, LazyValue<ResultHandle>> beanToResultSupplierHandle) { + private boolean isDependency(BeanInfo bean, Map<BeanInfo, List<BeanInfo>> beanToInjections) { + for (Iterator<Entry<BeanInfo, List<BeanInfo>>> iterator = beanToInjections.entrySet().iterator(); iterator.hasNext();) { + Entry<BeanInfo, List<BeanInfo>> entry = iterator.next(); + if (entry.getValue().contains(bean)) { + return true; + } + } + return false; + } + + static class ObserverAdder implements AutoCloseable { + + private static final int GROUP_LIMIT = 30; + private int group; + private int observersAdded; + private MethodCreator addObserversMethod; + private final MethodCreator getComponentsMethod; + private final ClassCreator componentsProvider; - String beanType = beanToGeneratedName.get(bean); - if (beanType == null) { - throw new IllegalStateException("No bean type found for: " + bean); + public ObserverAdder(ClassCreator componentsProvider, MethodCreator getComponentsMethod) { + this.group = 1; + this.getComponentsMethod = getComponentsMethod; + this.componentsProvider = componentsProvider; } - List<InjectionPointInfo> injectionPoints = bean.getInjections().stream().flatMap(i -> i.injectionPoints.stream()) - .filter(ip -> !BuiltinBean.resolvesTo(ip)).collect(toList()); - List<ResultHandle> params = new ArrayList<>(); - List<String> paramTypes = new ArrayList<>(); - - if (bean.isProducerMethod() || bean.isProducerField()) { - ResultHandle resultSupplierHandle = beanToResultSupplierHandle.get(bean.getDeclaringBean()).get(); - if (resultSupplierHandle == null) { - throw new IllegalStateException( - "A supplier for a declaring bean of a producer bean is not available - most probaly an unsupported circular dependency use case \\n - declaring bean: " - + bean.getDeclaringBean() + "\\n - producer bean: " + bean); + public void close() { + if (addObserversMethod != null) { + addObserversMethod.returnValue(null); } - params.add(resultSupplierHandle); - paramTypes.add(Type.getDescriptor(Supplier.class)); } - for (InjectionPointInfo injectionPoint : injectionPoints) { - // new MapValueSupplier(beanIdToBeanSupplier, id); - ResultHandle beanIdHandle = getComponents.load(injectionPoint.getResolvedBean().getIdentifier()); - ResultHandle beanSupplierHandle = getComponents.newInstance(MethodDescriptors.MAP_VALUE_SUPPLIER_CONSTRUCTOR, - beanIdToBeanSupplierHandle, beanIdHandle); + void addObserver(ObserverInfo observer, ResultHandle beanIdToBeanHandle, ResultHandle observersHandle, + Map<ObserverInfo, String> observerToGeneratedName) { + + if (addObserversMethod == null || observersAdded >= GROUP_LIMIT) { + if (addObserversMethod != null) { + addObserversMethod.returnValue(null); + } + observersAdded = 0; + // First add next addObservers(map) method + addObserversMethod = componentsProvider + .getMethodCreator(ADD_OBSERVERS + group++, void.class, Map.class, List.class) + .setModifiers(ACC_PRIVATE); + // Invoke addObservers(map) inside the getComponents() method + getComponentsMethod.invokeVirtualMethod( + MethodDescriptor.ofMethod(componentsProvider.getClassName(), + addObserversMethod.getMethodDescriptor().getName(), void.class, Map.class, List.class), + getComponentsMethod.getThis(), beanIdToBeanHandle, observersHandle); + } + observersAdded++; + + // Append to the addObservers() method body + beanIdToBeanHandle = addObserversMethod.getMethodParam(0); + observersHandle = addObserversMethod.getMethodParam(1); + + String observerType = observerToGeneratedName.get(observer); + List<InjectionPointInfo> injectionPoints = observer.getInjection().injectionPoints.stream() + .filter(ip -> !BuiltinBean.resolvesTo(ip)) + .collect(toList()); + List<ResultHandle> params = new ArrayList<>(); + List<String> paramTypes = new ArrayList<>(); - params.add(beanSupplierHandle); + // First param - declaring bean + params.add(addObserversMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET, + beanIdToBeanHandle, addObserversMethod.load(observer.getDeclaringBean().getIdentifier()))); paramTypes.add(Type.getDescriptor(Supplier.class)); - } - if (bean.getDisposer() != null) { - for (InjectionPointInfo injectionPoint : bean.getDisposer().getInjection().injectionPoints) { - ResultHandle resultSupplierHandle = beanToResultSupplierHandle.get(injectionPoint.getResolvedBean()).get(); - params.add(resultSupplierHandle); + for (InjectionPointInfo injectionPoint : injectionPoints) { + params.add(addObserversMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET, + beanIdToBeanHandle, addObserversMethod.load(injectionPoint.getResolvedBean().getIdentifier()))); paramTypes.add(Type.getDescriptor(Supplier.class)); } - } - for (InterceptorInfo interceptor : bean.getBoundInterceptors()) { - ResultHandle resultSupplierHandle = beanToResultSupplierHandle.get(interceptor).get(); - params.add(resultSupplierHandle); - paramTypes.add(Type.getDescriptor(Supplier.class)); + ResultHandle observerInstance = addObserversMethod.newInstance( + MethodDescriptor.ofConstructor(observerType, paramTypes.toArray(new String[0])), + params.toArray(new ResultHandle[0])); + addObserversMethod.invokeInterfaceMethod(MethodDescriptors.LIST_ADD, observersHandle, observerInstance); } - // Foo_Bean bean2 = new Foo_Bean(bean2) - ResultHandle beanInstance = getComponents.newInstance( - MethodDescriptor.ofConstructor(beanType, paramTypes.toArray(new String[0])), - params.toArray(new ResultHandle[0])); - // beans.put(..., bean2) - final ResultHandle beanInfoHandle = getComponents.load(bean.getIdentifier()); - getComponents.invokeInterfaceMethod(MethodDescriptors.MAP_PUT, beanIdToBeanSupplierHandle, beanInfoHandle, - beanInstance); - - // Create a Supplier that will return the bean instance at runtime. - beanToResultSupplierHandle.put(bean, new LazyValue<>( - () -> getComponents.newInstance(MethodDescriptors.FIXED_VALUE_SUPPLIER_CONSTRUCTOR, beanInstance))); } - private boolean isDependency(BeanInfo bean, Map<BeanInfo, List<BeanInfo>> beanToInjections) { - for (Iterator<Entry<BeanInfo, List<BeanInfo>>> iterator = beanToInjections.entrySet().iterator(); iterator.hasNext();) { - Entry<BeanInfo, List<BeanInfo>> entry = iterator.next(); - if (entry.getValue().contains(bean)) { - return true; + static class BeanAdder implements AutoCloseable { + + private static final int GROUP_LIMIT = 30; + private int group; + private int beansWritten; + private MethodCreator addBeansMethod; + private final MethodCreator getComponentsMethod; + private final ClassCreator componentsProvider; + private final Set<BeanInfo> processedBeans; + + public BeanAdder(ClassCreator componentsProvider, MethodCreator getComponentsMethod, Set<BeanInfo> processed) { + this.group = 1; + this.getComponentsMethod = getComponentsMethod; + this.componentsProvider = componentsProvider; + this.processedBeans = processed; + } + + public void close() { + if (addBeansMethod != null) { + addBeansMethod.returnValue(null); } } - return false; + + void addBean(BeanInfo bean, ResultHandle beanIdToBeanHandle, + Map<BeanInfo, String> beanToGeneratedName) { + + if (addBeansMethod == null || beansWritten >= GROUP_LIMIT) { + if (addBeansMethod != null) { + addBeansMethod.returnValue(null); + } + beansWritten = 0; + // First add next addBeans(map) method + addBeansMethod = componentsProvider.getMethodCreator(ADD_BEANS + group++, void.class, Map.class) + .setModifiers(ACC_PRIVATE); + // Invoke addBeans(map) inside the getComponents() method + getComponentsMethod.invokeVirtualMethod( + MethodDescriptor.ofMethod(componentsProvider.getClassName(), + addBeansMethod.getMethodDescriptor().getName(), void.class, Map.class), + getComponentsMethod.getThis(), beanIdToBeanHandle); + } + beansWritten++; + + // Append to the addBeans() method body + beanIdToBeanHandle = addBeansMethod.getMethodParam(0); + String beanType = beanToGeneratedName.get(bean); + if (beanType == null) { + throw new IllegalStateException("No bean type found for: " + bean); + } + + List<InjectionPointInfo> injectionPoints = bean.getInjections().stream().flatMap(i -> i.injectionPoints.stream()) + .filter(ip -> !BuiltinBean.resolvesTo(ip)).collect(toList()); + List<ResultHandle> params = new ArrayList<>(); + List<String> paramTypes = new ArrayList<>(); + + if (bean.isProducerMethod() || bean.isProducerField()) { + if (!processedBeans.contains(bean.getDeclaringBean())) { + throw new IllegalStateException( + "Declaring bean of a producer bean is not available - most probaly an unsupported circular dependency use case \\n - declaring bean: " + + bean.getDeclaringBean() + "\\n - producer bean: " + bean); + } + params.add(addBeansMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET, + beanIdToBeanHandle, addBeansMethod.load(bean.getDeclaringBean().getIdentifier()))); + paramTypes.add(Type.getDescriptor(Supplier.class)); + } + for (InjectionPointInfo injectionPoint : injectionPoints) { + if (processedBeans.contains(injectionPoint.getResolvedBean())) { + params.add(addBeansMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET, + beanIdToBeanHandle, addBeansMethod.load(injectionPoint.getResolvedBean().getIdentifier()))); + } else { + // Dependency was not processed yet - use MapValueSupplier + params.add(addBeansMethod.newInstance( + MethodDescriptors.MAP_VALUE_SUPPLIER_CONSTRUCTOR, + beanIdToBeanHandle, addBeansMethod.load(injectionPoint.getResolvedBean().getIdentifier()))); + } + paramTypes.add(Type.getDescriptor(Supplier.class)); + } + if (bean.getDisposer() != null) { + for (InjectionPointInfo injectionPoint : bean.getDisposer().getInjection().injectionPoints) { + params.add(addBeansMethod.newInstance( + MethodDescriptors.MAP_VALUE_SUPPLIER_CONSTRUCTOR, + beanIdToBeanHandle, addBeansMethod.load(injectionPoint.getResolvedBean().getIdentifier()))); + paramTypes.add(Type.getDescriptor(Supplier.class)); + } + } + for (InterceptorInfo interceptor : bean.getBoundInterceptors()) { + if (processedBeans.contains(interceptor)) { + params.add(addBeansMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET, + beanIdToBeanHandle, addBeansMethod.load(interceptor.getIdentifier()))); + } else { + // Bound interceptor was not processed yet - use MapValueSupplier + params.add(addBeansMethod.newInstance( + MethodDescriptors.MAP_VALUE_SUPPLIER_CONSTRUCTOR, + beanIdToBeanHandle, addBeansMethod.load(interceptor.getIdentifier()))); + } + paramTypes.add(Type.getDescriptor(Supplier.class)); + } + + // Foo_Bean bean = new Foo_Bean(bean3) + ResultHandle beanInstance = addBeansMethod.newInstance( + MethodDescriptor.ofConstructor(beanType, paramTypes.toArray(new String[0])), + params.toArray(new ResultHandle[0])); + // beans.put(id, bean) + final ResultHandle beanIdHandle = addBeansMethod.load(bean.getIdentifier()); + addBeansMethod.invokeInterfaceMethod(MethodDescriptors.MAP_PUT, beanIdToBeanHandle, beanIdHandle, + beanInstance); + } + } } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java index 07c570520f4..2bcd661e701 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Predicate; +import java.util.function.Supplier; import javax.enterprise.inject.spi.InterceptionType; import javax.interceptor.InvocationContext; import org.jboss.jandex.AnnotationInstance; @@ -73,7 +74,7 @@ Collection<Resource> generate(InterceptorInfo interceptor, ReflectionRegistratio // MyInterceptor_Bean implements InjectableInterceptor<T> ClassCreator interceptorCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName) - .interfaces(InjectableInterceptor.class) + .interfaces(InjectableInterceptor.class, Supplier.class) .build(); // Fields @@ -92,6 +93,7 @@ Collection<Resource> generate(InterceptorInfo interceptor, ReflectionRegistratio bindings.getFieldDescriptor()); implementGetIdentifier(interceptor, interceptorCreator); + implementSupplierGet(interceptorCreator); implementCreate(classOutput, interceptorCreator, interceptor, providerTypeName, baseName, injectionPointToProviderField, interceptorToProviderField, reflectionRegistration, targetPackage, isApplicationClass);

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java']

{'.java': 3}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4950/4815

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4815

https://github.com/quarkusio/quarkus/pull/4950

https://github.com/quarkusio/quarkus/pull/4950

fixes

No hot reload on bad configuration wich block the quarkus startup and when http.port is overridden

**Describe the bug** If you configure a bad value that block the first application start, there is no way to have hot reload. If you start on a good value, but after plug a bbad config, the hot reload is ok. A configuration change will trigger the hot reload as wanted. **Expected behavior** The hot reload is trigger if you change the configuration file, or a code change, even it never could be started correctly. **Actual behavior** The hot reload is broken if the app never could be started a first time. **To Reproduce** Steps to reproduce the behavior: 1. configure a bad jdbc url on hibernate (or flyway) 2. start the app 3. change to good value (it won't reload) **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Darwin 18.5.0 Darwin Kernel Version 18.5.0 - Output of `java -version`: openjdk version "13" 2019-09-17 - GraalVM version (if different from Java): - Quarkus version or git rev: 0.25.0 **Additional context** (Add any other context about the problem here.) @cescoffier the issue that we discuss after the quarkus workshop

4aa96e528bf656de904e6a9796e757a5081409ef

30ec90bb116c60a77a98638dca3019914b4710e1

https://github.com/quarkusio/quarkus/compare/4aa96e528bf656de904e6a9796e757a5081409ef...30ec90bb116c60a77a98638dca3019914b4710e1

diff --git a/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java b/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java index 37aff77da4c..40092f8331d 100644 --- a/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java +++ b/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java @@ -96,10 +96,6 @@ public void start() throws Exception { if (context.isAbortOnFailedStart()) { throw new RuntimeException(deploymentProblem == null ? compileProblem : deploymentProblem); } - log.error("Failed to start Quarkus, attempting to start hot replacement endpoint to recover"); - if (runtimeUpdatesProcessor != null) { - runtimeUpdatesProcessor.startupFailed(); - } } Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() { @Override @@ -180,6 +176,20 @@ public void execute(BuildContext context) { runner.run(); DevModeMain.runner = runner; deploymentProblem = null; + + } catch (Throwable t) { + deploymentProblem = t; + if (context.isAbortOnFailedStart() || liveReload) { + log.error("Failed to start quarkus", t); + } else { + //we need to set this here, while we still have the correct TCCL + //this is so the config is still valid, and we can read HTTP config from application.properties + log.error("Failed to start Quarkus, attempting to start hot replacement endpoint to recover"); + if (runtimeUpdatesProcessor != null) { + runtimeUpdatesProcessor.startupFailed(); + } + } + } finally { Thread.currentThread().setContextClassLoader(old); }

['core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/4914/4824

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/4824

https://github.com/quarkusio/quarkus/pull/4914

https://github.com/quarkusio/quarkus/pull/4914

fixes

Cannot use runtime quarkus.security.users.file.* config

**Describe the bug** I have successfully setup quarkus.security.users.file.* (enabled, users, roles, realm-name) config but the only place where I can have it to work is inside the application.properties file. I think this whould be overridable at startup using java -Dquarkus.security...... options. **Expected behavior** These configuration properties are marked as "Configuration property fixed at build time" in the Quarkus all-config page but in my opinion, this should be overridableat runtime, and my users / groups / passwords files could be generated by the people I distribute the app to, I would not be forced to ask them for their passwords / hashes/ users, in order to build them in. **Actual behavior** Configuration properties not being taken into account at startup **To Reproduce** Steps to reproduce the behavior: 1. Use quarkus.security.users.file.enabled=true In application.properties 2. Launch the app using 3. Get an exception : java.lang.IllegalStateException: No PropertiesRealmConfig users/roles settings found. Configure the quarkus.security.file.{enabled,users,roles,authMechanism,realmName} properties at io.quarkus.elytron.security.runtime.ElytronPropertiesFileRecorder$1.run(ElytronPropertiesFileRecorder.java:68) at io.quarkus.elytron.security.runtime.ElytronRecorder.runLoadTask(ElytronRecorder.java:31) at io.quarkus.deployment.steps.ElytronDeploymentProcessor$loadRealm15.deploy_0(ElytronDeploymentProcessor$loadRealm15.zig:70) at io.quarkus.deployment.steps.ElytronDeploymentProcessor$loadRealm15.deploy(ElytronDeploymentProcessor$loadRealm15.zig:36) at io.quarkus.runner.ApplicationImpl1.doStart(ApplicationImpl1.zig:105) at io.quarkus.runtime.Application.start(Application.java:93) at io.quarkus.runtime.Application.run(Application.java:213) at io.quarkus.runner.GeneratedMain.main(GeneratedMain.zig:34) **Configuration** ```properties Configuration file # key = value quarkus.http.port=8080 quarkus.http.ssl-port=443 quarkus.http.ssl.certificate.key-store-file=keystore.jks quarkus.http.ssl.certificate.key-store-password=mypasswd quarkus.security.users.file.enabled=true ``` **Screenshots** NA **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Linux raspberrypi 4.19.66-v7l+ #1253 SMP Thu Aug 15 12:02:08 BST 2019 armv7l GNU/Linux - Output of `java -version`: openjdk version "1.8.0_212" OpenJDK Runtime Environment (build 1.8.0_212-8u212-b01-1+rpi1-b01) OpenJDK Client VM (build 25.212-b01, mixed mode) - GraalVM version (if different from Java): - Quarkus version or git rev: 0.24.0 **Additional context** Zulip description here : https://quarkusio.zulipchat.com/#narrow/stream/187030-users/topic/Option.20quarkus.2Esecurity.2Eusers.2Efile.2Eenabled

575042827160e63fdfa24c49e43ac97005ac8d3a

7d85723773770ee4c2d197f28b3d9877facc260a

https://github.com/quarkusio/quarkus/compare/575042827160e63fdfa24c49e43ac97005ac8d3a...7d85723773770ee4c2d197f28b3d9877facc260a

diff --git a/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPropertiesFileRecorder.java b/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPropertiesFileRecorder.java index d39d15f683a..fff0e886ec5 100644 --- a/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPropertiesFileRecorder.java +++ b/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPropertiesFileRecorder.java @@ -3,6 +3,9 @@ import java.io.IOException; import java.net.URL; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.security.Provider; import java.util.ArrayList; import java.util.HashMap; @@ -50,25 +53,37 @@ public Runnable loadRealm(RuntimeValue<SecurityRealm> realm, PropertiesRealmConf return new Runnable() { @Override public void run() { - log.debugf("loadRealm, config=%s", config); - SecurityRealm secRealm = realm.getValue(); - if (!(secRealm instanceof LegacyPropertiesSecurityRealm)) { - return; - } - log.debugf("Trying to loader users: /%s", config.users); - URL users = Thread.currentThread().getContextClassLoader().getResource(config.users); - log.debugf("users: %s", users); - log.debugf("Trying to loader roles: %s", config.roles); - URL roles = Thread.currentThread().getContextClassLoader().getResource(config.roles); - log.debugf("roles: %s", roles); - if (users == null && roles == null) { - String msg = String.format( - "No PropertiesRealmConfig users/roles settings found. Configure the quarkus.security.file.%s properties", - config.help()); - throw new IllegalStateException(msg); - } - LegacyPropertiesSecurityRealm propsRealm = (LegacyPropertiesSecurityRealm) secRealm; try { + log.debugf("loadRealm, config=%s", config); + SecurityRealm secRealm = realm.getValue(); + if (!(secRealm instanceof LegacyPropertiesSecurityRealm)) { + return; + } + log.debugf("Trying to loader users: /%s", config.users); + URL users; + Path p = Paths.get(config.users); + if (Files.exists(p)) { + users = p.toUri().toURL(); + } else { + users = Thread.currentThread().getContextClassLoader().getResource(config.users); + } + log.debugf("users: %s", users); + log.debugf("Trying to loader roles: %s", config.roles); + URL roles; + p = Paths.get(config.roles); + if (Files.exists(p)) { + roles = p.toUri().toURL(); + } else { + roles = Thread.currentThread().getContextClassLoader().getResource(config.roles); + } + log.debugf("roles: %s", roles); + if (users == null && roles == null) { + String msg = String.format( + "No PropertiesRealmConfig users/roles settings found. Configure the quarkus.security.file.%s properties", + config.help()); + throw new IllegalStateException(msg); + } + LegacyPropertiesSecurityRealm propsRealm = (LegacyPropertiesSecurityRealm) secRealm; propsRealm.load(users.openStream(), roles.openStream()); } catch (IOException e) { throw new RuntimeException(e);

['extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPropertiesFileRecorder.java']

{'.java': 1}