Datasets:

tiginamaria

/

bug-localization

like 2

deeplearning4j/deeplearning4j/4667/4596

deeplearning4j

deeplearning4j

https://github.com/deeplearning4j/deeplearning4j/issues/4596

https://github.com/deeplearning4j/deeplearning4j/pull/4667

https://github.com/deeplearning4j/deeplearning4j/pull/4667

fix

UIServer: plotVocab and TsneModule routes do not match up

For some reason the route that would accept a POST request has been replaced with a GET based route. https://github.com/deeplearning4j/deeplearning4j/blob/master/deeplearning4j-ui-parent/deeplearning4j-play/src/main/java/org/deeplearning4j/ui/module/tsne/TsneModule.java#L50 ```java // Route r5 = new Route("/tsne/post/:sid", HttpMethod.POST, FunctionType.Function, this::postFile); Route r5 = new Route("/tsne/post/:sid", HttpMethod.GET, FunctionType.Function, this::postFile); ``` However, the InMemoryLookupTable.plotVocab method still tries to use the POST based version: https://github.com/deeplearning4j/deeplearning4j/blob/master/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTable.java#L222 ```java String address = connectionInfo.getFirstPart() + "/tsne/post/" + connectionInfo.getSessionId(); // System.out.println("ADDRESS: " + address); URI uri = new URI(address); HttpURLConnection connection = (HttpURLConnection) uri.toURL().openConnection(); connection.setRequestMethod("POST"); ``` @fenneclabs found the Bug, and it has shown itself with the following exception: ``` 15:54:23.369 Trc [main ] BarnesHutTsne <> Error at iteration 99 is -176691.3168704078 RESPONSE CODE: 404 15:54:23.416 Std [main ] InMemoryLookupTable <> Error posting to remote UI at http://localhost:9000/tsne/post/08cd2dcb-f68a-4861-abd6-76ce86d186aa java.io.FileNotFoundException: http://localhost:9000/tsne/post/08cd2dcb-f68a-4861-abd6-76ce86d186aa at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:423) at sun.net.www.protocol.http.HttpURLConnection$10.run(HttpURLConnection.java:1926) ``` The bug affects both 0.9.1 and current master. In Order to reproduce the bug, simply add the following to Word2VecRawTextExample after the `vec.fit()` call: ``` BarnesHutTsne tsne = new BarnesHutTsne.Builder() .setMaxIter(1) .theta(0.5) .normalize(false) .learningRate(500) .useAdaGrad(false) .build(); UIServer uiServer = UIServer.getInstance(); StatsStorage statsStorage = new InMemoryStatsStorage(); uiServer.attach(statsStorage); vec.lookupTable().plotVocab(tsne, 42, new UiConnectionInfo.Builder() .setPort(uiServer.getPort()) .build()); ```

f20fdf0b584484283c7b270676aaf761a7353b5a

3fa9ae90f63e2860fe762c3464d799a0e7cfdcab

https://github.com/deeplearning4j/deeplearning4j/compare/f20fdf0b584484283c7b270676aaf761a7353b5a...3fa9ae90f63e2860fe762c3464d799a0e7cfdcab

diff --git a/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTable.java b/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTable.java index 3961c9416e..3d483ad391 100644 --- a/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTable.java +++ b/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTable.java @@ -222,13 +222,25 @@ public class InMemoryLookupTable<T extends SequenceElement> implements WeightLoo connection.setRequestMethod("POST"); connection.setRequestProperty("User-Agent", "Mozilla/5.0"); // connection.setRequestProperty("Content-Type", "application/json"); - connection.setRequestProperty("Content-Type", "multipart/form-data"); + connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=-----TSNE-POST-DATA-----"); connection.setDoOutput(true); - DataOutputStream dos = new DataOutputStream(connection.getOutputStream()); + final OutputStream outputStream = connection.getOutputStream(); + final PrintWriter writer = new PrintWriter(outputStream); + writer.println("-------TSNE-POST-DATA-----"); + writer.println("Content-Disposition: form-data; name=\\"fileupload\\"; filename=\\"tsne.csv\\""); + writer.println("Content-Type: text/plain; charset=UTF-16"); + writer.println("Content-Transfer-Encoding: binary"); + writer.println(); + writer.flush(); + + DataOutputStream dos = new DataOutputStream(outputStream); dos.writeBytes(sb.toString()); dos.flush(); + writer.println(); + writer.flush(); dos.close(); + outputStream.close(); try { int responseCode = connection.getResponseCode(); diff --git a/deeplearning4j-ui-parent/deeplearning4j-play/src/main/java/org/deeplearning4j/ui/module/tsne/TsneModule.java b/deeplearning4j-ui-parent/deeplearning4j-play/src/main/java/org/deeplearning4j/ui/module/tsne/TsneModule.java index 131e48d459..e903206603 100644 --- a/deeplearning4j-ui-parent/deeplearning4j-play/src/main/java/org/deeplearning4j/ui/module/tsne/TsneModule.java +++ b/deeplearning4j-ui-parent/deeplearning4j-play/src/main/java/org/deeplearning4j/ui/module/tsne/TsneModule.java @@ -47,8 +47,7 @@ public class TsneModule implements UIModule { Route r2 = new Route("/tsne/sessions", HttpMethod.GET, FunctionType.Supplier, this::listSessions); Route r3 = new Route("/tsne/coords/:sid", HttpMethod.GET, FunctionType.Function, this::getCoords); Route r4 = new Route("/tsne/upload", HttpMethod.POST, FunctionType.Supplier, this::uploadFile); - // Route r5 = new Route("/tsne/post/:sid", HttpMethod.POST, FunctionType.Function, this::postFile); - Route r5 = new Route("/tsne/post/:sid", HttpMethod.GET, FunctionType.Function, this::postFile); + Route r5 = new Route("/tsne/post/:sid", HttpMethod.POST, FunctionType.Function, this::postFile); return Arrays.asList(r1, r2, r3, r4, r5); } @@ -126,7 +125,8 @@ public class TsneModule implements UIModule { List<String> lines; try { - lines = FileUtils.readLines(file); + // Set to uploadedFileLines as well, as the TSNE UI doesn't allow to properly select Sessions yet + lines = uploadedFileLines = FileUtils.readLines(file); } catch (IOException e) { // System.out.println("**** COULD NOT READ FILE ****"); return badRequest("Could not read from uploaded file");

['deeplearning4j-ui-parent/deeplearning4j-play/src/main/java/org/deeplearning4j/ui/module/tsne/TsneModule.java', 'deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTable.java']

{'.java': 2}

Java

{'Java': 42895752, 'C++': 17237193, 'Cuda': 2203734, 'Kotlin': 2030453, 'JavaScript': 296767, 'C': 172853, 'CMake': 126415, 'Shell': 96643, 'TypeScript': 81217, 'Python': 77566, 'FreeMarker': 77257, 'HTML': 18609, 'CSS': 12974, 'PureBasic': 12254, 'Cython': 12094, 'Ruby': 4558, 'Batchfile': 1458, 'Scala': 1026, 'Smarty': 975, 'Starlark': 931}

Apache License 2.0

deeplearning4j/deeplearning4j/4345/4339

deeplearning4j

deeplearning4j

https://github.com/deeplearning4j/deeplearning4j/issues/4339

https://github.com/deeplearning4j/deeplearning4j/pull/4345

https://github.com/deeplearning4j/deeplearning4j/pull/4345

fix

InputStream used twice, causing a NoSuchElementException

In case data is contained in an InputStream, the following snippet fails: ``` InputStream dataFile = this.getClass().getResourceAsStream("/mydata.csv"); RecordReader recordReader = new CSVRecordReader(0, ","); recordReader.initialize(new InputStreamInputSplit(dataFile)); DataSetIterator iterator = new RecordReaderDataSetIterator(recordReader, batchSize, labelIndex, numClasses); DataSet allData = iterator.next(); ``` The exception is the following: ``` Exception in thread "Thread-3" java.util.NoSuchElementException: No next elements at org.deeplearning4j.datasets.datavec.RecordReaderMultiDataSetIterator.next(RecordReaderMultiDataSetIterator.java:116) at org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator.next(RecordReaderDataSetIterator.java:320) at org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator.next(RecordReaderDataSetIterator.java:409) at org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator.next(RecordReaderDataSetIterator.java:51) at com.gluonhq.dlearning.DataRetrievalService.getData(DataRetrievalService.java:92) ``` Looking into the code, it seems the `InputStream` is consumed twice, by 2 different iterators. As a result, the second iterator will return false in its `hasNext()` method. The first iterator is created in `recordReader.initialize(new InputStreamInputSplit(dataFile)); ` The initialize method will set the InputStreamInputSplit, but also create the iterator. I don't see a method on recordReader that sets the InputStreamInputSplit but doesn't initialize the iterator. Next, the second iterator is created around the same InputStream in `org.datavec.api.records.reader.impl.LineRecordReader` when the next method is called: ` iter = IOUtils.lineIterator(new InputStreamReader(locations[splitIndex].toURL().openStream()));`

1691f3d5edcd7257cac9e2b1a1ad249be673d2bb

6a61e95e517b2d8edfc73dbcdd1f2e9adbe919bb

https://github.com/deeplearning4j/deeplearning4j/compare/1691f3d5edcd7257cac9e2b1a1ad249be673d2bb...6a61e95e517b2d8edfc73dbcdd1f2e9adbe919bb

diff --git a/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetIterator.java b/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetIterator.java index f480864109..a382b84253 100644 --- a/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetIterator.java +++ b/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetIterator.java @@ -27,6 +27,8 @@ import org.datavec.api.records.metadata.RecordMetaData; import org.datavec.api.records.metadata.RecordMetaDataComposableMap; import org.datavec.api.records.reader.RecordReader; import org.datavec.api.records.reader.SequenceRecordReader; +import org.datavec.api.records.reader.impl.ConcatenatingRecordReader; +import org.datavec.api.records.reader.impl.collection.CollectionRecordReader; import org.datavec.api.writable.Writable; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; @@ -170,6 +172,13 @@ public class RecordReaderDataSetIterator implements DataSetIterator { this.collectMetaData = collectMetaData; } + private void initializeUnderlying(){ + if (underlying == null) { + Record next = recordReader.nextRecord(); + initializeUnderlying(next); + } + } + private void initializeUnderlying(Record next) { int totalSize = next.getRecord().size(); @@ -178,7 +187,15 @@ public class RecordReaderDataSetIterator implements DataSetIterator { labelIndex = totalSize - 1; } - recordReader.reset(); + if(recordReader.resetSupported()) { + recordReader.reset(); + } else { + //Hack around the fact that we need the first record to initialize the underlying RRMDSI, but can't reset + // the original reader + recordReader = new ConcatenatingRecordReader( + new CollectionRecordReader(Collections.singletonList(next.getRecord())), + recordReader); + } RecordReaderMultiDataSetIterator.Builder builder = new RecordReaderMultiDataSetIterator.Builder(batchSize); if (recordReader instanceof SequenceRecordReader) { @@ -297,8 +314,7 @@ public class RecordReaderDataSetIterator implements DataSetIterator { } if (underlying == null) { - Record next = recordReader.nextRecord(); - initializeUnderlying(next); + initializeUnderlying(); } @@ -343,7 +359,10 @@ public class RecordReaderDataSetIterator implements DataSetIterator { @Override public boolean resetSupported() { - return true; + if(underlying == null){ + initializeUnderlying(); + } + return underlying.resetSupported(); } @Override diff --git a/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIterator.java b/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIterator.java index 527a4e192a..ebb31158e8 100644 --- a/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIterator.java +++ b/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIterator.java @@ -86,6 +86,8 @@ public class RecordReaderMultiDataSetIterator implements MultiDataSetIterator, S private MultiDataSetPreProcessor preProcessor; + private boolean resetSupported = true; + private RecordReaderMultiDataSetIterator(Builder builder) { this.batchSize = builder.batchSize; this.alignmentMode = builder.alignmentMode; @@ -97,6 +99,18 @@ public class RecordReaderMultiDataSetIterator implements MultiDataSetIterator, S if (this.timeSeriesRandomOffset) { timeSeriesRandomOffsetRng = new Random(builder.timeSeriesRandomOffsetSeed); } + + + if(recordReaders != null){ + for(RecordReader rr : recordReaders.values()){ + resetSupported &= rr.resetSupported(); + } + } + if(sequenceRecordReaders != null){ + for(SequenceRecordReader srr : sequenceRecordReaders.values()){ + resetSupported &= srr.resetSupported(); + } + } } @Override @@ -622,7 +636,7 @@ public class RecordReaderMultiDataSetIterator implements MultiDataSetIterator, S @Override public boolean resetSupported() { - return true; + return resetSupported; } @Override @@ -632,6 +646,11 @@ public class RecordReaderMultiDataSetIterator implements MultiDataSetIterator, S @Override public void reset() { + if(!resetSupported){ + throw new IllegalStateException("Cannot reset iterator - reset not supported (resetSupported() == false):" + + " one or more underlying (sequence) record readers do not support resetting"); + } + for (RecordReader rr : recordReaders.values()) rr.reset(); for (SequenceRecordReader rr : sequenceRecordReaders.values()) diff --git a/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetiteratorTest.java b/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetiteratorTest.java index 857989f5ae..c4cc460577 100644 --- a/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetiteratorTest.java +++ b/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetiteratorTest.java @@ -29,6 +29,7 @@ import org.datavec.api.records.reader.impl.collection.CollectionSequenceRecordRe import org.datavec.api.records.reader.impl.csv.CSVRecordReader; import org.datavec.api.records.reader.impl.csv.CSVSequenceRecordReader; import org.datavec.api.split.FileSplit; +import org.datavec.api.split.InputStreamInputSplit; import org.datavec.api.split.NumberedFileInputSplit; import org.datavec.api.writable.DoubleWritable; import org.datavec.api.writable.IntWritable; @@ -1248,4 +1249,35 @@ public class RecordReaderDataSetiteratorTest { iter.reset(); iter.next(); } + + @Test + public void testReadingFromStream() throws Exception { + int batchSize = 1; + int labelIndex = 4; + int numClasses = 3; + InputStream dataFile = new ClassPathResource("iris.txt").getInputStream(); + RecordReader recordReader = new CSVRecordReader(0, ','); + recordReader.initialize(new InputStreamInputSplit(dataFile)); + + assertTrue(recordReader.hasNext()); + assertFalse(recordReader.resetSupported()); + + DataSetIterator iterator = new RecordReaderDataSetIterator(recordReader, batchSize, labelIndex, numClasses); + assertFalse(iterator.resetSupported()); + + int count = 0; + while(iterator.hasNext()){ + assertNotNull(iterator.next()); + count++; + } + + assertEquals(150, count); + + try{ + iterator.reset(); + fail("Expected exception"); + } catch (Exception e){ + //expected + } + } } diff --git a/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/datavec/iterator/SparkSourceDummyReader.java b/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/datavec/iterator/SparkSourceDummyReader.java index 27d866ead8..c1b81a162d 100644 --- a/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/datavec/iterator/SparkSourceDummyReader.java +++ b/deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/datavec/iterator/SparkSourceDummyReader.java @@ -75,6 +75,11 @@ public class SparkSourceDummyReader implements RecordReader, Serializable { @Override public void reset() { /* No op */ } + @Override + public boolean resetSupported() { + return true; + } + @Override public List<Writable> record(URI uri, DataInputStream dataInputStream) throws IOException { throw new UnsupportedOperationException();

['deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderMultiDataSetIterator.java', 'deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/datavec/iterator/SparkSourceDummyReader.java', 'deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetIterator.java', 'deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetiteratorTest.java']

{'.java': 4}

Java

{'Java': 42895752, 'C++': 17237193, 'Cuda': 2203734, 'Kotlin': 2030453, 'JavaScript': 296767, 'C': 172853, 'CMake': 126415, 'Shell': 96643, 'TypeScript': 81217, 'Python': 77566, 'FreeMarker': 77257, 'HTML': 18609, 'CSS': 12974, 'PureBasic': 12254, 'Cython': 12094, 'Ruby': 4558, 'Batchfile': 1458, 'Scala': 1026, 'Smarty': 975, 'Starlark': 931}

Apache License 2.0

deeplearning4j/deeplearning4j/4370/4368

deeplearning4j

deeplearning4j

https://github.com/deeplearning4j/deeplearning4j/issues/4368

https://github.com/deeplearning4j/deeplearning4j/pull/4370

https://github.com/deeplearning4j/deeplearning4j/pull/4370

fix

Transfer learning: 0 dropout doesn't remove/override existing layer dropout

``` netToTest = new TransferLearning.Builder(net) .fineTuneConfiguration(new FineTuneConfiguration.Builder() .dropOut(0.0) .build()).build(); ``` The original dropout is still present on the existing layers. Reason: .dropOut(0.0) does dropOut((IDropOut)null) hence it's treated as equivalent to "not set"

eb98b40cba85affb7cfaaad1147ed84f64a06148

fe338bab56c2ca129a56e775c8c73cd249f37243

https://github.com/deeplearning4j/deeplearning4j/compare/eb98b40cba85affb7cfaaad1147ed84f64a06148...fe338bab56c2ca129a56e775c8c73cd249f37243

diff --git a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningCompGraphTest.java b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningCompGraphTest.java index da2b116696..893b8d68de 100644 --- a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningCompGraphTest.java +++ b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningCompGraphTest.java @@ -2,11 +2,14 @@ package org.deeplearning4j.nn.transferlearning; import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.ComputationGraphConfiguration; +import org.deeplearning4j.nn.conf.MultiLayerConfiguration; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; +import org.deeplearning4j.nn.conf.constraint.UnitNormConstraint; import org.deeplearning4j.nn.conf.distribution.NormalDistribution; import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.conf.layers.*; import org.deeplearning4j.nn.conf.layers.misc.FrozenLayer; +import org.deeplearning4j.nn.conf.weightnoise.DropConnect; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.weights.WeightInit; import org.junit.Test; @@ -23,6 +26,7 @@ import java.util.Collections; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; /** * Created by susaneraly on 2/17/17. @@ -421,4 +425,41 @@ public class TransferLearningCompGraphTest { // assertEquals(confExpected, graph.getConfiguration()); assertEquals(confExpected.toJson(), graph.getConfiguration().toJson()); } + + + @Test + public void testObjectOverrides(){ + //https://github.com/deeplearning4j/deeplearning4j/issues/4368 + ComputationGraphConfiguration conf = new NeuralNetConfiguration.Builder() + .dropOut(0.5) + .weightNoise(new DropConnect(0.5)) + .l2(0.5) + .constrainWeights(new UnitNormConstraint()) + .graphBuilder() + .addInputs("in") + .addLayer("layer", new DenseLayer.Builder().nIn(10).nOut(10).build(), "in") + .setOutputs("layer") + .build(); + + ComputationGraph orig = new ComputationGraph(conf); + orig.init(); + + FineTuneConfiguration ftc = new FineTuneConfiguration.Builder() + .dropOut(0) + .weightNoise(null) + .constraints(null) + .l2(0.0) + .build(); + + ComputationGraph transfer = new TransferLearning.GraphBuilder(orig) + .fineTuneConfiguration(ftc) + .build(); + + DenseLayer l = (DenseLayer) transfer.getLayer(0).conf().getLayer(); + + assertNull(l.getIDropout()); + assertNull(l.getWeightNoise()); + assertNull(l.getConstraints()); + assertEquals(0.0, l.getL2(), 0.0); + } } diff --git a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningMLNTest.java b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningMLNTest.java index 443eb1e7e5..86f2599489 100644 --- a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningMLNTest.java +++ b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningMLNTest.java @@ -6,12 +6,14 @@ import org.deeplearning4j.nn.conf.BackpropType; import org.deeplearning4j.nn.conf.GradientNormalization; import org.deeplearning4j.nn.conf.MultiLayerConfiguration; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; +import org.deeplearning4j.nn.conf.constraint.UnitNormConstraint; import org.deeplearning4j.nn.conf.distribution.NormalDistribution; import org.deeplearning4j.nn.conf.inputs.InputType; import org.deeplearning4j.nn.conf.layers.*; import org.deeplearning4j.nn.conf.preprocessor.CnnToFeedForwardPreProcessor; import org.deeplearning4j.nn.conf.preprocessor.FeedForwardToRnnPreProcessor; import org.deeplearning4j.nn.conf.preprocessor.RnnToCnnPreProcessor; +import org.deeplearning4j.nn.conf.weightnoise.DropConnect; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.WeightInit; import org.junit.Test; @@ -578,5 +580,38 @@ public class TransferLearningMLNTest { assertEquals(expectedParams, modelNow.params()); } + @Test + public void testObjectOverrides(){ + //https://github.com/deeplearning4j/deeplearning4j/issues/4368 + MultiLayerConfiguration conf = new NeuralNetConfiguration.Builder() + .dropOut(0.5) + .weightNoise(new DropConnect(0.5)) + .l2(0.5) + .constrainWeights(new UnitNormConstraint()) + .list() + .layer(new DenseLayer.Builder().nIn(10).nOut(10).build()) + .build(); + + MultiLayerNetwork orig = new MultiLayerNetwork(conf); + orig.init(); + + FineTuneConfiguration ftc = new FineTuneConfiguration.Builder() + .dropOut(0) + .weightNoise(null) + .constraints(null) + .l2(0.0) + .build(); + + MultiLayerNetwork transfer = new TransferLearning.Builder(orig) + .fineTuneConfiguration(ftc) + .build(); + + DenseLayer l = (DenseLayer) transfer.getLayer(0).conf().getLayer(); + + assertNull(l.getIDropout()); + assertNull(l.getWeightNoise()); + assertNull(l.getConstraints()); + assertEquals(0.0, l.getL2(), 0.0); + } } diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/FineTuneConfiguration.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/FineTuneConfiguration.java index c68b7430bd..d2de16ab1b 100644 --- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/FineTuneConfiguration.java +++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/FineTuneConfiguration.java @@ -1,7 +1,6 @@ package org.deeplearning4j.nn.transferlearning; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.deeplearning4j.nn.api.OptimizationAlgorithm; @@ -17,6 +16,7 @@ import org.deeplearning4j.nn.weights.WeightInit; import org.nd4j.linalg.activations.Activation; import org.nd4j.linalg.activations.IActivation; import org.nd4j.linalg.learning.config.IUpdater; +import org.nd4j.linalg.primitives.Optional; import org.nd4j.shade.jackson.annotation.JsonInclude; import org.nd4j.shade.jackson.annotation.JsonTypeInfo; import org.nd4j.shade.jackson.core.JsonProcessingException; @@ -25,14 +25,16 @@ import java.io.IOException; import java.util.List; /** - * Created by Alex on 21/02/2017. + * Configuration for fine tuning. Note that values set here will override values for all non-frozen layers + * + * @author Alex Black + * @author Susan Eraly */ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "type") @JsonInclude(JsonInclude.Include.NON_NULL) @NoArgsConstructor @AllArgsConstructor @Data -@Builder(builderClassName = "Builder") public class FineTuneConfiguration { protected IActivation activationFn; @@ -43,9 +45,9 @@ public class FineTuneConfiguration { protected Double l2; protected Double l1Bias; protected Double l2Bias; - protected IDropout dropout; - protected IWeightNoise weightNoise; - protected IUpdater iUpdater; + protected Optional<IDropout> dropout; + protected Optional<IWeightNoise> weightNoise; + protected IUpdater updater; protected IUpdater biasUpdater; protected Boolean miniBatch; protected Integer maxNumLineSearchIterations; @@ -53,12 +55,10 @@ public class FineTuneConfiguration { protected OptimizationAlgorithm optimizationAlgo; protected StepFunction stepFunction; protected Boolean minimize; - protected GradientNormalization gradientNormalization; + protected Optional<GradientNormalization> gradientNormalization; protected Double gradientNormalizationThreshold; protected ConvolutionMode convolutionMode; - protected List<LayerConstraint> constraints; - protected Boolean hasBiasConstraints; - protected Boolean hasWeightConstraints; + protected Optional<List<LayerConstraint>> constraints; protected Boolean pretrain; protected Boolean backprop; @@ -69,20 +69,103 @@ public class FineTuneConfiguration { protected WorkspaceMode trainingWorkspaceMode; protected WorkspaceMode inferenceWorkspaceMode; - //Lombok builder. Note that the code below ADDS OR OVERRIDES the lombok implementation; the final builder class - // is the composite of the lombok parts and the parts defined here - //partial implementation to allow public no-arg constructor (lombok default is package private) - //Plus some implementations to match NeuralNetConfiguration builder methods + public static Builder builder() { + return new Builder(); + } + + /* + * Can't use Lombok @Builder annotation due to optionals (otherwise we have a bunch of ugly .x(Optional<T> value) + * methods - lombok builder doesn't support excluding fields? :( + * Note the use of optional here: gives us 3 states... + * 1. Null: not set + * 2. Optional (empty): set to null + * 3. Optional (not empty): set to specific value + * + * Obviously, having null only makes sense for some things (dropout, etc) whereas null for other things doesn't + * make sense + */ public static class Builder { - public Builder() {} + private IActivation activation; + private WeightInit weightInit; + private Double biasInit; + private Distribution dist; + private Double l1; + private Double l2; + private Double l1Bias; + private Double l2Bias; + private Optional<IDropout> dropout; + private Optional<IWeightNoise> weightNoise; + private IUpdater updater; + private IUpdater biasUpdater; + private Boolean miniBatch; + private Integer maxNumLineSearchIterations; + private Long seed; + private OptimizationAlgorithm optimizationAlgo; + private StepFunction stepFunction; + private Boolean minimize; + private Optional<GradientNormalization> gradientNormalization; + private Double gradientNormalizationThreshold; + private ConvolutionMode convolutionMode; + private Optional<List<LayerConstraint>> constraints; + private Boolean pretrain; + private Boolean backprop; + private BackpropType backpropType; + private Integer tbpttFwdLength; + private Integer tbpttBackLength; + private WorkspaceMode trainingWorkspaceMode; + private WorkspaceMode inferenceWorkspaceMode; - public Builder seed(int seed) { - this.seed = (long) seed; + public Builder() { + + } + + public Builder activation(IActivation activationFn) { + this.activation = activationFn; return this; } - public Builder seed(long seed) { - this.seed = seed; + public Builder activation(Activation activation) { + this.activation = activation.getActivationFunction(); + return this; + } + + public Builder weightInit(WeightInit weightInit) { + this.weightInit = weightInit; + return this; + } + + public Builder biasInit(double biasInit) { + this.biasInit = biasInit; + return this; + } + + public Builder dist(Distribution dist) { + this.dist = dist; + return this; + } + + public Builder l1(double l1) { + this.l1 = l1; + return this; + } + + public Builder l2(double l2) { + this.l2 = l2; + return this; + } + + public Builder l1Bias(double l1Bias) { + this.l1Bias = l1Bias; + return this; + } + + public Builder l2Bias(double l2Bias) { + this.l2Bias = l2Bias; + return this; + } + + public Builder dropout(IDropout dropout) { + this.dropout = Optional.ofNullable(dropout); return this; } @@ -93,19 +176,122 @@ public class FineTuneConfiguration { return dropout(new Dropout(dropout)); } - public Builder activation(Activation activation) { - this.activationFn = activation.getActivationFunction(); + public Builder weightNoise(IWeightNoise weightNoise) { + this.weightNoise = Optional.ofNullable(weightNoise); return this; } public Builder updater(IUpdater updater) { - return iUpdater(updater); + this.updater = updater; + return this; } @Deprecated public Builder updater(Updater updater) { return updater(updater.getIUpdaterWithDefaultConfig()); } + + public Builder biasUpdater(IUpdater biasUpdater) { + this.biasUpdater = biasUpdater; + return this; + } + + public Builder miniBatch(boolean miniBatch) { + this.miniBatch = miniBatch; + return this; + } + + public Builder maxNumLineSearchIterations(int maxNumLineSearchIterations) { + this.maxNumLineSearchIterations = maxNumLineSearchIterations; + return this; + } + + public Builder seed(long seed) { + this.seed = seed; + return this; + } + + public Builder seed(int seed){ + return seed((long)seed); + } + + public Builder optimizationAlgo(OptimizationAlgorithm optimizationAlgo) { + this.optimizationAlgo = optimizationAlgo; + return this; + } + + public Builder stepFunction(StepFunction stepFunction) { + this.stepFunction = stepFunction; + return this; + } + + public Builder minimize(boolean minimize) { + this.minimize = minimize; + return this; + } + + public Builder gradientNormalization(GradientNormalization gradientNormalization) { + this.gradientNormalization = Optional.ofNullable(gradientNormalization); + return this; + } + + public Builder gradientNormalizationThreshold(double gradientNormalizationThreshold) { + this.gradientNormalizationThreshold = gradientNormalizationThreshold; + return this; + } + + public Builder convolutionMode(ConvolutionMode convolutionMode) { + this.convolutionMode = convolutionMode; + return this; + } + + public Builder constraints(List<LayerConstraint> constraints) { + this.constraints = Optional.ofNullable(constraints); + return this; + } + + public Builder pretrain(boolean pretrain) { + this.pretrain = pretrain; + return this; + } + + public Builder backprop(boolean backprop) { + this.backprop = backprop; + return this; + } + + public Builder backpropType(BackpropType backpropType) { + this.backpropType = backpropType; + return this; + } + + public Builder tbpttFwdLength(int tbpttFwdLength) { + this.tbpttFwdLength = tbpttFwdLength; + return this; + } + + public Builder tbpttBackLength(int tbpttBackLength) { + this.tbpttBackLength = tbpttBackLength; + return this; + } + + public Builder trainingWorkspaceMode(WorkspaceMode trainingWorkspaceMode) { + this.trainingWorkspaceMode = trainingWorkspaceMode; + return this; + } + + public Builder inferenceWorkspaceMode(WorkspaceMode inferenceWorkspaceMode) { + this.inferenceWorkspaceMode = inferenceWorkspaceMode; + return this; + } + + public FineTuneConfiguration build() { + return new FineTuneConfiguration(activation, weightInit, biasInit, dist, l1, l2, l1Bias, l2Bias, dropout, weightNoise, updater, biasUpdater, miniBatch, maxNumLineSearchIterations, seed, optimizationAlgo, stepFunction, minimize, gradientNormalization, gradientNormalizationThreshold, convolutionMode, constraints, pretrain, backprop, backpropType, tbpttFwdLength, tbpttBackLength, trainingWorkspaceMode, inferenceWorkspaceMode); + } + + public String toString() { + return "FineTuneConfiguration.Builder(activation=" + this.activation + ", weightInit=" + this.weightInit + ", biasInit=" + this.biasInit + ", dist=" + this.dist + ", l1=" + this.l1 + ", l2=" + this.l2 + ", l1Bias=" + this.l1Bias + ", l2Bias=" + this.l2Bias + ", dropout=" + this.dropout + ", weightNoise=" + this.weightNoise + ", updater=" + this.updater + ", biasUpdater=" + this.biasUpdater + ", miniBatch=" + this.miniBatch + ", maxNumLineSearchIterations=" + this.maxNumLineSearchIterations + ", seed=" + this.seed + ", optimizationAlgo=" + this.optimizationAlgo + ", stepFunction=" + this.stepFunction + ", minimize=" + this.minimize + ", gradientNormalization=" + this.gradientNormalization + ", gradientNormalizationThreshold=" + this.gradientNormalizationThreshold + ", convolutionMode=" + this.convolutionMode + ", constraints=" + this.constraints + ", pretrain=" + this.pretrain + ", backprop=" + this.backprop + ", backpropType=" + this.backpropType + ", tbpttFwdLength=" + this.tbpttFwdLength + ", tbpttBackLength=" + this.tbpttBackLength + ", trainingWorkspaceMode=" + this.trainingWorkspaceMode + ", inferenceWorkspaceMode=" + this.inferenceWorkspaceMode + ")"; + } } @@ -123,7 +309,9 @@ public class FineTuneConfiguration { if (l != null) { if (dropout != null) - l.setIDropout(dropout); + l.setIDropout(dropout.orElse(null)); + if(constraints != null) + l.setConstraints(constraints.orElse(null)); } if (l != null && l instanceof BaseLayer) { @@ -146,17 +334,17 @@ public class FineTuneConfiguration { if (l2Bias != null) bl.setL2Bias(l2Bias); if (gradientNormalization != null) - bl.setGradientNormalization(gradientNormalization); + bl.setGradientNormalization(gradientNormalization.orElse(null)); if (gradientNormalizationThreshold != null) bl.setGradientNormalizationThreshold(gradientNormalizationThreshold); - if (iUpdater != null){ - bl.setIUpdater(iUpdater); + if (updater != null){ + bl.setIUpdater(updater); } if (biasUpdater != null){ bl.setBiasUpdater(biasUpdater); } if (weightNoise != null){ - bl.setWeightNoise(weightNoise); + bl.setWeightNoise(weightNoise.orElse(null)); } } if (miniBatch != null) @@ -185,9 +373,10 @@ public class FineTuneConfiguration { ((BaseLayer) l).setDist(null); } - //Perform validation. This also sets the defaults for updaters. For example, Updater.RMSProp -> set rmsDecay + //Perform validation if (l != null) { - LayerValidation.generalValidation(l.getLayerName(), l, dropout, l2, l2Bias, l1, l1Bias, dist, constraints, null, null); + LayerValidation.generalValidation(l.getLayerName(), l, get(dropout), l2, l2Bias, l1, l1Bias, + dist, get(constraints), null, null); } //Also: update the LR, L1 and L2 maps, based on current config (which might be different to original config) @@ -198,6 +387,13 @@ public class FineTuneConfiguration { } } + private static <T> T get(Optional<T> optional){ + if(optional == null){ + return null; + } + return optional.orElse(null); + } + public void applyToMultiLayerConfiguration(MultiLayerConfiguration conf) { if (pretrain != null) conf.setPretrain(pretrain); @@ -243,9 +439,9 @@ public class FineTuneConfiguration { if (l2Bias != null) confBuilder.setL2Bias(l2Bias); if (dropout != null) - confBuilder.setIdropOut(dropout); - if (iUpdater != null) - confBuilder.updater(iUpdater); + confBuilder.setIdropOut(dropout.orElse(null)); + if (updater != null) + confBuilder.updater(updater); if(biasUpdater != null) confBuilder.biasUpdater(biasUpdater); if (miniBatch != null) @@ -261,7 +457,7 @@ public class FineTuneConfiguration { if (minimize != null) confBuilder.setMinimize(minimize); if (gradientNormalization != null) - confBuilder.setGradientNormalization(gradientNormalization); + confBuilder.setGradientNormalization(gradientNormalization.orElse(null)); if (gradientNormalizationThreshold != null) confBuilder.setGradientNormalizationThreshold(gradientNormalizationThreshold); if (trainingWorkspaceMode != null)

['deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/FineTuneConfiguration.java', 'deeplearning4j-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningMLNTest.java', 'deeplearning4j-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningCompGraphTest.java']

{'.java': 3}

Java

{'Java': 42895752, 'C++': 17237193, 'Cuda': 2203734, 'Kotlin': 2030453, 'JavaScript': 296767, 'C': 172853, 'CMake': 126415, 'Shell': 96643, 'TypeScript': 81217, 'Python': 77566, 'FreeMarker': 77257, 'HTML': 18609, 'CSS': 12974, 'PureBasic': 12254, 'Cython': 12094, 'Ruby': 4558, 'Batchfile': 1458, 'Scala': 1026, 'Smarty': 975, 'Starlark': 931}

Apache License 2.0

deeplearning4j/deeplearning4j/4415/4404

deeplearning4j

deeplearning4j

https://github.com/deeplearning4j/deeplearning4j/issues/4404

https://github.com/deeplearning4j/deeplearning4j/pull/4415

https://github.com/deeplearning4j/deeplearning4j/pull/4415

fix

RegressionEvaluation bug

``` @Test public void testRegressionEvalTimeSeriesSplit(){ INDArray out1 = Nd4j.rand(new int[]{3, 5, 20}); INDArray outSub1 = out1.get(all(), all(), interval(0,10)); INDArray outSub2 = out1.get(all(), all(), interval(10, 20)); INDArray label1 = Nd4j.rand(new int[]{3, 5, 20}); INDArray labelSub1 = label1.get(all(), all(), interval(0,10)); INDArray labelSub2 = label1.get(all(), all(), interval(10, 20)); RegressionEvaluation e1 = new RegressionEvaluation(); RegressionEvaluation e2 = new RegressionEvaluation(); e1.eval(label1, out1); e2.eval(labelSub1, outSub1); e2.eval(labelSub2, outSub2); assertEquals(e1, e2); } ``` Following test fails due to ```sumSquaredLabelDeviations``` array only.

2a5c7ba77d2392aad5467fab38c7fed392897d1b

4e0b2189a17b6e3977711bcb0d7f97c7029394b4

https://github.com/deeplearning4j/deeplearning4j/compare/2a5c7ba77d2392aad5467fab38c7fed392897d1b...4e0b2189a17b6e3977711bcb0d7f97c7029394b4

diff --git a/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java b/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java index 599a5e53f9..2de65032de 100644 --- a/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java +++ b/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java @@ -53,6 +53,8 @@ import org.nd4j.linalg.util.FeatureUtil; import java.util.*; import static org.junit.Assert.*; +import static org.nd4j.linalg.indexing.NDArrayIndex.all; +import static org.nd4j.linalg.indexing.NDArrayIndex.interval; /** * Created by agibsonccc on 12/22/14. @@ -254,7 +256,7 @@ public class EvalTest { for (int j = 0; j < tsLength; j++) { INDArray rand = Nd4j.rand(1, nOut); rand.divi(rand.sumNumber()); - predicted.put(new INDArrayIndex[] {NDArrayIndex.point(i), NDArrayIndex.all(), NDArrayIndex.point(j)}, + predicted.put(new INDArrayIndex[] {NDArrayIndex.point(i), all(), NDArrayIndex.point(j)}, rand); int idx = r.nextInt(nOut); labels.putScalar(new int[] {i, idx, j}, 1.0); @@ -264,11 +266,11 @@ public class EvalTest { //Create a longer labels/predicted with mask for first and last time step //Expect masked evaluation to be identical to original evaluation INDArray labels2 = Nd4j.zeros(miniBatch, nOut, tsLength + 2); - labels2.put(new INDArrayIndex[] {NDArrayIndex.all(), NDArrayIndex.all(), - NDArrayIndex.interval(1, tsLength + 1)}, labels); + labels2.put(new INDArrayIndex[] {all(), all(), + interval(1, tsLength + 1)}, labels); INDArray predicted2 = Nd4j.zeros(miniBatch, nOut, tsLength + 2); - predicted2.put(new INDArrayIndex[] {NDArrayIndex.all(), NDArrayIndex.all(), - NDArrayIndex.interval(1, tsLength + 1)}, predicted); + predicted2.put(new INDArrayIndex[] {all(), all(), + interval(1, tsLength + 1)}, predicted); INDArray labelsMask = Nd4j.ones(miniBatch, tsLength + 2); for (int i = 0; i < miniBatch; i++) { @@ -323,7 +325,7 @@ public class EvalTest { INDArray rand = Nd4j.rand(1, numClasses); rand.put(0, winner, rand.sumNumber()); rand.divi(rand.sumNumber()); - predicted.put(new INDArrayIndex[] {NDArrayIndex.point(i), NDArrayIndex.all()}, rand); + predicted.put(new INDArrayIndex[] {NDArrayIndex.point(i), all()}, rand); //Generating random label int label = r.nextInt(numClasses); labels.putScalar(new int[] {i, label}, 1.0); @@ -359,16 +361,16 @@ public class EvalTest { //Now: split into 3 separate evaluation objects -> expect identical values after merging Evaluation eval1 = new Evaluation(); - eval1.eval(actual.get(NDArrayIndex.interval(0, 5), NDArrayIndex.all()), - predicted.get(NDArrayIndex.interval(0, 5), NDArrayIndex.all())); + eval1.eval(actual.get(interval(0, 5), all()), + predicted.get(interval(0, 5), all())); Evaluation eval2 = new Evaluation(); - eval2.eval(actual.get(NDArrayIndex.interval(5, 10), NDArrayIndex.all()), - predicted.get(NDArrayIndex.interval(5, 10), NDArrayIndex.all())); + eval2.eval(actual.get(interval(5, 10), all()), + predicted.get(interval(5, 10), all())); Evaluation eval3 = new Evaluation(); - eval3.eval(actual.get(NDArrayIndex.interval(10, nRows), NDArrayIndex.all()), - predicted.get(NDArrayIndex.interval(10, nRows), NDArrayIndex.all())); + eval3.eval(actual.get(interval(10, nRows), all()), + predicted.get(interval(10, nRows), all())); eval1.merge(eval2); eval1.merge(eval3); @@ -378,8 +380,8 @@ public class EvalTest { //Next: check evaluation merging with empty, and empty merging with non-empty eval1 = new Evaluation(); - eval1.eval(actual.get(NDArrayIndex.interval(0, 5), NDArrayIndex.all()), - predicted.get(NDArrayIndex.interval(0, 5), NDArrayIndex.all())); + eval1.eval(actual.get(interval(0, 5), all()), + predicted.get(interval(0, 5), all())); Evaluation evalInitiallyEmpty = new Evaluation(); evalInitiallyEmpty.merge(eval1); diff --git a/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/RegressionEvalTest.java b/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/RegressionEvalTest.java index dcc42cb9f1..ff2523abfc 100644 --- a/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/RegressionEvalTest.java +++ b/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/RegressionEvalTest.java @@ -20,6 +20,8 @@ import java.util.Collections; import java.util.List; import static org.junit.Assert.assertEquals; +import static org.nd4j.linalg.indexing.NDArrayIndex.all; +import static org.nd4j.linalg.indexing.NDArrayIndex.interval; /** * @author Alex Black @@ -204,4 +206,26 @@ public class RegressionEvalTest { assertEquals(rmse[i], re.rootMeanSquaredError(i), 1e-6); } } + + @Test + public void testRegressionEvalTimeSeriesSplit(){ + + INDArray out1 = Nd4j.rand(new int[]{3, 5, 20}); + INDArray outSub1 = out1.get(all(), all(), interval(0,10)); + INDArray outSub2 = out1.get(all(), all(), interval(10, 20)); + + INDArray label1 = Nd4j.rand(new int[]{3, 5, 20}); + INDArray labelSub1 = label1.get(all(), all(), interval(0,10)); + INDArray labelSub2 = label1.get(all(), all(), interval(10, 20)); + + RegressionEvaluation e1 = new RegressionEvaluation(); + RegressionEvaluation e2 = new RegressionEvaluation(); + + e1.eval(label1, out1); + + e2.eval(labelSub1, outSub1); + e2.eval(labelSub2, outSub2); + + assertEquals(e1, e2); + } } diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/RegressionEvaluation.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/RegressionEvaluation.java index 9ef34ca53c..de701ca49c 100644 --- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/RegressionEvaluation.java +++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/RegressionEvaluation.java @@ -66,7 +66,7 @@ public class RegressionEvaluation extends BaseEvaluation<RegressionEvaluation> { private INDArray sumSquaredPredicted; @JsonSerialize(using = RowVectorSerializer.class) @JsonDeserialize(using = RowVectorDeserializer.class) - private INDArray sumSquaredLabelDeviations; + private INDArray sumLabels; public RegressionEvaluation() { this(null, DEFAULT_PRECISION); @@ -135,7 +135,7 @@ public class RegressionEvaluation extends BaseEvaluation<RegressionEvaluation> { sumOfProducts = Nd4j.zeros(n); sumSquaredLabels = Nd4j.zeros(n); sumSquaredPredicted = Nd4j.zeros(n); - sumSquaredLabelDeviations = Nd4j.zeros(n); + sumLabels = Nd4j.zeros(n); initialized = true; } @@ -217,8 +217,7 @@ public class RegressionEvaluation extends BaseEvaluation<RegressionEvaluation> { .divi(newExampleCountPerColumn); exampleCountPerColumn = newExampleCountPerColumn; - final INDArray n = labels.dup().subRowVector(currentMean); - sumSquaredLabelDeviations.addi(n.muli(n).sum(0)); + sumLabels.addi(labels.sum(0)); } @Override @@ -384,8 +383,14 @@ public class RegressionEvaluation extends BaseEvaluation<RegressionEvaluation> { * @see <a href="https://en.wikipedia.org/wiki/Coefficient_of_determination">Wikipedia</a> */ public double rSquared(int column) { - final double sstot = sumSquaredLabelDeviations.getDouble(column); - final double ssres = sumSquaredErrorsPerColumn.getDouble(column); + //ss_tot = sum_i (label_i - mean(labels))^2 + // = (sum_i label_i^2) + mean(labels) * (n * mean(labels) - 2 * sum_i label_i) + double sumLabelSquared = sumSquaredLabels.getDouble(column); + double meanLabel = currentMean.getDouble(column); + double sumLabel = sumLabels.getDouble(column); + double n = exampleCountPerColumn.getDouble(column); + double sstot = sumLabelSquared + meanLabel * (n * meanLabel - 2 * sumLabel); + double ssres = sumSquaredErrorsPerColumn.getDouble(column); return (sstot - ssres) / sstot; }

['deeplearning4j-core/src/test/java/org/deeplearning4j/eval/RegressionEvalTest.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/RegressionEvaluation.java', 'deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java']

{'.java': 3}

Java

{'Java': 42895752, 'C++': 17237193, 'Cuda': 2203734, 'Kotlin': 2030453, 'JavaScript': 296767, 'C': 172853, 'CMake': 126415, 'Shell': 96643, 'TypeScript': 81217, 'Python': 77566, 'FreeMarker': 77257, 'HTML': 18609, 'CSS': 12974, 'PureBasic': 12254, 'Cython': 12094, 'Ruby': 4558, 'Batchfile': 1458, 'Scala': 1026, 'Smarty': 975, 'Starlark': 931}

Apache License 2.0

pinpoint-apm/pinpoint/616/611

pinpoint-apm

pinpoint

https://github.com/pinpoint-apm/pinpoint/issues/611

https://github.com/pinpoint-apm/pinpoint/pull/616

https://github.com/pinpoint-apm/pinpoint/pull/616

resolve

Handle cases where services have the same application name with different service type.

Backporting fixes to 1.1.0. Issue resolves the following cases. 1. Services with the same application name but different service types should be selectable separately - #214 2. User nodes now take the destination's service type along with the application name when drawing the server map - #254

a1409559e43a7943f533ed3cf8a39233167b9cea

4fa9ef9ddb1cddcc4e78dd31a2ae0fafb19a41c7

https://github.com/pinpoint-apm/pinpoint/compare/a1409559e43a7943f533ed3cf8a39233167b9cea...4fa9ef9ddb1cddcc4e78dd31a2ae0fafb19a41c7

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/ApplicationMapStatisticsUtils.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/ApplicationMapStatisticsUtils.java index a0ff208e00..948e912ba1 100644 --- a/commons/src/main/java/com/navercorp/pinpoint/common/util/ApplicationMapStatisticsUtils.java +++ b/commons/src/main/java/com/navercorp/pinpoint/common/util/ApplicationMapStatisticsUtils.java @@ -103,6 +103,12 @@ public class ApplicationMapStatisticsUtils { return BytesUtils.toStringAndRightTrim(bytes, 6, length); } + public static String getDestApplicationNameFromColumnNameForUser(byte[] bytes, ServiceType destServiceType) { + String destApplicationName = getDestApplicationNameFromColumnName(bytes); + String destServiceTypeName = destServiceType.name(); + return destApplicationName + "_" + destServiceTypeName; + } + public static String getHost(byte[] bytes) { int offset = 6 + BytesUtils.bytesToShort(bytes, 4); diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApplicationIndexDao.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApplicationIndexDao.java index f4ef005500..9b5d1cc420 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApplicationIndexDao.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApplicationIndexDao.java @@ -16,6 +16,7 @@ package com.navercorp.pinpoint.web.dao.hbase; +import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; @@ -45,7 +46,7 @@ public class HbaseApplicationIndexDao implements ApplicationIndexDao { @Autowired @Qualifier("applicationNameMapper") - private RowMapper<Application> applicationNameMapper; + private RowMapper<List<Application>> applicationNameMapper; @Autowired @Qualifier("agentIdMapper") @@ -55,7 +56,12 @@ public class HbaseApplicationIndexDao implements ApplicationIndexDao { public List<Application> selectAllApplicationNames() { Scan scan = new Scan(); scan.setCaching(30); - return hbaseOperations2.find(HBaseTables.APPLICATION_INDEX, scan, applicationNameMapper); + List<List<Application>> results = hbaseOperations2.find(HBaseTables.APPLICATION_INDEX, scan, applicationNameMapper); + List<Application> applications = new ArrayList<Application>(); + for (List<Application> result : results) { + applications.addAll(result); + } + return applications; } @Override diff --git a/web/src/main/java/com/navercorp/pinpoint/web/mapper/ApplicationNameMapper.java b/web/src/main/java/com/navercorp/pinpoint/web/mapper/ApplicationNameMapper.java index 186e061e0c..62220fc0f3 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/mapper/ApplicationNameMapper.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/mapper/ApplicationNameMapper.java @@ -16,25 +16,50 @@ package com.navercorp.pinpoint.web.mapper; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.util.Bytes; import org.springframework.data.hadoop.hbase.RowMapper; import org.springframework.stereotype.Component; +import com.navercorp.pinpoint.common.ServiceType; import com.navercorp.pinpoint.web.vo.Application; /** * */ @Component -public class ApplicationNameMapper implements RowMapper<Application> { +public class ApplicationNameMapper implements RowMapper<List<Application>> { + @Override - public Application mapRow(Result result, int rowNum) throws Exception { + public List<Application> mapRow(Result result, int rowNum) throws Exception { if (result.isEmpty()) { - return null; + return Collections.emptyList(); } + Set<Short> uniqueTypeCodes = new HashSet<Short>(); String applicationName = Bytes.toString(result.getRow()); - short serviceType = Bytes.toShort(result.value()); - return new Application(applicationName, serviceType); + + List<Cell> list = result.listCells(); + if (list == null) { + return Collections.emptyList(); + } + + for (Cell cell : list) { + short serviceTypeCode = Bytes.toShort(CellUtil.cloneValue(cell)); + uniqueTypeCodes.add(serviceTypeCode); + } + List<Application> applications = new ArrayList<Application>(); + for (short serviceTypeCode : uniqueTypeCodes) { + applications.add(new Application(applicationName, ServiceType.findServiceType(serviceTypeCode))); + } + + return applications; } } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/mapper/MapStatisticsCalleeMapper.java b/web/src/main/java/com/navercorp/pinpoint/web/mapper/MapStatisticsCalleeMapper.java index 2040310f47..6afdf3812b 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/mapper/MapStatisticsCalleeMapper.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/mapper/MapStatisticsCalleeMapper.java @@ -16,6 +16,7 @@ package com.navercorp.pinpoint.web.mapper; +import com.navercorp.pinpoint.common.ServiceType; import com.navercorp.pinpoint.common.buffer.Buffer; import com.navercorp.pinpoint.common.buffer.FixedBuffer; import com.navercorp.pinpoint.common.util.ApplicationMapStatisticsUtils; @@ -71,7 +72,7 @@ public class MapStatisticsCalleeMapper implements RowMapper<LinkDataMap> { for (Cell cell : result.rawCells()) { final byte[] qualifier = CellUtil.cloneQualifier(cell); - final Application callerApplication = readCallerApplication(qualifier); + final Application callerApplication = readCallerApplication(qualifier, calleeApplication.getServiceType()); if (filter.filter(callerApplication)) { continue; } @@ -98,9 +99,15 @@ public class MapStatisticsCalleeMapper implements RowMapper<LinkDataMap> { return linkDataMap; } - private Application readCallerApplication(byte[] qualifier) { - String callerApplicationName = ApplicationMapStatisticsUtils.getDestApplicationNameFromColumnName(qualifier); - short callerServiceType = ApplicationMapStatisticsUtils.getDestServiceTypeFromColumnName(qualifier); + private Application readCallerApplication(byte[] qualifier, ServiceType calleeServiceType) { + short callerServiceType = ApplicationMapStatisticsUtils.getDestServiceTypeFromColumnName(qualifier);// Caller may be a user node, and user nodes may call nodes with the same application name but different service type. + // To distinguish between these user nodes, append callee's service type to the application name. + String callerApplicationName; + if (ServiceType.findServiceType(callerServiceType).isUser()) { + callerApplicationName = ApplicationMapStatisticsUtils.getDestApplicationNameFromColumnNameForUser(qualifier, calleeServiceType); + } else { + callerApplicationName = ApplicationMapStatisticsUtils.getDestApplicationNameFromColumnName(qualifier); + } return new Application(callerApplicationName, callerServiceType); }

['web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApplicationIndexDao.java', 'web/src/main/java/com/navercorp/pinpoint/web/mapper/MapStatisticsCalleeMapper.java', 'commons/src/main/java/com/navercorp/pinpoint/common/util/ApplicationMapStatisticsUtils.java', 'web/src/main/java/com/navercorp/pinpoint/web/mapper/ApplicationNameMapper.java']

{'.java': 4}

Java

{'Java': 20427181, 'TypeScript': 1739527, 'CSS': 222853, 'HTML': 216928, 'Thrift': 15920, 'Shell': 6420, 'JavaScript': 6310, 'Groovy': 1431, 'Kotlin': 1329, 'TSQL': 978, 'Batchfile': 200}

Apache License 2.0

pinpoint-apm/pinpoint/2078/2077

pinpoint-apm

pinpoint

https://github.com/pinpoint-apm/pinpoint/issues/2077

https://github.com/pinpoint-apm/pinpoint/pull/2078

https://github.com/pinpoint-apm/pinpoint/pull/2078

fixes

Tomcat plugin fails to trace when profiler.tomcat.excludeurl is empty

Tomcat plugin fails to inject interceptor to `StandardHostValve.invoke(...)` when _pinpoint.config_'s `profiler.tomcat.excludeurl` option is empty.

0f94b21205ca84f01d18283b381615f5e88f3f55

6f90e3cbcd4d1f34dbe87ef28f84e2759966d6d2

https://github.com/pinpoint-apm/pinpoint/compare/0f94b21205ca84f01d18283b381615f5e88f3f55...6f90e3cbcd4d1f34dbe87ef28f84e2759966d6d2

diff --git a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatConfiguration.java b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatConfiguration.java index 0c0ba3bfcf..3f7e8089f6 100644 --- a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatConfiguration.java +++ b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatConfiguration.java @@ -14,9 +14,9 @@ */ package com.navercorp.pinpoint.plugin.tomcat; -import com.navercorp.pinpoint.bootstrap.config.ExcludePathFilter; import com.navercorp.pinpoint.bootstrap.config.Filter; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; +import com.navercorp.pinpoint.bootstrap.config.SkipFilter; /** * @author Jongho Moon @@ -24,14 +24,14 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; */ public class TomcatConfiguration { private final boolean tomcatHidePinpointHeader; - private Filter<String> tomcatExcludeUrlFilter; + private final Filter<String> tomcatExcludeUrlFilter; public TomcatConfiguration(ProfilerConfig config) { this.tomcatHidePinpointHeader = config.readBoolean("profiler.tomcat.hidepinpointheader", true); - final String tomcatExcludeURL = config.readString("profiler.tomcat.excludeurl", ""); - - if (!tomcatExcludeURL.isEmpty()) { - this.tomcatExcludeUrlFilter = new ExcludePathFilter(tomcatExcludeURL); + if (config.getTomcatExcludeProfileMethodFilter() == null) { + this.tomcatExcludeUrlFilter = new SkipFilter<String>(); + } else { + this.tomcatExcludeUrlFilter = config.getTomcatExcludeUrlFilter(); } }

['plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatConfiguration.java']

{'.java': 1}

Java

{'Java': 20427181, 'TypeScript': 1739527, 'CSS': 222853, 'HTML': 216928, 'Thrift': 15920, 'Shell': 6420, 'JavaScript': 6310, 'Groovy': 1431, 'Kotlin': 1329, 'TSQL': 978, 'Batchfile': 200}

Apache License 2.0

pinpoint-apm/pinpoint/2011/2010

pinpoint-apm

pinpoint

https://github.com/pinpoint-apm/pinpoint/issues/2010

https://github.com/pinpoint-apm/pinpoint/pull/2011

https://github.com/pinpoint-apm/pinpoint/pull/2011

fixes

Jdk's HttpUrlConnection's target nodes are not rendered in the server map

Http calls made using `HttpUrlConnection` is currently being traced, but the server map does not seem to be rendering the target nodes, Related google groups post - https://groups.google.com/forum/#!topic/pinpoint_user/OgwAB9sPnak

2e39615c5c4b283d821aa3dba607a5d6d3fd856b

a2858a90331fb9e4dbd72d88a0ab4d5fdd1f58ab

https://github.com/pinpoint-apm/pinpoint/compare/2e39615c5c4b283d821aa3dba607a5d6d3fd856b...a2858a90331fb9e4dbd72d88a0ab4d5fdd1f58ab

diff --git a/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/JdkHttpConstants.java b/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/JdkHttpConstants.java index 184baf89b5..3a6bfa4ea7 100644 --- a/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/JdkHttpConstants.java +++ b/plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/JdkHttpConstants.java @@ -17,6 +17,8 @@ package com.navercorp.pinpoint.plugin.jdk.http; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; +import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.RECORD_STATISTICS; + /** * @author Jongho Moon * @@ -25,5 +27,5 @@ public final class JdkHttpConstants { private JdkHttpConstants() { } - public static final ServiceType SERVICE_TYPE = ServiceTypeFactory.of(9055, "JDK_HTTPURLCONNECTOR", "JDK_HTTPCONNECTOR"); + public static final ServiceType SERVICE_TYPE = ServiceTypeFactory.of(9055, "JDK_HTTPURLCONNECTOR", "JDK_HTTPCONNECTOR", RECORD_STATISTICS); }

['plugins/jdk-http/src/main/java/com/navercorp/pinpoint/plugin/jdk/http/JdkHttpConstants.java']

{'.java': 1}

Java

{'Java': 20427181, 'TypeScript': 1739527, 'CSS': 222853, 'HTML': 216928, 'Thrift': 15920, 'Shell': 6420, 'JavaScript': 6310, 'Groovy': 1431, 'Kotlin': 1329, 'TSQL': 978, 'Batchfile': 200}

Apache License 2.0

pinpoint-apm/pinpoint/1457/1443

pinpoint-apm

pinpoint

https://github.com/pinpoint-apm/pinpoint/issues/1443

https://github.com/pinpoint-apm/pinpoint/pull/1457

https://github.com/pinpoint-apm/pinpoint/pull/1457

fix

Fixed invalid classloading when using the AspectJ + Spring AOP

- support spring aspectj weaving - support OSGI (atlassian jira) - #1583 Enhancement PlaingClassLoaderHandler for Jira.

dd7c6f23472ca9bf0a8eef571c694921113145ee

e28e3cedad91e10c3c5ca9b1c22a82a16065e5bb

https://github.com/pinpoint-apm/pinpoint/compare/dd7c6f23472ca9bf0a8eef571c694921113145ee...e28e3cedad91e10c3c5ca9b1c22a82a16065e5bb

diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/PinpointStarter.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/PinpointStarter.java index 056da38017..7beb09d8df 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/PinpointStarter.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/PinpointStarter.java @@ -127,7 +127,7 @@ public class PinpointStarter { agentClassLoader.setBootClass(bootClass); logger.info("pinpoint agent [" + bootClass + "] starting..."); - AgentOption option = createAgentOption(agentArgs, instrumentation, profilerConfig, pluginJars, bootStrapCore, serviceTypeRegistryService, annotationKeyRegistryService, bootStrapCoreJar); + AgentOption option = createAgentOption(agentArgs, instrumentation, profilerConfig, pluginJars, bootStrapCore, serviceTypeRegistryService, annotationKeyRegistryService); Agent pinpointAgent = agentClassLoader.boot(option); pinpointAgent.start(); registerShutdownHook(pinpointAgent); @@ -139,9 +139,9 @@ public class PinpointStarter { } } - private AgentOption createAgentOption(String agentArgs, Instrumentation instrumentation, ProfilerConfig profilerConfig, URL[] pluginJars, String bootStrapJarPath, ServiceTypeRegistryService serviceTypeRegistryService, AnnotationKeyRegistryService annotationKeyRegistryService, String bootStrapCoreJar) { + private AgentOption createAgentOption(String agentArgs, Instrumentation instrumentation, ProfilerConfig profilerConfig, URL[] pluginJars, String bootStrapJarCorePath, ServiceTypeRegistryService serviceTypeRegistryService, AnnotationKeyRegistryService annotationKeyRegistryService) { - return new DefaultAgentOption(agentArgs, instrumentation, profilerConfig, pluginJars, bootStrapJarPath, serviceTypeRegistryService, annotationKeyRegistryService); + return new DefaultAgentOption(agentArgs, instrumentation, profilerConfig, pluginJars, bootStrapJarCorePath, serviceTypeRegistryService, annotationKeyRegistryService); } // for test diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JarProfilerPluginClassInjector.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JarProfilerPluginClassInjector.java index bafcb5cb51..1733f61f1c 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JarProfilerPluginClassInjector.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JarProfilerPluginClassInjector.java @@ -215,7 +215,7 @@ public class JarProfilerPluginClassInjector implements ClassInjector { } } if (logger.isInfoEnabled()) { - logger.debug("defineClass pluginClass:{} cl:{}", className, classLoader); + logger.info("defineClass pluginClass:{} cl:{}", className, classLoader); } final byte[] bytes = ct.toBytecode(); return (Class<?>)DEFINE_CLASS.invoke(classLoader, ct.getName(), bytes, 0, bytes.length);

['bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/PinpointStarter.java', 'profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JarProfilerPluginClassInjector.java']

{'.java': 2}

Java

{'Java': 20427181, 'TypeScript': 1739527, 'CSS': 222853, 'HTML': 216928, 'Thrift': 15920, 'Shell': 6420, 'JavaScript': 6310, 'Groovy': 1431, 'Kotlin': 1329, 'TSQL': 978, 'Batchfile': 200}

Apache License 2.0

pinpoint-apm/pinpoint/1272/1271

pinpoint-apm

pinpoint

https://github.com/pinpoint-apm/pinpoint/issues/1271

https://github.com/pinpoint-apm/pinpoint/pull/1272

https://github.com/pinpoint-apm/pinpoint/pull/1272

fixed

Unsampled Continuation is not collected for transaction metric.

Metric Gauge for TRANSACTION_UNSAMPLED_CONTINUATION is missing. Unsampled continuation gauge instead uses TRANSACTION_UNSAMPLED_NEW, which is wrong.

df606e80ff905ae81d51192708ae9e409967c69d

2cc7a9186af5b7cb9c7f6cccc33fd20e46ba9e16

https://github.com/pinpoint-apm/pinpoint/compare/df606e80ff905ae81d51192708ae9e409967c69d...2cc7a9186af5b7cb9c7f6cccc33fd20e46ba9e16

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/tps/TransactionMetricCollector.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/tps/TransactionMetricCollector.java index d505a228f8..f52520d703 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/tps/TransactionMetricCollector.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/tps/TransactionMetricCollector.java @@ -49,7 +49,7 @@ public class TransactionMetricCollector implements AgentStatCollector<TTransacti this.sampledNewGauge = (Gauge<Long>)MetricMonitorValues.getMetric(metrics, TRANSACTION_SAMPLED_NEW, UNSUPPORTED_GAUGE); this.sampledContinuationGauge = (Gauge<Long>)MetricMonitorValues.getMetric(metrics, TRANSACTION_SAMPLED_CONTINUATION, UNSUPPORTED_GAUGE); this.unsampledNewGauge = (Gauge<Long>)MetricMonitorValues.getMetric(metrics, TRANSACTION_UNSAMPLED_NEW, UNSUPPORTED_GAUGE); - this.unsampledContinuationGuage = (Gauge<Long>)MetricMonitorValues.getMetric(metrics, TRANSACTION_UNSAMPLED_NEW, UNSUPPORTED_GAUGE); + this.unsampledContinuationGuage = (Gauge<Long>)MetricMonitorValues.getMetric(metrics, TRANSACTION_UNSAMPLED_CONTINUATION, UNSUPPORTED_GAUGE); } @Override

['profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/tps/TransactionMetricCollector.java']

{'.java': 1}

Java

{'Java': 20427181, 'TypeScript': 1739527, 'CSS': 222853, 'HTML': 216928, 'Thrift': 15920, 'Shell': 6420, 'JavaScript': 6310, 'Groovy': 1431, 'Kotlin': 1329, 'TSQL': 978, 'Batchfile': 200}

Apache License 2.0

pinpoint-apm/pinpoint/1173/1171

pinpoint-apm

pinpoint

https://github.com/pinpoint-apm/pinpoint/issues/1171

https://github.com/pinpoint-apm/pinpoint/pull/1173

https://github.com/pinpoint-apm/pinpoint/pull/1173

fixed

Fixed a side effect of Arcus interceptor

Side effect : faild to failover. Root cause : Unnecessary reverse DNS lookup Bug fix : Avoid DNS lookup API. - ApiInterceptor.java - FutureGetInterceptor.java ``` java @Override public void after(Object target, Object[] args, Object result, Throwable throwable) { ... final Operation op = (Operation) getOperation.invoke(target); if (op != null) { MemcachedNode handlingNode = op.getHandlingNode(); if (handlingNode != null) { SocketAddress socketAddress = handlingNode.getSocketAddress(); if (socketAddress instanceof InetSocketAddress) { InetSocketAddress address = (InetSocketAddress) socketAddress; // ROOT Cause : Unnecessary DNS look -> InetSocketAddress.getHostName() trace.recordEndPoint(address.getHostName() + ":" + address.getPort()); } } else { logger.info("no handling node"); } } else { logger.info("operation not found"); } } ```

cd182945f1b1bb1e6be6091869bbd7ba64b3c504

a79a27bde7eee135f7ae1e5094243bedd7528fa9

https://github.com/pinpoint-apm/pinpoint/compare/cd182945f1b1bb1e6be6091869bbd7ba64b3c504...a79a27bde7eee135f7ae1e5094243bedd7528fa9

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/ApiInterceptor.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/ApiInterceptor.java index e9d33e86a0..d90c717676 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/ApiInterceptor.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/ApiInterceptor.java @@ -16,6 +16,7 @@ package com.navercorp.pinpoint.profiler.modifier.arcus.interceptor; +import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.concurrent.Future; @@ -61,11 +62,12 @@ public class ApiInterceptor extends SpanEventSimpleAroundInterceptor implements if (result instanceof Future && !(result instanceof FrontCacheGetFuture)) { final Operation op = getOperation(result); if (op != null) { - MemcachedNode handlingNode = op.getHandlingNode(); - SocketAddress socketAddress = handlingNode.getSocketAddress(); - if (socketAddress instanceof InetSocketAddress) { - InetSocketAddress address = (InetSocketAddress) socketAddress; - trace.recordEndPoint(address.getHostName() + ":" + address.getPort()); + final MemcachedNode handlingNode = op.getHandlingNode(); + if (handlingNode != null) { + final String endPoint = getEndPoint(handlingNode); + if (endPoint != null) { + trace.recordEndPoint(endPoint); + } } } else { logger.info("operation not found"); @@ -85,6 +87,40 @@ public class ApiInterceptor extends SpanEventSimpleAroundInterceptor implements trace.markAfterTime(); } + private String getEndPoint(MemcachedNode handlingNode) { + // TODO duplicated code : ApiInterceptor, FutureGetInterceptor + final SocketAddress socketAddress = handlingNode.getSocketAddress(); + if (socketAddress instanceof InetSocketAddress) { + final InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress; + final String hostAddress = getHostAddress(inetSocketAddress); + if (hostAddress == null) { + // TODO return "Unknown Host"; ? + logger.debug("hostAddress is null"); + return null; + } + return hostAddress + ":" + inetSocketAddress.getPort(); + + } else { + if (logger.isDebugEnabled()) { + logger.debug("invalid socketAddress:{}", socketAddress); + } + return null; + } + } + + private String getHostAddress(InetSocketAddress inetSocketAddress) { + if (inetSocketAddress == null) { + return null; + } + // TODO JDK 1.7 InetSocketAddress.getHostString(); + // Warning : Avoid unnecessary DNS lookup (warning:InetSocketAddress.getHostName()) + final InetAddress inetAddress = inetSocketAddress.getAddress(); + if (inetAddress == null) { + return null; + } + return inetAddress.getHostAddress(); + } + private Operation getOperation(Object result) { // __operation -> ObjectTraceValue1.class final Object operationObject = ObjectTraceValue1Utils.__getTraceObject1(result, null); diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/FutureGetInterceptor.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/FutureGetInterceptor.java index 6e5579a9ae..1d0ca160a8 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/FutureGetInterceptor.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/FutureGetInterceptor.java @@ -16,6 +16,7 @@ package com.navercorp.pinpoint.profiler.modifier.arcus.interceptor; +import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -77,12 +78,11 @@ public class FutureGetInterceptor implements SimpleAroundInterceptor, ByteCodeMe // find the target node final Operation op = getOperation(target); if (op != null) { - MemcachedNode handlingNode = op.getHandlingNode(); + final MemcachedNode handlingNode = op.getHandlingNode(); if (handlingNode != null) { - SocketAddress socketAddress = handlingNode.getSocketAddress(); - if (socketAddress instanceof InetSocketAddress) { - InetSocketAddress address = (InetSocketAddress) socketAddress; - trace.recordEndPoint(address.getHostName() + ":" + address.getPort()); + final String endPoint = getEndPoint(handlingNode); + if (endPoint != null) { + trace.recordEndPoint(endPoint); } trace.recordException(op.getException()); } else { @@ -113,6 +113,40 @@ public class FutureGetInterceptor implements SimpleAroundInterceptor, ByteCodeMe } } + private String getEndPoint(MemcachedNode handlingNode) { + // TODO duplicated code : ApiInterceptor, FutureGetInterceptor + final SocketAddress socketAddress = handlingNode.getSocketAddress(); + if (socketAddress instanceof InetSocketAddress) { + final InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress; + final String hostAddress = getHostAddress(inetSocketAddress); + if (hostAddress == null) { + // TODO return "Unknown Host"; + logger.debug("hostAddress is null"); + return null; + } + return hostAddress + ":" + inetSocketAddress.getPort(); + + } else { + if (logger.isDebugEnabled()) { + logger.debug("invalid socketAddress:{}", socketAddress); + } + return null; + } + } + + private String getHostAddress(InetSocketAddress inetSocketAddress) { + if (inetSocketAddress == null) { + return null; + } + // TODO JDK 1.7 InetSocketAddress.getHostString(); + // Warning : Avoid unnecessary DNS lookup (warning:InetSocketAddress.getHostName()) + final InetAddress inetAddress = inetSocketAddress.getAddress(); + if (inetAddress == null) { + return null; + } + return inetAddress.getHostAddress(); + } + // __operation -> ObjectTraceValue1.class private Operation getOperation(Object target) { final Object operationObject = ObjectTraceValue1Utils.__getTraceObject1(target, null);

['profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/ApiInterceptor.java', 'profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/FutureGetInterceptor.java']

{'.java': 2}

Java

{'Java': 20427181, 'TypeScript': 1739527, 'CSS': 222853, 'HTML': 216928, 'Thrift': 15920, 'Shell': 6420, 'JavaScript': 6310, 'Groovy': 1431, 'Kotlin': 1329, 'TSQL': 978, 'Batchfile': 200}

Apache License 2.0

pinpoint-apm/pinpoint/916/914

pinpoint-apm

pinpoint

https://github.com/pinpoint-apm/pinpoint/issues/914

https://github.com/pinpoint-apm/pinpoint/pull/916

https://github.com/pinpoint-apm/pinpoint/pull/916

fixes

Handle cases where collected cpu load is NaN

There was a case where calling `OperatingSystemMXBean.getSystemCpuLoad()` returned Double.NaN (the agent was ran on a virtual machine). The data collected was as follows: ``` TAgentStatBatch(agentId:test-agent, startTimestamp:1441085794300, agentStats:[ TAgentStat(timestamp:1441087205292, cpuLoad:TCpuLoad(systemCpuLoad:0.026276276276276277, jvmCpuLoad:5.983020928131048E-4), gc:TJvmGc(...)), TAgentStat(timestamp:1441087802597, cpuLoad:TCpuLoad(systemCpuLoad:0.13733025877530106, jvmCpuLoad:9.909711377187762E-6), gc:TJvmGc(...)), TAgentStat(timestamp:1441087802597, cpuLoad:TCpuLoad(systemCpuLoad:NaN, jvmCpuLoad:0.14527027027027026), gc:TJvmGc(...)), TAgentStat(timestamp:1441087802597, cpuLoad:TCpuLoad(systemCpuLoad:NaN, jvmCpuLoad:0.1275), gc:TJvmGc(...)), TAgentStat(timestamp:1441087802597, cpuLoad:TCpuLoad(systemCpuLoad:NaNjvmCpuLoad:0.125), gc:TJvmGc(...)), TAgentStat(timestamp:1441087802597, cpuLoad:TCpuLoad(systemCpuLoad:0.0jvmCpuLoad:0.125), gc:TJvmGc(...)) ]) ``` Need a NaN check - use `Double.isNaN()`. (equals check does not work on NaNs as `Double.NaN != Double.NaN`)

07b1cb664ed44b63014501a27828c913e95dff51

7b62f1d0313867f6d89d8d05f06b8006a49499bf

https://github.com/pinpoint-apm/pinpoint/compare/07b1cb664ed44b63014501a27828c913e95dff51...7b62f1d0313867f6d89d8d05f06b8006a49499bf

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/cpu/CpuLoadCollector.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/cpu/CpuLoadCollector.java index 3b47af433e..547864abe1 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/cpu/CpuLoadCollector.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/cpu/CpuLoadCollector.java @@ -61,6 +61,6 @@ public class CpuLoadCollector { } private boolean notCollected(double cpuLoad) { - return cpuLoad < 0; + return cpuLoad < 0 || Double.isNaN(cpuLoad); } }

['profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/cpu/CpuLoadCollector.java']

{'.java': 1}

Java

{'Java': 20427181, 'TypeScript': 1739527, 'CSS': 222853, 'HTML': 216928, 'Thrift': 15920, 'Shell': 6420, 'JavaScript': 6310, 'Groovy': 1431, 'Kotlin': 1329, 'TSQL': 978, 'Batchfile': 200}

Apache License 2.0

pinpoint-apm/pinpoint/1488/1487

pinpoint-apm

pinpoint

https://github.com/pinpoint-apm/pinpoint/issues/1487

https://github.com/pinpoint-apm/pinpoint/pull/1488

https://github.com/pinpoint-apm/pinpoint/pull/1488

fixes

Link data missing on emulated application nodes

Call counts on edges pointing to emulated application nodes are calculated from callee statistics rather than caller statistics. This is done because the caller cannot differentiate which emulated application node it has called as the caller only knows the host name of it's target (and emulated application nodes share the same host name). When such emulated application nodes sit on the edge of the callee search depth (for example, inbound depth=1, outbound depth=2 on a `USER -> SELECTED NODE -> EMULATED NODE -> some node`), the callee statistics of the `EMULATED_NODE` is not fetched as the inbound depth limit is 1. In these situations, the server map incorrectly renders the above as `USER --N--> SELECTED NODE --0--> --N--> some node`.

875a4a42f0a24dfeeca0b65a56baac02f23f48af

77cc779df69dc52a37e03f31c5b9298d62e004ec

https://github.com/pinpoint-apm/pinpoint/compare/875a4a42f0a24dfeeca0b65a56baac02f23f48af...77cc779df69dc52a37e03f31c5b9298d62e004ec

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/BFSLinkSelector.java b/web/src/main/java/com/navercorp/pinpoint/web/service/BFSLinkSelector.java index 82dad1e345..7eda23ea77 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/BFSLinkSelector.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/BFSLinkSelector.java @@ -196,7 +196,7 @@ public class BFSLinkSelector implements LinkSelector { } private List<LinkData> createVirtualLinkData(LinkData linkData, Application toApplication, Set<AcceptApplication> acceptApplicationList) { - logger.warn("ono to N replaced. node:{}->host:{} accept:{}", linkData.getFromApplication(), toApplication.getName(), acceptApplicationList); + logger.warn("one to N replaced. node:{}->host:{} accept:{}", linkData.getFromApplication(), toApplication.getName(), acceptApplicationList); List<LinkData> emulationLink = new ArrayList<>(); for (AcceptApplication acceptApplication : acceptApplicationList) { @@ -234,7 +234,7 @@ public class BFSLinkSelector implements LinkSelector { return acceptApplication; } - private void fillEmulationLink(LinkDataDuplexMap linkDataDuplexMap) { + private void fillEmulationLink(LinkDataDuplexMap linkDataDuplexMap, Range range) { // TODO need to be reimplemented - virtual node creation logic needs an overhaul. // Currently, only the reversed relationship node is displayed. We need to create a virtual node and convert the rpc data appropriately. logger.debug("this.emulationLinkMarker:{}", this.emulationLinkMarker); @@ -248,10 +248,18 @@ public class BFSLinkSelector implements LinkSelector { LinkKey findLinkKey = new LinkKey(emulationLinkData.getFromApplication(), emulationLinkData.getToApplication()); LinkData targetLinkData = linkDataDuplexMap.getTargetLinkData(findLinkKey); if (targetLinkData == null) { - // There has been a case where targetLinkData was null, but exact event could not be captured for analysis. - // Logging the case for further analysis should it happen again in the future. - logger.error("targetLinkData not found findLinkKey:{}", findLinkKey); - continue; + // This is a case where the emulation target node has been only "partially" visited, (ie. does not have a target link data) + // Most likely due to the limit imposed by inbound search depth. + // Must go fetch the target link data here. + final Application targetApplication = emulationLinkData.getToApplication(); + final LinkDataMap callee = mapStatisticsCalleeDao.selectCallee(targetApplication, range); + targetLinkData = callee.getLinkData(findLinkKey); + if (targetLinkData == null) { + // There has been a case where targetLinkData was null, but exact event could not be captured for analysis. + // Logging the case for further analysis should it happen again in the future. + logger.error("targetLinkData not found findLinkKey:{}", findLinkKey); + continue; + } } // create reversed link data - convert data accepted by the target to target's call data @@ -332,7 +340,7 @@ public class BFSLinkSelector implements LinkSelector { logger.debug("Link emulation size:{}", emulationLinkMarker.size()); // special case checkUnsearchEmulationCalleeNode(linkDataDuplexMap, range); - fillEmulationLink(linkDataDuplexMap); + fillEmulationLink(linkDataDuplexMap, range); } return linkDataDuplexMap;

['web/src/main/java/com/navercorp/pinpoint/web/service/BFSLinkSelector.java']

{'.java': 1}

Java

{'Java': 20427181, 'TypeScript': 1739527, 'CSS': 222853, 'HTML': 216928, 'Thrift': 15920, 'Shell': 6420, 'JavaScript': 6310, 'Groovy': 1431, 'Kotlin': 1329, 'TSQL': 978, 'Batchfile': 200}

Apache License 2.0

pinpoint-apm/pinpoint/491/488

pinpoint-apm

pinpoint

https://github.com/pinpoint-apm/pinpoint/issues/488

https://github.com/pinpoint-apm/pinpoint/pull/491

https://github.com/pinpoint-apm/pinpoint/pull/491

resolve

Web throws NPE when filtering calls with RPC internal types

When filtering RPC calls on Pinpoint web, NullPointerException is thrown. This is due to a missing check inside the filtering logic. WAS -> WAS filtering checks each span event for its `ServiceType` and if it is in the RPC range (9000~9999), does an equals check with the span event's `destinationId`. Since RPC internal methods does not have a `destinationId`, while being within the RPC range, NPE is thrown. Fix needs 2 checks - to check if the span event's ServiceType is set to record statistics, and to check for null `destinationId`.

1b5d37598c12c53c733ea362bcf7876cd97c060b

bb65435ffbdb8997d5fd3fc7bf1513389e2ae541

https://github.com/pinpoint-apm/pinpoint/compare/1b5d37598c12c53c733ea362bcf7876cd97c060b...bb65435ffbdb8997d5fd3fc7bf1513389e2ae541

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/filter/DefaultFilterBuilder.java b/web/src/main/java/com/navercorp/pinpoint/web/filter/DefaultFilterBuilder.java index 9a5d2afaa9..e944caa7a5 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/filter/DefaultFilterBuilder.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/filter/DefaultFilterBuilder.java @@ -149,7 +149,7 @@ public class DefaultFilterBuilder implements FilterBuilder { Long fromResponseTime = descriptor.getResponseFrom(); Long toResponseTime = descriptor.getResponseTo(); Boolean includeFailed = descriptor.getIncludeException(); - return new FromToResponseFilter(fromServiceType, fromApplicationName, fromAgentName, toServiceType, toApplicationName, toAgentName,fromResponseTime, toResponseTime, includeFailed, hint); + return new FromToResponseFilter(fromServiceType, fromApplicationName, fromAgentName, toServiceType, toApplicationName, toAgentName,fromResponseTime, toResponseTime, includeFailed, hint, this.registry); } private FromToFilter createFromToFilter(FilterDescriptor descriptor) { diff --git a/web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java b/web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java index 87ee338fdb..07a776cbd1 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java @@ -46,6 +46,10 @@ public class FilterHint extends HashMap<String, List<Object>> { if (!containApplicationHint(applicationName)) { return false; } + + if (endPoint == null) { + return false; + } List<Object> list = get(applicationName); diff --git a/web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.java b/web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.java index 7e18feb8db..f6a3497cbc 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.java @@ -20,6 +20,7 @@ import java.util.List; import com.navercorp.pinpoint.common.bo.SpanBo; import com.navercorp.pinpoint.common.bo.SpanEventBo; +import com.navercorp.pinpoint.common.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeCategory; @@ -43,8 +44,10 @@ public class FromToResponseFilter implements Filter { private final Boolean includeFailed; private final FilterHint hint; + + private final ServiceTypeRegistryService registry; - public FromToResponseFilter(List<ServiceType> fromServiceList, String fromApplicationName, String fromAgentName, List<ServiceType> toServiceList, String toApplicationName, String toAgentName, Long fromResponseTime, Long toResponseTime, Boolean includeFailed, FilterHint hint) { + public FromToResponseFilter(List<ServiceType> fromServiceList, String fromApplicationName, String fromAgentName, List<ServiceType> toServiceList, String toApplicationName, String toAgentName, Long fromResponseTime, Long toResponseTime, Boolean includeFailed, FilterHint hint, ServiceTypeRegistryService registry) { if (fromServiceList == null) { throw new NullPointerException("fromServiceList must not be null"); @@ -61,6 +64,9 @@ public class FromToResponseFilter implements Filter { if (hint == null) { throw new NullPointerException("hint must not be null"); } + if (registry == null) { + throw new NullPointerException("registry must not be null"); + } this.fromServiceCode = fromServiceList; this.fromApplicationName = fromApplicationName; @@ -74,8 +80,9 @@ public class FromToResponseFilter implements Filter { this.toResponseTime = toResponseTime; this.includeFailed = includeFailed; - this.hint = hint; + + this.registry = registry; } private boolean checkResponseCondition(long elapsed, boolean hasError) { @@ -211,8 +218,12 @@ public class FromToResponseFilter implements Filter { return false; } - private boolean isRpcClient(short serviceType) { - return ServiceTypeCategory.RPC.contains(serviceType); + private boolean isRpcClient(short serviceTypeCode) { + if (ServiceTypeCategory.RPC.contains(serviceTypeCode)) { + ServiceType serviceType = this.registry.findServiceType(serviceTypeCode); + return serviceType.isRecordStatistics(); + } + return false; }

['web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java', 'web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.java', 'web/src/main/java/com/navercorp/pinpoint/web/filter/DefaultFilterBuilder.java']

{'.java': 3}

Java

{'Java': 20427181, 'TypeScript': 1739527, 'CSS': 222853, 'HTML': 216928, 'Thrift': 15920, 'Shell': 6420, 'JavaScript': 6310, 'Groovy': 1431, 'Kotlin': 1329, 'TSQL': 978, 'Batchfile': 200}

Apache License 2.0

pinpoint-apm/pinpoint/490/488

pinpoint-apm

pinpoint

https://github.com/pinpoint-apm/pinpoint/issues/488

https://github.com/pinpoint-apm/pinpoint/pull/490

https://github.com/pinpoint-apm/pinpoint/pull/490

fix

Web throws NPE when filtering calls with RPC internal types

When filtering RPC calls on Pinpoint web, NullPointerException is thrown. This is due to a missing check inside the filtering logic. WAS -> WAS filtering checks each span event for its `ServiceType` and if it is in the RPC range (9000~9999), does an equals check with the span event's `destinationId`. Since RPC internal methods does not have a `destinationId`, while being within the RPC range, NPE is thrown. Fix needs 2 checks - to check if the span event's ServiceType is set to record statistics, and to check for null `destinationId`.

bce3c67128eed0d80a05519269323892fa0b72ed

f5da5ba237aa0fc14852f2dd30e69b04a8bf49f1

https://github.com/pinpoint-apm/pinpoint/compare/bce3c67128eed0d80a05519269323892fa0b72ed...f5da5ba237aa0fc14852f2dd30e69b04a8bf49f1

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java b/web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java index 1da96e2f28..c686337f26 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java @@ -46,6 +46,10 @@ public class FilterHint extends HashMap<String, List<Object>> { if (!containApplicationHint(applicationName)) { return false; } + + if (endPoint == null) { + return false; + } List<Object> list = get(applicationName); diff --git a/web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.java b/web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.java index a8fd905f9b..ff484bbef5 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.java @@ -147,8 +147,10 @@ public class FromToResponseFilter implements Filter { for (SpanEventBo event : eventBoList) { // check only whether a client exists or not. - if (event.getServiceType().isRpcClient() && toApplicationName.equals(event.getDestinationId())) { - return checkResponseCondition(event.getEndElapsed(), event.hasException()); + if (event.getServiceType().isRpcClient() && event.getServiceType().isRecordStatistics()) { + if (toApplicationName.equals(event.getDestinationId())) { + return checkResponseCondition(event.getEndElapsed(), event.hasException()); + } } } } @@ -169,6 +171,10 @@ public class FromToResponseFilter implements Filter { if (!event.getServiceType().isRpcClient()) { continue; } + + if (!event.getServiceType().isRecordStatistics()) { + continue; + } if (!hint.containApplicationEndpoint(toApplicationName, event.getDestinationId(), event.getServiceType().getCode())) { continue;

['web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java', 'web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.java']

{'.java': 2}

Java

{'Java': 20427181, 'TypeScript': 1739527, 'CSS': 222853, 'HTML': 216928, 'Thrift': 15920, 'Shell': 6420, 'JavaScript': 6310, 'Groovy': 1431, 'Kotlin': 1329, 'TSQL': 978, 'Batchfile': 200}

Apache License 2.0

quarkusio/quarkus/33586/33305

quarkusio

quarkus

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

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

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

fix

OutputTargetBuildItem.getOutputDirectory() returning a strange value when running a test in the Platform

### Describe the bug I see `OutputTargetBuildItem.getOutputDirectory()` returning a very strange value ``` /home/ppalaga/orgs/quarkus/quarkus-platform/generated-platform-project/quarkus-cxf/integration-tests/quarkus-cxf-integration-test-server/.. ``` when running a generarated test project on the Platform. I'd expect something like ``` /home/ppalaga/orgs/quarkus/quarkus-platform/generated-platform-project/quarkus-cxf/integration-tests/quarkus-cxf-integration-test-server/target ``` Is this a bug or some peculiarity of the Platform test config @aloubyansky ?

8101c3ec85fed92ecfff556a40c68243e93b0c73

47fa50fa5e6b5203c14af80e1c68a0e3cb1de089

https://github.com/quarkusio/quarkus/compare/8101c3ec85fed92ecfff556a40c68243e93b0c73...47fa50fa5e6b5203c14af80e1c68a0e3cb1de089

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java index 6c068b88029..e7b1c5a1e4c 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java @@ -205,7 +205,7 @@ public CurationResult resolveAppModel() throws BootstrapException { if (serializedModel != null) { final Path p = Paths.get(serializedModel); if (Files.exists(p)) { - try (InputStream existing = Files.newInputStream(Paths.get(serializedModel))) { + try (InputStream existing = Files.newInputStream(p)) { final ApplicationModel appModel = (ApplicationModel) new ObjectInputStream(existing).readObject(); return new CurationResult(appModel); } catch (IOException | ClassNotFoundException e) { diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java b/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java index 079f0d7a32d..05fda9bc7c6 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java @@ -292,14 +292,10 @@ private static Path toPath(URL resource) { * @return project build dir */ public static Path getProjectBuildDir(Path projectRoot, Path testClassLocation) { - Path outputDir; - try { - // this should work for both maven and gradle - outputDir = projectRoot.resolve(projectRoot.relativize(testClassLocation).getName(0)); - } catch (Exception e) { - // this shouldn't happen since testClassLocation is usually found under the project dir - outputDir = projectRoot; + if (!testClassLocation.startsWith(projectRoot)) { + // this typically happens in the platform testsuite where test classes are loaded from jars + return projectRoot.resolve("target"); } - return outputDir; + return projectRoot.resolve(projectRoot.relativize(testClassLocation).getName(0)); } }

['test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java', 'independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.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/33510/33477

quarkusio

quarkus

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

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

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

fix

Dev-UI v2 fails to work with swagger-ui extension after changing its path config

### Describe the bug After changing the path config for swagger-ui and openapi extension in quarkus `application.properties` like this `quarkus.swagger-ui.path=my-custom-path` and this `quarkus.smallrye-openapi.path=/swagger`, Dev-UI v2 fails to load the swagger-ui page. Dev-UI v1 works as expected. The following error log was captured by my error mapping and interceptor when I tried to open the swagger-ui page link. ``` 2023-05-18 22:41:17,043 INFO [ao.pla.com.log.LoggingFilters$ResponseFilter] (vert.x-eventloop-thread-5) [Response] GET /q/swagger-ui (404 Not Found) (00:00:00.005) 2023-05-18 22:41:25,120 ERROR [ao.pla.ResponseErrorMappers$WebApplicationErrorMapper] (vert.x-eventloop-thread-6) web error raised, errorId: c1e06f2c-6ef0-49c3-8403-0de38fd99977: jakarta.ws.rs.NotFoundException: HTTP 404 Not Found at org.jboss.resteasy.reactive.server.handlers.RestInitialHandler.handle(RestInitialHandler.java:71) at io.quarkus.resteasy.reactive.server.runtime.QuarkusResteasyReactiveRequestContext.invokeHandler(QuarkusResteasyReactiveRequestContext.java:121) at org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext.run(AbstractResteasyReactiveContext.java:145) at org.jboss.resteasy.reactive.server.handlers.RestInitialHandler.beginProcessing(RestInitialHandler.java:48) at org.jboss.resteasy.reactive.server.vertx.ResteasyReactiveVertxHandler.handle(ResteasyReactiveVertxHandler.java:23) at org.jboss.resteasy.reactive.server.vertx.ResteasyReactiveVertxHandler.handle(ResteasyReactiveVertxHandler.java:10) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1284) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:177) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:141) at io.quarkus.vertx.http.runtime.StaticResourcesRecorder$2.handle(StaticResourcesRecorder.java:102) at io.quarkus.vertx.http.runtime.StaticResourcesRecorder$2.handle(StaticResourcesRecorder.java:88) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1284) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:140) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:141) at io.vertx.ext.web.handler.impl.StaticHandlerImpl.lambda$sendStatic$1(StaticHandlerImpl.java:290) at io.vertx.core.impl.future.FutureImpl$3.onSuccess(FutureImpl.java:141) at io.vertx.core.impl.future.FutureBase.lambda$emitSuccess$0(FutureBase.java:54) at io.netty.util.concurrent.AbstractEventExecutor.runTask(AbstractEventExecutor.java:174) at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java:167) at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:470) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:569) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:997) at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.base/java.lang.Thread.run(Thread.java:1589) 2023-05-18 22:41:25,123 INFO [ao.pla.com.log.LoggingFilters$ResponseFilter] (vert.x-eventloop-thread-6) [Response] GET /q/openapi (404 Not Found) (00:00:00.002) ``` And also, this is a screenshot when I was trying to open the swagger-ui page.  ### Expected behavior Dev-UI v2 should be ok to open swagger-ui page as expected, just like Dev-UI v1 does. ### Actual behavior It just shows a blank page and reports a 404 NotFound error. ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

7bcfd6874a91ebb471b1e5a2442c7ef569c2e8b3

4027e96759d046dfbc69b1039a2267527fcbebc8

https://github.com/quarkusio/quarkus/compare/7bcfd6874a91ebb471b1e5a2442c7ef569c2e8b3...4027e96759d046dfbc69b1039a2267527fcbebc8

diff --git a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/devui/OpenApiDevUIProcessor.java b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/devui/OpenApiDevUIProcessor.java index e98b6a9f9f2..3e5cc8b6080 100644 --- a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/devui/OpenApiDevUIProcessor.java +++ b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/devui/OpenApiDevUIProcessor.java @@ -4,24 +4,28 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.devui.spi.page.CardPageBuildItem; import io.quarkus.devui.spi.page.Page; +import io.quarkus.smallrye.openapi.common.deployment.SmallRyeOpenApiConfig; +import io.quarkus.swaggerui.deployment.SwaggerUiConfig; import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; public class OpenApiDevUIProcessor { @BuildStep(onlyIf = IsDevelopment.class) - public CardPageBuildItem pages(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem) { + public CardPageBuildItem pages(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem, + SwaggerUiConfig swaggerUiConfig, SmallRyeOpenApiConfig openApiConfig) { - String uiPath = nonApplicationRootPathBuildItem.resolvePath("swagger-ui"); + String uiPath = nonApplicationRootPathBuildItem.resolvePath(swaggerUiConfig.path); + String schemaPath = nonApplicationRootPathBuildItem.resolvePath(openApiConfig.path); CardPageBuildItem cardPageBuildItem = new CardPageBuildItem(); cardPageBuildItem.addPage(Page.externalPageBuilder("Schema yaml") - .url(nonApplicationRootPathBuildItem.resolvePath("openapi")) + .url(nonApplicationRootPathBuildItem.resolvePath(schemaPath)) .isYamlContent() .icon("font-awesome-solid:file-lines")); cardPageBuildItem.addPage(Page.externalPageBuilder("Schema json") - .url(nonApplicationRootPathBuildItem.resolvePath("openapi") + "?format=json") + .url(nonApplicationRootPathBuildItem.resolvePath(schemaPath) + "?format=json") .isJsonContent() .icon("font-awesome-solid:file-code")); diff --git a/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiConfig.java b/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiConfig.java index b8d2180832a..deb0ad261ee 100644 --- a/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiConfig.java +++ b/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiConfig.java @@ -21,7 +21,7 @@ public class SwaggerUiConfig { * By default, this value will be resolved as a path relative to `${quarkus.http.non-application-root-path}`. */ @ConfigItem(defaultValue = "swagger-ui") - String path; + public String path; /** * If this should be included every time. By default, this is only included when the application is running

['extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiConfig.java', 'extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/devui/OpenApiDevUIProcessor.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/33476/33475

quarkusio

quarkus

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

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

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

fixes

Warning message if quarkus.oidc.application-type=service

### Describe the bug I got the warning message: > Secret key for encrypting tokens is missing, auto-generating it despite `quarkus.oidc.application-type=service` and I am not using cookies. https://github.com/quarkusio/quarkus/blob/0e63bfcfc468a48081c0ed54771d37ea75bcec3b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigContext.java#L77-L78 ### Quarkus version 3.0.2.Final ### Workaround Set `quarkus.oidc.token-state-manager.encryption-required=false`

6a8dadc48bf6ea586d17ca1b9f9ee898ab5213c5

77d1bb97de286cd5a2d2e04adc0d3ecb6ef482c4

https://github.com/quarkusio/quarkus/compare/6a8dadc48bf6ea586d17ca1b9f9ee898ab5213c5...77d1bb97de286cd5a2d2e04adc0d3ecb6ef482c4

diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java index 42ffc9ea3a1..936cae8f81c 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java @@ -187,7 +187,7 @@ private Uni<TenantConfigContext> createTenantContext(Vertx vertx, OidcTenantConf throw new ConfigurationException("'quarkus.oidc.auth-server-url' property must be configured"); } OidcCommonUtils.verifyEndpointUrl(oidcConfig.getAuthServerUrl().get()); - OidcCommonUtils.verifyCommonConfiguration(oidcConfig, isServiceApp(oidcConfig), true); + OidcCommonUtils.verifyCommonConfiguration(oidcConfig, OidcUtils.isServiceApp(oidcConfig), true); } catch (ConfigurationException t) { return Uni.createFrom().failure(t); } @@ -196,7 +196,7 @@ private Uni<TenantConfigContext> createTenantContext(Vertx vertx, OidcTenantConf throw new ConfigurationException( "UserInfo is not required but UserInfo is expected to be the source of authorization roles"); } - if (oidcConfig.token.verifyAccessTokenWithUserInfo.orElse(false) && !isWebApp(oidcConfig) + if (oidcConfig.token.verifyAccessTokenWithUserInfo.orElse(false) && !OidcUtils.isWebApp(oidcConfig) && !enableUserInfo(oidcConfig)) { throw new ConfigurationException( "UserInfo is not required but 'verifyAccessTokenWithUserInfo' is enabled"); @@ -207,7 +207,7 @@ private Uni<TenantConfigContext> createTenantContext(Vertx vertx, OidcTenantConf } if (!oidcConfig.discoveryEnabled.orElse(true)) { - if (!isServiceApp(oidcConfig)) { + if (!OidcUtils.isServiceApp(oidcConfig)) { if (!oidcConfig.authorizationPath.isPresent() || !oidcConfig.tokenPath.isPresent()) { throw new ConfigurationException( "'web-app' applications must have 'authorization-path' and 'token-path' properties " @@ -228,7 +228,7 @@ private Uni<TenantConfigContext> createTenantContext(Vertx vertx, OidcTenantConf } } - if (isServiceApp(oidcConfig)) { + if (OidcUtils.isServiceApp(oidcConfig)) { if (oidcConfig.token.refreshExpired) { throw new ConfigurationException( "The 'token.refresh-expired' property can only be enabled for " + ApplicationType.WEB_APP @@ -294,7 +294,7 @@ private static boolean enableUserInfo(OidcTenantConfig oidcConfig) { } private static TenantConfigContext createTenantContextFromPublicKey(OidcTenantConfig oidcConfig) { - if (!isServiceApp(oidcConfig)) { + if (!OidcUtils.isServiceApp(oidcConfig)) { throw new ConfigurationException("'public-key' property can only be used with the 'service' applications"); } LOG.debug("'public-key' property for the local token verification is set," @@ -443,6 +443,7 @@ public Uni<OidcProviderClient> apply(OidcConfigurationMetadata metadata, Throwab } return Uni.createFrom().item(new OidcProviderClient(client, metadata, oidcConfig)); } + }); } @@ -459,12 +460,4 @@ private static OidcConfigurationMetadata createLocalMetadata(OidcTenantConfig oi introspectionUri, authorizationUri, jwksUri, userInfoUri, endSessionUri, oidcConfig.token.issuer.orElse(null)); } - - private static boolean isServiceApp(OidcTenantConfig oidcConfig) { - return ApplicationType.SERVICE.equals(oidcConfig.applicationType.orElse(ApplicationType.SERVICE)); - } - - private static boolean isWebApp(OidcTenantConfig oidcConfig) { - return ApplicationType.WEB_APP.equals(oidcConfig.applicationType.orElse(ApplicationType.SERVICE)); - } } diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java index 8aa82db7da3..d8c99953005 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java @@ -29,6 +29,7 @@ import io.quarkus.oidc.AuthorizationCodeTokens; import io.quarkus.oidc.OIDCException; import io.quarkus.oidc.OidcTenantConfig; +import io.quarkus.oidc.OidcTenantConfig.ApplicationType; import io.quarkus.oidc.OidcTenantConfig.Authentication; import io.quarkus.oidc.RefreshToken; import io.quarkus.oidc.TokenIntrospection; @@ -78,6 +79,14 @@ private OidcUtils() { } + public static boolean isServiceApp(OidcTenantConfig oidcConfig) { + return ApplicationType.SERVICE.equals(oidcConfig.applicationType.orElse(ApplicationType.SERVICE)); + } + + public static boolean isWebApp(OidcTenantConfig oidcConfig) { + return ApplicationType.WEB_APP.equals(oidcConfig.applicationType.orElse(ApplicationType.SERVICE)); + } + public static boolean isEncryptedToken(String token) { return new StringTokenizer(token, ".").countTokens() == 5; } diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigContext.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigContext.java index 9ff389f5acd..d748c56035f 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigContext.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigContext.java @@ -47,8 +47,9 @@ public TenantConfigContext(OidcProvider client, OidcTenantConfig config, boolean this.oidcConfig = config; this.ready = ready; - pkceSecretKey = provider != null && provider.client != null ? createPkceSecretKey(config) : null; - tokenEncSecretKey = provider != null && provider.client != null ? createTokenEncSecretKey(config) : null; + boolean isService = OidcUtils.isServiceApp(config); + pkceSecretKey = !isService && provider != null && provider.client != null ? createPkceSecretKey(config) : null; + tokenEncSecretKey = !isService && provider != null && provider.client != null ? createTokenEncSecretKey(config) : null; } private static SecretKey createPkceSecretKey(OidcTenantConfig config) {

['extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigContext.java', 'extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java', 'extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.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/33466/33441

quarkusio

quarkus

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

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

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

fix

Two classes have the same XML type name "xmlObject".

After upgrading from 2.16.2 to 3.0.1 I'm getting the exception below when running tests with quarkus dev. Every first tests round are complete without trouble. But when the tests are run again, they keep failing until I stop dev mode and start it again. The exception occurs while testing a process that uses a RestClient which consumes XML. I'm using Wiremock to create the endpoint. <pre> at io.restassured.internal.ValidatableResponseOptionsImpl.statusCode(ValidatableResponseOptionsImpl.java:89) at org.acme.ExampleResourceTest.testHelloEndpoint(ExampleResourceTest.java:19) Suppressed: java.lang.RuntimeException: org.glassfish.jaxb.runtime.v2.runtime.IllegalAnnotationsException: 1 counts of IllegalAnnotationExceptions Two classes have the same XML type name "xmlObject". Use @XmlType.name and @XmlType.namespace to assign different names to them. this problem is related to the following location: at org.acme.XmlObject this problem is related to the following location: at org.acme.XmlObject at io.quarkus.jaxb.runtime.JaxbContextProducer.createJAXBContext(JaxbContextProducer.java:80) at io.quarkus.jaxb.runtime.JaxbContextProducer.jaxbContext(JaxbContextProducer.java:29) at io.quarkus.jaxb.runtime.JaxbContextProducer_ProducerMethod_jaxbContext_6a6d20272304edd64c7bdfa35e3ed5d5971a3949_Bean.doCreate(Unknown Source) at io.quarkus.jaxb.runtime.JaxbContextProducer_ProducerMethod_jaxbContext_6a6d20272304edd64c7bdfa35e3ed5d5971a3949_Bean.create(Unknown Source) at io.quarkus.jaxb.runtime.JaxbContextProducer_ProducerMethod_jaxbContext_6a6d20272304edd64c7bdfa35e3ed5d5971a3949_Bean.create(Unknown Source) at io.quarkus.arc.impl.AbstractSharedContext.createInstanceHandle(AbstractSharedContext.java:113) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:37) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:34) at io.quarkus.arc.impl.LazyValue.get(LazyValue.java:26) at io.quarkus.arc.impl.ComputingCache.computeIfAbsent(ComputingCache.java:69) at io.quarkus.arc.impl.AbstractSharedContext.get(AbstractSharedContext.java:34) at io.quarkus.jaxb.runtime.JaxbContextProducer_ProducerMethod_jaxbContext_6a6d20272304edd64c7bdfa35e3ed5d5971a3949_Bean.get(Unknown Source) at io.quarkus.jaxb.runtime.JaxbContextProducer_ProducerMethod_jaxbContext_6a6d20272304edd64c7bdfa35e3ed5d5971a3949_Bean.get(Unknown Source) at io.quarkus.jaxb.runtime.JaxbContextProducer_ProducerMethod_marshaller_9a19ba6b6391808bfb74663c9d044d412a8d27d6_Bean.doCreate(Unknown Source) at io.quarkus.jaxb.runtime.JaxbContextProducer_ProducerMethod_marshaller_9a19ba6b6391808bfb74663c9d044d412a8d27d6_Bean.create(Unknown Source) at io.quarkus.jaxb.runtime.JaxbContextProducer_ProducerMethod_marshaller_9a19ba6b6391808bfb74663c9d044d412a8d27d6_Bean.create(Unknown Source) at io.quarkus.arc.impl.RequestContext.getIfActive(RequestContext.java:74) at io.quarkus.arc.impl.ClientProxies.getDelegate(ClientProxies.java:30) at jakarta.xml.bind.JaxbContextProducer_ProducerMethod_marshaller_9a19ba6b6391808bfb74663c9d044d412a8d27d6_ClientProxy.arc$delegate(Unknown Source) at jakarta.xml.bind.JaxbContextProducer_ProducerMethod_marshaller_9a19ba6b6391808bfb74663c9d044d412a8d27d6_ClientProxy.marshal(Unknown Source) at io.quarkus.rest.client.reactive.jaxb.runtime.ClientMessageBodyWriter.marshal(ClientMessageBodyWriter.java:56) at io.quarkus.rest.client.reactive.jaxb.runtime.ClientMessageBodyWriter_Subclass.marshal$$superforward(Unknown Source) at io.quarkus.rest.client.reactive.jaxb.runtime.ClientMessageBodyWriter_Subclass$$function$$3.apply(Unknown Source) at io.quarkus.arc.impl.AroundInvokeInvocationContext.proceed(AroundInvokeInvocationContext.java:74) at io.quarkus.arc.impl.AroundInvokeInvocationContext.proceed(AroundInvokeInvocationContext.java:63) at io.quarkus.arc.impl.ActivateRequestContextInterceptor.invoke(ActivateRequestContextInterceptor.java:124) at io.quarkus.arc.impl.ActivateRequestContextInterceptor.aroundInvoke(ActivateRequestContextInterceptor.java:33) at io.quarkus.arc.impl.ActivateRequestContextInterceptor_Bean.intercept(Unknown Source) at io.quarkus.arc.impl.InterceptorInvocation.invoke(InterceptorInvocation.java:42) at io.quarkus.arc.impl.AroundInvokeInvocationContext.perform(AroundInvokeInvocationContext.java:38) at io.quarkus.arc.impl.InvocationContexts.performAroundInvoke(InvocationContexts.java:26) at io.quarkus.rest.client.reactive.jaxb.runtime.ClientMessageBodyWriter_Subclass.marshal(Unknown Source) at io.quarkus.rest.client.reactive.jaxb.runtime.ClientMessageBodyWriter.writeTo(ClientMessageBodyWriter.java:37) at io.quarkus.rest.client.reactive.jaxb.runtime.ClientMessageBodyWriter_Subclass.writeTo$$superforward(Unknown Source) at io.quarkus.rest.client.reactive.jaxb.runtime.ClientMessageBodyWriter_Subclass$$function$$4.apply(Unknown Source) at io.quarkus.arc.impl.AroundInvokeInvocationContext.proceed(AroundInvokeInvocationContext.java:74) at io.quarkus.arc.impl.AroundInvokeInvocationContext.proceed(AroundInvokeInvocationContext.java:63) at io.quarkus.arc.impl.ActivateRequestContextInterceptor.invoke(ActivateRequestContextInterceptor.java:124) at io.quarkus.arc.impl.ActivateRequestContextInterceptor.aroundInvoke(ActivateRequestContextInterceptor.java:33) at io.quarkus.arc.impl.ActivateRequestContextInterceptor_Bean.intercept(Unknown Source) at io.quarkus.arc.impl.InterceptorInvocation.invoke(InterceptorInvocation.java:42) at io.quarkus.arc.impl.AroundInvokeInvocationContext.perform(AroundInvokeInvocationContext.java:38) at io.quarkus.arc.impl.InvocationContexts.performAroundInvoke(InvocationContexts.java:26) at io.quarkus.rest.client.reactive.jaxb.runtime.ClientMessageBodyWriter_Subclass.writeTo(Unknown Source) at org.jboss.resteasy.reactive.client.impl.ClientSerialisers.invokeClientWriter(ClientSerialisers.java:126) at org.jboss.resteasy.reactive.client.impl.RestClientRequestContext.writeEntity(RestClientRequestContext.java:265) at org.jboss.resteasy.reactive.client.handlers.ClientSendRequestHandler.setRequestHeadersAndPrepareBody(ClientSendRequestHandler.java:525) at org.jboss.resteasy.reactive.client.handlers.ClientSendRequestHandler$2.accept(ClientSendRequestHandler.java:196) at org.jboss.resteasy.reactive.client.handlers.ClientSendRequestHandler$2.accept(ClientSendRequestHandler.java:117) at io.smallrye.context.impl.wrappers.SlowContextualConsumer.accept(SlowContextualConsumer.java:21) at io.smallrye.mutiny.helpers.UniCallbackSubscriber.onItem(UniCallbackSubscriber.java:73) at io.smallrye.mutiny.operators.uni.UniOperatorProcessor.onItem(UniOperatorProcessor.java:47) at io.smallrye.mutiny.operators.uni.UniOnItemTransformToUni$UniOnItemTransformToUniProcessor.onItem(UniOnItemTransformToUni.java:60) at org.jboss.resteasy.reactive.client.AsyncResultUni.lambda$subscribe$1(AsyncResultUni.java:35) at io.vertx.core.impl.future.FutureImpl$3.onSuccess(FutureImpl.java:141) at io.vertx.core.impl.future.FutureBase.emitSuccess(FutureBase.java:60) at io.vertx.core.impl.future.FutureImpl.tryComplete(FutureImpl.java:211) at io.vertx.core.impl.future.PromiseImpl.tryComplete(PromiseImpl.java:23) at io.vertx.core.http.impl.HttpClientImpl.lambda$null$5(HttpClientImpl.java:683) at io.vertx.core.impl.future.FutureImpl$3.onSuccess(FutureImpl.java:141) at io.vertx.core.impl.future.FutureBase.lambda$emitSuccess$0(FutureBase.java:54) at io.vertx.core.impl.EventLoopContext.execute(EventLoopContext.java:86) at io.vertx.core.impl.DuplicatedContext.execute(DuplicatedContext.java:163) at io.vertx.core.impl.future.FutureBase.emitSuccess(FutureBase.java:51) at io.vertx.core.impl.future.FutureImpl.addListener(FutureImpl.java:196) at io.vertx.core.impl.future.PromiseImpl.addListener(PromiseImpl.java:23) at io.vertx.core.impl.future.FutureImpl.onComplete(FutureImpl.java:164) at io.vertx.core.impl.future.PromiseImpl.onComplete(PromiseImpl.java:23) at io.vertx.core.http.impl.Http1xClientConnection.createStream(Http1xClientConnection.java:1270) at io.vertx.core.http.impl.HttpClientImpl.lambda$doRequest$6(HttpClientImpl.java:666) at io.verpl.pool.Endpoint.lambda$getConnection$0(Endpoint.java:52) at io.vertx.core.http.impl.SharedClientHttpStreamEndpoint$Request.handle(SharedClientHttpStreamEndpoint.java:162) at io.vertx.core.http.impl.SharedClientHttpStreamEndpoint$Request.handle(SharedClientHttpStreamEndpoint.java:123) at io.vertx.core.impl.EventLoopContext.emit(EventLoopContext.java:55) at io.vertx.core.impl.ContextBase.emit(ContextBase.java:239) at io.vertx.core.net.impl.pool.SimpleConnectionPool$LeaseImpl.emit(SimpleConnectionPool.java:704) at io.vertx.core.net.impl.pool.SimpleConnectionPool$ConnectSuccess$2.run(SimpleConnectionPool.java:338) at io.vertx.core.net.impl.pool.CombinerExecutor.submit(CombinerExecutor.java:56) at io.vertx.core.net.impl.pool.SimpleConnectionPool.execute(SimpleConnectionPool.java:245) at io.vertx.core.net.impl.pool.SimpleConnectionPool.lambda$connect$2(SimpleConnectionPool.java:257) at io.vertx.core.http.impl.SharedClientHttpStreamEndpoint.lambda$connect$2(SharedClientHttpStreamEndpoint.java:102) at io.vertx.core.impl.future.FutureImpl$3.onSuccess(FutureImpl.java:141) at io.vertx.core.impl.future.FutureBase.emitSuccess(FutureBase.java:60) at io.vertx.core.impl.future.FutureImpl.tryComplete(FutureImpl.java:211) at io.vertx.core.impl.future.Composition$1.onSuccess(Composition.java:62) at io.vertx.core.impl.future.FutureBase.emitSuccess(FutureBase.java:60) at io.vertx.core.impl.future.FutureImpl.addListener(FutureImpl.java:196) at io.vertx.core.impl.future.PromiseImpl.addListener(PromiseImpl.java:23) at io.vertx.core.impl.future.Composition.onSuccess(Composition.java:43) at io.vertx.core.impl.future.FutureBase.emitSuccess(FutureBase.java:60) at io.vertx.core.impl.future.FutureImpl.tryComplete(FutureImpl.java:211) at io.vertx.core.impl.future.PromiseImpl.tryComplete(PromiseImpl.java:23) at io.vertx.core.Promise.complete(Promise.java:66) at io.vertx.core.net.impl.NetClientImpl.lambda$connected$9(NetClientImpl.java:330) at io.vertx.core.net.impl.VertxHandler.setConnection(VertxHandler.java:82) at io.vertx.core.net.impl.VertxHandler.handlerAdded(VertxHandler.java:88) at io.netty.channel.AbstractChannelHandlerContext.callHandlerAdded(AbstractChannelHandlerContext.java:1114) at io.netty.channel.DefaultChannelPipeline.callHandlerAdded0(DefaultChannelPipeline.java:609) at io.netty.channel.DefaultChannelPipeline.addLast(DefaultChannelPipeline.java:223) at io.netty.channel.DefaultChannelPipeline.addLast(DefaultChannelPipeline.java:195) at io.vertx.core.net.impl.NetClientImpl.connected(NetClientImpl.java:332) at io.vertx.core.net.impl.NetClientImpl.lambda$connectInternal2$3(NetClientImpl.java:294) at io.vertx.core.impl.ContextInternal.dispatch(ContextInternal.java:264) at io.vertx.core.net.impl.ChannelProvider.connected(ChannelProvider.java:172) at io.vertx.core.net.impl.ChannelProvider.lambda$handleConnect$0(ChannelProvider.java:155) at io.netty.util.concurrent.DefaultPromise.notifyListener0(DefaultPromise.java:590) at io.netty.util.concurrent.DefaultPromise.notifyListeners0(DefaultPromise.java:583) at io.netty.util.concurrent.DefaultPromise.notifyListenersNow(DefaultPromise.java:559) at io.netty.util.concurrent.DefaultPromise.notifyListeners(DefaultPromise.java:492) at io.netty.util.concurrent.DefaultPromise.setValue0(DefaultPromise.java:636) at io.netty.util.concurrent.DefaultPromise.setSuccess0(DefaultPromise.java:625) at io.netty.util.concurrent.DefaultPromise.trySuccess(DefaultPromise.java:105) at io.netty.channel.DefaultChannelPromise.trySuccess(DefaultChannelPromise.java:84) at io.netty.channel.nio.AbstractNioChannel$AbstractNioUnsafe.fulfillConnectPromise(AbstractNioChannel.java:300) at io.netty.channel.nio.AbstractNioChannel$AbstractNioUnsafe.finishConnect(AbstractNioChannel.java:335) at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:776) at io.netty.channel.nio.NioEventLoop.processSelectedKeysOptimized(NioEventLoop.java:724) at io.netty.channel.nio.NioEventLoop.processSelectedKeys(NioEventLoop.java:650) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:562) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:997) at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.base/java.lang.Thread.run(Thread.java:833) Caused by: org.glassfish.jaxb.runtime.v2.runtime.IllegalAnnotationsException: 1 counts of IllegalAnnotationExceptions Two classes have the same XML type name "xmlObject". Use @XmlType.name and @XmlType.namespace to assign different names to them. this problem is related to the following location: at org.acme.XmlObject this problem is related to the following location: at org.acme.XmlObject at org.glassfish.jaxb.runtime.v2.runtime.IllegalAnnotationsException$Builder.check(IllegalAnnotationsException.java:83) at org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl.getTypeInfoSet(JAXBContextImpl.java:421) at org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl.<init>(JAXBContextImpl.java:255) at org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl$JAXBContextBuilder.build(JAXBContextImpl.java:1115) at org.glassfish.jaxb.runtime.v2.ContextFactory.createContext(ContextFactory.java:144) at org.glassfish.jaxb.runtime.v2.JAXBContextFactory.createContext(JAXBContextFactory.java:44) at jakarta.xml.bind.ContextFinder.find(ContextFinder.java:368) at jakarta.xml.bind.JAXBContext.newInstance(JAXBContext.java:605) at io.quarkus.jaxb.runtime.JaxbContextProducer.createJAXBContext(JaxbContextProducer.java:78) ... 122 more </pre> ### Expected behavior The test should continue to pass ### Actual behavior After the first execution, the test fails. ### How to Reproduce? 1. Create a XML consumer RestClient 2. Mock the responding endpoint with Wiremock 3. Create a Test that uses this RestClient 4. Execute quarkus dev and start the tests 5. Run the test again to see the exception ### Output of `uname -a` or `ver` Linux 5.15.90.1-microsoft-standard-WSL2 #1 SMP Fri Jan 27 02:56:13 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "17.0.7" 2023-04-18 OpenJDK Runtime Environment (build 17.0.7+7-Ubuntu-0ubuntu122.04.2) OpenJDK 64-Bit Server VM (build 17.0.7+7-Ubuntu-0ubuntu122.04.2, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.0.1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.6.3 Maven home: /usr/share/maven Java version: 17.0.7, vendor: Private Build, runtime: /usr/lib/jvm/java-17-openjdk-amd64 Default locale: en, platform encoding: UTF-8 OS name: "linux", version: "5.15.90.1-microsoft-standard-wsl2", arch: "amd64", family: "unix" ### Additional information _No response_

58374616d0034003359f9e87616a03397144e74e

4a5006e3240c65688c19e48bb22a04c65272bdfa

https://github.com/quarkusio/quarkus/compare/58374616d0034003359f9e87616a03397144e74e...4a5006e3240c65688c19e48bb22a04c65272bdfa

diff --git a/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java b/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java index 22ce22a0d46..17768f6d8e6 100644 --- a/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java +++ b/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java @@ -322,6 +322,7 @@ void bindClassesToJaxbContext( SynthesisFinishedBuildItem beanContainerState, JaxbContextConfigRecorder jaxbContextConfig /* Force the build time container to invoke this method */) { + jaxbContextConfig.reset(); final BeanResolver beanResolver = beanContainerState.getBeanResolver(); final Set<BeanInfo> beans = beanResolver .resolveBeans(Type.create(DotName.createSimple(JAXBContext.class), org.jboss.jandex.Type.Kind.CLASS)); diff --git a/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextConfigRecorder.java b/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextConfigRecorder.java index 30ef87780cd..f0a6e4587a5 100644 --- a/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextConfigRecorder.java +++ b/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextConfigRecorder.java @@ -15,6 +15,10 @@ public void addClassesToBeBound(Collection<Class<?>> classes) { this.classesToBeBound.addAll(classes); } + public void reset() { + classesToBeBound.clear(); + } + public static Set<Class<?>> getClassesToBeBound() { return Collections.unmodifiableSet(classesToBeBound); } diff --git a/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextProducer.java b/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextProducer.java index 8bfb0c6f1af..3b2dbc7cf4c 100644 --- a/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextProducer.java +++ b/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextProducer.java @@ -4,8 +4,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.RequestScoped; @@ -71,7 +73,7 @@ public JAXBContext createJAXBContext(Instance<JaxbContextCustomizer> customizers customizer.customizeContextProperties(properties); } - List<Class> classes = new ArrayList<>(); + Set<Class> classes = new HashSet<>(); classes.addAll(Arrays.asList(extraClasses)); classes.addAll(JaxbContextConfigRecorder.getClassesToBeBound());

['extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java', 'extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextConfigRecorder.java', 'extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextProducer.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/33451/33450

quarkusio

quarkus

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

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

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

fix

Native build fails if quarkus.package.output-directory is set

### Describe the bug Im my project, we generate several native executables using several executions with several quarkus.package.output-directory. Since Quarkus 3, each native generation fails if quarkus.package.output-directory is set. ### Expected behavior We expect to have as many binares as executions nodes in quarkus-maven-plugin. ### Actual behavior The native executable generation fails with : ```[ERROR] Failed to execute goal io.quarkus.platform:quarkus-maven-plugin:3.0.3.Final:build (oracle) on project getting-started: Failed to build quarkus application: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [ERROR] [error]: Build step io.quarkus.deployment.pkg.steps.JarResultBuildStep#buildNativeImageJar threw an exception: java.io.UncheckedIOException: Unable to copy json config file from /resources-config.json to /home/osboxes/Documents/Formations/quarkus/getting-started/target/oracle-quarkus-app/getting-started-1.0.0-SNAPSHOT-native-image-source-jar ``` In our real project we also have reflection-config.json and other properties with just this file it fails ### How to Reproduce? Here is a little project done with getting-started quarkus project to rerpduce. [getting-started.zip](https://github.com/quarkusio/quarkus/files/11500033/getting-started.zip) ### Output of `uname -a` or `ver` Linux localhost.localdomain 6.2.14-300.fc38.x86_64 #1 SMP PREEMPT_DYNAMIC Mon May 1 00:55:28 UTC 2023 x86_64 GNU/Linux ### Output of `java -version` Java HotSpot(TM) 64-Bit Server VM (build 17.0.1+12-LTS-39, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.0.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.2 (ea98e05a04480131370aa0c110b8c54cf726c06f) ### Additional information _No response_

5a2347f0671acdc3e33fd0988588ffa7c27f9840

fe93f9f486b9f3b7be7167caa0f5711f39efbcbb

https://github.com/quarkusio/quarkus/compare/5a2347f0671acdc3e33fd0988588ffa7c27f9840...fe93f9f486b9f3b7be7167caa0f5711f39efbcbb

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java index 9fac9e84a25..3936e20529b 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java @@ -1030,6 +1030,7 @@ private void copyJsonConfigFiles(ApplicationArchivesBuildItem applicationArchive @Override public void accept(Path jsonPath) { try { + Files.createDirectories(thinJarDirectory); Files.copy(jsonPath, thinJarDirectory.resolve(jsonPath.getFileName().toString())); } catch (IOException e) { throw new UncheckedIOException(

['core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.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/33448/33419

quarkusio

quarkus

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

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

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

fix

RESTEasy ResponseBuilder.location Inadvertently Decodes Path Segments in Relative URI

### Describe the bug The `ResponseBuilder.location(URI)` method accepts relative URIs and will build an absolute URI relative to the base URI to put in the `Location` header. When the relative URI contains URL-encoded path segments, `ResponseBuilder.location` erroneously decodes those segments when building the new absolute URI. For example, the given JAX-RS resource method should build an HTTP response with a `Location` header that has the URI path `/items/foo%2Fbar`, but it instead returns `/items/foo/bar`. ```java public Response create() { var uri = UriBuilder.newInstance().path("{id}").build("foo/bar"); return ResponseBuilder.status(202).location(uri).build(); } ``` ### Expected behavior `ResponseBuilder.location` creates an absolute URI without changing the semantics of the URI path. ### Actual behavior `ResponseBuilder.location` creates an absolute URI with a URI path that has different semantics. ### How to Reproduce? [quarkus-resteasy-reactive-uri-decode-issue.tar.gz](https://github.com/quarkusio/quarkus/files/11490428/quarkus-resteasy-reactive-uri-decode-issue.tar.gz) The attached reproducer includes a test that demonstrates the issue through a failure. The test fails with a message like ``` 2023-05-16 13:29:47,195 INFO [io.quarkus] (main) quarkus-resteasy-reactive-uri-decode-issue 1.0.0-SNAPSHOT on JVM (powered by Quarkus 3.0.3.Final) started in 0.940s. Listening on: http://localhost:63035 2023-05-16 13:29:47,214 INFO [io.quarkus] (main) Profile test activated. 2023-05-16 13:29:47,215 INFO [io.quarkus] (main) Installed features: [cdi, resteasy-reactive, smallrye-context-propagation, vertx] HTTP/1.1 201 Created Location: http://localhost:63035/greeting/en/us content-length: 0 java.lang.AssertionError: 1 expectation failed. Expected header "Location" was not a string matching the pattern 'http://localhost:\\d+/greeting/en-us', was "http://localhost:63035/greeting/en/us". Headers are: Location=http://localhost:63035/greeting/en/us content-length=0 ``` because the URI path should have been `/greeting/en%2Fus` ### Output of `uname -a` or `ver` Darwin pixee-mbp-gilday.localdomain 22.4.0 Darwin Kernel Version 22.4.0: Mon Mar 6 20:59:28 PST 2023; root:xnu-8796.101.5~3/RELEASE_ARM64_T6000 arm64 ### Output of `java -version` openjdk version "17.0.7" 2023-04-18 OpenJDK Runtime Environment Temurin-17.0.7+7 (build 17.0.7+7) OpenJDK 64-Bit Server VM Temurin-17.0.7+7 (build 17.0.7+7, mixed mode) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.0.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.8 (4c87b05d9aedce574290d1acc98575ed5eb6cd39) Maven home: /Users/jgilday/.m2/wrapper/dists/apache-maven-3.8.8-bin/67c30f74/apache-maven-3.8.8 Java version: 17.0.7, vendor: Eclipse Adoptium, runtime: /Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home Default locale: en_US, platform encoding: UTF-8 OS name: "mac os x", version: "13.3.1", arch: "aarch64", family: "mac" ### Additional information _No response_

aad9ce5afbba406a56528ca962b2f352344a2c3c

ced8b0a739651f312744e721ca9f11c49f1834f0

https://github.com/quarkusio/quarkus/compare/aad9ce5afbba406a56528ca962b2f352344a2c3c...ced8b0a739651f312744e721ca9f11c49f1834f0

diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java index c4c2847152c..208c1093d4f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java @@ -40,10 +40,12 @@ public Response.ResponseBuilder location(URI location) { prefix = deployment.getPrefix(); } // Spec says relative to request, but TCK tests relative to Base URI, so we do that - location = new URI(req.getRequestScheme(), null, host, port, - prefix + - (location.getPath().startsWith("/") ? location.getPath() : "/" + location.getPath()), - location.getQuery(), null); + String path = location.toString(); + if (!path.startsWith("/")) { + path = "/" + path; + } + URI baseUri = new URI(req.getRequestScheme(), null, host, port, null, null, null); + location = baseUri.resolve(prefix + path); } catch (URISyntaxException e) { throw new RuntimeException(e); } @@ -72,9 +74,12 @@ public Response.ResponseBuilder contentLocation(URI location) { port = Integer.parseInt(host.substring(index + 1)); host = host.substring(0, index); } - location = new URI(req.getRequestScheme(), null, host, port, - location.getPath().startsWith("/") ? location.getPath() : "/" + location.getPath(), - location.getQuery(), null); + String path = location.toString(); + if (!path.startsWith("/")) { + path = "/" + path; + } + location = new URI(req.getRequestScheme(), null, host, port, null, null, null) + .resolve(path); } catch (URISyntaxException e) { throw new RuntimeException(e); } diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java index 21d74d4b9f8..a62003cbef6 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java @@ -40,10 +40,12 @@ public RestResponse.ResponseBuilder<T> location(URI location) { prefix = deployment.getPrefix(); } // Spec says relative to request, but TCK tests relative to Base URI, so we do that - location = new URI(req.getRequestScheme(), null, host, port, - prefix + - (location.getPath().startsWith("/") ? location.getPath() : "/" + location.getPath()), - location.getQuery(), null); + String path = location.toString(); + if (!path.startsWith("/")) { + path = "/" + path; + } + URI baseUri = new URI(req.getRequestScheme(), null, host, port, null, null, null); + location = baseUri.resolve(prefix + path); } catch (URISyntaxException e) { throw new RuntimeException(e); } @@ -72,9 +74,12 @@ public RestResponse.ResponseBuilder<T> contentLocation(URI location) { port = Integer.parseInt(host.substring(index + 1)); host = host.substring(0, index); } - location = new URI(req.getRequestScheme(), null, host, port, - location.getPath().startsWith("/") ? location.getPath() : "/" + location.getPath(), - location.getQuery(), null); + String path = location.toString(); + if (!path.startsWith("/")) { + path = "/" + path; + } + location = new URI(req.getRequestScheme(), null, host, port, null, null, null) + .resolve(path); } catch (URISyntaxException e) { throw new RuntimeException(e); } diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java index 40af3653860..849646f9eb3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java @@ -2,6 +2,7 @@ import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -16,4 +17,20 @@ public void testCaseInsensitivity() { Assertions.assertEquals("HEAD", response.getHeaders().getFirst("allow")); Assertions.assertEquals("HEAD", response.getHeaders().getFirst(HttpHeaders.ALLOW)); } + + @Test + public void testLocation() { + final var location = UriBuilder.fromUri("http://localhost:8080").path("{language}") + .build("en/us"); + Response response = Response.ok("Hello").location(location).build(); + Assertions.assertEquals("http://localhost:8080/en%2Fus", response.getLocation().toString()); + } + + @Test + public void testContentLocation() { + final var location = UriBuilder.fromUri("http://localhost:8080").path("{language}") + .build("en/us"); + Response response = Response.ok("Hello").contentLocation(location).build(); + Assertions.assertEquals("http://localhost:8080/en%2Fus", response.getHeaderString("Content-Location")); + } } diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java index 1c2f8f1e5a8..d72fdf301ac 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java @@ -13,6 +13,7 @@ import jakarta.ws.rs.core.CacheControl; import jakarta.ws.rs.core.NewCookie; import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.Variant; import org.jboss.resteasy.reactive.RestResponse; @@ -47,6 +48,24 @@ public RestResponse<?> wildcard() { return RestResponse.ResponseBuilder.ok("Hello").header("content-type", "text/plain").build(); } + @GET + @Path("rest-response-location") + public RestResponse<?> location() { + final var location = UriBuilder.fromResource(RestResponseResource.class).path("{language}") + .queryParam("user", "John") + .build("en/us"); + return RestResponse.ResponseBuilder.ok("Hello").location(location).build(); + } + + @GET + @Path("rest-response-content-location") + public RestResponse<?> contentLocation() { + final var location = UriBuilder.fromResource(RestResponseResource.class).path("{language}") + .queryParam("user", "John") + .build("en/us"); + return RestResponse.ResponseBuilder.ok("Hello").contentLocation(location).build(); + } + @GET @Path("rest-response-full") @SuppressWarnings("deprecation") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseTest.java index 03d83f208b2..2563091c4f0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseTest.java @@ -1,5 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.response; +import static org.hamcrest.CoreMatchers.endsWith; + import java.util.function.Supplier; import org.hamcrest.Matchers; @@ -107,5 +109,11 @@ public void test() { .then().statusCode(200) .and().body(Matchers.equalTo("Uni<RestResponse> request filter")) .and().contentType("text/plain"); + RestAssured.get("/rest-response-location") + .then().statusCode(200) + .header("Location", endsWith("/en%2Fus?user=John")); + RestAssured.get("/rest-response-content-location") + .then().statusCode(200) + .header("Content-Location", endsWith("/en%2Fus?user=John")); } }

['independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java', 'independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseTest.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java', 'independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java', 'independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java']

{'.java': 5}

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/33446/33188

quarkusio

quarkus

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

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

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

closes

Podman fails to build native on macOS

### Describe the bug Podman 4.5.0 fails to build native on macOS ([longer output](https://gist.github.com/galderz/4ba6e81310f181d01fb2f1dc6dc3dbb5)): ``` /usr/bin/ld: cannot open output file /project/code-with-quarkus-1.0.0-SNAPSHOT-runner: Permission denied collect2: error: ld returned 1 exit status at org.graalvm.nativeimage.builder/com.oracle.svm.hosted.image.NativeImageViaCC.handleLinkerFailure(NativeImageViaCC.java:203) at org.graalvm.nativeimage.builder/com.oracle.svm.hosted.image.NativeImageViaCC.runLinkerCommand(NativeImageViaCC.java:151) at org.graalvm.nativeimage.builder/com.oracle.svm.hosted.image.NativeImageViaCC.write(NativeImageViaCC.java:117) at org.graalvm.nativeimage.builder/com.oracle.svm.hosted.NativeImageGenerator.doRun(NativeImageGenerator.java:718) at org.graalvm.nativeimage.builder/com.oracle.svm.hosted.NativeImageGenerator.run(NativeImageGenerator.java:535) at org.graalvm.nativeimage.builder/com.oracle.svm.hosted.NativeImageGeneratorRunner.buildImage(NativeImageGeneratorRunner.java:403) at org.graalvm.nativeimage.builder/com.oracle.svm.hosted.NativeImageGeneratorRunner.build(NativeImageGeneratorRunner.java:580) at org.graalvm.nativeimage.builder/com.oracle.svm.hosted.NativeImageGeneratorRunner.main(NativeImageGeneratorRunner.java:128) ``` ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` Darwin m22 22.4.0 Darwin Kernel Version 22.4.0: Mon Mar 6 20:59:28 PST 2023; root:xnu-8796.101.5~3/RELEASE_ARM64_T6000 arm64 ### Output of `java -version` native-image 22.3.2.1-Final Mandrel Distribution (Java Version 17.0.7+7) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.0.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information Podman machine was started with: ``` $ podman machine init --rootful -m 8092 --cpus 4 ``` FYI @n1hility @holly-cummins @tqvarnst

aad9ce5afbba406a56528ca962b2f352344a2c3c

aa8fd68d94a52368811c77645d1adbea7f9a4f24

https://github.com/quarkusio/quarkus/compare/aad9ce5afbba406a56528ca962b2f352344a2c3c...aa8fd68d94a52368811c77645d1adbea7f9a4f24

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalContainerRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalContainerRunner.java index c5e50652d4d..9d678efb538 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalContainerRunner.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalContainerRunner.java @@ -17,7 +17,7 @@ public class NativeImageBuildLocalContainerRunner extends NativeImageBuildContai public NativeImageBuildLocalContainerRunner(NativeConfig nativeConfig) { super(nativeConfig); - if (SystemUtils.IS_OS_LINUX) { + if (SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_MAC) { final ArrayList<String> containerRuntimeArgs = new ArrayList<>(Arrays.asList(baseContainerRuntimeArgs)); if (containerRuntime.isDocker() && containerRuntime.isRootless()) { Collections.addAll(containerRuntimeArgs, "--user", String.valueOf(0));

['core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalContainerRunner.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/33440/33417

quarkusio

quarkus

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

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

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

fixes

Custom cdi context not applied for certain bean types

### Describe the bug When using a custom `InjectableContext` the context implementation is not beeing used for all bean types. ### Expected behavior Either all beans that are annotated with my scope annotation should be handled over my context implementation or if not a clear feedback (visible log or exception) should be given from Quarkus. ### Actual behavior When having certain beantype e.g. `AtomicBoolean `, the context implementation is ignored ``` @MyCustomScoped @Produces AtomicBoolean atomicBoolean(){ return new AtomicBoolean(); ``` It is still scoped as `@MyCustomScoped` when checking with `Arc.container().instance(AtomicBoolean.class).getBean().getScope();` but the bean is not beeing handled over my context implementation. ### How to Reproduce? https://github.com/HerrDerb/extension-issues/tree/custom-context-issue ### Quarkus version or git rev 3.0.3Final

58374616d0034003359f9e87616a03397144e74e

c4bfc05bedae6945f0ce7da738b67f6cdfebdbcb

https://github.com/quarkusio/quarkus/compare/58374616d0034003359f9e87616a03397144e74e...c4bfc05bedae6945f0ce7da738b67f6cdfebdbcb

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java index cfede763330..c6c3c7e4df9 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java @@ -123,10 +123,16 @@ private static boolean skipForClientProxy(MethodInfo method, boolean transformUn .add(NameAndDescriptor.fromMethodInfo(method)); return false; } - + // in case we want to transform classes but are unable to, we log a WARN LOGGER.warn(String.format( "Final method %s.%s() is ignored during proxy generation and should never be invoked upon the proxy instance!", className, method.name())); + } else { + // JDK classes with final method are not proxyable and not transformable, we skip those methods and log a WARN + LOGGER.warn(String.format( + "JDK class %s with final method %s() cannot be proxied and is not transformable. " + + "This method will be ignored during proxy generation and should never be invoked upon the proxy instance!", + className, method.name())); } return true; }

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.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/33429/33356

quarkusio

quarkus

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

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

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

fixes

`ConsoleProcessor.java` references `quarkus.log.console.color`, which was deprecated in Quarkus 2.1

### Describe the bug [Line 77 in core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java](https://github.com/quarkusio/quarkus/blob/78c3e36b846168b6cce37c92aa642164436c7228/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java#L77) references `quarkus.log.console.color`, which [was deprecated in Quarkus 2.1](https://github.com/quarkusio/quarkus/pull/18506): E.g.,: ``` ConfigProvider.getConfig().getOptionalValue("quarkus.log.console.color", ``` Should it reference `quarkus.console.color` instead? ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

d73267b857555515f7e55b65f11e89baa825457d

8ceee5fdd2dabf6734a5c85d18ea92b192fe18b3

https://github.com/quarkusio/quarkus/compare/d73267b857555515f7e55b65f11e89baa825457d...8ceee5fdd2dabf6734a5c85d18ea92b192fe18b3

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java index ee2838f9481..83389f7902a 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java @@ -74,7 +74,7 @@ ConsoleInstalledBuildItem setupConsole(TestConfig config, ConsoleRuntimeConfig consoleRuntimeConfig = new ConsoleRuntimeConfig(); consoleRuntimeConfig.color = ConfigProvider.getConfig().getOptionalValue("quarkus.console.color", Boolean.class); io.quarkus.runtime.logging.ConsoleConfig loggingConsoleConfig = new io.quarkus.runtime.logging.ConsoleConfig(); - loggingConsoleConfig.color = ConfigProvider.getConfig().getOptionalValue("quarkus.log.console.color", + loggingConsoleConfig.color = ConfigProvider.getConfig().getOptionalValue("quarkus.console.color", Boolean.class); ConsoleHelper.installConsole(config, consoleConfig, consoleRuntimeConfig, loggingConsoleConfig, launchModeBuildItem.isTest());

['core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.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/33375/33372

quarkusio

quarkus

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

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

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

fix

Error handling with @WithSpan (OpenTelemetry)

### Describe the bug If an exception occurs in a method that's annotated with `@WithSpan`, the error won't be recorded in the trace. ### Expected behavior Trace will contain error span. ### Actual behavior Currently the error span is missing from the trace. Or in the reproducer's case the entire trace is missing. ### How to Reproduce? Slightly modified `TracedResources` class from the OpenTelemetry quickstart. https://quarkus.io/guides/opentelemetry ```java package org.acme.opentelemetry; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import io.opentelemetry.instrumentation.annotations.WithSpan; import org.jboss.logging.Logger; @Path("/hello") public class TracedResources { private static final Logger LOG = Logger.getLogger(TracedResources.class); @GET @Produces(MediaType.TEXT_PLAIN) public String hello(){ LOG.info("hello"); doSomething(); return "hello"; } @WithSpan public String doSomething() { throw new RuntimeException("foo"); } } ``` When the app is running, execute the command `curl http://localhost:8080/hello` and look at the trace result. ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` openjdk version "17.0.5" ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

2ddf46ef447771b3094ddfea64f0ba8e04b58327

e723c0b760cbed5d1be2d65106276f839001734c

https://github.com/quarkusio/quarkus/compare/2ddf46ef447771b3094ddfea64f0ba8e04b58327...e723c0b760cbed5d1be2d65106276f839001734c

diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanInterceptorTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanInterceptorTest.java index ee2a43b4721..52de43f905e 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanInterceptorTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanInterceptorTest.java @@ -3,9 +3,13 @@ import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.api.trace.SpanKind.SERVER; +import static io.opentelemetry.api.trace.StatusCode.ERROR; import static io.quarkus.opentelemetry.deployment.common.TestSpanExporter.getSpanByKindAndParentId; import static java.net.HttpURLConnection.HTTP_OK; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; import java.util.List; @@ -27,6 +31,7 @@ import io.opentelemetry.instrumentation.annotations.SpanAttribute; import io.opentelemetry.instrumentation.annotations.WithSpan; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.sdk.trace.internal.data.ExceptionEventData; import io.quarkus.opentelemetry.deployment.common.TestSpanExporter; import io.quarkus.opentelemetry.deployment.common.TestSpanExporterProvider; import io.quarkus.runtime.StartupEvent; @@ -62,6 +67,7 @@ void span() { List<SpanData> spanItems = spanExporter.getFinishedSpanItems(1); assertEquals("SpanBean.span", spanItems.get(0).getName()); assertEquals(INTERNAL, spanItems.get(0).getKind()); + assertNotEquals(ERROR, spanItems.get(0).getStatus().getStatusCode()); } @Test @@ -112,6 +118,25 @@ void spanCdiRest() { final SpanData server = getSpanByKindAndParentId(spans, SERVER, client.getSpanId()); } + @Test + void spanWithException() { + try { + spanBean.spanWithException(); + fail("Exception expected"); + } catch (Exception e) { + assertThrows(RuntimeException.class, () -> { + throw e; + }); + } + List<SpanData> spanItems = spanExporter.getFinishedSpanItems(1); + assertEquals("SpanBean.spanWithException", spanItems.get(0).getName()); + assertEquals(INTERNAL, spanItems.get(0).getKind()); + assertEquals(ERROR, spanItems.get(0).getStatus().getStatusCode()); + assertEquals(1, spanItems.get(0).getEvents().size()); + assertEquals("spanWithException for tests", + ((ExceptionEventData) spanItems.get(0).getEvents().get(0)).getException().getMessage()); + } + @ApplicationScoped public static class SpanBean { @WithSpan @@ -119,6 +144,11 @@ public void span() { } + @WithSpan + public void spanWithException() { + throw new RuntimeException("spanWithException for tests"); + } + @WithSpan("name") public void spanName() { diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/WithSpanInterceptor.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/WithSpanInterceptor.java index 49eecfad212..2948f09f273 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/WithSpanInterceptor.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/WithSpanInterceptor.java @@ -70,6 +70,11 @@ public Object span(final ArcInvocationContext invocationContext) throws Exceptio } return result; + } catch (Throwable t) { + if (shouldStart) { + instrumenter.end(spanContext, methodRequest, null, t); + } + throw t; } finally { if (scope != null) { scope.close();

['extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/WithSpanInterceptor.java', 'extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanInterceptorTest.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/22621/20904

quarkusio

quarkus

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

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

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

fixes

Remote dev mode with gradle throwing connection refused

### Describe the bug I am attempting to run remote dev mode via Gradle against a Kubernetes deployment. Everything appears to be working as expected, mutable jar deployed in a container, logs show live coding enabled. When I attempt to connect via `./gradlew quarkusRemoteDev` I get a connection refused. ### Expected behavior Remote dev mode working. ### Actual behavior The server side throws a BadRequestException and my workstation fails to connect. The issue mentioned in https://github.com/quarkusio/quarkus/pull/12969 seems similar. Specifically "The JDK client sends malformed q values (.2 instead of 0.2), resteasy rejects this with a bad request exception". I captured the initial http requests coming from HttpRemoteDevClient and verified the Header values `*; q=.2, */*; q=.2` were being included which I'm assuming is causing the issue. Here's the server side stacktrace: ```text 2021-10-19 19:35:34,387 INFO [io.quarkus] [{}] (Quarkus Main Thread) Profile dev activated. Live Coding activated. 2021-10-19 19:35:34,387 INFO [io.quarkus] [{}] (Quarkus Main Thread) Installed features: [agroal, cdi, config-yaml, elasticsearch-rest-client, elasticsearch-rest-high-level-client, flyway, hibernate-orm, jdbc-postgresql, kubernetes-client, narayana-jta, quartz, reactive-routes, rest-client, rest-client-jackson, resteasy, resteasy-jackson, resteasy-mutiny, scheduler, security, smallrye-context-propagation, smallrye-health, smallrye-jwt, smallrye-metrics, smallrye-openapi, smallrye-reactive-messaging, smallrye-reactive-messaging-amqp, swagger-ui, vertx] 2021-10-19 19:38:02,062 ERROR [io.qua.ver.htt.run.QuarkusErrorHandler] [{}] (executor-thread-0) HTTP Request to /connect failed, error id: a2e06b4b-fd41-4203-a991-88eee1224451-1: javax.ws.rs.BadRequestException: RESTEASY003520: Malformed quality value. at org.jboss.resteasy.core.request.QualityValue.parseAsInteger(QualityValue.java:113) at org.jboss.resteasy.core.request.QualityValue.valueOf(QualityValue.java:40) at org.jboss.resteasy.core.request.AcceptHeaders.evaluateAcceptParameters(AcceptHeaders.java:292) at org.jboss.resteasy.core.request.AcceptHeaders.getMediaTypeQualityValues(AcceptHeaders.java:170) at org.jboss.resteasy.core.request.ServerDrivenNegotiation.setAcceptHeaders(ServerDrivenNegotiation.java:41) at io.quarkus.resteasy.runtime.NotFoundExceptionMapper.selectVariant(NotFoundExceptionMapper.java:386) at io.quarkus.resteasy.runtime.NotFoundExceptionMapper.respond(NotFoundExceptionMapper.java:244) at io.quarkus.resteasy.runtime.NotFoundExceptionMapper.toResponse(NotFoundExceptionMapper.java:225) at io.quarkus.resteasy.runtime.NotFoundExceptionMapper.toResponse(NotFoundExceptionMapper.java:53) at org.jboss.resteasy.core.ExceptionHandler.executeExactExceptionMapper(ExceptionHandler.java:65) at org.jboss.resteasy.core.ExceptionHandler.handleException(ExceptionHandler.java:317) at org.jboss.resteasy.core.SynchronousDispatcher.writeException(SynchronousDispatcher.java:218) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$invoke$4(SynchronousDispatcher.java:258) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$preprocess$0(SynchronousDispatcher.java:161) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:364) at org.jboss.resteasy.core.SynchronousDispatcher.preprocess(SynchronousDispatcher.java:164) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:247) at io.quarkus.resteasy.runtime.standalone.RequestDispatcher.service(RequestDispatcher.java:73) at io.quarkus.resteasy.runtime.standalone.VertxRequestHandler.dispatch(VertxRequestHandler.java:135) at io.quarkus.resteasy.runtime.standalone.VertxRequestHandler$1.run(VertxRequestHandler.java:90) at io.quarkus.vertx.core.runtime.VertxCoreRecorder$13.runWith(VertxCoreRecorder.java:543) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) at org.jboss.threads.DelegatingRunnable.run(DelegatingRunnable.java:29) at org.jboss.threads.ThreadLocalResettingRunnable.run(ThreadLocalResettingRunnable.java:29) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.base/java.lang.Thread.run(Unknown Source) ``` ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` Microsoft Windows Version 10.0.19042 Build 19042 ### Output of `java -version` JVM: 11.0.2 (Oracle Corporation 11.0.2+9) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.3.0 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 6.8.3 ### Additional information _No response_

077ea2ffce5cbfbb2217a8a8e11cd952387df142

b65ae06d982cc461f5c53c19e2955da0ba8da2d9

https://github.com/quarkusio/quarkus/compare/077ea2ffce5cbfbb2217a8a8e11cd952387df142...b65ae06d982cc461f5c53c19e2955da0ba8da2d9

diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClient.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClient.java index aacf027f117..f3253f45768 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClient.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClient.java @@ -32,6 +32,16 @@ public class HttpRemoteDevClient implements RemoteDevClient { private final Logger log = Logger.getLogger(HttpRemoteDevClient.class); + /** + * The default Accept header defined in sun.net.www.protocol.http.HttpURLConnection is invalid and + * does not respect the RFC so we override it with a valid value. + * RESTEasy is quite strict regarding the RFC and throws an error. + * Note that this is just the default HttpURLConnection header value made valid. + * See https://bugs.openjdk.java.net/browse/JDK-8163921 and https://bugs.openjdk.java.net/browse/JDK-8177439 + * and https://github.com/quarkusio/quarkus/issues/20904 + */ + private static final String DEFAULT_ACCEPT = "text/html, image/gif, image/jpeg; q=0.2, */*; q=0.2"; + private final String url; private final String password; private final long reconnectTimeoutMillis; @@ -95,6 +105,7 @@ private void sendData(Map.Entry<String, byte[]> entry, String session) throws IO connection = (HttpURLConnection) new URL(url + "/" + entry.getKey()).openConnection(); connection.setRequestMethod("PUT"); connection.setDoOutput(true); + connection.setRequestProperty(HttpHeaders.ACCEPT.toString(), DEFAULT_ACCEPT); connection.addRequestProperty(HttpHeaders.CONTENT_TYPE.toString(), RemoteSyncHandler.APPLICATION_QUARKUS); connection.addRequestProperty(RemoteSyncHandler.QUARKUS_SESSION_COUNT, Integer.toString(currentSessionCounter)); @@ -120,6 +131,7 @@ private String doConnect(RemoteDevState initialState, Function<Set<String>, Map< HttpURLConnection connection = (HttpURLConnection) new URL(url + RemoteSyncHandler.CONNECT) .openConnection(); + connection.setRequestProperty(HttpHeaders.ACCEPT.toString(), DEFAULT_ACCEPT); connection.addRequestProperty(HttpHeaders.CONTENT_TYPE.toString(), RemoteSyncHandler.APPLICATION_QUARKUS); //for the connection we use the hash of the password and the contents //this can be replayed, but only with the same contents, and this does not affect the server @@ -195,6 +207,7 @@ public void run() { //long polling request //we always send the current problem state connection = (HttpURLConnection) devUrl.openConnection(); + connection.setRequestProperty(HttpHeaders.ACCEPT.toString(), DEFAULT_ACCEPT); connection.setRequestMethod("POST"); connection.addRequestProperty(HttpHeaders.CONTENT_TYPE.toString(), RemoteSyncHandler.APPLICATION_QUARKUS); connection.addRequestProperty(RemoteSyncHandler.QUARKUS_SESSION_COUNT, @@ -223,6 +236,7 @@ public void run() { } log.info("deleting " + file); connection = (HttpURLConnection) new URL(url + "/" + file).openConnection(); + connection.setRequestProperty(HttpHeaders.ACCEPT.toString(), DEFAULT_ACCEPT); connection.setRequestMethod("DELETE"); connection.addRequestProperty(HttpHeaders.CONTENT_TYPE.toString(), RemoteSyncHandler.APPLICATION_QUARKUS); @@ -270,6 +284,7 @@ private String waitForRestart(RemoteDevState initialState, while (System.currentTimeMillis() < timeout) { try { HttpURLConnection connection = (HttpURLConnection) probeUrl.openConnection(); + connection.setRequestProperty(HttpHeaders.ACCEPT.toString(), DEFAULT_ACCEPT); connection.setRequestMethod("POST"); connection.addRequestProperty(HttpHeaders.CONTENT_TYPE.toString(), RemoteSyncHandler.APPLICATION_QUARKUS); IoUtil.readBytes(connection.getInputStream());

['extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClient.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/22620/21030

quarkusio

quarkus

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

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

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

fixes

Warning in `quarkus:dev` when using `quarkus-smallrye-graphql`

### Describe the bug When running in dev mode (`quarkus:dev`) with the `quarkus-smallrye-graphql` extension, an unexpected warning is printed out: ``` 2021-10-27 09:40:54,889 WARN [io.qua.run.con.ConfigRecorder] (Quarkus Main Thread) Build time property cannot be changed at runtime: - quarkus.smallrye-graphql.print-data-fetcher-exception was 'null' at build time and is now 'true' ``` ### Expected behavior Aforementioned warning is not present in the log output. ### Actual behavior Aforementioned warning is present in the log output. ### How to Reproduce? Steps to reproduce: 1. ``` wget -O ./smallrye-qraphql-warn-reproducer.zip "https://code.quarkus.io/api/download?S=io.quarkus.platform:2.3&a=smallrye-qraphql-warn-reproducer&nc=true&e=quarkus-smallrye-graphql" ``` Alternatively for `2.4`: ``` wget -O ./smallrye-qraphql-warn-reproducer.zip "https://code.quarkus.io/api/download?S=io.quarkus.platform:2.4&a=smallrye-qraphql-warn-reproducer&nc=true&e=quarkus-smallrye-graphql" ``` 2. ``` unzip ./smallrye-qraphql-warn-reproducer.zip cd ./smallrye-qraphql-warn-reproducer/ ./mvnw clean quarkus:dev ``` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` openjdk version "11.0.11" 2021-04-20 OpenJDK Runtime Environment AdoptOpenJDK-11.0.11+9 (build 11.0.11+9) OpenJDK 64-Bit Server VM AdoptOpenJDK-11.0.11+9 (build 11.0.11+9, mixed mode) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.3.1.Final, 2.4.0.CR1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d) ### Additional information _No response_

077ea2ffce5cbfbb2217a8a8e11cd952387df142

bed3ac660b3a541ceba9745a5e327c976a68e011

https://github.com/quarkusio/quarkus/compare/077ea2ffce5cbfbb2217a8a8e11cd952387df142...bed3ac660b3a541ceba9745a5e327c976a68e011

diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java index 84058828434..8c059f1dfd9 100644 --- a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java +++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java @@ -417,7 +417,7 @@ void printDataFetcherExceptionInDevMode(SmallRyeGraphQLConfig graphQLConfig, LaunchModeBuildItem launchMode, BuildProducer<SystemPropertyBuildItem> systemProperties) { - // User did not set this explisitly + // User did not set this explicitly if (!graphQLConfig.printDataFetcherException.isPresent()) { if (launchMode.getLaunchMode().isDevOrTest()) { systemProperties.produce(new SystemPropertyBuildItem(ConfigKey.PRINT_DATAFETCHER_EXCEPTION, TRUE)); diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLConfigMapping.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLConfigMapping.java index 2eedffe9e10..2625810641a 100644 --- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLConfigMapping.java +++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLConfigMapping.java @@ -42,7 +42,6 @@ private static Map<String, String> relocations() { mapKey(relocations, ConfigKey.ALLOW_POST_WITH_QUERY_PARAMETERS, QUARKUS_HTTP_POST_QUERYPARAMETERS_ENABLED); mapKey(relocations, ConfigKey.ERROR_EXTENSION_FIELDS, QUARKUS_ERROR_EXTENSION_FIELDS); mapKey(relocations, ConfigKey.DEFAULT_ERROR_MESSAGE, QUARKUS_DEFAULT_ERROR_MESSAGE); - mapKey(relocations, ConfigKey.PRINT_DATAFETCHER_EXCEPTION, QUARKUS_PRINT_DATAFETCHER_EXCEPTION); mapKey(relocations, ConfigKey.SCHEMA_INCLUDE_SCALARS, QUARKUS_SCHEMA_INCLUDE_SCALARS); mapKey(relocations, ConfigKey.SCHEMA_INCLUDE_DEFINITION, QUARKUS_SCHEMA_INCLUDE_DEFINITION); mapKey(relocations, ConfigKey.SCHEMA_INCLUDE_DIRECTIVES, QUARKUS_SCHEMA_INCLUDE_DIRECTIVES);

['extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java', 'extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLConfigMapping.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/22575/22574

quarkusio

quarkus

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

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

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

fixes

x - open last stacktrace not working with vscode/codium

### Describe the bug have exception occur and try use `x` to open it and you get code to open "main.java:18" which is not a syntax code supports. example app: ``` //usr/bin/env jbang "$0" "$@" ; exit $? //DEPS io.quarkus.platform:quarkus-bom:2.6.1.Final@pom //DEPS io.quarkus:quarkus-resteasy //JAVAC_OPTIONS -parameters import io.quarkus.runtime.Quarkus; import javax.enterprise.context.ApplicationScoped; import javax.ws.rs.GET; import javax.ws.rs.Path; @Path("/hello-resteasy") @ApplicationScoped public class main { @GET public String sayHello() { throw new IllegalStateException("What up"); } public static void main(String[] args) { Quarkus.run(args); } } ``` ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

effb7b4513b37b1be7c0db4697fb68fca650974a

9a29739f8a4b3fe7b8a7f07a964e1c3aa8804cd7

https://github.com/quarkusio/quarkus/compare/effb7b4513b37b1be7c0db4697fb68fca650974a...9a29739f8a4b3fe7b8a7f07a964e1c3aa8804cd7

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java index 3182290ffd1..e945ece2c64 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java @@ -156,6 +156,7 @@ public void run() { List<String> command = new ArrayList<>(); command.add(effectiveCommand); command.addAll(args); + log.debugf("Opening IDE with %s", command); new ProcessBuilder(command).redirectOutput(ProcessBuilder.Redirect.DISCARD) .redirectError(ProcessBuilder.Redirect.DISCARD).start().waitFor(10, TimeUnit.SECONDS); diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.java index 5c13170cc6f..50959a7d7e7 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.java @@ -3,32 +3,36 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import org.jboss.logging.Logger; import io.quarkus.dev.console.DevConsoleManager; public enum Ide { // see for cli syntax of idea https://www.jetbrains.com/help/idea/opening-files-from-command-line.html - IDEA("idea", null, "--help"), - ECLIPSE("eclipse", null, (String[]) null), - VSCODE("code", null, "--version"), - NETBEANS("netbeans", null, "--help"); + IDEA("idea", List.of("--line", "{lineNumber}", "{fileName}"), List.of("--help")), + ECLIPSE("eclipse", List.of("--launcher.openFile", "{fileName}:{lineNumber}"), Collections.emptyList()), + VSCODE("code", List.of("--goto", "{fileName}:{lineNumber}"), List.of("--version")), + NETBEANS("netbeans", Collections.emptyList(), List.of("--help")); + + private static final Logger log = Logger.getLogger(Ide.class); private final String defaultCommand; private final List<String> markerArgs; - private final String lineNumberArg; + private final List<String> lineNumberArgs; private String machineSpecificCommand; private String effectiveCommand; - Ide(String defaultCommand, String lineNumberArg, String... markerArgs) { + Ide(String defaultCommand, List<String> lineNumberArgs, List<String> markerArgs) { this.defaultCommand = defaultCommand; - this.lineNumberArg = lineNumberArg; - this.markerArgs = markerArgs != null ? Arrays.asList(markerArgs) : Collections.emptyList(); + this.lineNumberArgs = lineNumberArgs; + this.markerArgs = markerArgs; } /** @@ -46,7 +50,7 @@ public String getEffectiveCommand() { private String doGetEffectiveCommand() { if (defaultCommand != null) { - if (markerArgs == null) { + if (markerArgs.isEmpty()) { // in this case there is nothing much we can do but hope that the default command will work return defaultCommand; } else { @@ -54,6 +58,7 @@ private String doGetEffectiveCommand() { List<String> command = new ArrayList<>(1 + markerArgs.size()); command.add(defaultCommand); command.addAll(markerArgs); + log.debugf("Checking if IDE available with %s", command); new ProcessBuilder(command).redirectError(ProcessBuilder.Redirect.DISCARD.file()) .redirectOutput(ProcessBuilder.Redirect.DISCARD.file()).start() .waitFor(10, @@ -75,13 +80,16 @@ public List<String> createFileOpeningArgs(String fileName, String line) { return Collections.singletonList(fileName); } - if (lineNumberArg == null) { - return Collections.singletonList(fileName + ":" + line); + // we don't know the syntax for opening a file at a given line + // so we just open the file + if (lineNumberArgs.isEmpty()) { + log.debug("No syntax provided for opening the file at a given line for this IDE so we will just open the file"); + return Collections.singletonList(fileName); } - String formattedLineArg = String.format(lineNumberArg, line); - - return List.of(formattedLineArg, fileName); + return lineNumberArgs.stream() + .map(arg -> arg.replace("{fileName}", fileName).replace("{lineNumber}", line)) + .collect(Collectors.toList()); } public void setMachineSpecificCommand(String machineSpecificCommand) {

['core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java', 'core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.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/22504/22495

quarkusio

quarkus

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

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

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

fixes

4 warnings about unknown 'wildfly.sasl.relax-compliance' config when using infinispan-client + smallrye-reactive-messaging-kafka

### Describe the bug 4 warnings about unknown 'wildfly.sasl.relax-compliance' config when using `infinispan-client` + `smallrye-reactive-messaging-kafka` I used vanilla application from code.quarkus, using Quarkus 2.6.0.Final ``` __ ____ __ _____ ___ __ ____ ______ --/ __ \\/ / / / _ | / _ \\/ //_/ / / / __/ -/ /_/ / /_/ / __ |/ , _/ ,< / /_/ /\\ \\ --\\___\\_\\____/_/ |_/_/|_/_/|_|\\____/___/ 2021-12-23 13:16:59,208 INFO [io.sma.rea.mes.kafka] (Quarkus Main Thread) SRMSG18214: Key deserializer omitted, using String as default 2021-12-23 13:16:59,294 WARN [org.apa.kaf.cli.con.ConsumerConfig] (Quarkus Main Thread) The configuration 'wildfly.sasl.relax-compliance' was supplied but isn't a known config. 2021-12-23 13:16:59,324 INFO [io.sma.rea.mes.kafka] (Quarkus Main Thread) SRMSG18229: Configured topics for channel 'uppercase-in': [uppercase-word] 2021-12-23 13:16:59,329 INFO [io.sma.rea.mes.kafka] (Quarkus Main Thread) SRMSG18214: Key deserializer omitted, using String as default 2021-12-23 13:16:59,335 WARN [org.apa.kaf.cli.con.ConsumerConfig] (Quarkus Main Thread) The configuration 'wildfly.sasl.relax-compliance' was supplied but isn't a known config. 2021-12-23 13:16:59,356 WARN [org.apa.kaf.cli.pro.ProducerConfig] (Quarkus Main Thread) The configuration 'wildfly.sasl.relax-compliance' was supplied but isn't a known config. 2021-12-23 13:16:59,363 INFO [io.sma.rea.mes.kafka] (Quarkus Main Thread) SRMSG18258: Kafka producer kafka-producer-source-out, connected to Kafka brokers 'OUTSIDE://localhost:55023', is configured to write records to 'word' 2021-12-23 13:16:59,377 WARN [org.apa.kaf.cli.pro.ProducerConfig] (Quarkus Main Thread) The configuration 'wildfly.sasl.relax-compliance' was supplied but isn't a known config. 2021-12-23 13:16:59,379 INFO [io.sma.rea.mes.kafka] (Quarkus Main Thread) SRMSG18258: Kafka producer kafka-producer-uppercase-out, connected to Kafka brokers 'OUTSIDE://localhost:55023', is configured to write records to 'uppercase-word' 2021-12-23 13:16:59,407 INFO [io.sma.rea.mes.kafka] (smallrye-kafka-consumer-thread-0) SRMSG18257: Kafka consumer kafka-consumer-uppercase-in, connected to Kafka brokers 'OUTSIDE://localhost:55023', belongs to the 'code-with-quarkus' consumer group and is configured to poll records from [uppercase-word] 2021-12-23 13:16:59,407 INFO [io.sma.rea.mes.kafka] (smallrye-kafka-consumer-thread-1) SRMSG18257: Kafka consumer kafka-consumer-source-in, connected to Kafka brokers 'OUTSIDE://localhost:55023', belongs to the 'code-with-quarkus' consumer group and is configured to poll records from [word] 2021-12-23 13:16:59,436 INFO [io.quarkus] (Quarkus Main Thread) code-with-quarkus 1.0.0-SNAPSHOT on JVM (powered by Quarkus 2.6.0.Final) started in 14.033s. 2021-12-23 13:16:59,437 INFO [io.quarkus] (Quarkus Main Thread) Profile dev activated. Live Coding activated. 2021-12-23 13:16:59,437 INFO [io.quarkus] (Quarkus Main Thread) Installed features: [cdi, infinispan-client, kafka-client, smallrye-context-propagation, smallrye-reactive-messaging, smallrye-reactive-messaging-kafka, vertx] ``` ### Expected behavior No warnings about unknown config property are expected ### Actual behavior 4 x `2021-12-23 13:16:59,356 WARN [org.apa.kaf.cli.pro.ProducerConfig] (Quarkus Main Thread) The configuration 'wildfly.sasl.relax-compliance' was supplied but isn't a known config.` ### How to Reproduce? - Go to https://code.quarkus.io - Select quarkus-infinispan-client - Select quarkus-smallrye-reactive-messaging-kafka - Download and uzip the app - Run `mvn quarkus:dev` - Check the log ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

f133a1bb8a32989b0a1d68da0679d51d1ea98c82

d54255b1839370534a39fa5e4ad23a1e10574582

https://github.com/quarkusio/quarkus/compare/f133a1bb8a32989b0a1d68da0679d51d1ea98c82...d54255b1839370534a39fa5e4ad23a1e10574582

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/logging/LogCleanupFilterBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/logging/LogCleanupFilterBuildItem.java index e856ae2b974..7c3b23c5f12 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/logging/LogCleanupFilterBuildItem.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/logging/LogCleanupFilterBuildItem.java @@ -1,6 +1,7 @@ package io.quarkus.deployment.logging; import java.util.Arrays; +import java.util.List; import java.util.logging.Level; import io.quarkus.builder.item.MultiBuildItem; @@ -17,17 +18,25 @@ public final class LogCleanupFilterBuildItem extends MultiBuildItem { private LogCleanupFilterElement filterElement; public LogCleanupFilterBuildItem(String loggerName, String... messageStarts) { - if (messageStarts.length == 0) { - throw new IllegalArgumentException("messageStarts cannot be null"); - } - this.filterElement = new LogCleanupFilterElement(loggerName, Arrays.asList(messageStarts)); + this(loggerName, Arrays.asList(messageStarts)); } public LogCleanupFilterBuildItem(String loggerName, Level targetLevel, String... messageStarts) { - if (messageStarts.length == 0) { - throw new IllegalArgumentException("messageStarts cannot be null"); + this(loggerName, targetLevel, Arrays.asList(messageStarts)); + } + + public LogCleanupFilterBuildItem(String loggerName, List<String> messageStarts) { + if (messageStarts.isEmpty()) { + throw new IllegalArgumentException("messageStarts cannot be empty"); + } + this.filterElement = new LogCleanupFilterElement(loggerName, messageStarts); + } + + public LogCleanupFilterBuildItem(String loggerName, Level targetLevel, List<String> messageStarts) { + if (messageStarts.isEmpty()) { + throw new IllegalArgumentException("messageStarts cannot be empty"); } - this.filterElement = new LogCleanupFilterElement(loggerName, targetLevel, Arrays.asList(messageStarts)); + this.filterElement = new LogCleanupFilterElement(loggerName, targetLevel, messageStarts); } public LogCleanupFilterElement getFilterElement() { 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 79027fdba7f..76ccae4a3d1 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 @@ -1,8 +1,10 @@ package io.quarkus.kafka.client.deployment; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.function.Consumer; import java.util.logging.Level; @@ -79,6 +81,7 @@ import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; +import io.quarkus.deployment.logging.LogCleanupFilterBuildItem; import io.quarkus.deployment.pkg.NativeConfig; import io.quarkus.kafka.client.runtime.KafkaBindingConverter; import io.quarkus.kafka.client.runtime.KafkaRecorder; @@ -137,7 +140,21 @@ void logging(BuildProducer<LogCategoryBuildItem> log) { log.produce(new LogCategoryBuildItem("org.apache.kafka.clients", Level.WARNING)); log.produce(new LogCategoryBuildItem("org.apache.kafka.common.utils", Level.WARNING)); log.produce(new LogCategoryBuildItem("org.apache.kafka.common.metrics", Level.WARNING)); + } + + @BuildStep + void silenceUnwantedConfigLogs(BuildProducer<LogCleanupFilterBuildItem> logCleanupFilters) { + String[] ignoredConfigProperties = { "wildfly.sasl.relax-compliance", "ssl.endpoint.identification.algorithm" }; + + List<String> ignoredMessages = new ArrayList<>(); + for (String ignoredConfigProperty : ignoredConfigProperties) { + ignoredMessages.add("The configuration '" + ignoredConfigProperty + "' was supplied but isn't a known config."); + } + logCleanupFilters.produce(new LogCleanupFilterBuildItem("org.apache.kafka.clients.consumer.ConsumerConfig", + ignoredMessages)); + logCleanupFilters.produce(new LogCleanupFilterBuildItem("org.apache.kafka.clients.producer.ProducerConfig", + ignoredMessages)); } @BuildStep

['extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java', 'core/deployment/src/main/java/io/quarkus/deployment/logging/LogCleanupFilterBuildItem.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/33569/33573

quarkusio

quarkus

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

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

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

fixes

disableTrustManager is not used in ResteasyReactiveClientProvider

### Describe the bug The parameter `disableTrustManager` is not passed to `clientBuilder`. https://github.com/quarkusio/quarkus/blob/071a89c3b8acc50eb760b6740a547851e8032a0c/extensions/keycloak-admin-client-reactive/runtime/src/main/java/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.java#L32-L36

8101c3ec85fed92ecfff556a40c68243e93b0c73

f61b0b37040b28c3eea5f734ef48c1d4977c5f1d

https://github.com/quarkusio/quarkus/compare/8101c3ec85fed92ecfff556a40c68243e93b0c73...f61b0b37040b28c3eea5f734ef48c1d4977c5f1d

diff --git a/extensions/keycloak-admin-client-reactive/runtime/src/main/java/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.java b/extensions/keycloak-admin-client-reactive/runtime/src/main/java/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.java index 275fc580fb2..26cd9782d31 100644 --- a/extensions/keycloak-admin-client-reactive/runtime/src/main/java/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.java +++ b/extensions/keycloak-admin-client-reactive/runtime/src/main/java/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.java @@ -31,7 +31,7 @@ public class ResteasyReactiveClientProvider implements ResteasyClientProvider { @Override public Client newRestEasyClient(Object messageHandler, SSLContext sslContext, boolean disableTrustManager) { - ClientBuilderImpl clientBuilder = new ClientBuilderImpl(); + ClientBuilderImpl clientBuilder = new ClientBuilderImpl().trustAll(disableTrustManager); return registerJacksonProviders(clientBuilder).build(); }

['extensions/keycloak-admin-client-reactive/runtime/src/main/java/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.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/33598/33585

quarkusio

quarkus

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

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

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

fixes

NPE When Constructor Injecting a Microprofile Metric

### Describe the bug Quarkus throws an NPE when a bean constructor injects a microprofile metric e.g. ```java @ApplicationScoped public class FailsToInjectMetric { private final Timer timer; @Inject public FailsToInjectMetric( @Metric(name = "my-timer", unit = MetricUnits.MILLISECONDS) final Timer timer) { this.timer = timer; } ``` ``` java.lang.NullPointerException: Cannot invoke "org.eclipse.microprofile.metrics.annotation.Metric.name()" because "annotation" is null at io.quarkus.micrometer.runtime.binder.mpmetrics.MetricRegistryAdapter.injectedTimer(MetricRegistryAdapter.java:365) at io.quarkus.micrometer.runtime.binder.mpmetrics.InjectedMetricProducer.getTimer(InjectedMetricProducer.java:72) at io.quarkus.micrometer.runtime.binder.mpmetrics.InjectedMetricProducer_ProducerMethod_getTimer_40638bc6dcfae855a99f42cfc454029922b9370a_Bean.doCreate(Unknown Source) at io.quarkus.micrometer.runtime.binder.mpmetrics.InjectedMetricProducer_ProducerMethod_getTimer_40638bc6dcfae855a99f42cfc454029922b9370a_Bean.create(Unknown Source) at io.quarkus.micrometer.runtime.binder.mpmetrics.InjectedMetricProducer_ProducerMethod_getTimer_40638bc6dcfae855a99f42cfc454029922b9370a_Bean.get(Unknown Source) at io.quarkus.micrometer.runtime.binder.mpmetrics.InjectedMetricProducer_ProducerMethod_getTimer_40638bc6dcfae855a99f42cfc454029922b9370a_Bean.get(Unknown Source) at io.quarkus.arc.impl.CurrentInjectionPointProvider.get(CurrentInjectionPointProvider.java:48) at com.acme.FailsToInjectMetric_Bean.doCreate(Unknown Source) ``` Changing the bean to use package-private field injection instead of constructor injection works around this issue. ### Expected behavior Quarkus constructor injection works with microprofile metrics. ### Actual behavior Quarkus throws NPE. ### How to Reproduce? Run the tests in the attached Maven project. [constructor-inject-microprofile-metric-issue.zip](https://github.com/quarkusio/quarkus/files/11557001/constructor-inject-microprofile-metric-issue.zip) ### Output of `uname -a` or `ver` Darwin pixee-mbp-gilday.localdomain 22.4.0 Darwin Kernel Version 22.4.0: Mon Mar 6 20:59:28 PST 2023; root:xnu-8796.101.5~3/RELEASE_ARM64_T6000 arm64 ### Output of `java -version` openjdk version "17.0.7" 2023-04-18 OpenJDK Runtime Environment Temurin-17.0.7+7 (build 17.0.7+7) OpenJDK 64-Bit Server VM Temurin-17.0.7+7 (build 17.0.7+7, mixed mode) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.0.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.8 (4c87b05d9aedce574290d1acc98575ed5eb6cd39) Maven home: /Users/jgilday/.m2/wrapper/dists/apache-maven-3.8.8-bin/67c30f74/apache-maven-3.8.8 Java version: 17.0.7, vendor: Eclipse Adoptium, runtime: /Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home Default locale: en_US, platform encoding: UTF-8 OS name: "mac os x", version: "13.3.1", arch: "aarch64", family: "mac" ### Additional information _No response_

7a39f3135ae387bc9ed70f6c7d837a2ee259530d

5ef3b089b13d432210461c1c491799accbf829c7

https://github.com/quarkusio/quarkus/compare/7a39f3135ae387bc9ed70f6c7d837a2ee259530d...5ef3b089b13d432210461c1c491799accbf829c7

diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/AnnotationHandler.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/AnnotationHandler.java index 1645ffbe59e..50d29838e39 100644 --- a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/AnnotationHandler.java +++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/AnnotationHandler.java @@ -29,12 +29,12 @@ static AnnotationsTransformerBuildItem transformAnnotations(final IndexView inde } static AnnotationsTransformerBuildItem transformAnnotations(final IndexView index, - DotName sourceAnnotation, DotName targetAnnotation) { + DotName sourceAnnotationName, DotName targetAnnotationName) { return new AnnotationsTransformerBuildItem(new AnnotationsTransformer() { @Override public void transform(TransformationContext ctx) { final Collection<AnnotationInstance> annotations = ctx.getAnnotations(); - AnnotationInstance annotation = Annotations.find(annotations, sourceAnnotation); + AnnotationInstance annotation = Annotations.find(annotations, sourceAnnotationName); if (annotation == null) { return; } @@ -59,8 +59,8 @@ public void transform(TransformationContext ctx) { // Remove the @Counted annotation when both @Counted & @Timed/SimplyTimed // Ignore @Metric with @Produces - if (removeCountedWhenTimed(sourceAnnotation, target, classInfo, methodInfo) || - removeMetricWhenProduces(sourceAnnotation, target, methodInfo, fieldInfo)) { + if (removeCountedWhenTimed(sourceAnnotationName, target, classInfo, methodInfo) || + removeMetricWhenProduces(sourceAnnotationName, target, methodInfo, fieldInfo)) { ctx.transform() .remove(x -> x == annotation) .done(); @@ -71,10 +71,14 @@ public void transform(TransformationContext ctx) { MetricAnnotationInfo annotationInfo = new MetricAnnotationInfo(annotation, index, classInfo, methodInfo, fieldInfo); + // preserve the original annotation target, `ctx.getTarget()` is different in case of method parameters + AnnotationInstance newAnnotation = AnnotationInstance.create(targetAnnotationName, annotation.target(), + annotationInfo.getAnnotationValues()); + // Remove the existing annotation, and add a new one with all the fields ctx.transform() .remove(x -> x == annotation) - .add(targetAnnotation, annotationInfo.getAnnotationValues()) + .add(newAnnotation) .done(); } });

['extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/AnnotationHandler.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/22475/21694

quarkusio

quarkus

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

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

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

fixes

Hibernate Validator warnings are displayed when optional ResourceBundles are missing

### Describe the bug When an app depending on the Hibernate Validator extension is package using the native build, the following messages are printed to the output: ``` The bundle named: ContributorValidationMessages, has not been found. If the bundle is part of a module, verify the bundle name is a fully qualified class name. Otherwise verify the bundle path is accessible in the classpath. The bundle named: ValidationMessages, has not been found. If the bundle is part of a module, verify the bundle name is a fully qualified class name. Otherwise verify the bundle path is accessible in the classpath. The bundle named: messages, has not been found. If the bundle is part of a module, verify the bundle name is a fully qualified class name. Otherwise verify the bundle path is accessible in the classpath. ``` Although that does no harm to the build, it may lead to confusion giving that those bundles are optional. ### Expected behavior Do not print any message if the bundle does not exist in the user's application ### Actual behavior The message is printed. ### How to Reproduce? 1. Clone https://github.com/quarkusio/registry.quarkus.io 2. run `mvn clean package -Dnative -DskipTests` ### Output of `uname -a` or `ver` Fedora 35 ### Output of `java -version` 11 ### GraalVM version (if different from Java) 21 ### Quarkus version or git rev 2.5.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Maven 3.8.4 ### Additional information This issue was originated from [a chat in Zulip](https://quarkusio.zulipchat.com/#narrow/stream/187038-dev/topic/Hibernate.20Validation). Also it seems that [this snippet](https://github.com/quarkusio/quarkus/blob/main/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java#L346-L353) may need to be enhanced to check if the bundle really exists

bb06c1a40d8c1c38f507462bf7d89052453f8c1d

0a1eda3a3d66df33790b1df0ff751eef6003215a

https://github.com/quarkusio/quarkus/compare/bb06c1a40d8c1c38f507462bf7d89052453f8c1d...0a1eda3a3d66df33790b1df0ff751eef6003215a

diff --git a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java index 81d69df34b4..428d556583f 100644 --- a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java +++ b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java @@ -345,11 +345,28 @@ public void build(HibernateValidatorRecorder recorder, RecorderContext recorderC @BuildStep NativeImageConfigBuildItem nativeImageConfig() { - return NativeImageConfigBuildItem.builder() - .addResourceBundle(AbstractMessageInterpolator.DEFAULT_VALIDATION_MESSAGES) - .addResourceBundle(AbstractMessageInterpolator.USER_VALIDATION_MESSAGES) - .addResourceBundle(AbstractMessageInterpolator.CONTRIBUTOR_VALIDATION_MESSAGES) - .build(); + List<String> potentialHibernateValidatorResourceBundles = List.of( + AbstractMessageInterpolator.DEFAULT_VALIDATION_MESSAGES, + AbstractMessageInterpolator.USER_VALIDATION_MESSAGES, + AbstractMessageInterpolator.CONTRIBUTOR_VALIDATION_MESSAGES); + List<String> userDefinedHibernateValidatorResourceBundles = new ArrayList<>(); + + for (String potentialHibernateValidatorResourceBundle : potentialHibernateValidatorResourceBundles) { + if (Thread.currentThread().getContextClassLoader().getResource(potentialHibernateValidatorResourceBundle) != null) { + userDefinedHibernateValidatorResourceBundles.add(potentialHibernateValidatorResourceBundle); + } + } + + if (userDefinedHibernateValidatorResourceBundles.isEmpty()) { + return null; + } + + NativeImageConfigBuildItem.Builder builder = NativeImageConfigBuildItem.builder(); + for (String hibernateValidatorResourceBundle : userDefinedHibernateValidatorResourceBundles) { + builder.addResourceBundle(hibernateValidatorResourceBundle); + } + + return builder.build(); } @BuildStep diff --git a/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java b/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java index d65a5a58c02..3595bd4899f 100755 --- a/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java +++ b/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java @@ -88,6 +88,7 @@ public class ResteasyServerCommonProcessor { private static final Logger log = Logger.getLogger("io.quarkus.resteasy"); private static final String JAX_RS_APPLICATION_PARAMETER_NAME = "javax.ws.rs.Application"; + private static final String MESSAGES_RESOURCE_BUNDLE = "messages"; private static final DotName JSONB_ANNOTATION = DotName.createSimple("javax.json.bind.annotation.JsonbAnnotation"); @@ -181,8 +182,12 @@ static final class ResteasyConfig { @BuildStep NativeImageConfigBuildItem config() { + if (Thread.currentThread().getContextClassLoader().getResource(MESSAGES_RESOURCE_BUNDLE) == null) { + return null; + } + return NativeImageConfigBuildItem.builder() - .addResourceBundle("messages") + .addResourceBundle(MESSAGES_RESOURCE_BUNDLE) .build(); }

['extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java', 'extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.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/33608/33418

quarkusio

quarkus

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

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

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

fix

Quarkus redis reactive pubsub disconnecting handler

### Describe the bug I have the following code: ``` ReactiveRedisDataSource redis; -> Injected ReactivePubSubCommands<String> pubsub = redis.pubsub(String.class); pubsub.subscribe('my-channel') .onItem().call(this::consume) .subscribe().with( notificationId -> log.debug("New notification has been processed {}", notificationId), err -> log.error("Error while listening for new notifications ", err)); ``` Everything is working fine, I receive data via the subscription, but for some reason, after a while (days, weeks), my subscription is gone. It can be checked by running in redis the folowing command: ``` PUBSUB NUMSUB my-channel ``` Initially returns 1, but when my issues occurs, it is going to 0. No other failures can be seen in the application. It is very easy to reproduce the issue: 1. Connect via the code above to a redis docker instance. 2. Check `PUBSUB NUMSUB my-channel -> 1` 3. Stop redis container 4. Start redis container 5. Now `PUBSUB NUMSUB my-channel -> 0` and no errors thrown in code. **How can I watch the disconnected state to be able to manually reconnect?** I tried to add handlers like `onTermination`, `onCanncelation`, `onFailure`, `onCompletion` but they are never triggered. An undesired solution is to use ``` pubsub.Uni<ReactiveRedisSubscriber> subscribe(String channel, Consumer<V> onMessage, Runnable onEnd, Consumer<Throwable> onException); ``` I noticed that when my redis connection is going down, it triggers `onEnd` handler. But this cuts my reactivity in the process for consuming the event. I want to use `pubsub.Multi<V> subscribe(String... channels)` ### Quarkus version or git rev 2.14.3.Final

9495ee57355c49780c0bca17f80472775a1af54b

f406a26f4e8af255ee2fd31836d2e3be298d761b

https://github.com/quarkusio/quarkus/compare/9495ee57355c49780c0bca17f80472775a1af54b...f406a26f4e8af255ee2fd31836d2e3be298d761b

diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/datasource/ReactivePubSubCommandsImpl.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/datasource/ReactivePubSubCommandsImpl.java index c06075075d3..95476dcb225 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/datasource/ReactivePubSubCommandsImpl.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/datasource/ReactivePubSubCommandsImpl.java @@ -143,9 +143,11 @@ public Multi<V> subscribe(String... channels) { doesNotContainNull(channels, "channels"); return Multi.createFrom().emitter(emitter -> { - subscribe(List.of(channels), emitter::emit) + subscribe(List.of(channels), emitter::emit, emitter::complete, emitter::fail) .subscribe().with(x -> { - emitter.onTermination(() -> x.unsubscribe(channels).subscribe().asCompletionStage()); + emitter.onTermination(() -> { + x.unsubscribe(channels).subscribe().asCompletionStage(); + }); }, emitter::fail); }); } @@ -156,7 +158,7 @@ public Multi<V> subscribeToPatterns(String... patterns) { doesNotContainNull(patterns, "patterns"); return Multi.createFrom().emitter(emitter -> { - subscribeToPatterns(List.of(patterns), emitter::emit) + subscribeToPatterns(List.of(patterns), emitter::emit, emitter::complete, emitter::fail) .subscribe().with(x -> { emitter.onTermination(() -> x.unsubscribe(patterns).subscribe().asCompletionStage()); }, emitter::fail); @@ -186,10 +188,12 @@ private AbstractRedisSubscriber(RedisConnection connection, RedisAPI api, Consum public Uni<String> subscribe() { Uni<Void> handled = Uni.createFrom().emitter(emitter -> { connection.handler(r -> runOnDuplicatedContext(() -> handleRedisEvent(emitter, r))); - if (onEnd != null) + if (onEnd != null) { connection.endHandler(() -> runOnDuplicatedContext(onEnd)); - if (onException != null) + } + if (onException != null) { connection.exceptionHandler(t -> runOnDuplicatedContext(() -> onException.accept(t))); + } }); Uni<Void> subscribed = subscribeToRedis();

['extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/datasource/ReactivePubSubCommandsImpl.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/33923/33922

quarkusio

quarkus

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

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

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

fixes

Access-Control-Expose-Headers not returned to request

### Describe the bug The Access-Control-Expose-Headers is only returned during the preflight request but not included in the subsequent request itself. Consequently, the header cannot be accessed through JavaScript in the browser. ### Expected behavior The Access-Control-Expose-Headers should be returned ### Actual behavior The Access-Control-Expose-Headers is not returned. ### How to Reproduce? 1 - Configure the quarkus.http.cors.exposed-headers with some header. 2 - Send a request from browser ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

1c8d56437bc335f6d5766ccd5eb655794c1f66be

0fcfc8b517f72f49c780ea96ec8ff6350bda5062

https://github.com/quarkusio/quarkus/compare/1c8d56437bc335f6d5766ccd5eb655794c1f66be...0fcfc8b517f72f49c780ea96ec8ff6350bda5062

diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSFullConfigHandlerTestCase.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSFullConfigHandlerTestCase.java index 445fe9adc05..8b829208564 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSFullConfigHandlerTestCase.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSFullConfigHandlerTestCase.java @@ -32,6 +32,15 @@ public void corsFullConfigTestServlet() { .header("Access-Control-Allow-Headers", "X-Custom") .header("Access-Control-Max-Age", "86400"); + given().header("Origin", "http://custom.origin.quarkus") + .when() + .get("/test").then() + .statusCode(200) + .header("Access-Control-Allow-Origin", "http://custom.origin.quarkus") + .header("Access-Control-Allow-Methods", "GET,PUT,POST") + .header("Access-Control-Expose-Headers", "Content-Disposition") + .header("Access-Control-Allow-Headers", "X-Custom"); + given().header("Origin", "http://www.quarkus.io") .header("Access-Control-Request-Method", "PUT") .when() @@ -40,6 +49,7 @@ public void corsFullConfigTestServlet() { .header("Access-Control-Allow-Origin", "http://www.quarkus.io") .header("Access-Control-Allow-Methods", "GET,PUT,POST") .header("Access-Control-Expose-Headers", "Content-Disposition"); + } @Test diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java index 4cd477c951b..4304433190d 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java @@ -176,6 +176,12 @@ public void handle(RoutingContext event) { if (allowedMethods != null) { response.headers().add(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, allowedMethods); } + + //always set expose headers if present + if (exposedHeaders != null) { + response.headers().add(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, exposedHeaders); + } + //we check that the actual request matches the allowed methods and headers if (!isMethodAllowed(request.method())) { LOG.debug("Method is not allowed"); @@ -216,10 +222,6 @@ private void handlePreflightRequest(RoutingContext event, String requestedHeader response.headers().add(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, exposedHeaders); } - if (!isConfiguredWithWildcard(corsConfig.exposedHeaders)) { - response.headers().set(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, this.exposedHeaders); - } - } static boolean isSameOrigin(HttpServerRequest request, String origin) {

['extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java', 'extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/cors/CORSFullConfigHandlerTestCase.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/33910/33658

quarkusio

quarkus

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

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

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

fix

redirect of /q/dev too permanent?

### Describe the bug was using quarkus dev with quarkus 3 using dev UI all good. now switch to quarkus 2.x by running quarkus dev in https://github.com/quarkusio/todo-demo-app pressing 'd' gets me to http://localhost:8080/dev which then redirects to http://localhost:8080/dev-ui presumably because of previous quarkus 3 returned a permanent redirect? ### Expected behavior dont break quarkus 2 dev ui just because I ran a quarkus 3 dev mode app ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

58f8abb270dfe86925ae235d0b903f5f8f8a2e3d

4031d6259a25036bdd30536c9806e92486abe8db

https://github.com/quarkusio/quarkus/compare/58f8abb270dfe86925ae235d0b903f5f8f8a2e3d...4031d6259a25036bdd30536c9806e92486abe8db

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIRecorder.java index 4b8eca0d506..57fc606b1b7 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIRecorder.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIRecorder.java @@ -17,6 +17,7 @@ import org.jboss.logging.Logger; +import io.netty.handler.codec.http.HttpResponseStatus; import io.quarkus.arc.runtime.BeanContainer; import io.quarkus.dev.console.DevConsoleManager; import io.quarkus.devui.runtime.comms.JsonRpcRouter; @@ -98,8 +99,14 @@ public Handler<RoutingContext> redirect(String contextRoot) { return new Handler<RoutingContext>() { @Override public void handle(RoutingContext rc) { - // 308 because we also want to redirect other HTTP Methods (and not only GET). - rc.response().putHeader("Location", contextRoot + "dev-ui").setStatusCode(308).end(); + // Initially we were using 308 (MOVED PERMANENTLY) because we also want to redirect other HTTP Methods + // (and not only GET). + // However, it caused issues with browser caches and prevented users to have applications using Quarkus 2 + // and Quarkus 3 at the same time. So, we decided to switch to FOUND (302) + // See https://github.com/quarkusio/quarkus/issues/33658 for more context. + rc.response() + .putHeader("Location", contextRoot + "dev-ui") + .setStatusCode(HttpResponseStatus.FOUND.code()).end(); } }; }

['extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIRecorder.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/33904/33870

quarkusio

quarkus

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

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

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

fixes

Gradle plugin does not copy all files correctly, when having parent-first-artifacts

### Describe the bug I've a Quarkus project, which uses an own Jackson ObjectMapper, with that I had problems using the same ClassLoader for that lib. As a solution I added the lib to the property ```quarkus.class-loading.parent-first-artifacts```. With Quarkus < 3.x this worked well. Now I've tried to migrate to Quarkus 3.x and I got a ClassNotFoundException. After searching I found the reason. My lib - added via the parent-first-artifact - is copied during the build to ```build/quarkus-build/gen/querkus-app/lib/boot```, which is as expected. But in the next step, I would expect, that it should also be copied to ```build/quarkus-build/dep/lib/boot``` (and finally to ```build/quarkus-app/lib/boot```), but this doesn't happen. The lib is mentioned in the manifest file. ### Expected behavior The parent-first-artifact lib is copied in the app folder. ### Actual behavior JAR is not copied. ### How to Reproduce? Run ```gradle build``` and the ```gson``` lib (just used as an example) was not copied to ```build/quarkus-build/dep/lib/boot``` [reproducer.zip](https://github.com/quarkusio/quarkus/files/11676041/reproducer.zip) ### Output of `uname -a` or `ver` Darwin TMXQT47KNH 22.5.0 Darwin Kernel Version 22.5.0 ### Output of `java -version` openjdk version "17.0.6" 2023-01-17 LTS ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.1.0 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 8.1.1 ### Additional information _No response_

51cb9667c303d62b5c7ffb0c40e47f2d57213f42

b46341ae8c8af4787d32d4267eacd83ceca3f3c0

https://github.com/quarkusio/quarkus/compare/51cb9667c303d62b5c7ffb0c40e47f2d57213f42...b46341ae8c8af4787d32d4267eacd83ceca3f3c0

diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildDependencies.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildDependencies.java index 2e7b714ff72..a410e1af412 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildDependencies.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildDependencies.java @@ -5,6 +5,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -34,6 +35,8 @@ public abstract class QuarkusBuildDependencies extends QuarkusBuildTask { static final String CLASS_LOADING_REMOVED_ARTIFACTS = "quarkus.class-loading.removed-artifacts"; static final String CLASS_LOADING_PARENT_FIRST_ARTIFACTS = "quarkus.class-loading.parent-first-artifacts"; + static final String FILTER_OPTIONAL_DEPENDENCIES = "quarkus.package.filter-optional-dependencies"; + static final String INCLUDED_OPTIONAL_DEPENDENCIES = "quarkus.package.included-optional-dependencies"; @Inject public QuarkusBuildDependencies() { @@ -139,19 +142,22 @@ private void jarDependencies(Path libBoot, Path libMain) { Map<String, String> configMap = extension().buildEffectiveConfiguration(appModel.getAppArtifact()).configMap(); // see https://quarkus.io/guides/class-loading-reference#configuring-class-loading - String removedArtifactsProp = configMap.getOrDefault(CLASS_LOADING_PARENT_FIRST_ARTIFACTS, ""); - java.util.Optional<Set<ArtifactKey>> optionalDependencies = java.util.Optional.ofNullable( + Set<ArtifactKey> removedArtifacts = java.util.Optional.ofNullable( configMap.getOrDefault(CLASS_LOADING_REMOVED_ARTIFACTS, null)) - .map(s -> Arrays.stream(s.split(",")) - .map(String::trim) - .filter(gact -> !gact.isEmpty()) - .map(ArtifactKey::fromString) - .collect(Collectors.toSet())); - Set<ArtifactKey> removedArtifacts = Arrays.stream(removedArtifactsProp.split(",")) - .map(String::trim) - .filter(gact -> !gact.isEmpty()) - .map(ArtifactKey::fromString) - .collect(Collectors.toSet()); + .map(QuarkusBuildDependencies::dependenciesListToArtifactKeySet) + .orElse(Collections.emptySet()); + getLogger().info("Removed artifacts: {}", configMap.getOrDefault(CLASS_LOADING_REMOVED_ARTIFACTS, "(none)")); + + String parentFirstArtifactsProp = configMap.getOrDefault(CLASS_LOADING_PARENT_FIRST_ARTIFACTS, ""); + Set<ArtifactKey> parentFirstArtifacts = dependenciesListToArtifactKeySet(parentFirstArtifactsProp); + getLogger().info("parent first artifacts: {}", configMap.getOrDefault(CLASS_LOADING_PARENT_FIRST_ARTIFACTS, "(none)")); + + String optionalDependenciesProp = configMap.getOrDefault(INCLUDED_OPTIONAL_DEPENDENCIES, ""); + boolean filterOptionalDependencies = Boolean + .parseBoolean(configMap.getOrDefault(FILTER_OPTIONAL_DEPENDENCIES, "false")); + Set<ArtifactKey> optionalDependencies = filterOptionalDependencies + ? dependenciesListToArtifactKeySet(optionalDependenciesProp) + : Collections.emptySet(); appModel.getRuntimeDependencies().stream() .filter(appDep -> { @@ -159,13 +165,13 @@ private void jarDependencies(Path libBoot, Path libMain) { if (!appDep.isJar()) { return false; } - if (appDep.isOptional()) { - return optionalDependencies.map(appArtifactKeys -> appArtifactKeys.contains(appDep.getKey())) - .orElse(true); + if (filterOptionalDependencies && appDep.isOptional()) { + return optionalDependencies.contains(appDep.getKey()); } return !removedArtifacts.contains(appDep.getKey()); }) - .map(dep -> Map.entry(dep.isFlagSet(DependencyFlags.CLASSLOADER_RUNNER_PARENT_FIRST) ? libBoot : libMain, dep)) + .map(dep -> Map.entry(dep.isFlagSet(DependencyFlags.CLASSLOADER_RUNNER_PARENT_FIRST) + || parentFirstArtifacts.contains(dep.getKey()) ? libBoot : libMain, dep)) .peek(depAndTarget -> { ResolvedDependency dep = depAndTarget.getValue(); Path targetDir = depAndTarget.getKey(); @@ -199,4 +205,12 @@ private void jarDependencies(Path libBoot, Path libMain) { .collect(Collectors.toMap(Map.Entry::getKey, depAndTarget -> 1, Integer::sum)) .forEach((path, count) -> getLogger().info("Copied {} files into {}", count, path)); } + + private static Set<ArtifactKey> dependenciesListToArtifactKeySet(String optionalDependenciesProp) { + return Arrays.stream(optionalDependenciesProp.split(",")) + .map(String::trim) + .filter(gact -> !gact.isEmpty()) + .map(ArtifactKey::fromString) + .collect(Collectors.toSet()); + } }

['devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildDependencies.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/33901/33842

quarkusio

quarkus

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

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

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

fixes

AppCDS generation failed with `Permission denied`

### Describe the bug Building application with AppCDS `gradle build -Dquarkus.package.create-appcds=true` failed with error ``` > Could not copy file '/home/palo/git/app-cds-fail/build/quarkus-build/app/quarkus-app/app-cds.jsa' to '/home/palo/git/app-cds-fail/build/quarkus-app/app-cds.jsa'. > /home/palo/git/app-cds-fail/build/quarkus-app/app-cds.jsa (Permission denied) ``` ### Expected behavior AppCDS generation success. ### Actual behavior _No response_ ### How to Reproduce? Reproducer: https://github.com/paloliska/app-cds-fail 1. build with `gradle build -Dquarkus.package.create-appcds=true` ### Output of `uname -a` or `ver` Linux *** 6.1.0-1013-oem #13-Ubuntu SMP PREEMPT_DYNAMIC Thu May 18 16:45:09 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "17.0.7" 2023-04-18 OpenJDK Runtime Environment (build 17.0.7+7-Ubuntu-0ubuntu122.04.2) OpenJDK 64-Bit Server VM (build 17.0.7+7-Ubuntu-0ubuntu122.04.2, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.1.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) 8.1.1 ### Additional information _No response_

51cb9667c303d62b5c7ffb0c40e47f2d57213f42

5ee63a01d06e91a493617a73fb493f1cf0826a39

https://github.com/quarkusio/quarkus/compare/51cb9667c303d62b5c7ffb0c40e47f2d57213f42...5ee63a01d06e91a493617a73fb493f1cf0826a39

diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java index 8f9a34bc20c..a2dcbb502b1 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java @@ -308,6 +308,7 @@ private void assembleFastJar() { getLogger().info("Synchronizing Quarkus build for {} packaging from {} and {} into {}", packageType(), appBuildDir, depBuildDir, appTargetDir); getFileSystemOperations().sync(sync -> { + sync.eachFile(new CopyActionDeleteNonWriteableTarget(appTargetDir.toPath())); sync.into(appTargetDir); sync.from(appBuildDir, depBuildDir); }); diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildTask.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildTask.java index fa954cbed2a..ec21628c731 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildTask.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildTask.java @@ -1,14 +1,18 @@ package io.quarkus.gradle.tasks; import java.io.File; +import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; import java.util.stream.Collectors; import javax.inject.Inject; +import org.gradle.api.Action; import org.gradle.api.GradleException; import org.gradle.api.file.FileCollection; +import org.gradle.api.file.FileCopyDetails; import org.gradle.api.file.FileSystemOperations; import org.gradle.api.logging.LogLevel; import org.gradle.api.tasks.Classpath; @@ -168,6 +172,9 @@ void generateBuild() { PackageConfig.BuiltInType packageType = packageType(); getLogger().info("Building Quarkus app for package type {} in {}", packageType, genDir); + // Need to delete app-cds.jsa specially, because it's usually read-only and Gradle's delete file-system + // operation doesn't delete "read only" files :( + deleteFileIfExists(genDir.resolve(outputDirectory()).resolve("app-cds.jsa")); getFileSystemOperations().delete(delete -> { // Caching and "up-to-date" checks depend on the inputs, this 'delete()' should ensure that the up-to-date // checks work against "clean" outputs, considering that the outputs depend on the package-type. @@ -223,6 +230,7 @@ void generateBuild() { getFileSystemOperations().copy(copy -> { copy.from(buildDir); copy.into(genDir); + copy.eachFile(new CopyActionDeleteNonWriteableTarget(genDir)); switch (packageType) { case NATIVE: copy.include(nativeRunnerFileName()); @@ -261,4 +269,32 @@ void abort(String message, Object... args) { }); throw new StopExecutionException(); } + + public static final class CopyActionDeleteNonWriteableTarget implements Action<FileCopyDetails> { + private final Path destDir; + + public CopyActionDeleteNonWriteableTarget(Path destDir) { + this.destDir = destDir; + } + + @Override + public void execute(FileCopyDetails details) { + // Delete a pre-existing non-writeable file, otherwise a copy or sync operation would fail. + // This situation happens for 'app-cds.jsa' files, which are created as "read only" files, + // prefer to keep those files read-only. + + Path destFile = destDir.resolve(details.getPath()); + if (Files.exists(destFile) && !Files.isWritable(destFile)) { + deleteFileIfExists(destFile); + } + } + } + + protected static void deleteFileIfExists(Path file) { + try { + Files.deleteIfExists(file); + } catch (IOException e) { + throw new RuntimeException(e); + } + } } diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java index 94a82fc82ac..3a71110e64d 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java @@ -15,6 +15,7 @@ import org.gradle.api.file.FileCollection; import org.gradle.api.tasks.CacheableTask; import org.gradle.api.tasks.CompileClasspath; +import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputFiles; import org.gradle.api.tasks.OutputDirectory; import org.gradle.api.tasks.PathSensitive; @@ -62,6 +63,11 @@ public void setCompileClasspath(Configuration compileClasspath) { this.compileClasspath = compileClasspath; } + @Input + public Map<String, String> getCachingRelevantInput() { + return extension().baseConfig().quarkusProperties(); + } + @InputFiles @PathSensitive(PathSensitivity.RELATIVE) public Set<File> getInputDirectory() {

['devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java', 'devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java', 'devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildTask.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/33834/33730

quarkusio

quarkus

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

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

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

fixes

Smallrye Reactive Messaging with Kafka Connector does not support channel names containing a dot

### Describe the bug Seems like that a dot in the channel name isn't supported when using ``Smallrye Reactive Messaging`` and ``Kafka``: ``` @ApplicationScoped public class TestConsumer { @Incoming("test.test") public void consume(ChangeEvent event) { Log.info(event); } } ``` This leads to the following exception: ``(Quarkus Main Thread) Failed to start application (with profile [dev]): java.lang.IllegalArgumentException: The attribute `value.deserializer` on connector 'smallrye-kafka' (channel: test.test) must be set`` ### Expected behavior Quarkus should behave in the same way as defining a channel name without a dot like ``test``: ``` 2023-05-31 14:50:31,122 INFO [io.qua.sma.dep.processor] (build-22) Configuring the channel 'test' to be managed by the connector 'smallrye-kafka' 2023-05-31 14:50:31,125 INFO [io.qua.sma.dep.processor] (build-37) Generating Jackson deserializer for type com........event.consumer.ChangeEvent 2023-05-31 14:50:35,103 INFO [io.qua.kaf.cli.dep.DevServicesKafkaProcessor] (build-2) Dev Services for Kafka started. Other Quarkus applications in dev mode will find the broker automatically. For Quarkus applications in production mode, you can connect to this by starting your application with -Dkafka.bootstr ap.servers=OUTSIDE://localhost:32777 __ ____ __ _____ ___ __ ____ ______ --/ __ \\/ / / / _ | / _ \\/ //_/ / / / __/ -/ /_/ / /_/ / __ |/ , _/ ,< / /_/ /\\ \\ --\\___\\_\\____/_/ |_/_/|_/_/|_|\\____/___/ 2023-05-31 14:50:35,854 INFO [io.sma.rea.mes.kafka] (Quarkus Main Thread) SRMSG18229: Configured topics for channel 'test': [test] 2023-05-31 14:50:35,859 INFO [io.sma.rea.mes.kafka] (Quarkus Main Thread) SRMSG18214: Key deserializer omitted, using String as default 2023-05-31 14:50:35,993 INFO [io.ope.api.GlobalOpenTelemetry] (Quarkus Main Thread) AutoConfiguredOpenTelemetrySdk found on classpath but automatic configuration is disabled. To enable, run your JVM with -Dotel.java.global-autoconfigure.enabled=true 2023-05-31 14:50:36,011 INFO [io.sma.rea.mes.kafka] (smallrye-kafka-consumer-thread-0) SRMSG18257: Kafka consumer kafka-consumer-test, connected to Kafka brokers 'OUTSIDE://localhost:32777', belongs to the 'eventbatching' consumer group and is configured to poll records from [test] 2023-05-31 14:50:36,071 INFO [io.quarkus] (Quarkus Main Thread) eventbatching main-SNAPSHOT on JVM (powered by Quarkus 3.0.4.Final) started in 5.846s. Listening on: http://localhost:8080 2023-05-31 14:50:36,072 INFO [io.quarkus] (Quarkus Main Thread) Profile dev activated. Live Coding activated. 2023-05-31 14:50:36,072 INFO [io.quarkus] (Quarkus Main Thread) Installed features: [cdi, jdbc-postgresql, kafka-client, logging-json, micrometer, opentelemetry, resteasy-reactive, resteasy-reactive-jackson, smallrye-context-propagation, smallrye-health, smallrye-reactive-messaging, smallrye-reactive-messaging -kafka, vertx] ``` ### Actual behavior The startup fails due to the following exception: ``` 2023-05-31 14:44:41,302 ERROR [io.qua.run.Application] (Quarkus Main Thread) Failed to start application (with profile [dev]): java.lang.IllegalArgumentException: The attribute `value.deserializer` on connector 'smallrye-kafka' (channel: test.test) must be set at io.smallrye.reactive.messaging.kafka.KafkaConnectorIncomingConfiguration.lambda$getValueDeserializer$0(KafkaConnectorIncomingConfiguration.java:62) at java.base/java.util.Optional.orElseThrow(Optional.java:403) at io.smallrye.reactive.messaging.kafka.KafkaConnectorIncomingConfiguration.getValueDeserializer(KafkaConnectorIncomingConfiguration.java:62) at io.smallrye.reactive.messaging.kafka.KafkaConnectorIncomingConfiguration.validate(KafkaConnectorIncomingConfiguration.java:425) at io.smallrye.reactive.messaging.kafka.KafkaConnectorIncomingConfiguration.<init>(KafkaConnectorIncomingConfiguration.java:16) at io.smallrye.reactive.messaging.kafka.KafkaConnector.getPublisher(KafkaConnector.java:189) at io.smallrye.reactive.messaging.kafka.KafkaConnector_Subclass.getPublisher$$superforward(Unknown Source) at io.smallrye.reactive.messaging.kafka.KafkaConnector_Subclass$$function$$9.apply(Unknown Source) at io.quarkus.arc.impl.AroundInvokeInvocationContext.proceed(AroundInvokeInvocationContext.java:74) at io.quarkus.arc.impl.AroundInvokeInvocationContext$NextAroundInvokeInvocationContext.proceed(AroundInvokeInvocationContext.java:100) at io.quarkus.smallrye.reactivemessaging.runtime.devmode.DevModeSupportConnectorFactoryInterceptor.intercept(DevModeSupportConnectorFactoryInterceptor.java:53) at io.quarkus.smallrye.reactivemessaging.runtime.devmode.DevModeSupportConnectorFactoryInterceptor_Bean.intercept(Unknown Source) at io.quarkus.arc.impl.InterceptorInvocation.invoke(InterceptorInvocation.java:42) at io.quarkus.arc.impl.AroundInvokeInvocationContext.proceed(AroundInvokeInvocationContext.java:71) at io.quarkus.arc.impl.AroundInvokeInvocationContext.proceed(AroundInvokeInvocationContext.java:63) at io.quarkus.smallrye.reactivemessaging.runtime.DuplicatedContextConnectorFactoryInterceptor.intercept(DuplicatedContextConnectorFactoryInterceptor.java:32) at io.quarkus.smallrye.reactivemessaging.runtime.DuplicatedContextConnectorFactoryInterceptor_Bean.intercept(Unknown Source) at io.quarkus.arc.impl.InterceptorInvocation.invoke(InterceptorInvocation.java:42) at io.quarkus.arc.impl.AroundInvokeInvocationContext.perform(AroundInvokeInvocationContext.java:38) at io.quarkus.arc.impl.InvocationContexts.performAroundInvoke(InvocationContexts.java:26) at io.smallrye.reactive.messaging.kafka.KafkaConnector_Subclass.getPublisher(Unknown Source) at io.smallrye.reactive.messaging.kafka.KafkaConnector_ClientProxy.getPublisher(Unknown Source) at io.smallrye.reactive.messaging.providers.impl.ConfiguredChannelFactory.createPublisher(ConfiguredChannelFactory.java:172) at io.smallrye.reactive.messaging.providers.impl.ConfiguredChannelFactory.register(ConfiguredChannelFactory.java:134) at io.smallrye.reactive.messaging.providers.impl.ConfiguredChannelFactory.initialize(ConfiguredChannelFactory.java:106) at io.smallrye.reactive.messaging.providers.impl.ConfiguredChannelFactory_ClientProxy.initialize(Unknown Source) at java.base/java.util.Iterator.forEachRemaining(Iterator.java:133) at java.base/java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1845) at java.base/java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:762) at io.smallrye.reactive.messaging.providers.extension.MediatorManager.start(MediatorManager.java:206) at io.smallrye.reactive.messaging.providers.extension.MediatorManager_ClientProxy.start(Unknown Source) at io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle.onApplicationStart(SmallRyeReactiveMessagingLifecycle.java:52) at io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle_Observer_onApplicationStart_68e7b57eb97cb75d597c5b816682366e888d0d9b.notify(Unknown Source) at io.quarkus.arc.impl.EventImpl$Notifier.notifyObservers(EventImpl.java:346) at io.quarkus.arc.impl.EventImpl$Notifier.notify(EventImpl.java:328) at io.quarkus.arc.impl.EventImpl.fire(EventImpl.java:82) at io.quarkus.arc.runtime.ArcRecorder.fireLifecycleEvent(ArcRecorder.java:155) at io.quarkus.arc.runtime.ArcRecorder.handleLifecycleEvents(ArcRecorder.java:106) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent1144526294.deploy_0(Unknown Source) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent1144526294.deploy(Unknown Source) at io.quarkus.runner.ApplicationImpl.doStart(Unknown Source) at io.quarkus.runtime.Application.start(Application.java:101) at io.quarkus.runtime.ApplicationLifecycleManager.run(ApplicationLifecycleManager.java:111) at io.quarkus.runtime.Quarkus.run(Quarkus.java:71) at io.quarkus.runtime.Quarkus.run(Quarkus.java:44) at io.quarkus.runtime.Quarkus.run(Quarkus.java:124) at io.quarkus.runner.GeneratedMain.main(Unknown Source) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.runner.bootstrap.StartupActionImpl$1.run(StartupActionImpl.java:104) at java.base/java.lang.Thread.run(Thread.java:833) ``` ### How to Reproduce? Try to run the following code snippet: ``` @ApplicationScoped public class TestConsumer { @Incoming("test.test") public void consume(ChangeEvent event) { Log.info(event); } } ``` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 17 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.0.4.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) mvn 3.8.8 ### Additional information _No response_

e361121d056f19e7d342427755ca7ca3f1981c60

81f3014552446129382abfe6b666bd8881d9eb09

https://github.com/quarkusio/quarkus/compare/e361121d056f19e7d342427755ca7ca3f1981c60...81f3014552446129382abfe6b666bd8881d9eb09

diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java index 7e49c499fba..dbe9ede291e 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java @@ -1,5 +1,7 @@ package io.quarkus.smallrye.reactivemessaging.kafka.deployment; +import static io.quarkus.smallrye.reactivemessaging.kafka.deployment.SmallRyeReactiveMessagingKafkaProcessor.getChannelPropertyKey; + import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -57,7 +59,7 @@ boolean isKafkaConnector(List<ConnectorManagedChannelBuildItem> channelsManagedB String channelType = incoming ? "incoming" : "outgoing"; return isKafkaConnector.computeIfAbsent(channelType + "|" + channelName, ignored -> { - String connectorKey = "mp.messaging." + channelType + "." + channelName + ".connector"; + String connectorKey = getChannelPropertyKey(channelName, "connector", incoming); String connector = getConfig() .getOptionalValue(connectorKey, String.class) .orElse("ignored"); diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java index ae4319516a4..d974580b1a6 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java @@ -102,6 +102,13 @@ private static List<String> getChannelProperties(String keySuffix, Config config return values; } + static String channelPropertyFormat = "mp.messaging.%s.%s.%s"; + + static String getChannelPropertyKey(String channelName, String propertyName, boolean incoming) { + return String.format(channelPropertyFormat, incoming ? "incoming" : "outgoing", + channelName.contains(".") ? "\\"" + channelName + "\\"" : channelName, propertyName); + } + @BuildStep public void checkpointRedis(BuildProducer<AdditionalBeanBuildItem> additionalBean, BuildProducer<ReflectiveClassBuildItem> reflectiveClass, @@ -173,7 +180,7 @@ public void defaultChannelConfiguration( if (!discoveryState.isKafkaConnector(channelsManagedByConnectors, true, channelName)) { continue; } - String key = "mp.messaging.incoming." + channelName + ".graceful-shutdown"; + String key = getChannelPropertyKey(channelName, "graceful-shutdown", true); discoveryState.ifNotYetConfigured(key, () -> { defaultConfigProducer.produce(new RunTimeConfigurationDefaultBuildItem(key, "false")); }); @@ -215,12 +222,11 @@ void discoverDefaultSerdeConfig(DefaultSerdeDiscoveryState discovery, Type outgoingType = getOutgoingTypeFromMethod(method); processOutgoingType(discovery, outgoingType, (keySerializer, valueSerializer) -> { produceRuntimeConfigurationDefaultBuildItem(discovery, config, - "mp.messaging.outgoing." + channelName + ".key.serializer", keySerializer); + getChannelPropertyKey(channelName, "key.serializer", false), keySerializer); produceRuntimeConfigurationDefaultBuildItem(discovery, config, - "mp.messaging.outgoing." + channelName + ".value.serializer", valueSerializer); + getChannelPropertyKey(channelName, "value.serializer", false), valueSerializer); - handleAdditionalProperties("mp.messaging.outgoing." + channelName + ".", discovery, - config, keySerializer, valueSerializer); + handleAdditionalProperties(channelName, false, discovery, config, keySerializer, valueSerializer); }, generatedClass, reflection, alreadyGeneratedSerializers); } @@ -246,12 +252,11 @@ void discoverDefaultSerdeConfig(DefaultSerdeDiscoveryState discovery, Type outgoingType = getOutgoingTypeFromChannelInjectionPoint(injectionPointType); processOutgoingType(discovery, outgoingType, (keySerializer, valueSerializer) -> { produceRuntimeConfigurationDefaultBuildItem(discovery, config, - "mp.messaging.outgoing." + channelName + ".key.serializer", keySerializer); + getChannelPropertyKey(channelName, "key.serializer", false), keySerializer); produceRuntimeConfigurationDefaultBuildItem(discovery, config, - "mp.messaging.outgoing." + channelName + ".value.serializer", valueSerializer); + getChannelPropertyKey(channelName, "value.serializer", false), valueSerializer); - handleAdditionalProperties("mp.messaging.outgoing." + channelName + ".", discovery, - config, keySerializer, valueSerializer); + handleAdditionalProperties(channelName, false, discovery, config, keySerializer, valueSerializer); }, generatedClass, reflection, alreadyGeneratedSerializers); } } @@ -259,17 +264,17 @@ void discoverDefaultSerdeConfig(DefaultSerdeDiscoveryState discovery, private void processKafkaTransactions(DefaultSerdeDiscoveryState discovery, BuildProducer<RunTimeConfigurationDefaultBuildItem> config, String channelName, Type injectionPointType) { if (injectionPointType != null && isKafkaEmitter(injectionPointType)) { + String transactionalIdKey = getChannelPropertyKey(channelName, "transactional.id", false); + String enableIdempotenceKey = getChannelPropertyKey(channelName, "enable.idempotence", false); + String acksKey = getChannelPropertyKey(channelName, "acks", false); LOGGER.infof("Transactional producer detected for channel '%s', setting following default config values: " - + "'mp.messaging.outgoing.%s.transactional.id=${quarkus.application.name}-${channelName}', " - + "'mp.messaging.outgoing.%s.enable.idempotence=true', " - + "'mp.messaging.outgoing.%s.acks=all'", channelName, channelName, channelName, channelName); - produceRuntimeConfigurationDefaultBuildItem(discovery, config, - "mp.messaging.outgoing." + channelName + ".transactional.id", + + "'" + transactionalIdKey + "=${quarkus.application.name}-${channelName}', " + + "'" + enableIdempotenceKey + "=true', " + + "'" + acksKey + "=all'", channelName); + produceRuntimeConfigurationDefaultBuildItem(discovery, config, transactionalIdKey, "${quarkus.application.name}-" + channelName); - produceRuntimeConfigurationDefaultBuildItem(discovery, config, - "mp.messaging.outgoing." + channelName + ".enable.idempotence", "true"); - produceRuntimeConfigurationDefaultBuildItem(discovery, config, - "mp.messaging.outgoing." + channelName + ".acks", "all"); + produceRuntimeConfigurationDefaultBuildItem(discovery, config, enableIdempotenceKey, "true"); + produceRuntimeConfigurationDefaultBuildItem(discovery, config, acksKey, "all"); } } @@ -283,16 +288,15 @@ private void processIncomingType(DefaultSerdeDiscoveryState discovery, alreadyGeneratedDeserializers); produceRuntimeConfigurationDefaultBuildItem(discovery, config, - "mp.messaging.incoming." + channelName + ".key.deserializer", keyDeserializer); + getChannelPropertyKey(channelName, "key.deserializer", true), keyDeserializer); produceRuntimeConfigurationDefaultBuildItem(discovery, config, - "mp.messaging.incoming." + channelName + ".value.deserializer", valueDeserializer); + getChannelPropertyKey(channelName, "value.deserializer", true), valueDeserializer); if (Boolean.TRUE.equals(isBatchType)) { produceRuntimeConfigurationDefaultBuildItem(discovery, config, - "mp.messaging.incoming." + channelName + ".batch", "true"); + getChannelPropertyKey(channelName, "batch", true), "true"); } - handleAdditionalProperties("mp.messaging.incoming." + channelName + ".", discovery, - config, keyDeserializer, valueDeserializer); + handleAdditionalProperties(channelName, true, discovery, config, keyDeserializer, valueDeserializer); }); } @@ -308,7 +312,7 @@ private Type getInjectionPointType(AnnotationInstance annotation) { } } - private void handleAdditionalProperties(String configPropertyBase, DefaultSerdeDiscoveryState discovery, + private void handleAdditionalProperties(String channelName, boolean incoming, DefaultSerdeDiscoveryState discovery, BuildProducer<RunTimeConfigurationDefaultBuildItem> config, Result... results) { for (Result result : results) { if (result == null) { @@ -316,7 +320,8 @@ private void handleAdditionalProperties(String configPropertyBase, DefaultSerdeD } result.additionalProperties.forEach((key, value) -> { - produceRuntimeConfigurationDefaultBuildItem(discovery, config, configPropertyBase + key, value); + String configKey = getChannelPropertyKey(channelName, key, incoming); + produceRuntimeConfigurationDefaultBuildItem(discovery, config, configKey, value); }); } } @@ -946,7 +951,9 @@ private void processAnnotationsForReflectiveClassPayload(IndexView index, Config } private boolean isSerdeJson(IndexView index, Config config, String channelName, boolean serializer, boolean isKey) { - ConfigValue configValue = config.getConfigValue(getConfigName(channelName, serializer, isKey)); + String configKey = getChannelPropertyKey(channelName, (isKey ? "key" : "value") + "." + + (serializer ? "serializer" : "deserializer"), !serializer); + ConfigValue configValue = config.getConfigValue(configKey); if (configValue.getValue() != null) { DotName serdeName = DotName.createSimple(configValue.getValue()); return serializer ? isSubclassOfJsonSerializer(index, serdeName) : isSubclassOfJsonDeserializer(index, serdeName); @@ -954,14 +961,6 @@ private boolean isSerdeJson(IndexView index, Config config, String channelName, return false; } - String getConfigName(String channelName, boolean serializer, boolean isKey) { - return "mp.messaging." + - (serializer ? "outgoing" : "incoming") + "." + - channelName + "." + - (isKey ? "key" : "value") + "." + - (serializer ? "serializer" : "deserializer"); - } - private boolean isSubclassOfJsonSerializer(IndexView index, DotName serializerName) { return isSubclassOf(index, DotNames.OBJECT_MAPPER_SERIALIZER, serializerName) || isSubclassOf(index, DotNames.JSONB_SERIALIZER, serializerName); diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java index 0f941cc60d1..70a6d866a70 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java @@ -2727,5 +2727,32 @@ void method2(JsonObject msg) { } + @Test + void channelNameContainingDot() { + Tuple[] expectations = { + tuple("mp.messaging.incoming.\\"new.channel\\".key.deserializer", "org.apache.kafka.common.serialization.IntegerDeserializer"), + tuple("mp.messaging.incoming.\\"new.channel\\".value.deserializer", "org.apache.kafka.common.serialization.StringDeserializer"), + tuple("mp.messaging.outgoing.\\"new.channel.out\\".key.serializer", "org.apache.kafka.common.serialization.LongSerializer"), + tuple("mp.messaging.outgoing.\\"new.channel.out\\".value.serializer", "io.quarkus.kafka.client.serialization.JsonObjectSerializer"), + tuple("mp.messaging.outgoing.\\"new.channel.out\\".transactional.id", "${quarkus.application.name}-new.channel.out"), + tuple("mp.messaging.outgoing.\\"new.channel.out\\".enable.idempotence", "true"), + tuple("mp.messaging.outgoing.\\"new.channel.out\\".acks", "all"), + }; + doTest(expectations, ChannelContainingDot.class); + } + + + private static class ChannelContainingDot { + + @Incoming("new.channel") + void method1(KafkaRecord<Integer, String> msg) { + + } + + @Channel("new.channel.out") + KafkaTransactions<ProducerRecord<Long, JsonObject>> transactions; + + } + }

['extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java', 'extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java', 'extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.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/33819/33321

quarkusio

quarkus

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

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

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

fixes

Different behavior in native build using env var in application.properties when build with gradle vs. maven (Quarkus 3.x)

### Describe the bug Setting a environment variable which is used like `quarkus.some.var=${MY_ENV_VAR:defaultValue}` in application.properties has no effect when the native image is build with gradle. The important part is the replacement of `MY_ENV_VAR` with the set value in the property `quarkus.some.var`. This can lead to unexpected behaviour during execution in production because a property does not have the expected value. The behavior is only reproducible in Quarkus 3.x, but not in Quarkus 2.x. To describe and reproduce this behavior the following configuration example is used: `quarkus.banner.enabled=${BANNER:false}` Reproducers: maven -> https://github.com/dagrammy/quarkus-env-reproducer-maven gradle -> https://github.com/dagrammy/quarkus-env-reproducer-gradle ### Expected behavior Setting the env var `BANNER` to `true` before starting the application should show the banner regardless of the build tool used. ### Actual behavior Using maven: Expected behavior is met, the banner is shown. Using gradle: Expected behavior is not met, the banner is **NOT** shown. ### How to Reproduce? maven -> https://github.com/dagrammy/quarkus-env-reproducer-maven **build it using maven:** ``` unset BANNER ./mvnw clean package -Pnative ``` **run it without env var:** ``` ./target/command-mode-quickstart-1.0.0-SNAPSHOT-runner ``` -> header is NOT shown **run it with env var:** ``` export BANNER=true ./target/command-mode-quickstart-1.0.0-SNAPSHOT-runner ``` -> header is shown --- gradle -> https://github.com/dagrammy/quarkus-env-reproducer-gradle **build it using gradle:** ``` unset BANNER ./gradlew clean build -Dquarkus.package.type=native --info ``` **run it without env var:** ``` ./build/command-mode-quickstart-gradle-1.0.0-SNAPSHOT-runner ``` -> header is NOT shown **run it with env var:** ``` export BANNER=true ./build/command-mode-quickstart-gradle-1.0.0-SNAPSHOT-runner ``` -> header is **NOT** shown although env var is set ### Output of `uname -a` or `ver` Darwin grammy.local 22.3.0 Darwin Kernel Version 22.3.0: Thu Jan 5 20:49:43 PST 2023; root:xnu-8792.81.2~2/RELEASE_ARM64_T8103 arm64 ### Output of `java -version` openjdk version "17.0.5" 2022-10-18 OpenJDK Runtime Environment GraalVM CE 22.3.0 (build 17.0.5+8-jvmci-22.3-b08) OpenJDK 64-Bit Server VM GraalVM CE 22.3.0 (build 17.0.5+8-jvmci-22.3-b08, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.0.3 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 / Gradle 7.5.1 ### Additional information _No response_

5ed7597ea415438a66c9e3f392e15b5d5aff4951

2b1f2b1dfa6651fd70b9158984ac72c0a23be1d2

https://github.com/quarkusio/quarkus/compare/5ed7597ea415438a66c9e3f392e15b5d5aff4951...2b1f2b1dfa6651fd70b9158984ac72c0a23be1d2

diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java index 1fc804e23f4..2e01013032b 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java @@ -20,6 +20,9 @@ import io.quarkus.utilities.OS; public abstract class QuarkusTask extends DefaultTask { + private static final List<String> WORKER_BUILD_FORK_OPTIONS = List.of("quarkus.package.", + "quarkus.application.", "quarkus.gradle-worker."); + private final transient QuarkusPluginExtension extension; protected final File projectDir; protected final File buildDir; @@ -85,15 +88,17 @@ private void configureProcessWorkerSpec(ProcessWorkerSpec processWorkerSpec, Map forkOptions.environment("PATH", javaBin + File.pathSeparator + System.getenv("PATH")); } - // It's kind of a "very big hammer" here, but this way we ensure that all 'quarkus.*' properties from - // all configuration sources are (forcefully) used in the Quarkus build - even properties defined on the - // QuarkusPluginExtension. + // It's kind of a "very big hammer" here, but this way we ensure that all necessary properties + // ("quarkus.package.*","quarkus.application,*", "quarkus.gradle-worker.*") from all configuration sources + // are (forcefully) used in the Quarkus build - even properties defined on the QuarkusPluginExtension. // This prevents that settings from e.g. a application.properties takes precedence over an explicit // setting in Gradle project properties, the Quarkus extension or even via the environment or system // properties. + // see https://github.com/quarkusio/quarkus/issues/33321 why not all properties are passed as system properties // Note that we MUST NOT mess with the system properties of the JVM running the build! And that is the // main reason why build and code generation happen in a separate process. - configMap.entrySet().stream().filter(e -> e.getKey().startsWith("quarkus.")) + configMap.entrySet().stream() + .filter(e -> WORKER_BUILD_FORK_OPTIONS.stream().anyMatch(e.getKey().toLowerCase()::startsWith)) .forEach(e -> forkOptions.systemProperty(e.getKey(), e.getValue())); // populate worker classpath with additional content?

['devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.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/33811/33804

quarkusio

quarkus

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

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

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

fix

Dev Mode fails with Quarkus 3.1 and Kafka client (no vert.x http extension on the classpath)

### Describe the bug When starting devservices with `io.quarkus:quarkus-kafka-client:3.1.0.Final`, I get this error: ``` 2023-06-02 22:48:36,647 INFO [io.qua.kaf.cli.dep.DevServicesKafkaProcessor] (build-24) Dev Services for Kafka started. Other Quarkus applications in dev mode will find the broker automatically. For Quarkus applications in production mode, you can connect to this by starting your application with -Dkafka.bootstrap.servers=OUTSIDE://localhost:32769 2023-06-02 22:48:36,832 ERROR [io.qua.run.Application] (Quarkus Main Thread) Failed to start application (with profile [dev]): java.lang.ClassNotFoundException: io.vertx.core.Handler at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:641) at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:188) at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:520) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:516) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:466) at io.quarkus.deployment.steps.KafkaProcessor$registerKafkaUiExecHandler1228376192.deploy_0(Unknown Source) at io.quarkus.deployment.steps.KafkaProcessor$registerKafkaUiExecHandler1228376192.deploy(Unknown Source) at io.quarkus.runner.ApplicationImpl.doStart(Unknown Source) at io.quarkus.runtime.Application.start(Application.java:101) at io.quarkus.runtime.ApplicationLifecycleManager.run(ApplicationLifecycleManager.java:111) at io.quarkus.runtime.Quarkus.run(Quarkus.java:71) at io.quarkus.runtime.Quarkus.run(Quarkus.java:44) at io.quarkus.runtime.Quarkus.run(Quarkus.java:124) at io.quarkus.runner.GeneratedMain.main(Unknown Source) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.runner.bootstrap.StartupActionImpl$1.run(StartupActionImpl.java:104) at java.base/java.lang.Thread.run(Thread.java:833) ``` ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? To reproduce is simple. Create a Quarkus 3 project, add `io.quarkus:quarkus-kafka-client` extension. Run the app in devMode. ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

f7cfbd316ae081b8771fb3baae9e602c681340d9

ffc0d8b5fdf761334e541f2e6e56473e5c856517

https://github.com/quarkusio/quarkus/compare/f7cfbd316ae081b8771fb3baae9e602c681340d9...ffc0d8b5fdf761334e541f2e6e56473e5c856517

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 d2ced26b180..eef8ad985c9 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 @@ -561,14 +561,17 @@ public AdditionalBeanBuildItem kafkaClientBeans() { @BuildStep(onlyIf = IsDevelopment.class) @Record(ExecutionTime.RUNTIME_INIT) public void registerKafkaUiExecHandler( + Capabilities capabilities, BuildProducer<DevConsoleRouteBuildItem> routeProducer, KafkaUiRecorder recorder) { - routeProducer.produce(DevConsoleRouteBuildItem.builder() - .method("POST") - .handler(recorder.kafkaControlHandler()) - .path(KAFKA_ADMIN_PATH) - .bodyHandlerRequired() - .build()); + if (capabilities.isPresent(Capability.VERTX_HTTP)) { + routeProducer.produce(DevConsoleRouteBuildItem.builder() + .method("POST") + .handler(recorder.kafkaControlHandler()) + .path(KAFKA_ADMIN_PATH) + .bodyHandlerRequired() + .build()); + } } @BuildStep(onlyIf = IsDevelopment.class)

['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/33757/33744

quarkusio

quarkus

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

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

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

fixes

Tests run in DEV mode are now logged with short names, previously signature was present

### Describe the bug Before https://github.com/quarkusio/quarkus/pull/33685 our DEV mode test contained: ``` 17:45:10,608 INFO [app] Running 1/1. Running: io.quarkus.ts.http.minimum.HelloResourceTest#HelloResourceTest ``` now it contains ``` 17:53:53,032 INFO [app] Running 1/1. Running: #HelloResourceTest ``` I can so no information about this in PR description or note in migration guide or anything, therefore there is no way to tell whether this change is intentional or side effect. ### Expected behavior Previous behavior was clearer, but I just need a confirmation this was intentional change, that's all. ### Actual behavior `io.quarkus.ts.http.minimum.HelloResourceTest#HelloResourceTest` => `HelloResourceTest` ### How to Reproduce? Reproducer: 1. `git clone git@github.com:michalvavrik/quarkus-test-suite.git` 2. `cd quarkus-test-suite/http/http-minimum-reactive` 3. `git checkout -b reproducer/domain-socket-vertx-bump` 4. `mvn clean verify -Dit.test=DevModeHttpMinimumReactiveIT` ### Output of `uname -a` or `ver` Fedora 38 ### Output of `java -version` 17 ### GraalVM version (if different from Java) 22.3 ### Quarkus version or git rev 999-SNAPSHOT ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.9.1 ### Additional information _No response_

8d4b3d135bfaffb6dfd6bc455c13eea6c2c026c2

2828c0a0a8b3225ba0ef61d4da3c735a84b0d2d3

https://github.com/quarkusio/quarkus/compare/8d4b3d135bfaffb6dfd6bc455c13eea6c2c026c2...2828c0a0a8b3225ba0ef61d4da3c735a84b0d2d3

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java index 51fddadc5f5..88453151ec3 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java @@ -235,6 +235,9 @@ public void executionStarted(TestIdentifier testIdentifier) { startTimes.put(testIdentifier, System.currentTimeMillis()); String testClassName = ""; Class<?> testClass = getTestClassFromSource(testIdentifier.getSource()); + if (testClass != null) { + testClassName = testClass.getName(); + } for (TestRunListener listener : listeners) { listener.testStarted(testIdentifier, testClassName); }

['core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.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/33680/32963

quarkusio

quarkus

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

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

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

fix

Reactive Client - Mutiny Dropped Exception on Cancel (stream+json)

### Describe the bug After canceling a subscription to a Multi from the reactive client, I see error logs like `2023-04-27 11:51:47,838 ERROR [io.qua.mut.run.MutinyInfrastructure] (vert.x-eventloop-thread-0) Mutiny had to drop the following exception: io.vertx.core.http.HttpClosedException: Connection was closed` This error log looks identical to what was seen in https://github.com/quarkusio/quarkus/issues/27489 and fixed in a PR linked in that issue, but it is occurring in my code. The difference seems to be that my client is dealing with these media types ``` @Produces(RestMediaType.APPLICATION_STREAM_JSON) @RestStreamElementType(MediaType.APPLICATION_JSON) ``` rather than `MediaType.SERVER_SENT_EVENTS` ### Expected behavior The `Cancellable` will cancel gracefully/without lingering error logs in the client ### Actual behavior error logs as copied in description ### How to Reproduce? Reproducer: `service3` (client) and `service4` (server) in https://github.com/fleckware/quarkus-test 1. in one terminal `./gradlew service4:quarkusDev` 2. in a separate terminal `./gradlew service3:quarkusDev` 3. in a separate terminal `curl localhost:8080/service3/test/cancel` It sleeps for 10 seconds before trying to cancel, then observe error logs in client ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` openjdk 11.0.10 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.0.0 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) gradle 7.4.2 ### Additional information _No response_

3212b8a6f87dd4860caeea91906824950554ed5f

42edefe6f39af5ab6110950d7e817720a9eed970

https://github.com/quarkusio/quarkus/compare/3212b8a6f87dd4860caeea91906824950554ed5f...42edefe6f39af5ab6110950d7e817720a9eed970

diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java index e84f30da72e..9a0efc53b29 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java @@ -241,7 +241,6 @@ public void handle(Buffer buffer) { }); // this captures the end of the response - // FIXME: won't this call complete twice()? vertxClientResponse.endHandler(v -> { multiRequest.emitter.complete(); }); @@ -265,9 +264,9 @@ public void handle(Buffer chunk) { try { R item = restClientRequestContext.readEntity(in, responseType, response.getMediaType(), response.getMetadata()); - multiRequest.emitter.emit(item); + multiRequest.emit(item); } catch (IOException e) { - multiRequest.emitter.fail(e); + multiRequest.fail(e); } } }); @@ -275,7 +274,7 @@ public void handle(Buffer chunk) { if (t == ConnectionBase.CLOSED_EXCEPTION) { // we can ignore this one since we registered a closeHandler } else { - multiRequest.emitter.fail(t); + multiRequest.fail(t); } }); vertxClientResponse.endHandler(new Handler<Void>() {

['independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.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/33667/33623

quarkusio

quarkus

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

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

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

fix

Regression - Unable to build native binary when using quarkus-kafka-client extension

### Describe the bug See https://github.com/quarkusio/quarkus/issues/32968. Steps to reproduce are the same. Root cause differs for released Quarkus versions and snapshot: - `3.0.2.Final` / `3.0.3.Final` / `3.0.4.Final` / `3.1.0.CR1` ``` Caused by: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved method during parsing: io.quarkus.kafka.client.runtime.ui.KafkaUiUtils.<init>(io.quarkus.kafka.client.runtime.KafkaAdminClient, io.quarkus.kafka.client.runtime.ui.KafkaTopicClient, java.util.Map). This error is reported at image build time because class io.quarkus.kafka.client.runtime.ui.KafkaUiUtils_Bean is registered for linking at image build time by command line ``` - `999-SNAPSHOT` (2023-05-25) ``` Caused by: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: io.netty.util.internal.logging.Log4J2Logger. This error is reported at image build time because class io.netty.util.internal.logging.Log4J2LoggerFactory is registered for linking at image build time by command line ``` See attached logs: [kafka-client-3-0-2-final.log](https://github.com/quarkusio/quarkus/files/11572911/kafka-client-3-0-2-final.log) [kafka-client-3-0-3-final.log](https://github.com/quarkusio/quarkus/files/11572912/kafka-client-3-0-3-final.log) [kafka-client-3-0-4-final.log](https://github.com/quarkusio/quarkus/files/11572913/kafka-client-3-0-4-final.log) [kafka-client-3-1-0-cr1.log](https://github.com/quarkusio/quarkus/files/11572914/kafka-client-3-1-0-cr1.log) [kafka-client-999-snapshot.log](https://github.com/quarkusio/quarkus/files/11572915/kafka-client-999-snapshot.log) ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? [code-with-quarkus.zip](https://github.com/quarkusio/quarkus/files/11575553/code-with-quarkus.zip) unzip && cd && mvn clean verify -Dnative Alternative reproducer for `999-SNAPSHOT`: [code-with-quarkus_999-SNAPSHOT.zip](https://github.com/quarkusio/quarkus/files/11611945/code-with-quarkus_999-SNAPSHOT.zip) ### Output of `uname -a` or `ver` Linux 6.2.15-200.fc37.x86_64 ### Output of `java -version` openjdk 17.0.7 2023-04-18 ### GraalVM version (if different from Java) GraalVM 22.3.2.1-Final Java 17 Mandrel Distribution ### Quarkus version or git rev 3.0.2.Final, 3.0.3.Final, 3.0.4.Final, 3.1.0.CR1, 999-SNAPSHOT (2023-05-25) ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) 3.8.6 ### Additional information _No response_

7987b282516e6b32ec1dd1a2e2d9e7de12798d44

3a3acdf2d3fe651609ac41f0047ff8ca5c8c6739

https://github.com/quarkusio/quarkus/compare/7987b282516e6b32ec1dd1a2e2d9e7de12798d44...3a3acdf2d3fe651609ac41f0047ff8ca5c8c6739

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 2c8f91193f6..d2ced26b180 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 @@ -539,12 +539,19 @@ void registerServiceBinding(Capabilities capabilities, } } + @BuildStep + public AdditionalBeanBuildItem kafkaAdmin() { + return AdditionalBeanBuildItem.builder() + .addBeanClass(KafkaAdminClient.class) + .setUnremovable() + .build(); + } + // Kafka UI related stuff - @BuildStep + @BuildStep(onlyIf = IsDevelopment.class) public AdditionalBeanBuildItem kafkaClientBeans() { return AdditionalBeanBuildItem.builder() - .addBeanClass(KafkaAdminClient.class) .addBeanClass(KafkaTopicClient.class) .addBeanClass(KafkaUiUtils.class) .setUnremovable()

['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/33645/28971

quarkusio

quarkus

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

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

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

fix

Quarkus Maven Plugin unable to handle maven exclusions

### Describe the bug One of the artifacts in my POM has `ehcache` as a dependency, but when I'm trying to exclude it as follows: ``` <dependency> <groupId>io.quarkiverse.cxf</groupId> <artifactId>quarkus-cxf-rt-ws-security</artifactId> <exclusions> <exclusion> <groupId>org.ehcache</groupId> <artifactId>ehcache</artifactId> </exclusion> </exclusions> </dependency> ``` I'm getting this error: ``` [ERROR] [error]: Build step io.quarkus.deployment.index.ApplicationArchiveBuildStep#build threw an exception: java.lang.RuntimeException: Could not resolve artifact org.ehcache:ehcache::jar among the runtime dependencies of the application [ERROR] at io.quarkus.deployment.index.ApplicationArchiveBuildStep.addIndexDependencyPaths(ApplicationArchiveBuildStep.java:188) [ERROR] at io.quarkus.deployment.index.ApplicationArchiveBuildStep.scanForOtherIndexes(ApplicationArchiveBuildStep.java:151) [ERROR] at io.quarkus.deployment.index.ApplicationArchiveBuildStep.build(ApplicationArchiveBuildStep.java:108) [ERROR] at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [ERROR] at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) [ERROR] at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [ERROR] at java.base/java.lang.reflect.Method.invoke(Method.java:567) [ERROR] at io.quarkus.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:909) [ERROR] at io.quarkus.builder.BuildContext.run(BuildContext.java:281) [ERROR] at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) [ERROR] at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) [ERROR] at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) [ERROR] at java.base/java.lang.Thread.run(Thread.java:835) [ERROR] at org.jboss.threads.JBossThread.run(JBossThread.java:501) [ERROR] -> [Help 1] ``` Is it a known bug? I tried to downgrade to the older version (from 2.13.0.Final to 2.12.1.Final) and it worked, so it must be a regression. ### Expected behavior Successful build without an error. ### Actual behavior Plugin throws java.lang.RuntimeException. ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

2a867eea956cf5d83657541c4b60f8b3e426c112

f79f2c2249c22cb404a6a5ec63299aadbc618a41

https://github.com/quarkusio/quarkus/compare/2a867eea956cf5d83657541c4b60f8b3e426c112...f79f2c2249c22cb404a6a5ec63299aadbc618a41

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java index 89f62b23054..cb4b7289fe2 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java @@ -6,7 +6,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -168,35 +167,28 @@ private void addIndexDependencyPaths(List<IndexDependencyBuildItem> indexDepende if (indexDependencyBuildItems.isEmpty()) { return; } - final Collection<ResolvedDependency> userDeps = curateOutcomeBuildItem.getApplicationModel() - .getRuntimeDependencies(); - final Map<ArtifactKey, ResolvedDependency> userMap = new HashMap<>(userDeps.size()); - for (ResolvedDependency dep : userDeps) { - userMap.put(dep.getKey(), dep); + final Set<ArtifactKey> indexDependencyKeys = new HashSet<>(indexDependencyBuildItems.size()); + for (IndexDependencyBuildItem indexDependencyBuildItem : indexDependencyBuildItems) { + indexDependencyKeys.add(ArtifactKey.of(indexDependencyBuildItem.getGroupId(), + indexDependencyBuildItem.getArtifactId(), + indexDependencyBuildItem.getClassifier(), + ArtifactCoords.TYPE_JAR)); } - try { - for (IndexDependencyBuildItem indexDependencyBuildItem : indexDependencyBuildItems) { - final ArtifactKey key = ArtifactKey.of(indexDependencyBuildItem.getGroupId(), - indexDependencyBuildItem.getArtifactId(), - indexDependencyBuildItem.getClassifier(), - ArtifactCoords.TYPE_JAR); - final ResolvedDependency artifact = userMap.get(key); - if (artifact == null) { - throw new RuntimeException( - "Additional dependency to be indexed (added via 'quarkus.index-dependency' configuration) " - + key - + " could not be found among the runtime dependencies of the application. Either remove the indexing configuration or add the dependency to your build system."); - } - for (Path path : artifact.getContentTree().getRoots()) { - if (!root.isExcludedFromIndexing(path) && !root.getResolvedPaths().contains(path) + for (ResolvedDependency dep : curateOutcomeBuildItem.getApplicationModel().getDependencies()) { + if (dep.isRuntimeCp() && indexDependencyKeys.contains(dep.getKey())) { + for (Path path : dep.getContentTree().getRoots()) { + if (!root.isExcludedFromIndexing(path) + && !root.getResolvedPaths().contains(path) && indexedDeps.add(path)) { - appArchives.add(createApplicationArchive(buildCloseables, indexCache, path, key, - removedResources)); + try { + appArchives.add(createApplicationArchive(buildCloseables, indexCache, path, dep.getKey(), + removedResources)); + } catch (IOException e) { + throw new UncheckedIOException(e); + } } } } - } catch (IOException e) { - throw new RuntimeException(e); } }

['core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.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/33644/33501

quarkusio

quarkus

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

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

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

fix

gradle multi module project build fails when quarkus.bootstrap.workspace-discovery is enabled

### Describe the bug After upgrading Quarkus to 3.0.3, my multi-module gradle project fails to build with the following error when `quarkus.bootstrap.workspace-discovery` is set as `true`. ``` ❯ ./gradlew clean build FAILURE: Build failed with an exception. * What went wrong: Execution failed for task ':app:quarkusBuild'. > Could not copy file '/.../multi-module/code-with-quarkus/app/build/quarkus-build/dep/lib/main/org.acme.main' to '/.../multi-module/code-with-quarkus/app/build/quarkus-app/lib/main/org.acme.main'. > Cannot create directory '/.../multi-module/code-with-quarkus/app/build/quarkus-app/lib/main/org.acme.main' as it already exists, but is not a directory ``` INFO logs show that the build fails at `quarkusBuild` task. ``` > Task :app:quarkusBuild FAILED Caching disabled for task ':app:quarkusBuild' because: Build cache is disabled Task ':app:quarkusBuild' is not up-to-date because: Task has failed previously. Removing output files and directories (provide a clean state). Synchronizing Quarkus build for jar packaging from /.../multi-module/code-with-quarkus/app/build/quarkus-build/app/quarkus-app and /.../multi-module/code-with-quarkus/app/build/quarkus-build/dep into /.../multi-module/code-with-quarkus/app/build/quarkus-app ``` If I set `quarkus.bootstrap.workspace-discovery` to `false`, the project builds successfully. ### Expected behavior `./gradlew build` finishes successfully. ### Actual behavior `./gradlew build` fails with the above error. ### How to Reproduce? 1. download and unzip [project.zip](https://github.com/quarkusio/quarkus/files/11518944/project.zip) 2. `cd code-with-quarkus` 3. run `./gradlew clean build` twice ### Output of `uname -a` or `ver` Darwin KEFUJII-M-Q636 22.4.0 Darwin Kernel Version 22.4.0: Mon Mar 6 21:00:17 PST 2023; root:xnu-8796.101.5~3/RELEASE_X86_64 x86_64 ### Output of `java -version` openjdk version "18.0.2.1" 2022-08-18 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.0.3 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 8.1 ### Additional information _No response_

2a867eea956cf5d83657541c4b60f8b3e426c112

30d8579297610f1f3a355b9ae0fc6cbab5c49bff

https://github.com/quarkusio/quarkus/compare/2a867eea956cf5d83657541c4b60f8b3e426c112...30d8579297610f1f3a355b9ae0fc6cbab5c49bff

diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildDependencies.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildDependencies.java index 10d841997ac..2e7b714ff72 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildDependencies.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildDependencies.java @@ -18,6 +18,7 @@ import io.quarkus.bootstrap.model.ApplicationModel; import io.quarkus.deployment.pkg.PackageConfig; +import io.quarkus.fs.util.ZipUtils; import io.quarkus.gradle.QuarkusPlugin; import io.quarkus.maven.dependency.ArtifactKey; import io.quarkus.maven.dependency.DependencyFlags; @@ -175,10 +176,22 @@ private void jarDependencies(Path libBoot, Path libMain) { getLogger().debug("Dependency {} : copying {} to {}", dep.toGACTVString(), p, target); - try { - Files.copy(p, target); - } catch (IOException e) { - throw new GradleException(String.format("Failed to copy %s to %s", p, target), e); + if (Files.isDirectory(p)) { + // This case can happen when we are building a jar from inside the Quarkus repository + // and Quarkus Bootstrap's localProjectDiscovery has been set to true. In such a case + // the non-jar dependencies are the Quarkus dependencies picked up on the file system + try { + ZipUtils.zip(p, target); + } catch (IOException e) { + throw new GradleException( + String.format("Failed to archive classes at %s into %s", p, target), e); + } + } else { + try { + Files.copy(p, target); + } catch (IOException e) { + throw new GradleException(String.format("Failed to copy %s to %s", p, target), e); + } } } });

['devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildDependencies.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/22502/21265

quarkusio

quarkus

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

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

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

fixes

No instance of TenantResolver was found for persistence unit <default>

### Describe the bug After updating from quarkus 2.2.0 to version 2.3.1.Final (I tried also with version 2.4.1.Final) I added the annotation @PersistenceUnitExtension as mentioned in the migration guide here: [Migration Guide 2.3 Quarkus](https://github.com/quarkusio/quarkus/wiki/Migration-Guide-2.3) I am dynamically retrieving the schema. No named persistence Unit. Quarkus is working with the new annotation and also the schema is correctly retrieved after quarkus has booted up, but **at startup** I get the following error message: `HHH000342: Could not obtain connection to query metadata: java.lang.IllegalStateException: No instance of TenantResolver was found for persistence unit <default>. You need to create an implementation for this interface to allow resolving the current tenant identifier.` But I get this error message only at startup. To me it looks like it's a startup order issue. Can somebody approve this? My Code: ``` import io.quarkus.hibernate.orm.PersistenceUnitExtension; import io.quarkus.hibernate.orm.runtime.tenant.TenantResolver; import lombok.extern.slf4j.Slf4j; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; @RequestScoped @PersistenceUnitExtension @Slf4j public class CustomTenantResolver implements TenantResolver { @PostConstruct private void postConstruct() { log.info( "CustomTenantResolver constructed!" ); } @Override public String getDefaultTenantId() { log.info( "getDefaultTenantId" ); return "public"; } @Override public String resolveTenantId() { log.info( "resolveTenantId" ); String schema = TenantContext.getCurrentTenant(); if ( schema == null ) { return "public"; } log.info( "current schema {}", schema ); return schema; } } ``` Only if needed my application.properties ``` # datasource settings quarkus.http.port=8080 quarkus.hibernate-orm.multitenant=SCHEMA quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/db quarkus.datasource.db-kind=postgresql quarkus.datasource.username=useraa quarkus.datasource.password=myPassword quarkus.datasource.jdbc.initial-size=2 quarkus.datasource.jdbc.min-size=2 quarkus.datasource.jdbc.max-size=8 quarkus.transaction-manager.default-transaction-timeout=300S quarkus.flyway.migrate-at-start=false quarkus.flyway.schemas=public quarkus.package.type=uber-jar # Logging quarkus.log.level=INFO quarkus.log.min-level=INFO #%dev.quarkus.log.level=DEBUG #%dev.quarkus.log.min-level=DEBUG # Rest-api settings portal-api/mp-rest/url=http://localhost:8180/ portal-api/mp-rest/scope=javax.inject.Singleton org.eclipse.microprofile.rest.client.propagateHeaders=Authorization # Rest-api settings # OIDC Configuration quarkus.oidc.auth-server-url=http://localhost:8280/auth/realms/software quarkus.oidc.token.issuer=https://mywebsite.at/auth/realms/turniersoftware quarkus.oidc.client-id=quarkus-pea quarkus.oidc.credentials.secret=mySecretCode # Enable Policy Enforcement quarkus.keycloak.policy-enforcer.enable=false # Dev variables #quarkus.log.level=INFO #quarkus.log.min-level=DEBUG #quarkus.log.category."io.undertow".level=DEBUG ``` **//SOLUTION found by nmvr2600:** Add `@default` annotation to your class from the package: `import javax.enterprise.inject.Default;` ``` import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Default; @Default @RequestScoped @PersistenceUnitExtension @Slf4j public class CustomTenantResolver implements TenantResolver { ... ``` ### Expected behavior No error message on startup. ### Actual behavior I get the no instance of tenantResolver was found exception. ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 11 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.4.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

a43f46e60adf656c67a3ea274094c21b857e9fbb

7aab5f94836afef2c127197a7eec08b8e8532f9a

https://github.com/quarkusio/quarkus/compare/a43f46e60adf656c67a3ea274094c21b857e9fbb...7aab5f94836afef2c127197a7eec08b8e8532f9a

diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java index c5fef6c9cc1..1455be9ea39 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java @@ -7,7 +7,6 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Default; import org.hibernate.engine.jdbc.connections.spi.AbstractMultiTenantConnectionProvider; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; @@ -17,7 +16,6 @@ import io.quarkus.arc.InjectableInstance; import io.quarkus.arc.InstanceHandle; import io.quarkus.arc.ManagedContext; -import io.quarkus.hibernate.orm.PersistenceUnit.PersistenceUnitLiteral; import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil; /** @@ -107,20 +105,18 @@ private static ConnectionProvider resolveConnectionProvider(String persistenceUn * @return Current tenant resolver. */ private static InstanceHandle<TenantResolver> tenantResolver(String persistenceUnitName) { - InstanceHandle<TenantResolver> resolverInstance; - if (PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) { - resolverInstance = Arc.container().instance(TenantResolver.class, Default.Literal.INSTANCE); - } else { - resolverInstance = Arc.container().instance(TenantResolver.class, - new PersistenceUnitLiteral(persistenceUnitName)); - } - if (!resolverInstance.isAvailable()) { + InjectableInstance<TenantResolver> instance = PersistenceUnitUtil + .legacySingleExtensionInstanceForPersistenceUnit( + TenantResolver.class, persistenceUnitName); + + if (instance.isUnsatisfied()) { throw new IllegalStateException(String.format(Locale.ROOT, "No instance of %1$s was found for persistence unit %2$s. " + "You need to create an implementation for this interface to allow resolving the current tenant identifier.", TenantResolver.class.getSimpleName(), persistenceUnitName)); } - return resolverInstance; + + return instance.getHandle(); } }

['extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.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/32723/32591

quarkusio

quarkus

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

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

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

fixes

Unrecognized configuration key set by DevServices

### Describe the bug When starting a application that use the postgress jdbc dev services and an empty application.properties, this warning is printed in the startup log: `Unrecognized configuration key "quarkus.datasource.jdbc.url" was provided; it will be ignored; verify that the dependency extension for this configuration is set or that you did not make a typo` ### Expected behavior Dev Services should not set Unrecognized configuration keys or at least not show the warning ### Actual behavior User are warned about something they can not do anything about ### How to Reproduce? Reproducer: https://github.com/phillip-kruger/devui-example 1) clone the about repo and start the app, you should see the warning in the log ### Output of `uname -a` or `ver` Linux pkruger-laptop 6.2.9-200.fc37.x86_64 #1 SMP PREEMPT_DYNAMIC Thu Mar 30 22:31:57 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` OpenJDK 64-Bit Server VM (Red_Hat-17.0.6.0.10-1.fc37) (build 17.0.6+10, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 999-SNAPSHOT ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.5 (3599d3414f046de2324203b78ddcf9b5e4388aa0) ### Additional information As discussed here: https://github.com/quarkusio/quarkus/pull/32563#issuecomment-1505174872

b422d5b26765a35839314f8f746b3b11e59bcdab

e20b37dae461d48094801ed6c325e328bcefec17

https://github.com/quarkusio/quarkus/compare/b422d5b26765a35839314f8f746b3b11e59bcdab...e20b37dae461d48094801ed6c325e328bcefec17

diff --git a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java index 83af2b468d6..bfeafc14aa2 100644 --- a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java +++ b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java @@ -23,6 +23,8 @@ import io.quarkus.datasource.deployment.spi.DevServicesDatasourceResultBuildItem; import io.quarkus.datasource.runtime.DataSourceBuildTimeConfig; import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig; +import io.quarkus.deployment.Capabilities; +import io.quarkus.deployment.Capability; import io.quarkus.deployment.IsNormal; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; @@ -57,7 +59,9 @@ public class DevServicesDatasourceProcessor { static volatile boolean first = true; @BuildStep - DevServicesDatasourceResultBuildItem launchDatabases(CurateOutcomeBuildItem curateOutcomeBuildItem, + DevServicesDatasourceResultBuildItem launchDatabases( + Capabilities capabilities, + CurateOutcomeBuildItem curateOutcomeBuildItem, DockerStatusBuildItem dockerStatusBuildItem, List<DefaultDataSourceDbKindBuildItem> installedDrivers, List<DevServicesDatasourceProviderBuildItem> devDBProviders, @@ -133,7 +137,7 @@ DevServicesDatasourceResultBuildItem launchDatabases(CurateOutcomeBuildItem cura Map<String, DevServicesDatasourceProvider> devDBProviderMap = devDBProviders.stream() .collect(Collectors.toMap(DevServicesDatasourceProviderBuildItem::getDatabase, DevServicesDatasourceProviderBuildItem::getDevServicesProvider)); - RunningDevService defaultDevService = startDevDb(null, curateOutcomeBuildItem, installedDrivers, + RunningDevService defaultDevService = startDevDb(null, capabilities, curateOutcomeBuildItem, installedDrivers, !dataSourceBuildTimeConfig.namedDataSources.isEmpty(), devDBProviderMap, dataSourceBuildTimeConfig.defaultDataSource, @@ -145,7 +149,7 @@ DevServicesDatasourceResultBuildItem launchDatabases(CurateOutcomeBuildItem cura } defaultResult = toDbResult(defaultDevService); for (Map.Entry<String, DataSourceBuildTimeConfig> entry : dataSourceBuildTimeConfig.namedDataSources.entrySet()) { - RunningDevService namedDevService = startDevDb(entry.getKey(), curateOutcomeBuildItem, + RunningDevService namedDevService = startDevDb(entry.getKey(), capabilities, curateOutcomeBuildItem, installedDrivers, true, devDBProviderMap, entry.getValue(), configHandlersByDbType, propertiesMap, dockerStatusBuildItem, @@ -192,7 +196,9 @@ private String trim(String optional) { return optional.trim(); } - private RunningDevService startDevDb(String dbName, + private RunningDevService startDevDb( + String dbName, + Capabilities capabilities, CurateOutcomeBuildItem curateOutcomeBuildItem, List<DefaultDataSourceDbKindBuildItem> installedDrivers, boolean hasNamedDatasources, @@ -314,8 +320,17 @@ private RunningDevService startDevDb(String dbName, Map<String, String> devDebProperties = new HashMap<>(); for (DevServicesDatasourceConfigurationHandlerBuildItem devDbConfigurationHandlerBuildItem : configHandlers) { - devDebProperties.putAll(devDbConfigurationHandlerBuildItem.getConfigProviderFunction() - .apply(dbName, datasource)); + Map<String, String> properties = devDbConfigurationHandlerBuildItem.getConfigProviderFunction().apply(dbName, + datasource); + for (Map.Entry<String, String> entry : properties.entrySet()) { + if (entry.getKey().contains(".jdbc.") && entry.getKey().endsWith(".url")) { + if (capabilities.isCapabilityWithPrefixPresent(Capability.AGROAL)) { + devDebProperties.put(entry.getKey(), entry.getValue()); + } + } else { + devDebProperties.put(entry.getKey(), entry.getValue()); + } + } } setDataSourceProperties(devDebProperties, dbName, "db-kind", defaultDbKind.get()); if (datasource.getUsername() != null) {

['extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.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/22318/21067

quarkusio

quarkus

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

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

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

fixes

Hibernate Panache sorting not working with Named Query

### Describe the bug Sorting not working with Named Query ``` @Entity @NamedQueries({ @NamedQuery(name = "countFruit", query = "FROM Fruit") }) public class Fruit extends PanacheEntity { @Column(length = 40, unique = true) public String name; public static List<Fruit> listSortedFruitsByNamedQuery() { return list("#countFruit", Sort.by("name").ascending(), new HashMap<>()); // Not sorting } public static List<Fruit> listSortedFruits() { return list("FROM Fruit", Sort.by("name").ascending(), new HashMap<>()); //Sorting is done } } ``` ### Expected behavior find, list and stream functions should support sorting for named queries also. ### Actual behavior No errors, but the result list is not sorted if named query is used ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` openjdk version "11.0.11" ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.3.0.FINAL ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.6.3 ### Additional information Possible related issue: https://github.com/quarkusio/quarkus/issues/20758

ab8818d486958a324ec83f55963086b916f47e7a

0eb6caf4618dc8c6abfbfae5b633f49c5812f40a

https://github.com/quarkusio/quarkus/compare/ab8818d486958a324ec83f55963086b916f47e7a...0eb6caf4618dc8c6abfbfae5b633f49c5812f40a

diff --git a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java index 63f987a9f7e..717e433a4d7 100644 --- a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java +++ b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java @@ -196,9 +196,13 @@ public PanacheQueryType find(Class<?> entityClass, String query, Object... param public PanacheQueryType find(Class<?> entityClass, String query, Sort sort, Object... params) { String findQuery = PanacheJpaUtil.createFindQuery(entityClass, query, paramCount(params)); EntityManager em = getEntityManager(entityClass); - // FIXME: check for duplicate ORDER BY clause? if (PanacheJpaUtil.isNamedQuery(query)) { String namedQuery = query.substring(1); + if (sort != null) { + throw new IllegalArgumentException( + "Sort cannot be used with named query, add an \\"order by\\" clause to the named query \\"" + namedQuery + + "\\" instead"); + } NamedQueryUtil.checkNamedQuery(entityClass, namedQuery); return createPanacheQuery(em, query, PanacheJpaUtil.toOrderBy(sort), params); } @@ -212,9 +216,13 @@ public PanacheQueryType find(Class<?> entityClass, String query, Map<String, Obj public PanacheQueryType find(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) { String findQuery = PanacheJpaUtil.createFindQuery(entityClass, query, paramCount(params)); EntityManager em = getEntityManager(entityClass); - // FIXME: check for duplicate ORDER BY clause? if (PanacheJpaUtil.isNamedQuery(query)) { String namedQuery = query.substring(1); + if (sort != null) { + throw new IllegalArgumentException( + "Sort cannot be used with named query, add an \\"order by\\" clause to the named query \\"" + namedQuery + + "\\" instead"); + } NamedQueryUtil.checkNamedQuery(entityClass, namedQuery); return createPanacheQuery(em, query, PanacheJpaUtil.toOrderBy(sort), params); } diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java index 03e920604d2..b8c6e53508f 100644 --- a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java +++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java @@ -192,9 +192,13 @@ public PanacheQueryType find(Class<?> entityClass, String query, Object... param public PanacheQueryType find(Class<?> entityClass, String query, Sort sort, Object... params) { String findQuery = PanacheJpaUtil.createFindQuery(entityClass, query, paramCount(params)); Uni<Mutiny.Session> session = getSession(); - // FIXME: check for duplicate ORDER BY clause? if (PanacheJpaUtil.isNamedQuery(query)) { String namedQuery = query.substring(1); + if (sort != null) { + throw new IllegalArgumentException( + "Sort cannot be used with named query, add an \\"order by\\" clause to the named query \\"" + namedQuery + + "\\" instead"); + } NamedQueryUtil.checkNamedQuery(entityClass, namedQuery); return createPanacheQuery(session, query, PanacheJpaUtil.toOrderBy(sort), params); } @@ -208,9 +212,13 @@ public PanacheQueryType find(Class<?> entityClass, String query, Map<String, Obj public PanacheQueryType find(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) { String findQuery = PanacheJpaUtil.createFindQuery(entityClass, query, paramCount(params)); Uni<Mutiny.Session> session = getSession(); - // FIXME: check for duplicate ORDER BY clause? if (PanacheJpaUtil.isNamedQuery(query)) { String namedQuery = query.substring(1); + if (sort != null) { + throw new IllegalArgumentException( + "Sort cannot be used with named query, add an \\"order by\\" clause to the named query \\"" + namedQuery + + "\\" instead"); + } NamedQueryUtil.checkNamedQuery(entityClass, namedQuery); return createPanacheQuery(session, query, PanacheJpaUtil.toOrderBy(sort), params); } diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java index 1569e415ae2..2daf1aa31eb 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java @@ -170,6 +170,8 @@ public String testModel() { Assertions.assertEquals(person, persons.get(0)); Assertions.assertEquals(1, Person.find("#Person.getByName", Parameters.with("name", "stef")).count()); Assertions.assertThrows(PanacheQueryException.class, () -> Person.find("#Person.namedQueryNotFound").list()); + Assertions.assertThrows(IllegalArgumentException.class, + () -> Person.find("#Person.getByName", Sort.by("name"), Parameters.with("name", "stef"))); NamedQueryEntity.find("#NamedQueryMappedSuperClass.getAll").list(); NamedQueryEntity.find("#NamedQueryEntity.getAll").list(); NamedQueryWith2QueriesEntity.find("#NamedQueryWith2QueriesEntity.getAll1").list(); @@ -711,6 +713,8 @@ public String testModelDao() { Assertions.assertEquals(1, persons.size()); Assertions.assertEquals(person, persons.get(0)); Assertions.assertThrows(PanacheQueryException.class, () -> personDao.find("#Person.namedQueryNotFound").list()); + Assertions.assertThrows(IllegalArgumentException.class, + () -> personDao.find("#Person.getByName", Sort.by("name"), Parameters.with("name", "stef"))); namedQueryRepository.find("#NamedQueryMappedSuperClass.getAll").list(); namedQueryRepository.find("#NamedQueryEntity.getAll").list(); namedQueryWith2QueriesRepository.find("#NamedQueryWith2QueriesEntity.getAll1").list(); diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java index aefb180316f..4a9ca0cb80f 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java @@ -224,7 +224,10 @@ public Uni<String> testModel() { return assertThrows(PanacheQueryException.class, () -> Person.find("#Person.namedQueryNotFound").list(), "singleResult should have thrown"); - }).flatMap(v -> NamedQueryEntity.list("#NamedQueryMappedSuperClass.getAll")) + }).flatMap(v -> assertThrows(IllegalArgumentException.class, + () -> Person.list("#Person.getByName", Sort.by("name"), Parameters.with("name", "stef")), + "Should have thrown sort exception")) + .flatMap(v -> NamedQueryEntity.list("#NamedQueryMappedSuperClass.getAll")) .flatMap(v -> NamedQueryEntity.list("#NamedQueryEntity.getAll")) .flatMap(v -> NamedQueryWith2QueriesEntity.list("#NamedQueryWith2QueriesEntity.getAll1")) .flatMap(v -> NamedQueryWith2QueriesEntity.list("#NamedQueryWith2QueriesEntity.getAll2")) @@ -966,7 +969,10 @@ public Uni<String> testModelDao() { return assertThrows(PanacheQueryException.class, () -> personDao.find("#Person.namedQueryNotFound").list(), "singleResult should have thrown"); - }).flatMap(v -> namedQueryRepository.list("#NamedQueryMappedSuperClass.getAll")) + }).flatMap(v -> assertThrows(IllegalArgumentException.class, + () -> personDao.list("#Person.getByName", Sort.by("name"), Parameters.with("name", "stef")), + "Should have thrown sort exception")) + .flatMap(v -> namedQueryRepository.list("#NamedQueryMappedSuperClass.getAll")) .flatMap(v -> namedQueryRepository.list("#NamedQueryEntity.getAll")) .flatMap(v -> namedQueryWith2QueriesRepository.list("#NamedQueryWith2QueriesEntity.getAll1")) .flatMap(v -> namedQueryWith2QueriesRepository.list("#NamedQueryWith2QueriesEntity.getAll2"))

['extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java', 'extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java', 'integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java', 'integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java']

{'.java': 4}