Datasets:

JetBrains-Research

/

lca-bug-localization

like 1

deeplearning4j/deeplearning4j/9400/9393

deeplearning4j

deeplearning4j

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

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

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

INDArray.match(Number, Condition) not returning expected results.

fixes

**Expected behavior:** `array.match(n, Conditions.equals())` should return a mask such that each entry `mask.get(i)` is `array[i] == n` **Encountered behavior:** the mask contains incorrect booleans for anything but `n=0`. #### Version Information Please indicate relevant versions, including, if relevant: * nd4j version beta 7. * Platform information (OS, etc): Windows 10 Enterprise #### To reproduce: The following code will reproduce the error for `i > 0`: int[] assignments = {0,0,0,1,0,2,2}; int[] indexes = {0,1,2,3,4,5,7}; INDArray asarray = Nd4j.createFromArray(assignments); INDArray idxarray = Nd4j.createFromArray(indexes); int i = 1; INDArray mask = asarray.match(i, Conditions.equals()); - `i=1` results in the mask ` [ false, false, false, true, false, true, true]` - `i=2` results in the mask ` [ false, false, false, false, false, false, false]` There seem to be similar problems with `notEquals()` and `notEquals(someNumber)`. Everything is inverted or totally incorrect. #### Contributing I would love to contribute, but might need guidance.

a7a123592854e34f039dcff40c2c0000b1dfb809

e8d92d25341a4e6c9a83fc54a170f55abdadb704

https://github.com/deeplearning4j/deeplearning4j/compare/a7a123592854e34f039dcff40c2c0000b1dfb809...e8d92d25341a4e6c9a83fc54a170f55abdadb704

diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java index c3594696d5..98bf9d16e5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java @@ -1889,7 +1889,9 @@ public abstract class BaseNDArray implements INDArray, Iterable { @Override public INDArray match(Number comp, Condition condition) { - return Nd4j.getExecutioner().exec(new MatchConditionTransform(this,comp.doubleValue(), condition)); + //override the value so the value gets parsed properly + condition.setValue(comp); + return Nd4j.getExecutioner().exec(new MatchConditionTransform(this, EPS_THRESHOLD, condition)); } @Override diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/MatchConditionTransform.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/MatchConditionTransform.java index 2ae0e0c0f5..7a94c3fd22 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/MatchConditionTransform.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/MatchConditionTransform.java @@ -45,7 +45,7 @@ public class MatchConditionTransform extends BaseTransformBoolOp { this.compare = condition.getValue(); this.mode = condition.condtionNum(); this.eps = Nd4j.EPS_THRESHOLD; - this.extraArgs = new Object[] {compare, eps, (double) mode}; + this.extraArgs = new Object[] {compare,1.0, eps, mode}; } public MatchConditionTransform() {} @@ -70,7 +70,7 @@ public class MatchConditionTransform extends BaseTransformBoolOp { this.mode = condition.condtionNum(); this.eps = eps; - this.extraArgs = new Object[] {compare, eps, (double) mode}; + this.extraArgs = new Object[] {compare, eps, mode}; } public MatchConditionTransform(INDArray x, double eps, @NonNull Condition condition) { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/BaseCondition.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/BaseCondition.java index 0b5b619a67..207cfc9d3f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/BaseCondition.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/BaseCondition.java @@ -29,6 +29,11 @@ public abstract class BaseCondition implements Condition { this.value = value; } + @Override + public void setValue(Number value) { + this.value = value; + } + @Override public double epsThreshold() { return Nd4j.EPS_THRESHOLD; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Condition.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Condition.java index 7f92450f38..acfc47b9d6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Condition.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Condition.java @@ -21,9 +21,47 @@ package org.nd4j.linalg.indexing.conditions; import org.nd4j.common.function.Function; - +/** + * + * Sets a condition in correspondence with the MatchConditionalBool op + * (op num 5 in the legacy operations) + * + * Condition number is affected by the ops internals, see here for the comprehensive overview: + * https://github.com/eclipse/deeplearning4j/blob/master/libnd4j/include/ops/ops.h#L2253 + * + * As of this writing (July 27,2021), the following operations are relevant: + * 0: equals + * 1: not equals + * 2: less than + * 3: greater than + * 4: less than or equal + * 5: greater than or equal + * 6: absolute difference less than + * 7: absolute difference greater than + * 8: is infinite + * 9: is nan + * 10: absolute equals + * 11: not equals + * 12: absolute difference greater or equal to + * 13: absolute difference less than or equal to + * 14: is finite + * 15: is infinite + * + * @return + */ public interface Condition extends Function<Number, Boolean> { + /** + * Allows overriding of the value. + * + * @param value + */ + default void setValue(Number value) { + //no-op for aggregate conditions. Mainly used for providing an api to end users such as: + //INDArray.match(input,Conditions.equals()) + //See: https://github.com/eclipse/deeplearning4j/issues/9393 + } + /** * Returns condition ID for native side * diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/ConditionEquals.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/ConditionEquals.java index cd8e78b873..edbc1368a4 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/ConditionEquals.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/ConditionEquals.java @@ -28,6 +28,7 @@ public class ConditionEquals implements Condition { this.conditions = conditions; } + /** * Returns condition ID for native side * diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/EqualsCondition.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/EqualsCondition.java index a535f807ea..bceb885beb 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/EqualsCondition.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/EqualsCondition.java @@ -38,12 +38,14 @@ public class EqualsCondition extends BaseCondition { /** * Returns condition ID for native side + * Condition number is affected by: + * https://github.com/eclipse/deeplearning4j/blob/0ba0f933a95d2dceeff3651bc540d03b5f3b1631/libnd4j/include/ops/ops.h#L2253 * * @return */ @Override public int condtionNum() { - return 10; + return 0; } @Override diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Not.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Not.java index db6cfd6a70..9e911c0e03 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Not.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Not.java @@ -24,6 +24,7 @@ public class Not implements Condition { private Condition opposite; + /** * Returns condition ID for native side * diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Or.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Or.java index 6c1f6adeed..65ae169ae2 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Or.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Or.java @@ -28,6 +28,7 @@ public class Or implements Condition { this.conditions = conditions; } + /** * Returns condition ID for native side * diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java index bec01aa6ee..7c204de133 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java @@ -819,6 +819,8 @@ public class NativeOpExecutioner extends DefaultOpExecutioner { case TRANSFORM_FLOAT: { val xtraz = getPointerForExtraArgs(op, z.dataType()); + + loop.execTransformFloat(dummy, op.opNum(), xb, (LongPointer) x.shapeInfoDataBuffer().addressPointer(), null, zb, (LongPointer) z.shapeInfoDataBuffer().addressPointer(), diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java index 4b6cd2b079..750c024a98 100644 --- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java +++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java @@ -3392,9 +3392,6 @@ public native int getRandomGeneratorRelativeInt(OpaqueRandomGenerator ptr, @Cast public native @Cast("Nd4jLong") long getRandomGeneratorRelativeLong(OpaqueRandomGenerator ptr, @Cast("Nd4jLong") long index); public native void deleteRandomGenerator(OpaqueRandomGenerator ptr); -public native @Cast("char*") String runLightBenchmarkSuit(@Cast("bool") boolean printOut); -public native @Cast("char*") String runFullBenchmarkSuit(@Cast("bool") boolean printOut); - public native OpaqueLaunchContext defaultLaunchContext(); public native @Cast("Nd4jPointer") Pointer lcScalarPointer(OpaqueLaunchContext lc); public native @Cast("Nd4jPointer") Pointer lcReductionPointer(OpaqueLaunchContext lc); diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java index 4bc2de4b21..35a6bc66d3 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java @@ -1497,6 +1497,30 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends { assertEquals(exp, z); } + @ParameterizedTest + @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") + public void testMatch_2(Nd4jBackend backend) { + int[] assignments = {0,0,0,1,0,2,2}; + int[] indexes = {0,1,2,3,4,5,7}; + + INDArray asarray = Nd4j.createFromArray(assignments); + INDArray idxarray = Nd4j.createFromArray(indexes); + + int[] testIndicesForMask = new int[] {1,2}; + INDArray[] assertions = { + Nd4j.createFromArray(false,false,false,true,false,false,false), + Nd4j.createFromArray(false,false,false,false,false,true,true) + }; + + for(int j = 0; j < testIndicesForMask.length; j++) { + INDArray mask = asarray.match(testIndicesForMask[j], Conditions.equals()); + assertEquals(assertions[j],mask); + + } + + } + + @ParameterizedTest @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")

['nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Or.java', 'nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/EqualsCondition.java', 'nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/linalg/cpu/nativecpu/ops/NativeOpExecutioner.java', 'nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Condition.java', 'nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java', 'nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java', 'nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/ConditionEquals.java', 'nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/Not.java', 'nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java', 'nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/MatchConditionTransform.java', 'nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/indexing/conditions/BaseCondition.java']

{'.java': 11}

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/9353/9349

deeplearning4j

deeplearning4j

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

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

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

M1: Parameters of Keras MaxPooling1D layer are incorrectly read

fixes

#### Issue Description I trained a model using Tensorflow/Keras version 2.4.1 in Python. This model contains a MaxPooling1D layer. I then saved the model as the (default) .hdf5 file. Loading this file in Keras and saving its config as json, reveals the following layer: ``` json { "class_name": "MaxPooling1D", "config": { "name": "max_pooling1d_3", "trainable": true, "dtype": "float32", "strides": [ 836 ], "pool_size": [ 836 ], "padding": "valid", "data_format": "channels_last" }, "name": "max_pooling1d_3", "inbound_nodes": [ [ [ "conv1d_3", 0, 0, {} ] ] ] }, ``` Please note that the **data_format** is set to "channels_last" which is the default value in Keras. This corresponds to NHWC. The stride is loaded as `(836,)` in Keras - a 1-tuple holding only the value (836). If I now load the model in 1.0.0-M1 using `importKerasModelAndWeights()`, this specific layer is loaded as a `Subsampling1DLayer`. Unfortunately, the parameter values are incorrectly parsed. The `Cnn2dDataFormat` is set to `NCHW`. The stride is loaded as `[836,2]` which leads to incorrect dimensions in the following layer. I believe that `[836,1]` is the correct value for the stride. When I overwrite these two parameter values in my loaded network, then everything runs as expected. #### Version Information Please indicate relevant versions, including, if relevant: * Deeplearning4j version: 1.0.0-M1 * Tensorflow version 2.4.1 (same error exists for models trained in Tensorflow 1.14) * Platform information: Ubuntu 20.04

9026d172ac882f861a03ac1ff57ee6d8ce4535d9

f446c74bf4e90f6447be8f98ea1a81f882fd82b5

https://github.com/deeplearning4j/deeplearning4j/compare/9026d172ac882f861a03ac1ff57ee6d8ce4535d9...f446c74bf4e90f6447be8f98ea1a81f882fd82b5

diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/HelperUtilsTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/HelperUtilsTest.java index 71f01b0235..81de2dae85 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/HelperUtilsTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/HelperUtilsTest.java @@ -57,6 +57,7 @@ import org.nd4j.linalg.lossfunctions.LossFunctions; import java.util.List; +import static org.deeplearning4j.common.config.DL4JSystemProperties.DISABLE_HELPER_PROPERTY; import static org.junit.jupiter.api.Assertions.*; /** @@ -75,7 +76,7 @@ public class HelperUtilsTest extends BaseDL4JTest { @Test @DisplayName("Test instance creation of various helpers") public void testOneDnnHelperCreation() { - System.setProperty(HelperUtils.DISABLE_HELPER_PROPERTY,"false"); + System.setProperty(DISABLE_HELPER_PROPERTY,"false"); assertNotNull(HelperUtils.createHelper("", MKLDNNLSTMHelper.class.getName(), LSTMHelper.class,"layername",getDataType())); assertNotNull(HelperUtils.createHelper("", MKLDNNBatchNormHelper.class.getName(), diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/pooling/KerasPooling1D.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/pooling/KerasPooling1D.java index bb27e7d816..6030e5c38f 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/pooling/KerasPooling1D.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/pooling/KerasPooling1D.java @@ -66,6 +66,7 @@ public class KerasPooling1D extends KerasLayer { Subsampling1DLayer.Builder builder = new Subsampling1DLayer.Builder( KerasPoolingUtils.mapPoolingType(this.className, conf)).name(this.layerName) .dropOut(this.dropout) + .dataFormat(dimOrder == DimOrder.TENSORFLOW ? CNN2DFormat.NHWC : CNN2DFormat.NCHW) .convolutionMode(getConvolutionModeFromConfig(layerConfig, conf)) .kernelSize(getKernelSizeFromConfig(layerConfig, 1, conf, kerasMajorVersion)[0]) .stride(getStrideFromConfig(layerConfig, 1, conf)[0]); diff --git a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/layers/pooling/KerasPooling1DTest.java b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/layers/pooling/KerasPooling1DTest.java index a7163d1cfb..a81a7bb7af 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/layers/pooling/KerasPooling1DTest.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/layers/pooling/KerasPooling1DTest.java @@ -19,21 +19,31 @@ */ package org.deeplearning4j.nn.modelimport.keras.layers.pooling; +import org.deeplearning4j.nn.api.Layer; +import org.deeplearning4j.nn.conf.CNN2DFormat; import org.deeplearning4j.nn.conf.ConvolutionMode; import org.deeplearning4j.nn.conf.layers.PoolingType; import org.deeplearning4j.nn.conf.layers.Subsampling1DLayer; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.nn.graph.ComputationGraph; +import org.deeplearning4j.nn.graph.vertex.GraphVertex; +import org.deeplearning4j.nn.modelimport.keras.KerasModelImport; import org.deeplearning4j.nn.modelimport.keras.config.Keras1LayerConfiguration; import org.deeplearning4j.nn.modelimport.keras.config.Keras2LayerConfiguration; import org.deeplearning4j.nn.modelimport.keras.config.KerasLayerConfiguration; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; + +import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.extension.ExtendWith; +import org.nd4j.common.resources.Resources; import org.nd4j.common.tests.tags.NativeTag; import org.nd4j.common.tests.tags.TagNames; @@ -111,4 +121,18 @@ class KerasPooling1DTest extends BaseDL4JTest { assertEquals(ConvolutionMode.Truncate, layer.getConvolutionMode()); assertEquals(VALID_PADDING[0], layer.getPadding()[0]); } + + + @Test + public void testPooling1dNWHC() throws Exception { + File file = Resources.asFile("modelimport/keras/tfkeras/issue_9349.hdf5"); + ComputationGraph computationGraph = KerasModelImport.importKerasModelAndWeights(file.getAbsolutePath()); + GraphVertex maxpooling1d = computationGraph.getVertex("max_pooling1d"); + assertNotNull(maxpooling1d); + Layer layer = maxpooling1d.getLayer(); + org.deeplearning4j.nn.layers.convolution.subsampling.Subsampling1DLayer subsampling1DLayer = (org.deeplearning4j.nn.layers.convolution.subsampling.Subsampling1DLayer) layer; + assertEquals(CNN2DFormat.NHWC,subsampling1DLayer.layerConf().getCnn2dDataFormat()); + } + + } diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java index f0ebd4e7a9..91d97ff437 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java @@ -100,10 +100,12 @@ public class SubsamplingLayer extends NoParamLayer { this.stride = builder.stride; this.padding = builder.padding; this.convolutionMode = builder.convolutionMode; + this.cnn2dDataFormat = builder.cnn2DFormat; + if (builder instanceof Builder) { this.dilation = ((Builder) builder).dilation; - this.cnn2dDataFormat = ((Builder) builder).dataFormat; } + this.pnorm = builder.pnorm; this.eps = builder.eps; this.cudnnAllowFallback = builder.cudnnAllowFallback; @@ -239,7 +241,6 @@ public class SubsamplingLayer extends NoParamLayer { * Dilation for kernel */ private int[] dilation = new int[] {1, 1}; - protected CNN2DFormat dataFormat = CNN2DFormat.NCHW; public Builder(PoolingType poolingType, int[] kernelSize, int[] stride) { super(poolingType, kernelSize, stride); @@ -318,16 +319,7 @@ public class SubsamplingLayer extends NoParamLayer { return this; } - /** - * Set the data format for the CNN activations - NCHW (channels first) or NHWC (channels last). - * See {@link CNN2DFormat} for more details.<br> - * Default: NCHW - * @param format Format for activations (in and out) - */ - public Builder dataFormat(CNN2DFormat format){ - this.dataFormat = format; - return this; - } + /** * Kernel dilation. Default: {1, 1}, which is standard convolutions. Used for implementing dilated convolutions, @@ -382,7 +374,7 @@ public class SubsamplingLayer extends NoParamLayer { } public void setDataFormat(CNN2DFormat format){ - this.dataFormat = format; + this.cnn2DFormat = format; } } @@ -418,6 +410,11 @@ public class SubsamplingLayer extends NoParamLayer { protected boolean cudnnAllowFallback = true; protected boolean avgPoolIncludePadInDivisor = false; + /** + * Configure the 2d data format + */ + protected CNN2DFormat cnn2DFormat = CNN2DFormat.NCHW; + protected BaseSubsamplingBuilder(PoolingType poolingType, int[] kernelSize, int[] stride) { this.setPoolingType(poolingType.toPoolingType()); this.setKernelSize(kernelSize); @@ -477,7 +474,7 @@ public class SubsamplingLayer extends NoParamLayer { this.pnorm = pnorm; } - public void setEps(double eps){ + public void setEps(double eps) { ValidationUtils.validateNonNegative(eps, "eps"); this.eps = eps; } @@ -490,6 +487,17 @@ public class SubsamplingLayer extends NoParamLayer { this.convolutionMode = convolutionMode; } + /** + * Set the data format for the CNN activations - NCHW (channels first) or NHWC (channels last). + * See {@link CNN2DFormat} for more details.<br> + * Default: NCHW + * @param cnn2DFormat Format for activations (in and out) + */ + public T dataFormat(CNN2DFormat cnn2DFormat) { + this.cnn2DFormat = cnn2DFormat; + return (T) this; + } + /** * Set the convolution mode for the Convolution layer. See {@link ConvolutionMode} for more details * diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/subsampling/SubsamplingLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/subsampling/SubsamplingLayer.java index ebaa7008a3..3e5dc3c377 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/subsampling/SubsamplingLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/subsampling/SubsamplingLayer.java @@ -87,7 +87,7 @@ public class SubsamplingLayer extends AbstractLayer<org.deeplearning4j.nn.conf.l CNN2DFormat dataFormat = layerConf().getCnn2dDataFormat(); int hIdx = 2; int wIdx = 3; - if(dataFormat == CNN2DFormat.NHWC){ + if(dataFormat == CNN2DFormat.NHWC) { hIdx = 1; wIdx = 2; }

['deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/pooling/KerasPooling1D.java', 'deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/subsampling/SubsamplingLayer.java', 'deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/HelperUtilsTest.java', 'deeplearning4j/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/layers/pooling/KerasPooling1DTest.java', 'deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/layers/SubsamplingLayer.java']

{'.java': 5}

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/5643/5605

deeplearning4j

deeplearning4j

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

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

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

Unable to broadcast dimension 1 due to shape mismatch exception with Deconvolution2D layers

fixes

I tried to set up a neural net using a ComputationGraph based on some research paper. This net has an encoder-decoder like structure: it uses Deconvolution2D layers for the decoding part. After putting together the net, I found that I can run the training with batch size 1, but any higher batch size value causes the net to stop with a message similar to the below: Exception in thread "main" java.lang.IllegalArgumentException: Unable to broadcast dimension 1 due to shape mismatch. Right shape must be 1. Left array shape: [2, 16, 33, 33], right array shape: [16, 2, 33, 33] I spent a lot of time debugging the issue to see what did I miss. I simplified the net to the smallest possible size, it now only has a Convolution, Deconvolution2D and an Output layer. I can still reproduce my original problem: with batch size 1, it works fine, otherwise it stops. Looking at the array shapes in the error message it seems that the minibatch size and the number of channels is mixed up whenever I receive this error. I created a GIST for this in the hope that someone could check and give me a hint on how to fix this. https://gist.github.com/bekkon/7fd406d21d1320d08a5d2fe82e2a0331 After tracing back the calls, I found that I can seemingly fix this error by modifying the backpropGradient method in Deconvolution2D class. At the very end of the method, it does a permutation of the previously prepared outEps: "outEps = outEps.permute(1, 0, 2 , 3);" If I change this to "outEps = outEps.permute(0, 1, 2 , 3);", the exception goes away, backpropagation succeeds in the preceding layer. Please check if this is indeed an error in Deconvolution2D. If not, please help me understand what did I do wrong in my network setup to end up with this error. (The attached net in the GIST is just for reproducing the error, it is not supposed to be meaningful, for network-help I'll share the complex net in a separate GIST ) Thanks :)

50b5e6427c0ad19ae6216bc82f9e15030de55408

e338b026a120ea6634bf7d67c45b07dfd6f11e9d

https://github.com/deeplearning4j/deeplearning4j/compare/50b5e6427c0ad19ae6216bc82f9e15030de55408...e338b026a120ea6634bf7d67c45b07dfd6f11e9d

diff --git a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.java b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.java index 22f33a7f31..5c656c807d 100644 --- a/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.java +++ b/deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.java @@ -861,7 +861,7 @@ public class CNNGradientCheckTest extends BaseDL4JTest { public void testDeconvolution2D() { int nOut = 2; - int[] minibatchSizes = new int[]{1, 3, 1, 3, 1, 3, 1, 3}; + int[] minibatchSizes = new int[]{1, 4, 1, 4, 1, 1, 2, 1}; int[] kernelSizes = new int[]{1, 1, 3, 3, 1, 1, 3, 3}; int[] strides = {1, 1, 1, 1, 2, 2, 2, 2}; int[] dilation = {1, 2, 2, 1, 1, 1, 2, 2}; @@ -895,13 +895,23 @@ public class CNNGradientCheckTest extends BaseDL4JTest { .updater(new NoOp()) .activation(act) .list() + .layer(new Deconvolution2D.Builder().name("deconvolution_2D_layer-0") + .cudnnAllowFallback(false) + .kernelSize(1, 1) + .stride(1, 1) + .dilation(0, 0) + .convolutionMode(cm) + .nIn(inputDepth) + .nOut(inputDepth) + .build()) .layer(new Deconvolution2D.Builder().name("deconvolution_2D_layer") .cudnnAllowFallback(false) .kernelSize(k, k) .stride(s, s) .dilation(d, d) .convolutionMode(cm) - .nIn(inputDepth).nOut(nOut).build()); + .nIn(inputDepth).nOut(nOut) + .build()); MultiLayerConfiguration conf = b.layer(new OutputLayer.Builder(LossFunctions.LossFunction.MCXENT) .activation(Activation.SOFTMAX).nOut(nOut).build()) diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Deconvolution2DLayer.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Deconvolution2DLayer.java index e86b583fef..f609d4e06e 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Deconvolution2DLayer.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Deconvolution2DLayer.java @@ -132,8 +132,6 @@ public class Deconvolution2DLayer extends ConvolutionLayer { retGradient.setGradientFor(DeconvolutionParamInitializer.WEIGHT_KEY, weightGradView, 'c'); weightNoiseParams.clear(); - outEps = outEps.permute(1, 0, 2 , 3); - return new Pair<>(retGradient, outEps); }

['deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/Deconvolution2DLayer.java', 'deeplearning4j/deeplearning4j-cuda/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.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/5381/2104

deeplearning4j

deeplearning4j

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

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

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

Poor GPU performance relative to CPU

closes

This issue is similar to #2053, with a few key differences: - I'm using a recurrent neural network. - Performance is consistently and significantly _worse_ with the GPU backend (not merely comparable). - I have a small dataset (16x9x308), which is probably at least partly to blame. However, the nsight profiling results with a larger dataset may suggest that DL4J can close the gap somewhat (see below). I'm using the latest release of DeepLearning4J (0.5.0). **Minimized Test Case** ``` java package com.stottlerhenke.illuminate; import java.util.List; import com.stottlerhenke.illuminate.training.PerformanceListener; import org.deeplearning4j.nn.api.OptimizationAlgorithm; import org.deeplearning4j.nn.conf.*; import org.deeplearning4j.nn.conf.layers.GravesLSTM; import org.deeplearning4j.nn.conf.layers.RnnOutputLayer; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.WeightInit; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.dataset.DataSet; import org.nd4j.linalg.dataset.api.DataSetPreProcessor; import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; import org.nd4j.linalg.factory.Nd4j; import org.nd4j.linalg.lossfunctions.LossFunctions; public class GpuProblem { public static int timeSeriesCount = 16; public static int inputCount = 9; public static int timeSteps = 308; public static int numHiddenNodes = 20; public static int truncatedBPTTLength = 100; public static int epochCount = 3; public static class MyDatasetIterator implements DataSetIterator { private DataSetPreProcessor preProcessor; int cursor = 0; @Override public boolean hasNext() { return cursor < epochCount; } @Override public DataSet next() { return next(1); } @Override public DataSet next(int num) { DataSet ds = createDataset(); if (preProcessor != null) preProcessor.preProcess(ds); cursor += num; System.out.println("NEW CURSOR " + cursor); return ds; } private DataSet createDataset() { INDArray createDataSetinput = Nd4j.zeros(timeSeriesCount, inputCount, timeSteps); INDArray createDataSetlabels = Nd4j.zeros(timeSeriesCount, 2, timeSteps); return new DataSet(createDataSetinput, createDataSetlabels); } @Override public int totalExamples() { throw new UnsupportedOperationException(); } @Override public int inputColumns() { return inputCount; } @Override public int totalOutcomes() { return 2; } @Override public boolean resetSupported() { return true; } @Override public void reset() { cursor = 0; System.out.println("RESET NEW CURSOR " + cursor); } @Override public int batch() { return timeSeriesCount; } @Override public int cursor() { throw new UnsupportedOperationException(); } @Override public int numExamples() { throw new UnsupportedOperationException(); } @Override public void setPreProcessor(DataSetPreProcessor preProcessor) { this.preProcessor = preProcessor; } @Override public DataSetPreProcessor getPreProcessor() { return this.preProcessor; } @Override public List<String> getLabels() { return null; } } public static void main(String[] args) { MultiLayerConfiguration.Builder builder = new NeuralNetConfiguration.Builder() .optimizationAlgo(OptimizationAlgorithm.STOCHASTIC_GRADIENT_DESCENT).iterations(1) .updater(Updater.ADAM).adamMeanDecay(0.9).adamVarDecay(0.999) .regularization(true).l1(1e-4).dropOut(0.5) .weightInit(WeightInit.XAVIER) .learningRate(5e-4) .list() .layer(0, new GravesLSTM.Builder().nIn(inputCount).nOut(numHiddenNodes) .activation("tanh").build()) .layer(1, new RnnOutputLayer.Builder().nIn(numHiddenNodes) .activation("softmax") .lossFunction(LossFunctions.LossFunction.MCXENT) .nIn(numHiddenNodes).nOut(2).build()) .pretrain(false) .backprop(true) .backpropType(BackpropType.TruncatedBPTT) .tBPTTBackwardLength(truncatedBPTTLength).tBPTTForwardLength(truncatedBPTTLength); MultiLayerNetwork net = new MultiLayerNetwork(builder.build()); net.init(); net.setListeners(new PerformanceListener(1)); net.fit(new MyDatasetIterator()); } } ``` **Performance Results** CPU ``` iteration 1; iteration time: 341 ms; samples/sec: 46.921; batches/sec: 2.933; iteration 2; iteration time: 170 ms; samples/sec: 94.118; batches/sec: 5.882; iteration 3; iteration time: 158 ms; samples/sec: 101.266; batches/sec: 6.329; iteration 4; iteration time: 181 ms; samples/sec: 88.398; batches/sec: 5.525; iteration 5; iteration time: 127 ms; samples/sec: 125.984; batches/sec: 7.874; iteration 6; iteration time: 122 ms; samples/sec: 131.148; batches/sec: 8.197; iteration 7; iteration time: 122 ms; samples/sec: 131.148; batches/sec: 8.197; iteration 8; iteration time: 119 ms; samples/sec: 134.454; batches/sec: 8.403; iteration 9; iteration time: 119 ms; samples/sec: 134.454; batches/sec: 8.403; ``` GPU ``` iteration 1; iteration time: 1667 ms; samples/sec: 9.598; batches/sec: 0.600; iteration 2; iteration time: 1266 ms; samples/sec: 12.638; batches/sec: 0.790; iteration 3; iteration time: 1241 ms; samples/sec: 12.893; batches/sec: 0.806; iteration 4; iteration time: 1192 ms; samples/sec: 13.423; batches/sec: 0.839; iteration 5; iteration time: 1204 ms; samples/sec: 13.289; batches/sec: 0.831; iteration 6; iteration time: 1178 ms; samples/sec: 13.582; batches/sec: 0.849; iteration 7; iteration time: 1137 ms; samples/sec: 14.072; batches/sec: 0.880; iteration 8; iteration time: 1141 ms; samples/sec: 14.023; batches/sec: 0.876; iteration 9; iteration time: 1183 ms; samples/sec: 13.525; batches/sec: 0.845; ``` I also tested with more data by increasing the number of time series from 16 to 16,000. With this change, the GPU does outperform the CPU (as expected); however, profiling with nsight shows only 9.1% GPU utilization (although I was only able to profile one iteration due to an issue with nsight that caused the test application to terminate early with an access violation, and the utilization percentage is probably unduly influenced by the time period before network training begins).

f076de2362651f28469efc117a2e240cc9ced031

8e1619c81dcabcd3d6d8f21fc992666b4a674154

https://github.com/deeplearning4j/deeplearning4j/compare/f076de2362651f28469efc117a2e240cc9ced031...8e1619c81dcabcd3d6d8f21fc992666b4a674154

diff --git a/nd4j/nd4j-buffer/src/main/java/org/nd4j/linalg/api/buffer/BaseDataBuffer.java b/nd4j/nd4j-buffer/src/main/java/org/nd4j/linalg/api/buffer/BaseDataBuffer.java index e56a3abaa1..6660e2b6d2 100644 --- a/nd4j/nd4j-buffer/src/main/java/org/nd4j/linalg/api/buffer/BaseDataBuffer.java +++ b/nd4j/nd4j-buffer/src/main/java/org/nd4j/linalg/api/buffer/BaseDataBuffer.java @@ -822,8 +822,7 @@ public abstract class BaseDataBuffer implements DataBuffer { @Override public void assign(Number value) { - for (int i = 0; i < length(); i++) - assign(value, i); + assign(value, 0); }

['nd4j/nd4j-buffer/src/main/java/org/nd4j/linalg/api/buffer/BaseDataBuffer.java']

{'.java': 1}

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/5363/5263

deeplearning4j

deeplearning4j

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

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

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

DataVec: Unit test failure - TestNativeImageLoader.testAsMatrix

fixes

This is very likely related to long shapes, but couldn't at first glance see what the fix would be. ``` java.lang.IndexOutOfBoundsException: 3 at org.bytedeco.javacpp.indexer.Indexer.checkIndex(Indexer.java:90) at org.bytedeco.javacpp.indexer.FloatRawIndexer.put(FloatRawIndexer.java:90) at org.bytedeco.javacpp.indexer.FloatRawIndexer.put(FloatRawIndexer.java:110) at org.datavec.image.loader.NativeImageLoader.asMat(NativeImageLoader.java:724) at org.datavec.image.loader.NativeImageLoader.asMat(NativeImageLoader.java:684) at org.datavec.image.loader.TestNativeImageLoader.testAsMatrix(TestNativeImageLoader.java:235) ```

d5f2f8d1c07d18813064598285fe6acccbd24393

3a6e80d1fe4d620320ab9e24ac38bceda2da8eba

https://github.com/deeplearning4j/deeplearning4j/compare/d5f2f8d1c07d18813064598285fe6acccbd24393...3a6e80d1fe4d620320ab9e24ac38bceda2da8eba

diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/io/filters/BalancedPathFilter.java b/datavec/datavec-api/src/main/java/org/datavec/api/io/filters/BalancedPathFilter.java index 3242e0315a..8c0168d428 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/io/filters/BalancedPathFilter.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/io/filters/BalancedPathFilter.java @@ -32,7 +32,7 @@ import java.util.*; public class BalancedPathFilter extends RandomPathFilter { protected PathLabelGenerator labelGenerator; - protected int maxLabels = 0, minPathsPerLabel = 0, maxPathsPerLabel = 0; + protected long maxLabels = 0, minPathsPerLabel = 0, maxPathsPerLabel = 0; protected String[] labels = null; /** Calls {@code this(random, extensions, labelGenerator, 0, 0, 0, 0)}. */ @@ -41,25 +41,25 @@ public class BalancedPathFilter extends RandomPathFilter { } /** Calls {@code this(random, null, labelGenerator, 0, 0, 0, maxPathsPerLabel)}. */ - public BalancedPathFilter(Random random, PathLabelGenerator labelGenerator, int maxPathsPerLabel) { + public BalancedPathFilter(Random random, PathLabelGenerator labelGenerator, long maxPathsPerLabel) { this(random, null, labelGenerator, 0, 0, 0, maxPathsPerLabel); } /** Calls {@code this(random, extensions, labelGenerator, 0, 0, 0, maxPathsPerLabel)}. */ public BalancedPathFilter(Random random, String[] extensions, PathLabelGenerator labelGenerator, - int maxPathsPerLabel) { + long maxPathsPerLabel) { this(random, extensions, labelGenerator, 0, 0, 0, maxPathsPerLabel); } /** Calls {@code this(random, extensions, labelGenerator, 0, maxLabels, 0, maxPathsPerLabel)}. */ - public BalancedPathFilter(Random random, PathLabelGenerator labelGenerator, int maxPaths, int maxLabels, - int maxPathsPerLabel) { + public BalancedPathFilter(Random random, PathLabelGenerator labelGenerator, long maxPaths, long maxLabels, + long maxPathsPerLabel) { this(random, null, labelGenerator, maxPaths, maxLabels, 0, maxPathsPerLabel); } /** Calls {@code this(random, extensions, labelGenerator, 0, maxLabels, 0, maxPathsPerLabel)}. */ - public BalancedPathFilter(Random random, String[] extensions, PathLabelGenerator labelGenerator, int maxLabels, - int maxPathsPerLabel) { + public BalancedPathFilter(Random random, String[] extensions, PathLabelGenerator labelGenerator, long maxLabels, + long maxPathsPerLabel) { this(random, extensions, labelGenerator, 0, maxLabels, 0, maxPathsPerLabel); } @@ -77,8 +77,8 @@ public class BalancedPathFilter extends RandomPathFilter { * @param maxPathsPerLabel max number of paths per labels to return (0 == unlimited) * @param labels of the paths to keep (empty set == keep all paths) */ - public BalancedPathFilter(Random random, String[] extensions, PathLabelGenerator labelGenerator, int maxPaths, - int maxLabels, int minPathsPerLabel, int maxPathsPerLabel, String... labels) { + public BalancedPathFilter(Random random, String[] extensions, PathLabelGenerator labelGenerator, long maxPaths, + long maxLabels, long minPathsPerLabel, long maxPathsPerLabel, String... labels) { super(random, extensions, maxPaths); this.labelGenerator = labelGenerator; this.maxLabels = maxLabels; @@ -121,14 +121,15 @@ public class BalancedPathFilter extends RandomPathFilter { pathList.add(path); } - int minCount = maxPathsPerLabel > 0 ? maxPathsPerLabel : Integer.MAX_VALUE; + int minCount = maxPathsPerLabel > 0 ? + (int)Math.min(maxPathsPerLabel, Integer.MAX_VALUE) : Integer.MAX_VALUE; for (List<URI> pathList : labelPaths.values()) { if (minCount > pathList.size()) { minCount = pathList.size(); } } if (minCount < minPathsPerLabel) { - minCount = minPathsPerLabel; + minCount = (int)Math.min(minPathsPerLabel, Integer.MAX_VALUE); } ArrayList<URI> newpaths = new ArrayList<URI>(); diff --git a/datavec/datavec-api/src/main/java/org/datavec/api/io/filters/RandomPathFilter.java b/datavec/datavec-api/src/main/java/org/datavec/api/io/filters/RandomPathFilter.java index 92158c0314..d1636731c6 100644 --- a/datavec/datavec-api/src/main/java/org/datavec/api/io/filters/RandomPathFilter.java +++ b/datavec/datavec-api/src/main/java/org/datavec/api/io/filters/RandomPathFilter.java @@ -29,7 +29,7 @@ public class RandomPathFilter implements PathFilter { protected Random random; protected String[] extensions; - protected int maxPaths = 0; + protected long maxPaths = 0; /** Calls {@code this(random, extensions, 0)}. */ public RandomPathFilter(Random random, String... extensions) { @@ -43,7 +43,7 @@ public class RandomPathFilter implements PathFilter { * @param extensions of files to keep * @param maxPaths max number of paths to return (0 == unlimited) */ - public RandomPathFilter(Random random, String[] extensions, int maxPaths) { + public RandomPathFilter(Random random, String[] extensions, long maxPaths) { this.random = random; this.extensions = extensions; this.maxPaths = maxPaths; diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/BaseImageLoader.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/BaseImageLoader.java index 9f6be773b1..28bd4e2244 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/BaseImageLoader.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/BaseImageLoader.java @@ -43,9 +43,9 @@ public abstract class BaseImageLoader implements Serializable { public static final String[] ALLOWED_FORMATS = {"tif", "jpg", "png", "jpeg", "bmp", "JPEG", "JPG", "TIF", "PNG"}; protected Random rng = new Random(System.currentTimeMillis()); - protected int height = -1; - protected int width = -1; - protected int channels = -1; + protected long height = -1; + protected long width = -1; + protected long channels = -1; protected boolean centerCropIfNeeded = false; protected ImageTransform imageTransform = null; protected NativeImageLoader.MultiPageMode multiPageMode = null; diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/ImageLoader.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/ImageLoader.java index d00816c9a4..89c99224ea 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/ImageLoader.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/ImageLoader.java @@ -65,7 +65,7 @@ public class ImageLoader extends BaseImageLoader { * @param width the width to load */ - public ImageLoader(int height, int width) { + public ImageLoader(long height, long width) { super(); this.height = height; this.width = width; @@ -79,7 +79,7 @@ public class ImageLoader extends BaseImageLoader { * @param width the width to load * @param channels the number of channels for the image* */ - public ImageLoader(int height, int width, int channels) { + public ImageLoader(long height, long width, long channels) { super(); this.height = height; this.width = width; @@ -94,7 +94,7 @@ public class ImageLoader extends BaseImageLoader { * @param channels the number of channels for the image* * @param centerCropIfNeeded to crop before rescaling and converting */ - public ImageLoader(int height, int width, int channels, boolean centerCropIfNeeded) { + public ImageLoader(long height, long width, long channels, boolean centerCropIfNeeded) { this(height, width, channels); this.centerCropIfNeeded = centerCropIfNeeded; } @@ -349,7 +349,9 @@ public class ImageLoader extends BaseImageLoader { int w = image.getWidth(), h = image.getHeight(); int bands = image.getSampleModel().getNumBands(); - int[][][] ret = new int[channels][h][w]; + int[][][] ret = new int[(int)Math.min(channels, Integer.MAX_VALUE)] + [(int)Math.min(h, Integer.MAX_VALUE)] + [(int)Math.min(w, Integer.MAX_VALUE)]; byte[] pixels = ((DataBufferByte) image.getRaster().getDataBuffer()).getData(); for (int i = 0; i < h; i++) { @@ -357,7 +359,7 @@ public class ImageLoader extends BaseImageLoader { for (int k = 0; k < channels; k++) { if (k >= bands) break; - ret[k][i][j] = pixels[channels * w * i + channels * j + k]; + ret[k][i][j] = pixels[(int)Math.min(channels * w * i + channels * j + k, Integer.MAX_VALUE)]; } } } diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/LFWLoader.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/LFWLoader.java index 9b5b5d1a4a..1e08a43d50 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/LFWLoader.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/LFWLoader.java @@ -83,13 +83,17 @@ public class LFWLoader extends BaseImageLoader implements Serializable { } public LFWLoader(boolean useSubset) { - this(new int[] {HEIGHT, WIDTH, CHANNELS,}, null, useSubset); + this(new long[] {HEIGHT, WIDTH, CHANNELS,}, null, useSubset); } public LFWLoader(int[] imgDim, boolean useSubset) { this(imgDim, null, useSubset); } + public LFWLoader(long[] imgDim, boolean useSubset) { + this(imgDim, null, useSubset); + } + public LFWLoader(int[] imgDim, ImageTransform imgTransform, boolean useSubset) { this.height = imgDim[0]; this.width = imgDim[1]; @@ -101,6 +105,17 @@ public class LFWLoader extends BaseImageLoader implements Serializable { generateLfwMaps(); } + public LFWLoader(long[] imgDim, ImageTransform imgTransform, boolean useSubset) { + this.height = imgDim[0]; + this.width = imgDim[1]; + this.channels = imgDim[2]; + this.imageTransform = imgTransform; + this.useSubset = useSubset; + this.localDir = useSubset ? localSubDir : localDir; + this.fullDir = new File(BASE_DIR, localDir); + generateLfwMaps(); + } + public void generateLfwMaps() { if (useSubset) { // Subset of just faces with a name starting with A @@ -124,7 +139,7 @@ public class LFWLoader extends BaseImageLoader implements Serializable { load(NUM_IMAGES, NUM_IMAGES, NUM_LABELS, LABEL_PATTERN, 1, rng); } - public void load(int batchSize, int numExamples, int numLabels, PathLabelGenerator labelGenerator, + public void load(long batchSize, long numExamples, long numLabels, PathLabelGenerator labelGenerator, double splitTrainTest, Random rng) { if (!imageFilesExist()) { if (!fullDir.exists() || fullDir.listFiles() == null || fullDir.listFiles().length == 0) { @@ -163,42 +178,69 @@ public class LFWLoader extends BaseImageLoader implements Serializable { } - public RecordReader getRecordReader(int numExamples) { - return getRecordReader(numExamples, numExamples, new int[] {height, width, channels}, + public RecordReader getRecordReader(long numExamples) { + return getRecordReader(numExamples, numExamples, new long[] {height, width, channels}, useSubset ? SUB_NUM_LABELS : NUM_LABELS, LABEL_PATTERN, true, 1, new Random(System.currentTimeMillis())); } - public RecordReader getRecordReader(int batchSize, int numExamples, int numLabels, Random rng) { - return getRecordReader(numExamples, batchSize, new int[] {height, width, channels}, numLabels, LABEL_PATTERN, + public RecordReader getRecordReader(long batchSize, long numExamples, long numLabels, Random rng) { + return getRecordReader(numExamples, batchSize, new long[] {height, width, channels}, numLabels, LABEL_PATTERN, true, 1, rng); } - public RecordReader getRecordReader(int batchSize, int numExamples, boolean train, double splitTrainTest) { - return getRecordReader(numExamples, batchSize, new int[] {height, width, channels}, + public RecordReader getRecordReader(long batchSize, long numExamples, boolean train, double splitTrainTest) { + return getRecordReader(numExamples, batchSize, new long[] {height, width, channels}, useSubset ? SUB_NUM_LABELS : NUM_LABELS, LABEL_PATTERN, train, splitTrainTest, new Random(System.currentTimeMillis())); } - public RecordReader getRecordReader(int batchSize, int numExamples, int[] imgDim, boolean train, + public RecordReader getRecordReader(long batchSize, long numExamples, int[] imgDim, boolean train, double splitTrainTest, Random rng) { return getRecordReader(numExamples, batchSize, imgDim, useSubset ? SUB_NUM_LABELS : NUM_LABELS, LABEL_PATTERN, train, splitTrainTest, rng); } - public RecordReader getRecordReader(int batchSize, int numExamples, PathLabelGenerator labelGenerator, + public RecordReader getRecordReader(long batchSize, long numExamples, long[] imgDim, boolean train, + double splitTrainTest, Random rng) { + return getRecordReader(numExamples, batchSize, imgDim, useSubset ? SUB_NUM_LABELS : NUM_LABELS, LABEL_PATTERN, + train, splitTrainTest, rng); + } + + public RecordReader getRecordReader(long batchSize, long numExamples, PathLabelGenerator labelGenerator, boolean train, double splitTrainTest, Random rng) { - return getRecordReader(numExamples, batchSize, new int[] {height, width, channels}, + return getRecordReader(numExamples, batchSize, new long[] {height, width, channels}, useSubset ? SUB_NUM_LABELS : NUM_LABELS, labelGenerator, train, splitTrainTest, rng); } - public RecordReader getRecordReader(int batchSize, int numExamples, int[] imgDim, PathLabelGenerator labelGenerator, + public RecordReader getRecordReader(long batchSize, long numExamples, int[] imgDim, PathLabelGenerator labelGenerator, boolean train, double splitTrainTest, Random rng) { return getRecordReader(numExamples, batchSize, imgDim, useSubset ? SUB_NUM_LABELS : NUM_LABELS, labelGenerator, train, splitTrainTest, rng); } - public RecordReader getRecordReader(int batchSize, int numExamples, int[] imgDim, int numLabels, + public RecordReader getRecordReader(long batchSize, long numExamples, long[] imgDim, PathLabelGenerator labelGenerator, + boolean train, double splitTrainTest, Random rng) { + return getRecordReader(numExamples, batchSize, imgDim, useSubset ? SUB_NUM_LABELS : NUM_LABELS, labelGenerator, + train, splitTrainTest, rng); + } + + public RecordReader getRecordReader(long batchSize, long numExamples, int[] imgDim, long numLabels, + PathLabelGenerator labelGenerator, boolean train, double splitTrainTest, Random rng) { + load(batchSize, numExamples, numLabels, labelGenerator, splitTrainTest, rng); + RecordReader recordReader = + new ImageRecordReader(imgDim[0], imgDim[1], imgDim[2], labelGenerator, imageTransform); + + try { + InputSplit data = train ? inputSplit[0] : inputSplit[1]; + recordReader.initialize(data); + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + return recordReader; + } + + public RecordReader getRecordReader(long batchSize, long numExamples, long[] imgDim, long numLabels, PathLabelGenerator labelGenerator, boolean train, double splitTrainTest, Random rng) { load(batchSize, numExamples, numLabels, labelGenerator, splitTrainTest, rng); RecordReader recordReader = diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/NativeImageLoader.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/NativeImageLoader.java index fb3608f989..09e265201f 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/NativeImageLoader.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/NativeImageLoader.java @@ -46,7 +46,7 @@ import static org.bytedeco.javacpp.opencv_imgproc.*; * @author saudet */ public class NativeImageLoader extends BaseImageLoader { - private static final int MIN_BUFFER_STEP_SIZE = 1024*1024; + private static final int MIN_BUFFER_STEP_SIZE = 64 * 1024; private byte[] buffer = null; private Mat bufferMat = null; @@ -72,7 +72,7 @@ public class NativeImageLoader extends BaseImageLoader { * @param width the width to load */ - public NativeImageLoader(int height, int width) { + public NativeImageLoader(long height, long width) { this.height = height; this.width = width; } @@ -85,7 +85,7 @@ public class NativeImageLoader extends BaseImageLoader { * @param width the width to load * @param channels the number of channels for the image* */ - public NativeImageLoader(int height, int width, int channels) { + public NativeImageLoader(long height, long width, long channels) { this.height = height; this.width = width; this.channels = channels; @@ -99,7 +99,7 @@ public class NativeImageLoader extends BaseImageLoader { * @param channels the number of channels for the image* * @param centerCropIfNeeded to crop before rescaling and converting */ - public NativeImageLoader(int height, int width, int channels, boolean centerCropIfNeeded) { + public NativeImageLoader(long height, long width, long channels, boolean centerCropIfNeeded) { this(height, width, channels); this.centerCropIfNeeded = centerCropIfNeeded; } @@ -112,7 +112,7 @@ public class NativeImageLoader extends BaseImageLoader { * @param channels the number of channels for the image* * @param imageTransform to use before rescaling and converting */ - public NativeImageLoader(int height, int width, int channels, ImageTransform imageTransform) { + public NativeImageLoader(long height, long width, long channels, ImageTransform imageTransform) { this(height, width, channels); this.imageTransform = imageTransform; } @@ -125,7 +125,7 @@ public class NativeImageLoader extends BaseImageLoader { * @param channels the number of channels for the image* * @param mode how to load multipage image */ - public NativeImageLoader(int height, int width, int channels, MultiPageMode mode) { + public NativeImageLoader(long height, long width, long channels, MultiPageMode mode) { this(height, width, channels); this.multiPageMode = mode; } @@ -347,9 +347,9 @@ public class NativeImageLoader extends BaseImageLoader { protected void fillNDArray(Mat image, INDArray ret) { - int rows = image.rows(); - int cols = image.cols(); - int channels = image.channels(); + long rows = image.rows(); + long cols = image.cols(); + long channels = image.channels(); if (ret.lengthLong() != rows * cols * channels) { throw new ND4JIllegalStateException("INDArray provided to store image not equal to image: {channels: " @@ -369,9 +369,9 @@ public class NativeImageLoader extends BaseImageLoader { new long[] {channels, rows, cols}, new long[] {stride[0], stride[1], stride[2]}, direct); if (idx instanceof UByteIndexer) { UByteIndexer ubyteidx = (UByteIndexer) idx; - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { retidx.put(k, i, j, ubyteidx.get(i, j, k)); } } @@ -379,9 +379,9 @@ public class NativeImageLoader extends BaseImageLoader { done = true; } else if (idx instanceof UShortIndexer) { UShortIndexer ushortidx = (UShortIndexer) idx; - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { retidx.put(k, i, j, ushortidx.get(i, j, k)); } } @@ -389,9 +389,9 @@ public class NativeImageLoader extends BaseImageLoader { done = true; } else if (idx instanceof IntIndexer) { IntIndexer intidx = (IntIndexer) idx; - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { retidx.put(k, i, j, intidx.get(i, j, k)); } } @@ -399,9 +399,9 @@ public class NativeImageLoader extends BaseImageLoader { done = true; } else if (idx instanceof FloatIndexer) { FloatIndexer floatidx = (FloatIndexer) idx; - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { retidx.put(k, i, j, floatidx.get(i, j, k)); } } @@ -413,9 +413,9 @@ public class NativeImageLoader extends BaseImageLoader { new long[] {channels, rows, cols}, new long[] {stride[0], stride[1], stride[2]}, direct); if (idx instanceof UByteIndexer) { UByteIndexer ubyteidx = (UByteIndexer) idx; - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { retidx.put(k, i, j, ubyteidx.get(i, j, k)); } } @@ -423,9 +423,9 @@ public class NativeImageLoader extends BaseImageLoader { done = true; } else if (idx instanceof UShortIndexer) { UShortIndexer ushortidx = (UShortIndexer) idx; - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { retidx.put(k, i, j, ushortidx.get(i, j, k)); } } @@ -433,9 +433,9 @@ public class NativeImageLoader extends BaseImageLoader { done = true; } else if (idx instanceof IntIndexer) { IntIndexer intidx = (IntIndexer) idx; - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { retidx.put(k, i, j, intidx.get(i, j, k)); } } @@ -443,9 +443,9 @@ public class NativeImageLoader extends BaseImageLoader { done = true; } else if (idx instanceof FloatIndexer) { FloatIndexer floatidx = (FloatIndexer) idx; - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { retidx.put(k, i, j, floatidx.get(i, j, k)); } } @@ -456,9 +456,9 @@ public class NativeImageLoader extends BaseImageLoader { if (!done) { - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { if (channels > 1) { ret.putScalar(k, i, j, idx.getDouble(i, j, k)); } else { @@ -522,7 +522,7 @@ public class NativeImageLoader extends BaseImageLoader { int code = -1; switch (image.channels()) { case 1: - switch (channels) { + switch ((int)channels) { case 3: code = CV_GRAY2BGR; break; @@ -532,7 +532,7 @@ public class NativeImageLoader extends BaseImageLoader { } break; case 3: - switch (channels) { + switch ((int)channels) { case 1: code = CV_BGR2GRAY; break; @@ -542,7 +542,7 @@ public class NativeImageLoader extends BaseImageLoader { } break; case 4: - switch (channels) { + switch ((int)channels) { case 1: code = CV_RGBA2GRAY; break; @@ -617,10 +617,12 @@ public class NativeImageLoader extends BaseImageLoader { return scalingIfNeed(image, height, width); } - protected Mat scalingIfNeed(Mat image, int dstHeight, int dstWidth) { + protected Mat scalingIfNeed(Mat image, long dstHeight, long dstWidth) { Mat scaled = image; if (dstHeight > 0 && dstWidth > 0 && (image.rows() != dstHeight || image.cols() != dstWidth)) { - resize(image, scaled = new Mat(), new Size(dstWidth, dstHeight)); + resize(image, scaled = new Mat(), new Size( + (int)Math.min(dstWidth, Integer.MAX_VALUE), + (int)Math.min(dstHeight, Integer.MAX_VALUE))); } return scaled; } @@ -708,7 +710,8 @@ public class NativeImageLoader extends BaseImageLoader { if (dataType < 0) { dataType = pointer instanceof DoublePointer ? CV_64F : CV_32F; } - Mat mat = new Mat(rows, cols, CV_MAKETYPE(dataType, (int) channels)); + Mat mat = new Mat((int)Math.min(rows, Integer.MAX_VALUE), (int)Math.min(cols, Integer.MAX_VALUE), + CV_MAKETYPE(dataType, (int)Math.min(channels, Integer.MAX_VALUE))); boolean direct = !Loader.getPlatform().startsWith("android"); Indexer matidx = mat.createIndexer(direct); @@ -718,9 +721,9 @@ public class NativeImageLoader extends BaseImageLoader { FloatIndexer ptridx = FloatIndexer.create((FloatPointer)pointer, new long[] {channels, rows, cols}, new long[] {stride[rank == 3 ? 0 : 1], stride[rank == 3 ? 1 : 2], stride[rank == 3 ? 2 : 3]}, direct); FloatIndexer idx = (FloatIndexer)matidx; - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { idx.put(i, j, k, ptridx.get(k, i, j)); } } @@ -730,9 +733,9 @@ public class NativeImageLoader extends BaseImageLoader { DoubleIndexer ptridx = DoubleIndexer.create((DoublePointer)pointer, new long[] {channels, rows, cols}, new long[] {stride[rank == 3 ? 0 : 1], stride[rank == 3 ? 1 : 2], stride[rank == 3 ? 2 : 3]}, direct); DoubleIndexer idx = (DoubleIndexer)matidx; - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { idx.put(i, j, k, ptridx.get(k, i, j)); } } @@ -741,9 +744,9 @@ public class NativeImageLoader extends BaseImageLoader { } if (!done) { - for (int k = 0; k < channels; k++) { - for (int i = 0; i < rows; i++) { - for (int j = 0; j < cols; j++) { + for (long k = 0; k < channels; k++) { + for (long i = 0; i < rows; i++) { + for (long j = 0; j < cols; j++) { if (rank == 3) { matidx.putDouble(new long[] {i, j, k}, array.getDouble(k, i, j)); } else { @@ -764,7 +767,7 @@ public class NativeImageLoader extends BaseImageLoader { * @return INDArray * @throws IOException */ - private INDArray asMatrix(BytePointer bytes, int length) throws IOException { + private INDArray asMatrix(BytePointer bytes, long length) throws IOException { PIXA pixa; pixa = pixaReadMemMultipageTiff(bytes, length); INDArray data; diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/BaseImageRecordReader.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/BaseImageRecordReader.java index 4da2ec5477..383ef3e3fd 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/BaseImageRecordReader.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/BaseImageRecordReader.java @@ -67,7 +67,7 @@ public abstract class BaseImageRecordReader extends BaseRecordReader { protected boolean writeLabel = false; protected List<Writable> record; protected boolean hitImage = false; - protected int height = 28, width = 28, channels = 1; + protected long height = 28, width = 28, channels = 1; protected boolean cropImage = false; protected ImageTransform imageTransform; protected BaseImageLoader imageLoader; @@ -86,20 +86,20 @@ public abstract class BaseImageRecordReader extends BaseRecordReader { public BaseImageRecordReader() {} - public BaseImageRecordReader(int height, int width, int channels, PathLabelGenerator labelGenerator) { + public BaseImageRecordReader(long height, long width, long channels, PathLabelGenerator labelGenerator) { this(height, width, channels, labelGenerator, null); } - public BaseImageRecordReader(int height, int width, int channels, PathMultiLabelGenerator labelGenerator) { + public BaseImageRecordReader(long height, long width, long channels, PathMultiLabelGenerator labelGenerator) { this(height, width, channels, null, labelGenerator,null); } - public BaseImageRecordReader(int height, int width, int channels, PathLabelGenerator labelGenerator, + public BaseImageRecordReader(long height, long width, long channels, PathLabelGenerator labelGenerator, ImageTransform imageTransform) { this(height, width, channels, labelGenerator, null, imageTransform); } - protected BaseImageRecordReader(int height, int width, int channels, PathLabelGenerator labelGenerator, + protected BaseImageRecordReader(long height, long width, long channels, PathLabelGenerator labelGenerator, PathMultiLabelGenerator labelMultiGenerator, ImageTransform imageTransform) { this.height = height; this.width = width; @@ -173,9 +173,9 @@ public abstract class BaseImageRecordReader extends BaseRecordReader { public void initialize(Configuration conf, InputSplit split) throws IOException, InterruptedException { this.appendLabel = conf.getBoolean(APPEND_LABEL, appendLabel); this.labels = new ArrayList<>(conf.getStringCollection(LABELS)); - this.height = conf.getInt(HEIGHT, height); - this.width = conf.getInt(WIDTH, width); - this.channels = conf.getInt(CHANNELS, channels); + this.height = conf.getLong(HEIGHT, height); + this.width = conf.getLong(WIDTH, width); + this.channels = conf.getLong(CHANNELS, channels); this.cropImage = conf.getBoolean(CROP_IMAGE, cropImage); if ("imageio".equals(conf.get(IMAGE_LOADER))) { this.imageLoader = new ImageLoader(height, width, channels, cropImage); @@ -327,7 +327,7 @@ public abstract class BaseImageRecordReader extends BaseRecordReader { cnt++; } - INDArray features = Nd4j.createUninitialized(new int[] {cnt, channels, height, width}, 'c'); + INDArray features = Nd4j.createUninitialized(new long[] {cnt, channels, height, width}, 'c'); Nd4j.getAffinityManager().tagLocation(features, AffinityManager.Location.HOST); for (int i = 0; i < cnt; i++) { try { diff --git a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/ImageRecordReader.java b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/ImageRecordReader.java index 0855f04cfa..7195ea4790 100644 --- a/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/ImageRecordReader.java +++ b/datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/ImageRecordReader.java @@ -40,38 +40,38 @@ public class ImageRecordReader extends BaseImageRecordReader { } /** Loads images with given height, width, and channels, appending labels returned by the generator. */ - public ImageRecordReader(int height, int width, int channels, PathLabelGenerator labelGenerator) { + public ImageRecordReader(long height, long width, long channels, PathLabelGenerator labelGenerator) { super(height, width, channels, labelGenerator); } /** Loads images with given height, width, and channels, appending labels returned by the generator. */ - public ImageRecordReader(int height, int width, int channels, PathMultiLabelGenerator labelGenerator) { + public ImageRecordReader(long height, long width, long channels, PathMultiLabelGenerator labelGenerator) { super(height, width, channels, labelGenerator); } /** Loads images with given height, width, and channels, appending no labels. */ - public ImageRecordReader(int height, int width, int channels) { + public ImageRecordReader(long height, long width, long channels) { super(height, width, channels, (PathLabelGenerator) null); } /** Loads images with given height, width, and channels, appending labels returned by the generator. */ - public ImageRecordReader(int height, int width, int channels, PathLabelGenerator labelGenerator, + public ImageRecordReader(long height, long width, long channels, PathLabelGenerator labelGenerator, ImageTransform imageTransform) { super(height, width, channels, labelGenerator, imageTransform); } /** Loads images with given height, width, and channels, appending no labels. */ - public ImageRecordReader(int height, int width, int channels, ImageTransform imageTransform) { + public ImageRecordReader(long height, long width, long channels, ImageTransform imageTransform) { super(height, width, channels, null, imageTransform); } /** Loads images with given height, width, and channels, appending labels returned by the generator. */ - public ImageRecordReader(int height, int width, PathLabelGenerator labelGenerator) { + public ImageRecordReader(long height, long width, PathLabelGenerator labelGenerator) { super(height, width, 1, labelGenerator); } /** Loads images with given height, width, and channels = 1, appending no labels. */ - public ImageRecordReader(int height, int width) { + public ImageRecordReader(long height, long width) { super(height, width, 1, null, null); } diff --git a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/LoaderTests.java b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/LoaderTests.java index d78e356bcb..28791810d0 100644 --- a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/LoaderTests.java +++ b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/LoaderTests.java @@ -56,7 +56,7 @@ public class LoaderTests { rr.initialize(inputSplit[0]); List<String> exptedLabel = rr.getLabels(); - RecordReader rr2 = new LFWLoader(new int[] {250, 250, 3}, true).getRecordReader(1, 1, 1, new Random(42)); + RecordReader rr2 = new LFWLoader(new long[] {250, 250, 3}, true).getRecordReader(1, 1, 1, new Random(42)); assertEquals(exptedLabel.get(0), rr2.getLabels().get(0)); } diff --git a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/TestNativeImageLoader.java b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/TestNativeImageLoader.java index 6a161f83ab..a81728d526 100644 --- a/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/TestNativeImageLoader.java +++ b/datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/TestNativeImageLoader.java @@ -121,7 +121,7 @@ public class TestNativeImageLoader { assertEquals(w4, array6.size(3)); int ch5 = 4, pages1 = 1; - NativeImageLoader loader6 = new NativeImageLoader(h4, w4, ch5, NativeImageLoader.MultiPageMode.CHANNELS); + NativeImageLoader loader6 = new NativeImageLoader(h4, w4, 1, NativeImageLoader.MultiPageMode.CHANNELS); INDArray array7 = null; try { array7 = loader6.asMatrix( @@ -249,6 +249,14 @@ public class TestNativeImageLoader { Java2DNativeImageLoader loader4 = new Java2DNativeImageLoader(); BufferedImage img12 = loader4.asBufferedImage(array1); assertEquals(array1, loader4.asMatrix(img12)); + + NativeImageLoader loader5 = new NativeImageLoader(0, 0, 0); + INDArray array7 = loader5.asMatrix(f3); + assertEquals(4, array7.rank()); + assertEquals(1, array7.size(0)); + assertEquals(3, array7.size(1)); + assertEquals(32, array7.size(2)); + assertEquals(32, array7.size(3)); } @Test

['datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/TestNativeImageLoader.java', 'datavec/datavec-api/src/main/java/org/datavec/api/io/filters/RandomPathFilter.java', 'datavec/datavec-data/datavec-data-image/src/test/java/org/datavec/image/loader/LoaderTests.java', 'datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/ImageLoader.java', 'datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/BaseImageLoader.java', 'datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/LFWLoader.java', 'datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/loader/NativeImageLoader.java', 'datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/ImageRecordReader.java', 'datavec/datavec-data/datavec-data-image/src/main/java/org/datavec/image/recordreader/BaseImageRecordReader.java', 'datavec/datavec-api/src/main/java/org/datavec/api/io/filters/BalancedPathFilter.java']

{'.java': 10}

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/5352/5351

deeplearning4j

deeplearning4j

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

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

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

"Expected no workspace active" exception during evaluation

fix

Training a simple MLP on MNIST with an EvaluativeListener, I get the following workspace-related exception: `Exception in thread "main" org.nd4j.linalg.workspace.ND4JWorkspaceException: Expected no workspace active in outputOfLayerDetached - Open/active workspaces: [WS_ALL_LAYERS_ACT]` It happens on the first call to `doEvaluation(...)` inside of the listener, so it likely has to do with the inference workspace mode...? Here's a full stack trace for the exception: ``` Exception in thread "main" org.nd4j.linalg.workspace.ND4JWorkspaceException: Expected no workspace active in outputOfLayerDetached - Open/active workspaces: [WS_ALL_LAYERS_ACT] at org.nd4j.linalg.workspace.WorkspaceUtils.assertNoWorkspacesOpen(WorkspaceUtils.java:38) at org.deeplearning4j.nn.multilayer.MultiLayerNetwork.outputOfLayerDetached(MultiLayerNetwork.java:1030) at org.deeplearning4j.nn.multilayer.MultiLayerNetwork.doEvaluation(MultiLayerNetwork.java:3052) at org.deeplearning4j.optimize.listeners.EvaluativeListener.invokeListener(EvaluativeListener.java:211) at org.deeplearning4j.optimize.listeners.EvaluativeListener.onBackwardPass(EvaluativeListener.java:188) at org.deeplearning4j.nn.multilayer.MultiLayerNetwork.computeGradientAndScore(MultiLayerNetwork.java:2460) at org.deeplearning4j.nn.multilayer.MultiLayerNetwork.computeGradientAndScore(MultiLayerNetwork.java:2395) at org.deeplearning4j.optimize.solvers.BaseOptimizer.gradientAndScore(BaseOptimizer.java:178) at org.deeplearning4j.optimize.solvers.StochasticGradientDescent.optimize(StochasticGradientDescent.java:60) at org.deeplearning4j.optimize.Solver.optimize(Solver.java:54) at org.deeplearning4j.nn.multilayer.MultiLayerNetwork.fit(MultiLayerNetwork.java:1459) at org.deeplearning4j.distributed.BasicTrainingExperimentDriver.entryPoint(BasicTrainingExperimentDriver.java:127) at org.deeplearning4j.distributed.BasicTrainingExperimentDriver.main(BasicTrainingExperimentDriver.java:58) ```

a589d2c42700c62eef32dee7a9d9ffb875d46aa7

df681f07aef9dbe8e98814f9ca96d718c027eb6a

https://github.com/deeplearning4j/deeplearning4j/compare/a589d2c42700c62eef32dee7a9d9ffb875d46aa7...df681f07aef9dbe8e98814f9ca96d718c027eb6a

diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java index c71b5ab115..bf36fe97db 100644 --- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java +++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java @@ -43,6 +43,7 @@ import org.deeplearning4j.nn.conf.layers.RnnOutputLayer; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; import org.deeplearning4j.nn.weights.WeightInit; +import org.deeplearning4j.optimize.listeners.EvaluativeListener; import org.deeplearning4j.optimize.listeners.ScoreIterationListener; import org.junit.Test; import org.nd4j.linalg.activations.Activation; @@ -1249,6 +1250,40 @@ public class EvalTest extends BaseDL4JTest { System.out.println("\n\n\n\n"); System.out.println(e.stats(false, true)); + } + + + + @Test + public void testEvaluativeListenerSimple(){ + //Sanity check: https://github.com/deeplearning4j/deeplearning4j/issues/5351 + + // Network config + MultiLayerConfiguration conf = new NeuralNetConfiguration.Builder() + + .optimizationAlgo(OptimizationAlgorithm.LINE_GRADIENT_DESCENT).seed(42) + .updater(new Sgd(1e-6)).list() + .layer(0, new DenseLayer.Builder().nIn(4).nOut(2).activation(Activation.TANH) + .weightInit(WeightInit.XAVIER).build()) + .layer(1, new org.deeplearning4j.nn.conf.layers.OutputLayer.Builder( + LossFunctions.LossFunction.MCXENT).nIn(2).nOut(3).weightInit(WeightInit.XAVIER) + .activation(Activation.SOFTMAX).build()) + .build(); + + // Instantiate model + MultiLayerNetwork net = new MultiLayerNetwork(conf); + net.init(); + + // Train-test split + DataSetIterator iter = new IrisDataSetIterator(30, 150); + DataSetIterator iterTest = new IrisDataSetIterator(30, 150); + + net.setListeners(new EvaluativeListener(iterTest, 3)); + + for( int i=0; i<10; i++ ){ + net.fit(iter); + } + } } diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/EvaluativeListener.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/EvaluativeListener.java index d8168c0b12..82e6d2aad3 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/EvaluativeListener.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/EvaluativeListener.java @@ -152,7 +152,8 @@ public class EvaluativeListener extends BaseTrainingListener { */ @Override public void iterationDone(Model model, int iteration, int epoch) { - // no-op + if (invocationType == InvocationType.ITERATION_END) + invokeListener(model); } @Override @@ -167,27 +168,6 @@ public class EvaluativeListener extends BaseTrainingListener { invokeListener(model); } - @Override - public void onForwardPass(Model model, List<INDArray> activations) { - // no-op - } - - @Override - public void onForwardPass(Model model, Map<String, INDArray> activations) { - // no-op - } - - @Override - public void onGradientCalculation(Model model) { - // no-op - } - - @Override - public void onBackwardPass(Model model) { - if (invocationType == InvocationType.ITERATION_END) - invokeListener(model); - } - protected void invokeListener(Model model) { if (iterationCount.get() == null) iterationCount.set(new AtomicLong(0));

['deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalTest.java', 'deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/optimize/listeners/EvaluativeListener.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/5081/4294

deeplearning4j

deeplearning4j

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

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

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

Keras Model Import API Loss Layer inconsistencies

closes

#### Issue Description KerasModelImport.importKerasModelAndWeights(modelFileName, enforceTrain) vs KerasModelImport.importKerasModelAndWeights(jsonConfig, weightsFile, enforceTrain) produces different results (one includes a Loss Layer to the tail while the other does not): Reference the following gist for summary output: https://gist.github.com/akamlani/3a73df77fc1d3cbbc09101ba560a5efc In addition, it also is unable to handle the Loss Layer: Reference the following Keras gist for model architecture: https://gist.github.com/akamlani/f0371c3f91ad3e809a706b026bbf8ddb ``` KerasModel - Model cannot be trained: output layer outputLayer_a_loss is not an IOutputLayer (no loss function specified) KerasModel - Model cannot be trained: output outputLayer_a_loss is not an IOutputLayer (no loss function specified) ``` Unable to perform training nor inference, as no Output Layer recognized. #### Version Information * 0.9.2-SNAPSHOT (Per 11/12) * Keras 2.0.7 + TensorFlow 1.3.0 * MacOS * CPU Based

d1749c9f7cb79423f2273931b91d4947523f45af

4f058e80f1f9cf14d80b2700f3cb66bdb3965f37

https://github.com/deeplearning4j/deeplearning4j/compare/d1749c9f7cb79423f2273931b91d4947523f45af...4f058e80f1f9cf14d80b2700f3cb66bdb3965f37

diff --git a/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java b/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java index 1b23683f2f..90f57bdef0 100644 --- a/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java +++ b/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java @@ -158,8 +158,12 @@ public class KerasModel { prepareLayers((List<Object>) layerLists.get((config.getModelFieldLayers()))); /* Import training configuration. */ - if (trainingJson != null && enforceTrainingConfig) - importTrainingConfiguration(trainingJson); + if (enforceTrainingConfig) { + if (trainingJson != null) + importTrainingConfiguration(trainingJson); + else throw new UnsupportedKerasConfigurationException("If enforceTrainingConfig is true, a training " + + "configuration object (JSON) has to be provided."); + } /* Infer output types for each layer. */ inferOutputTypes(inputShape); diff --git a/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java b/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java index 8d0cf1d141..dc1c7e9a08 100644 --- a/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java +++ b/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java @@ -287,6 +287,30 @@ public class KerasModelEndToEndTest { importFunctionalModelH5Test("modelimport/keras/examples/reshape_to_rnn/reshape_model.h5"); } + /** + * Functional LSTM test + */ + @Test + public void importFunctionalLstmTfKeras2() throws Exception { + String modelPath = "modelimport/keras/examples/functional_lstm/lstm_functional_tf_keras_2.h5"; + + // No training enabled + ComputationGraph graphNoTrain = importFunctionalModelH5Test(modelPath, null, false); + System.out.println(graphNoTrain.summary()); + + // Training enabled + ComputationGraph graph = importFunctionalModelH5Test(modelPath, null, true); + System.out.println(graph.summary()); + + // Make predictions + int miniBatch = 32; + INDArray input = Nd4j.ones(miniBatch, 4, 10); + INDArray[] out = graph.output(input); + + // Fit model + graph.fit(new INDArray[] {input}, out); + } + /** * U-Net */

['deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java', 'deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.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/4952/2689

deeplearning4j

deeplearning4j

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

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

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

Training Inception v3 from Keras TF fails with ArrayIndexOutOfBoundsException

closes

Version 0.7.2 + latest model import module from master. Running following code fails: `ComputationGraphConfiguration config = importKerasModelConfiguration( "KerasInception3.json"); // from Keras Tensorflow ComputationGraph model = new ComputationGraph(config); model.init(); double[] flattened = new double[299 * 299 * 3]; Arrays.fill(flattened, 0.05); INDArray input = Nd4j.create(flattened, new int[] { 1, 3, 299, 299 }, 'c'); double[] outputArray = new double[1000]; Arrays.fill(outputArray, 0.01); INDArray output = Nd4j.create(outputArray); model.fit(new INDArray[] { input }, new INDArray[] { output });` Fails with: `Caused by: java.lang.ArrayIndexOutOfBoundsException: 0 at org.deeplearning4j.nn.graph.ComputationGraph.calcBackpropGradients(ComputationGraph.java:1198) at org.deeplearning4j.nn.graph.ComputationGraph.computeGradientAndScore(ComputationGraph.java:969) at org.deeplearning4j.optimize.solvers.BaseOptimizer.gradientAndScore(BaseOptimizer.java:151) at org.deeplearning4j.optimize.solvers.StochasticGradientDescent.optimize(StochasticGradientDescent.java:54) at org.deeplearning4j.optimize.Solver.optimize(Solver.java:51) at org.deeplearning4j.nn.graph.ComputationGraph.fit(ComputationGraph.java:833) at org.deeplearning4j.nn.graph.ComputationGraph.fit(ComputationGraph.java:798) at deeplearning.Main.main(Main.java:71) ... 5 more`

d86a8f3cdde699c6543566648db238461797c7bd

bb80477314de6eec007b72f651a824a1d6202f88

https://github.com/deeplearning4j/deeplearning4j/compare/d86a8f3cdde699c6543566648db238461797c7bd...bb80477314de6eec007b72f651a824a1d6202f88

diff --git a/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java b/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java index bf901aadc5..120e9535dd 100644 --- a/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java +++ b/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java @@ -230,6 +230,7 @@ public class KerasModelEndToEndTest { public void importDcganMnistDiscriminator() throws Exception { importSequentialModelH5Test("modelimport/keras/examples/mnist_dcgan/dcgan_discriminator_epoch_50.h5"); } + @Test public void importDcganMnistGenerator() throws Exception { importSequentialModelH5Test("modelimport/keras/examples/mnist_dcgan/dcgan_generator_epoch_50.h5"); @@ -265,7 +266,7 @@ public class KerasModelEndToEndTest { } @Test - public void importCnn1d() throws Exception { + public void importCnn1d() throws Exception { importSequentialModelH5Test("modelimport/keras/examples/cnn1d/cnn1d_flatten_tf_keras2.h5"); } @@ -316,9 +317,12 @@ public class KerasModelEndToEndTest { */ @Test @Ignore - // Take unreasonably long, but work + // Takes unreasonably long, but works public void importInception() throws Exception { - importFunctionalModelH5Test("modelimport/keras/examples/inception/inception_v3_complete.h5"); + ComputationGraph graph = importFunctionalModelH5Test("modelimport/keras/examples/inception/inception_v3_complete.h5"); + INDArray input = Nd4j.ones(10, 3, 299, 299); + graph.output(input); + System.out.println(graph.summary()); } /** @@ -327,11 +331,11 @@ public class KerasModelEndToEndTest { @Test @Ignore public void importXception() throws Exception { - importFunctionalModelH5Test("modelimport/keras/examples/xception/xception_tf_keras_2.h5"); + ComputationGraph graph = importFunctionalModelH5Test("modelimport/keras/examples/xception/xception_tf_keras_2.h5"); } - private void importFunctionalModelH5Test(String modelPath) throws Exception { + private ComputationGraph importFunctionalModelH5Test(String modelPath) throws Exception { ClassPathResource modelResource = new ClassPathResource(modelPath, KerasModelEndToEndTest.class.getClassLoader()); @@ -340,8 +344,7 @@ public class KerasModelEndToEndTest { KerasModelBuilder builder = new KerasModel().modelBuilder().modelHdf5Filename(modelFile.getAbsolutePath()) .enforceTrainingConfig(false); KerasModel model = builder.buildModel(); - ComputationGraph graph = model.getComputationGraph(); - System.out.println(graph.summary()); + return model.getComputationGraph(); } private void importSequentialModelH5Test(String modelPath) throws Exception { @@ -378,50 +381,50 @@ public class KerasModelEndToEndTest { Files.copy(outputsResource.getInputStream(), outputsFile.toPath(), StandardCopyOption.REPLACE_EXISTING); try (Hdf5Archive outputsArchive = new Hdf5Archive(outputsFile.getAbsolutePath())) { - if (checkPredictions) { - INDArray input = getInputs(outputsArchive, tfOrdering)[0]; - Map<String, INDArray> activationsKeras = getActivations(outputsArchive, tfOrdering); - for (int i = 0; i < model.getLayers().length; i++) { - String layerName = model.getLayerNames().get(i); - if (activationsKeras.containsKey(layerName)) { - INDArray activationsDl4j = model.feedForwardToLayer(i, input, false).get(i + 1); + if (checkPredictions) { + INDArray input = getInputs(outputsArchive, tfOrdering)[0]; + Map<String, INDArray> activationsKeras = getActivations(outputsArchive, tfOrdering); + for (int i = 0; i < model.getLayers().length; i++) { + String layerName = model.getLayerNames().get(i); + if (activationsKeras.containsKey(layerName)) { + INDArray activationsDl4j = model.feedForwardToLayer(i, input, false).get(i + 1); /* TODO: investigate why this fails for some layers: * compareINDArrays(layerName, activationsKeras.get(layerName), activationsDl4j, EPS); */ + } } - } - INDArray predictionsKeras = getPredictions(outputsArchive, tfOrdering)[0]; - INDArray predictionsDl4j = model.output(input, false); + INDArray predictionsKeras = getPredictions(outputsArchive, tfOrdering)[0]; + INDArray predictionsDl4j = model.output(input, false); /* TODO: investigate why this fails when max difference is ~1E-7! * compareINDArrays("predictions", predictionsKeras, predictionsDl4j, EPS); */ - INDArray outputs = getOutputs(outputsArchive, true)[0]; - compareMulticlassAUC("predictions", outputs, predictionsKeras, predictionsDl4j, 10, EPS); - } + INDArray outputs = getOutputs(outputsArchive, true)[0]; + compareMulticlassAUC("predictions", outputs, predictionsKeras, predictionsDl4j, 10, EPS); + } - if (checkGradients) { - Random r = new Random(12345); - INDArray input = getInputs(outputsArchive, tfOrdering)[0]; - INDArray predictionsDl4j = model.output(input, false); + if (checkGradients) { + Random r = new Random(12345); + INDArray input = getInputs(outputsArchive, tfOrdering)[0]; + INDArray predictionsDl4j = model.output(input, false); - //Infer one-hot labels... this probably won't work for all - INDArray testLabels = Nd4j.create(predictionsDl4j.shape()); - if (testLabels.rank() == 2) { - for (int i = 0; i < testLabels.size(0); i++) { - testLabels.putScalar(i, r.nextInt(testLabels.size(1)), 1.0); - } - } else if (testLabels.rank() == 3) { - for (int i = 0; i < testLabels.size(0); i++) { - for (int j = 0; j < testLabels.size(1); j++) { - testLabels.putScalar(i, j, r.nextInt(testLabels.size(1)), 1.0); + //Infer one-hot labels... this probably won't work for all + INDArray testLabels = Nd4j.create(predictionsDl4j.shape()); + if (testLabels.rank() == 2) { + for (int i = 0; i < testLabels.size(0); i++) { + testLabels.putScalar(i, r.nextInt(testLabels.size(1)), 1.0); + } + } else if (testLabels.rank() == 3) { + for (int i = 0; i < testLabels.size(0); i++) { + for (int j = 0; j < testLabels.size(1); j++) { + testLabels.putScalar(i, j, r.nextInt(testLabels.size(1)), 1.0); + } } + } else { + throw new RuntimeException("Cannot gradient check 4d output array"); } - } else { - throw new RuntimeException("Cannot gradient check 4d output array"); + checkGradients(model, input, testLabels); } - checkGradients(model, input, testLabels); - } } }

['deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java']

{'.java': 1}

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

InputStream used twice, causing a NoSuchElementException

fix

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-core/src/main/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetIterator.java', 'deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/datavec/RecordReaderDataSetiteratorTest.java', 'deeplearning4j-scaleout/spark/dl4j-spark/src/main/java/org/deeplearning4j/spark/datavec/iterator/SparkSourceDummyReader.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

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

fix

``` 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-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningCompGraphTest.java', 'deeplearning4j-core/src/test/java/org/deeplearning4j/nn/transferlearning/TransferLearningMLNTest.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/transferlearning/FineTuneConfiguration.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

RegressionEvaluation bug

fix

``` @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/EvalTest.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/eval/RegressionEvaluation.java', 'deeplearning4j-core/src/test/java/org/deeplearning4j/eval/RegressionEvalTest.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/4664/4635

deeplearning4j

deeplearning4j

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

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

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

Error using TransferLearningHelper with TinyYOLO

fix

Hi By calling the following code: TinyYOLO model = new TinyYOLO(nClasses, seed); ComputationGraph computationGraph = (ComputationGraph) model.initPretrained(); TransferLearningHelper transferLearningHelper = new TransferLearningHelper(computationGraph, "conv2d_9"); We get the following exception stacktrace: Exception in thread "main" org.nd4j.linalg.exception.ND4JIllegalStateException: Invalid shape: Requested INDArray shape [1, 0] contains dimension size values < 1 (all dimensions must be 1 or more) at org.nd4j.linalg.factory.Nd4j.checkShapeValues(Nd4j.java:5122) at org.nd4j.linalg.factory.Nd4j.create(Nd4j.java:5112) at org.nd4j.linalg.factory.Nd4j.create(Nd4j.java:5065) at org.nd4j.linalg.factory.Nd4j.create(Nd4j.java:4170) at org.deeplearning4j.nn.graph.ComputationGraph.init(ComputationGraph.java:452) at org.deeplearning4j.nn.graph.ComputationGraph.init(ComputationGraph.java:377) at org.deeplearning4j.nn.transferlearning.TransferLearning$GraphBuilder.build(TransferLearning.java:755) at org.deeplearning4j.nn.transferlearning.TransferLearningHelper.initHelperGraph(TransferLearningHelper.java:252) at org.deeplearning4j.nn.transferlearning.TransferLearningHelper.<init>(TransferLearningHelper.java:56) at nlb.ai.deeplearning.dl4j.image.objectdetection.PersonsDetection.main(PersonsDetection.java:39) It works perfectly well with VGG16. * Deeplearning4j version 0.9.2-SANPSHOT * windows 10 * neither CUDA nor NVIDIA are used

6edd2e893be21e465790af47c8410851a8094c57

3e36a29d08219be90dfaa13ebd865a2e05b64ee1

https://github.com/deeplearning4j/deeplearning4j/compare/6edd2e893be21e465790af47c8410851a8094c57...3e36a29d08219be90dfaa13ebd865a2e05b64ee1

diff --git a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java index 76098e52ca..8c776ce99c 100644 --- a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java +++ b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java @@ -6,8 +6,10 @@ import org.datavec.api.records.reader.RecordReader; import org.datavec.api.records.reader.impl.csv.CSVRecordReader; import org.datavec.api.split.FileSplit; import org.deeplearning4j.BaseDL4JTest; +import org.deeplearning4j.TestUtils; import org.deeplearning4j.datasets.datavec.RecordReaderMultiDataSetIterator; import org.deeplearning4j.datasets.iterator.impl.IrisDataSetIterator; +import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator; import org.deeplearning4j.eval.Evaluation; import org.deeplearning4j.exception.DL4JException; import org.deeplearning4j.nn.api.OptimizationAlgorithm; @@ -1340,4 +1342,32 @@ public class TestComputationGraphNetwork extends BaseDL4JTest { assertEquals(13, net.layerSize("3")); } + @Test + public void testZeroParamNet() throws Exception { + + ComputationGraphConfiguration conf = new NeuralNetConfiguration.Builder() + .graphBuilder() + .addInputs("in") + .layer("0", new SubsamplingLayer.Builder().kernelSize(2,2).stride(2,2).build(), "in") + .layer("1", new LossLayer.Builder().activation(Activation.SIGMOID).lossFunction(LossFunctions.LossFunction.MSE).build(), "0") + .setOutputs("1") + .setInputTypes(InputType.convolutionalFlat(28,28,1)) + .build(); + + ComputationGraph net = new ComputationGraph(conf); + net.init(); + + DataSet ds = new MnistDataSetIterator(16, true, 12345).next(); + + INDArray out = net.outputSingle(ds.getFeatures()); + + INDArray labelTemp = Nd4j.create(out.shape()); + ds.setLabels(labelTemp); + + net.fit(ds); + + ComputationGraph net2 = TestUtils.testModelSerialization(net); + INDArray out2 = net2.outputSingle(ds.getFeatures()); + assertEquals(out, out2); + } } diff --git a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java index 6b3b87d013..af21fb6c08 100644 --- a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java +++ b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java @@ -1245,4 +1245,32 @@ public class MultiLayerTest extends BaseDL4JTest { assertEquals(30, net.layerSize(2)); assertEquals(13, net.layerSize(3)); } + + + @Test + public void testZeroParamNet() throws Exception { + + MultiLayerConfiguration conf = new NeuralNetConfiguration.Builder() + .list() + .layer(new SubsamplingLayer.Builder().kernelSize(2,2).stride(2,2).build()) + .layer(new LossLayer.Builder().activation(Activation.SIGMOID).lossFunction(LossFunctions.LossFunction.MSE).build()) + .setInputType(InputType.convolutionalFlat(28,28,1)) + .build(); + + MultiLayerNetwork net = new MultiLayerNetwork(conf); + net.init(); + + DataSet ds = new MnistDataSetIterator(16, true, 12345).next(); + + INDArray out = net.output(ds.getFeatures()); + + INDArray labelTemp = Nd4j.create(out.shape()); + ds.setLabels(labelTemp); + + net.fit(ds); + + MultiLayerNetwork net2 = TestUtils.testModelSerialization(net); + INDArray out2 = net2.output(ds.getFeatures()); + assertEquals(out, out2); + } } diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/gradient/DefaultGradient.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/gradient/DefaultGradient.java index d09015682b..dea4e3e4d3 100644 --- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/gradient/DefaultGradient.java +++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/gradient/DefaultGradient.java @@ -93,7 +93,7 @@ public class DefaultGradient implements Gradient { } } flattenedGradient = Nd4j.toFlattened(DEFAULT_FLATTENING_ORDER, toFlatten); - } else { + } else if( !gradients.values().isEmpty() ){ //Edge case: can be empty for nets with 0 params //Standard case: flatten all to f order flattenedGradient = Nd4j.toFlattened(DEFAULT_FLATTENING_ORDER, gradients.values()); } diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/ComputationGraph.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/ComputationGraph.java index 59399df257..db983b45b1 100755 --- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/ComputationGraph.java +++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/ComputationGraph.java @@ -449,9 +449,12 @@ public class ComputationGraph implements Serializable, Model, NeuralNetwork { flattenedParams = parameters; initializeParams = false; - } else { + } else if(numParams > 0){ flattenedParams = Nd4j.create(1, numParams); initializeParams = true; + } else { + flattenedParams = null; + initializeParams = false; } //Set RNG seed, for repeatability between initializations when set @@ -632,7 +635,10 @@ public class ComputationGraph implements Serializable, Model, NeuralNetwork { numParams += numParamsForVertex[i]; i++; } - flattenedGradients = Nd4j.create(1, numParams); + + if(numParams > 0) { + flattenedGradients = Nd4j.create(1, numParams); + } //Given the topological ordering: work out the subset of the gradient array used for each layer, and set it int paramOffsetSoFar = 0; @@ -1138,6 +1144,10 @@ public class ComputationGraph implements Serializable, Model, NeuralNetwork { * @param labelMaskArrays Mas arrays for the labels/outputs. Typically used for RNN training. May be null. */ public void fit(INDArray[] inputs, INDArray[] labels, INDArray[] featureMaskArrays, INDArray[] labelMaskArrays) { + if (numParams() == 0) { + return; //Edge case: net with no params: fitting is a no-op + } + if (flattenedGradients == null) { initGradientsView(); } diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java index b220483e91..ce19832f2a 100755 --- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java +++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java @@ -604,9 +604,13 @@ public class MultiLayerNetwork implements Serializable, Classifier, Layer, Neura flattenedParams = parameters; initializeParams = false; - } else { + } else if(paramLength > 0){ flattenedParams = Nd4j.create(1, paramLength); initializeParams = true; + } else { + //Edge case: 0 params in network + flattenedParams = null; + initializeParams = false; } //Set RNG seed, for repeatability between initializations when set @@ -693,7 +697,9 @@ public class MultiLayerNetwork implements Serializable, Classifier, Layer, Neura paramLength += nParamsPerLayer[i]; } - flattenedGradients = Nd4j.zeros(new int[] {1, paramLength}, 'f'); //No need to initialize, as each layer will do it each iteration anyway + if(paramLength > 0) { + flattenedGradients = Nd4j.zeros(new int[]{1, paramLength}, 'f'); //No need to initialize, as each layer will do it each iteration anyway + } int backpropParamsSoFar = 0; for (int i = 0; i < layers.length; i++) { @@ -1861,6 +1867,10 @@ public class MultiLayerNetwork implements Serializable, Classifier, Layer, Neura * @param labelsMask The mask array for the labels (used for variable length time series, etc). May be null. */ public void fit(INDArray features, INDArray labels, INDArray featuresMask, INDArray labelsMask) { + if(numParams() == 0){ + //No op: can't fit a network with 0 parameters + return; + } setInput(features); setLabels(labels); diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/updater/BaseMultiLayerUpdater.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/updater/BaseMultiLayerUpdater.java index ba08beb97f..da46b30e77 100644 --- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/updater/BaseMultiLayerUpdater.java +++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/updater/BaseMultiLayerUpdater.java @@ -299,7 +299,11 @@ public abstract class BaseMultiLayerUpdater<T extends Model> implements Updater gradient.gradient().divi(batchSize); } else { //Standard case - getFlattenedGradientsView().divi(batchSize); + INDArray grad = getFlattenedGradientsView(); + if(grad != null) { + //May be null for nets with no parameters + grad.divi(batchSize); + } } } } diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ModelSerializer.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ModelSerializer.java index e0644a9f1b..70694cc547 100644 --- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ModelSerializer.java +++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ModelSerializer.java @@ -125,12 +125,18 @@ public class ModelSerializer { ZipEntry coefficients = new ZipEntry("coefficients.bin"); zipfile.putNextEntry(coefficients); DataOutputStream dos = new DataOutputStream(new BufferedOutputStream(zipfile)); - try { - Nd4j.write(model.params(), dos); - } finally { - dos.flush(); - if (!saveUpdater) - dos.close(); + INDArray params = model.params(); + if(params != null) { + try { + Nd4j.write(model.params(), dos); + } finally { + dos.flush(); + if (!saveUpdater) + dos.close(); + } + } else { + ZipEntry noParamsMarker = new ZipEntry("noParams.marker"); + zipfile.putNextEntry(noParamsMarker); } if (saveUpdater) { @@ -225,13 +231,18 @@ public class ModelSerializer { ZipEntry coefficients = zipFile.getEntry("coefficients.bin"); - if (coefficients != null) { - InputStream stream = zipFile.getInputStream(coefficients); - DataInputStream dis = new DataInputStream(new BufferedInputStream(stream)); - params = Nd4j.read(dis); + if (coefficients != null ) { + if(coefficients.getSize() > 0) { + InputStream stream = zipFile.getInputStream(coefficients); + DataInputStream dis = new DataInputStream(new BufferedInputStream(stream)); + params = Nd4j.read(dis); - dis.close(); - gotCoefficients = true; + dis.close(); + gotCoefficients = true; + } else { + ZipEntry noParamsMarker = zipFile.getEntry("noParams.marker"); + gotCoefficients = (noParamsMarker != null); + } } if (loadUpdater) { @@ -470,12 +481,17 @@ public class ModelSerializer { ZipEntry coefficients = zipFile.getEntry("coefficients.bin"); if (coefficients != null) { - InputStream stream = zipFile.getInputStream(coefficients); - DataInputStream dis = new DataInputStream(new BufferedInputStream(stream)); - params = Nd4j.read(dis); + if(coefficients.getSize() > 0) { + InputStream stream = zipFile.getInputStream(coefficients); + DataInputStream dis = new DataInputStream(new BufferedInputStream(stream)); + params = Nd4j.read(dis); - dis.close(); - gotCoefficients = true; + dis.close(); + gotCoefficients = true; + } else { + ZipEntry noParamsMarker = zipFile.getEntry("noParams.marker"); + gotCoefficients = (noParamsMarker != null); + } } diff --git a/deeplearning4j-zoo/src/test/java/org/deeplearning4j/zoo/TestInstantiation.java b/deeplearning4j-zoo/src/test/java/org/deeplearning4j/zoo/TestInstantiation.java index 66d0b54f95..10232887cd 100644 --- a/deeplearning4j-zoo/src/test/java/org/deeplearning4j/zoo/TestInstantiation.java +++ b/deeplearning4j-zoo/src/test/java/org/deeplearning4j/zoo/TestInstantiation.java @@ -5,6 +5,7 @@ import org.deeplearning4j.datasets.iterator.impl.BenchmarkDataSetIterator; import org.deeplearning4j.nn.api.Model; import org.deeplearning4j.nn.graph.ComputationGraph; import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; +import org.deeplearning4j.nn.transferlearning.TransferLearningHelper; import org.deeplearning4j.zoo.model.Darknet19; import org.deeplearning4j.zoo.model.GoogLeNet; import org.deeplearning4j.zoo.model.ResNet50; @@ -139,4 +140,16 @@ public class TestInstantiation { assertArrayEquals(result[0].shape(), new int[] {1, 125, 13, 13}); } + + @Test + public void testYolo4635() throws Exception { + //https://github.com/deeplearning4j/deeplearning4j/issues/4635 + + int nClasses = 10; + int seed = 12345; + TinyYOLO model = new TinyYOLO(nClasses, seed); + ComputationGraph computationGraph = (ComputationGraph) model.initPretrained(); + TransferLearningHelper transferLearningHelper = new TransferLearningHelper(computationGraph, "conv2d_9"); + } + }

['deeplearning4j-zoo/src/test/java/org/deeplearning4j/zoo/TestInstantiation.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/ComputationGraph.java', 'deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/gradient/DefaultGradient.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/updater/BaseMultiLayerUpdater.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/util/ModelSerializer.java', 'deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java']

{'.java': 8}

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/4666/4633

deeplearning4j

deeplearning4j

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

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

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

External errors unit tests failing

fix

MultiLayerTest.testExternalErrors TestComputationGraphNetwork.testExternalErrors Appears to be workspace related, but workspace scope panic is not triggered... Edit: may be linux only... Windows seems to pass

c24376c17d963d5d09cba01d20a0418e6628b0c7

b63c55505defcbe26953c3fdc0a6e554cb8a35f1

https://github.com/deeplearning4j/deeplearning4j/compare/c24376c17d963d5d09cba01d20a0418e6628b0c7...b63c55505defcbe26953c3fdc0a6e554cb8a35f1

diff --git a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java index 8c776ce99c..5246f3a69c 100644 --- a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java +++ b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.java @@ -688,12 +688,14 @@ public class TestComputationGraphNetwork extends BaseDL4JTest { s.computeGradientAndScore(); Gradient sGrad = s.gradient(); + s.feedForward(new INDArray[]{inData}, true, false); //FF without clearing inputs as we need them later + org.deeplearning4j.nn.layers.OutputLayer ol = (org.deeplearning4j.nn.layers.OutputLayer) s.getLayer(1); Pair<Gradient, INDArray> olPairStd = ol.backpropGradient(null); INDArray olEpsilon = olPairStd.getSecond(); - e.feedForward(new INDArray[]{inData}, true, false); + e.feedForward(new INDArray[]{inData}, true, false); //FF without clearing inputs as we need them later Gradient extErrorGrad = e.backpropGradient(olEpsilon); int nParamsDense = 10 * 10 + 10; diff --git a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java index af21fb6c08..4204159f0f 100644 --- a/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java +++ b/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java @@ -1132,47 +1132,63 @@ public class MultiLayerTest extends BaseDL4JTest { //Simple test: same network, but in one case: one less layer (the OutputLayer), where the epsilons are passed in externally // instead. Should get identical results - Nd4j.getRandom().setSeed(12345); - INDArray inData = Nd4j.rand(3, 10); - INDArray outData = Nd4j.rand(3, 10); + for(WorkspaceMode ws : WorkspaceMode.values()) { + log.info("Workspace mode: " + ws); - Nd4j.getRandom().setSeed(12345); - MultiLayerConfiguration standard = new NeuralNetConfiguration.Builder().updater(new Sgd(0.1)) - .seed(12345).list() - .layer(new DenseLayer.Builder().nIn(10).nOut(10).build()) - .layer(new OutputLayer.Builder().lossFunction(LossFunctions.LossFunction.MSE).nIn(10) - .nOut(10).build()) - .build(); - MultiLayerNetwork s = new MultiLayerNetwork(standard); - s.init(); + Nd4j.getRandom().setSeed(12345); + INDArray inData = Nd4j.rand(3, 10); + INDArray outData = Nd4j.rand(3, 10); + Nd4j.getRandom().setSeed(12345); + MultiLayerConfiguration standard = new NeuralNetConfiguration.Builder().updater(new Sgd(0.1)) + .trainingWorkspaceMode(ws) + .inferenceWorkspaceMode(ws) + .seed(12345).list() + .layer(new DenseLayer.Builder().nIn(10).nOut(10).build()) + .layer(new OutputLayer.Builder().lossFunction(LossFunctions.LossFunction.MSE).nIn(10) + .nOut(10).build()) + .build(); + MultiLayerNetwork s = new MultiLayerNetwork(standard); + s.init(); - Nd4j.getRandom().setSeed(12345); - MultiLayerConfiguration external = new NeuralNetConfiguration.Builder().updater(new Sgd(0.1)) - .seed(12345).list() - .layer(new DenseLayer.Builder().nIn(10).nOut(10).build()) - .build(); - MultiLayerNetwork e = new MultiLayerNetwork(external); - e.init(); + Nd4j.getRandom().setSeed(12345); + MultiLayerConfiguration external = new NeuralNetConfiguration.Builder().updater(new Sgd(0.1)) + .trainingWorkspaceMode(ws) + .inferenceWorkspaceMode(ws) + .seed(12345).list() + .layer(new DenseLayer.Builder().nIn(10).nOut(10).build()) + .build(); + + MultiLayerNetwork e = new MultiLayerNetwork(external); + e.init(); - s.setInput(inData); - s.setLabels(outData); - s.computeGradientAndScore(); - Gradient sGrad = s.gradient(); + s.setInput(inData); + s.setLabels(outData); + s.computeGradientAndScore(); + Gradient sGrad = s.gradient(); - org.deeplearning4j.nn.layers.OutputLayer ol = (org.deeplearning4j.nn.layers.OutputLayer) s.getLayer(1); - Pair<Gradient, INDArray> olPairStd = ol.backpropGradient(null); + s.setInput(inData); + s.feedForward(true, false); //FF without clearing inputs as we need them later - INDArray olEpsilon = olPairStd.getSecond(); + e.setInput(inData); + e.feedForward(true, false); //FF without clearing inputs as we need them later - e.setInput(inData); - e.feedForward(true, false); - Pair<Gradient,INDArray> extErrorGrad = e.backpropGradient(olEpsilon); + org.deeplearning4j.nn.layers.OutputLayer ol = (org.deeplearning4j.nn.layers.OutputLayer) s.getLayer(1); + Pair<Gradient, INDArray> olPairStd = ol.backpropGradient(null); - int nParamsDense = 10 * 10 + 10; - assertEquals(sGrad.gradient().get(NDArrayIndex.point(0), NDArrayIndex.interval(0, nParamsDense)), - extErrorGrad.getFirst().gradient()); + INDArray olEpsilon = olPairStd.getSecond().detach(); + + e.setInput(inData); + e.feedForward(true, false); + Pair<Gradient, INDArray> extErrorGrad = e.backpropGradient(olEpsilon); + + int nParamsDense = 10 * 10 + 10; + assertEquals(sGrad.gradient().get(NDArrayIndex.point(0), NDArrayIndex.interval(0, nParamsDense)), + extErrorGrad.getFirst().gradient()); + + Nd4j.getWorkspaceManager().destroyAllWorkspacesForCurrentThread(); + } } @Test @@ -1220,6 +1236,7 @@ public class MultiLayerTest extends BaseDL4JTest { Pair<Gradient,INDArray> gradient = graph.backpropGradient(error); graph.getUpdater().update(graph, gradient.getFirst(), 0, 0, minibatch); + Nd4j.getWorkspaceManager().destroyAllWorkspacesForCurrentThread(); } Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.DISABLED);

['deeplearning4j-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java', 'deeplearning4j-core/src/test/java/org/deeplearning4j/nn/graph/TestComputationGraphNetwork.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/5079/4534

deeplearning4j

deeplearning4j

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

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

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

Unet: Error importing model for training with Conv2D as last layer (0.9.2-SNAPSHOT)

closes

#### Issue Description Hi so I have a model in keras that looks like this. ``` python def get_unet(): conv_params = dict(activation='relu', border_mode='same') merge_params = dict(mode='concat', concat_axis=1) inputs = Input((8, 256, 256)) conv1 = Convolution2D(32, 3, 3, **conv_params)(inputs) conv1 = Convolution2D(32, 3, 3, **conv_params)(conv1) pool1 = MaxPooling2D(pool_size=(2, 2))(conv1) conv2 = Convolution2D(64, 3, 3, **conv_params)(pool1) conv2 = Convolution2D(64, 3, 3, **conv_params)(conv2) pool2 = MaxPooling2D(pool_size=(2, 2))(conv2) conv3 = Convolution2D(128, 3, 3, **conv_params)(pool2) conv3 = Convolution2D(128, 3, 3, **conv_params)(conv3) pool3 = MaxPooling2D(pool_size=(2, 2))(conv3) conv4 = Convolution2D(256, 3, 3, **conv_params)(pool3) conv4 = Convolution2D(256, 3, 3, **conv_params)(conv4) pool4 = MaxPooling2D(pool_size=(2, 2))(conv4) conv5 = Convolution2D(512, 3, 3, **conv_params)(pool4) conv5 = Convolution2D(512, 3, 3, **conv_params)(conv5) up6 = merge_l([UpSampling2D(size=(2, 2))(conv5), conv4], **merge_params) conv6 = Convolution2D(256, 3, 3, **conv_params)(up6) conv6 = Convolution2D(256, 3, 3, **conv_params)(conv6) up7 = merge_l([UpSampling2D(size=(2, 2))(conv6), conv3], **merge_params) conv7 = Convolution2D(128, 3, 3, **conv_params)(up7) conv7 = Convolution2D(128, 3, 3, **conv_params)(conv7) up8 = merge_l([UpSampling2D(size=(2, 2))(conv7), conv2], **merge_params) conv8 = Convolution2D(64, 3, 3, **conv_params)(up8) conv8 = Convolution2D(64, 3, 3, **conv_params)(conv8) up9 = merge_l([UpSampling2D(size=(2, 2))(conv8), conv1], **merge_params) conv9 = Convolution2D(32, 3, 3, **conv_params)(up9) conv9 = Convolution2D(32, 3, 3, **conv_params)(conv9) conv10 = Convolution2D(1, 1, 1, activation='sigmoid')(conv9) optimizer = SGD(lr=0.01, momentum=0.9, nesterov=True) model = Model(input=inputs, output=conv10) model.compile(optimizer=optimizer, loss='binary_crossentropy', metrics=['accuracy', jaccard_coef, jaccard_coef_int]) return model ``` And saved like this ``` python model = get_unet() #train model on lots of images.... model.save('unet.h5') ``` I would like to try loading this trained model into dl4j. I tried to do this with ``` scala val unet = KerasModelImport.importKerasModelAndWeights("src/main/resources/unet.h5") ``` However I got the following error: ``` Exception in thread "main" java.lang.IllegalStateException: Invalid input type (layer index = -1, layer name="convolution2d_19_loss"): expected FeedForward input type. Got: InputTypeConvolutional(h=256,w=256,d=1) ``` Any ideas? This model works as expected in keras. I had to use the snapshot build so that the merge layers will work in dl4j. Not sure why it doesn't like that the first layer is convolutional. keras==1.0.0 theano==0.9.0 inside keras.json ``` { "image_dim_ordering": "th", "epsilon": 1e-07, "floatx": "float32", "backend": "theano" } ```

c533a2d61d253f917af48b38c7161fa926ff9d26

1b9b2a54a3cdce9276a9d86a6822680f392d0119

https://github.com/deeplearning4j/deeplearning4j/compare/c533a2d61d253f917af48b38c7161fa926ff9d26...1b9b2a54a3cdce9276a9d86a6822680f392d0119

diff --git a/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java b/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java index c11dd47493..1b23683f2f 100644 --- a/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java +++ b/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java @@ -322,17 +322,10 @@ public class KerasModel { if (preprocessor != null) preprocessors.put(layer.getLayerName(), preprocessor); graphBuilder.addLayer(layer.getLayerName(), layer.getLayer(), inboundLayerNamesArray); - if (this.outputLayerNames.contains(layer.getLayerName()) && !(layer.getLayer() instanceof IOutputLayer)) - log.warn("Model cannot be trained: output layer " + layer.getLayerName() - + " is not an IOutputLayer (no loss function specified)"); } else if (layer.isVertex()) { // Ignore "preprocessor" layers for now if (preprocessor != null) preprocessors.put(layer.getLayerName(), preprocessor); graphBuilder.addVertex(layer.getLayerName(), layer.getVertex(), inboundLayerNamesArray); - if (this.outputLayerNames.contains(layer.getLayerName()) - && !(layer.getVertex() instanceof IOutputLayer)) - log.warn("Model cannot be trained: output vertex " + layer.getLayerName() - + " is not an IOutputLayer (no loss function specified)"); } else if (layer.isInputPreProcessor()) { if (preprocessor == null) throw new UnsupportedKerasConfigurationException("Layer " + layer.getLayerName() @@ -340,10 +333,6 @@ public class KerasModel { graphBuilder.addVertex(layer.getLayerName(), new PreprocessorVertex(preprocessor), inboundLayerNamesArray); } - - if (this.outputLayerNames.contains(layer.getLayerName())) - log.warn("Model cannot be trained: output " + layer.getLayerName() - + " is not an IOutputLayer (no loss function specified)"); } graphBuilder.setInputPreProcessors(preprocessors); diff --git a/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/KerasLoss.java b/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/KerasLoss.java index 33884e2121..4e264de468 100644 --- a/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/KerasLoss.java +++ b/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/KerasLoss.java @@ -4,7 +4,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.deeplearning4j.nn.conf.inputs.InputType; +import org.deeplearning4j.nn.conf.layers.CnnLossLayer; +import org.deeplearning4j.nn.conf.layers.FeedForwardLayer; import org.deeplearning4j.nn.conf.layers.LossLayer; +import org.deeplearning4j.nn.conf.layers.RnnLossLayer; import org.deeplearning4j.nn.modelimport.keras.KerasLayer; import org.deeplearning4j.nn.modelimport.keras.exceptions.InvalidKerasConfigurationException; import org.deeplearning4j.nn.modelimport.keras.exceptions.UnsupportedKerasConfigurationException; @@ -25,6 +28,8 @@ import static org.deeplearning4j.nn.modelimport.keras.utils.KerasLossUtils.mapLo public class KerasLoss extends KerasLayer { private final String KERAS_CLASS_NAME_LOSS = "Loss"; + private LossFunctions.LossFunction loss; + /** * Constructor from layer name and input shape. @@ -58,7 +63,6 @@ public class KerasLoss extends KerasLayer { this.dimOrder = DimOrder.NONE; this.inboundLayerNames = new ArrayList<>(); this.inboundLayerNames.add(inboundLayerName); - LossFunctions.LossFunction loss; try { loss = mapLossFunction(kerasLoss, conf); } catch (UnsupportedKerasConfigurationException e) { @@ -67,7 +71,6 @@ public class KerasLoss extends KerasLayer { log.warn("Unsupported Keras loss function. Replacing with MSE."); loss = LossFunctions.LossFunction.SQUARED_LOSS; } - this.layer = new LossLayer.Builder(loss).name(layerName).build(); } /** @@ -75,8 +78,20 @@ public class KerasLoss extends KerasLayer { * * @return LossLayer */ - public LossLayer getLossLayer() { - return (LossLayer) this.layer; + public FeedForwardLayer getLossLayer(InputType type) throws UnsupportedKerasConfigurationException { + if (type instanceof InputType.InputTypeFeedForward) { + this.layer = new LossLayer.Builder(loss).name(this.layerName).build(); + } + else if (type instanceof InputType.InputTypeRecurrent) { + this.layer = new RnnLossLayer.Builder(loss).name(this.layerName).build(); + } + else if (type instanceof InputType.InputTypeConvolutional) { + this.layer = new CnnLossLayer.Builder(loss).name(this.layerName).build(); + } else { + throw new UnsupportedKerasConfigurationException("Unsupported output layer type" + + "got : " + type.toString()); + } + return (FeedForwardLayer) this.layer; } /** @@ -87,10 +102,11 @@ public class KerasLoss extends KerasLayer { * @throws InvalidKerasConfigurationException Invalid Keras config */ @Override - public InputType getOutputType(InputType... inputType) throws InvalidKerasConfigurationException { + public InputType getOutputType(InputType... inputType) throws InvalidKerasConfigurationException, + UnsupportedKerasConfigurationException { if (inputType.length > 1) throw new InvalidKerasConfigurationException( "Keras Loss layer accepts only one input (received " + inputType.length + ")"); - return this.getLossLayer().getOutputType(-1, inputType[0]); + return this.getLossLayer(inputType[0]).getOutputType(-1, inputType[0]); } } diff --git a/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java b/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java index 68c8f89e49..8d0cf1d141 100644 --- a/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java +++ b/deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java @@ -287,6 +287,15 @@ public class KerasModelEndToEndTest { importFunctionalModelH5Test("modelimport/keras/examples/reshape_to_rnn/reshape_model.h5"); } + /** + * U-Net + */ + @Test + public void importUnetTfKeras2() throws Exception { + importFunctionalModelH5Test( + "modelimport/keras/examples/unet/unet_keras_2_tf.h5", null, true); + } + /** * ResNet50 */ @@ -329,7 +338,8 @@ public class KerasModelEndToEndTest { @Ignore // Takes unreasonably long, but works public void importInception() throws Exception { - ComputationGraph graph = importFunctionalModelH5Test("modelimport/keras/examples/inception/inception_v3_complete.h5"); + ComputationGraph graph = importFunctionalModelH5Test( + "modelimport/keras/examples/inception/inception_v3_complete.h5"); INDArray input = Nd4j.ones(10, 3, 299, 299); graph.output(input); System.out.println(graph.summary()); @@ -343,23 +353,22 @@ public class KerasModelEndToEndTest { public void importXception() throws Exception { int[] inputShape = new int[]{299, 299, 3}; ComputationGraph graph = importFunctionalModelH5Test( - "modelimport/keras/examples/xception/xception_tf_keras_2.h5", inputShape); + "modelimport/keras/examples/xception/xception_tf_keras_2.h5", inputShape, false); } - private ComputationGraph importFunctionalModelH5Test(String modelPath) throws Exception { - return importFunctionalModelH5Test(modelPath, null); + return importFunctionalModelH5Test(modelPath, null, false); } - private ComputationGraph importFunctionalModelH5Test(String modelPath, int[] inputShape) throws Exception { + private ComputationGraph importFunctionalModelH5Test(String modelPath, int[] inputShape, boolean train) throws Exception { ClassPathResource modelResource = new ClassPathResource(modelPath, KerasModelEndToEndTest.class.getClassLoader()); File modelFile = File.createTempFile(TEMP_MODEL_FILENAME, H5_EXTENSION); Files.copy(modelResource.getInputStream(), modelFile.toPath(), StandardCopyOption.REPLACE_EXISTING); KerasModelBuilder builder = new KerasModel().modelBuilder().modelHdf5Filename(modelFile.getAbsolutePath()) - .enforceTrainingConfig(false); + .enforceTrainingConfig(train); if (inputShape != null) { builder.inputShape(inputShape); }

['deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/KerasModel.java', 'deeplearning4j-modelimport/src/test/java/org/deeplearning4j/nn/modelimport/keras/e2e/KerasModelEndToEndTest.java', 'deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/layers/KerasLoss.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/5042/5041

deeplearning4j

deeplearning4j

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

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

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

Workspace exception in 1.0.0 snapshot

fix

#### Issue Description Running the following method results in a Workspace exception being thrown: public static void main(String[] args) { final int[] inputShape = {1, 1, 4, 4}; final INDArray input = Nd4j.rand(inputShape); final INDArray label = Nd4j.create(new double[]{1}); final String inputName = "input"; final String outputName = "output"; ComputationGraphConfiguration graphConf = new NeuralNetConfiguration.Builder() .weightInit(WeightInit.RELU_UNIFORM) .activation(Activation.IDENTITY) // Will be set later on .optimizationAlgo(OptimizationAlgorithm.STOCHASTIC_GRADIENT_DESCENT) .updater(new Nesterovs(0.01, 0.9)) .trainingWorkspaceMode(WorkspaceMode.ENABLED) .inferenceWorkspaceMode(WorkspaceMode.ENABLED) .graphBuilder() .addInputs(inputName) .backprop(true) .pretrain(false) .setInputTypes(InputType.convolutional(inputShape[3], inputShape[2], inputShape[1])) .layer("conv", new ConvolutionLayer.Builder(3,3) .nIn(1) .nOut(1) .build(), inputName) .addVertex("mv", new MergeVertex(), "conv") .addVertex("add", new ElementWiseVertex(ElementWiseVertex.Op.Add), "mv", "conv") .layer("gp", new GlobalPoolingLayer.Builder().build(), "add") .layer(outputName, new CenterLossOutputLayer.Builder() .lossFunction(new LossMCXENT()) .nOut(label.length()) .build(), "gp") .setOutputs(outputName) .build(); final ComputationGraph graph = new ComputationGraph(graphConf); graph.init(); graph.fit(new INDArray[] {input}, new INDArray[] {label}); } Exception thrown: Exception in thread "main" java.lang.IllegalStateException: Backprop: array (ACTIVATION_GRAD) workspace validation failed (vertex mv - class: MergeVertex) - array is defined in incorrect workspace at org.deeplearning4j.nn.graph.ComputationGraph.validateArrayWorkspaces(ComputationGraph.java:1603) at org.deeplearning4j.nn.graph.ComputationGraph.calcBackpropGradients(ComputationGraph.java:2319) at org.deeplearning4j.nn.graph.ComputationGraph.computeGradientAndScore(ComputationGraph.java:1218) at org.deeplearning4j.nn.graph.ComputationGraph.computeGradientAndScore(ComputationGraph.java:1179) at org.deeplearning4j.optimize.solvers.BaseOptimizer.gradientAndScore(BaseOptimizer.java:178) at org.deeplearning4j.optimize.solvers.StochasticGradientDescent.optimize(StochasticGradientDescent.java:60) at org.deeplearning4j.optimize.Solver.optimize(Solver.java:54) at org.deeplearning4j.nn.graph.ComputationGraph.fit(ComputationGraph.java:1052) at org.deeplearning4j.nn.graph.ComputationGraph.fit(ComputationGraph.java:998) at ampControl.model.training.model.layerblocks.graph.WorkspaceException.main(WorkspaceException.java:63) Caused by: org.nd4j.linalg.workspace.ND4JWorkspaceException: Array workspace validation failed: Array of type ACTIVATION_GRAD should be in workspace "WS_LAYER_ACT_1" but is in workspace "WS_LAYER_ACT_0" at org.nd4j.linalg.workspace.BaseWorkspaceMgr.validateArrayLocation(BaseWorkspaceMgr.java:221) at org.deeplearning4j.nn.workspace.LayerWorkspaceMgr.validateArrayLocation(LayerWorkspaceMgr.java:66) at org.deeplearning4j.nn.graph.ComputationGraph.validateArrayWorkspaces(ComputationGraph.java:1594) ... 9 more #### Version Information Please indicate relevant versions, including, if relevant: * Deeplearning4j version : 1.0.0 snapshot (pom refreshed ~1 hour before post in case it matters). * platform information: Windows 10 * CUDA version, if used: CUDA 8.0, cudnn 6.0 * NVIDIA driver version, if in use: 391.35 #### Contributing Would ofc love to help out, but I don't think I'll be able to help out efficiently here.

693e1ef0ca08d93fa3deae263b1393822f368aff

5a656ecc0891ce370690cbfd881e02ce930d24ff

https://github.com/deeplearning4j/deeplearning4j/compare/693e1ef0ca08d93fa3deae263b1393822f368aff...5a656ecc0891ce370690cbfd881e02ce930d24ff

diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/MergeVertex.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/MergeVertex.java index 8c4a1d4d30..73a1da33e0 100644 --- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/MergeVertex.java +++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/MergeVertex.java @@ -82,7 +82,7 @@ public class MergeVertex extends BaseGraphVertex { //No-op case int[] shape = inputs[0].shape(); forwardPassShapes = new int[][] {Arrays.copyOf(shape, shape.length)}; - return inputs[0]; + return workspaceMgr.leverageTo(ArrayType.ACTIVATIONS, inputs[0]); } forwardPassShapes = new int[inputs.length][0]; @@ -120,7 +120,7 @@ public class MergeVertex extends BaseGraphVertex { if (forwardPassShapes.length == 1) { //No op case - return new Pair<>(null, new INDArray[] {epsilon}); + return new Pair<>(null, new INDArray[] {workspaceMgr.leverageTo(ArrayType.ACTIVATION_GRAD, epsilon)}); } //Split the epsilons in the opposite way that the activations were merged

['deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/graph/vertex/impl/MergeVertex.java']

{'.java': 1}

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

UIServer: plotVocab and TsneModule routes do not match up

fix

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-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/models/embeddings/inmemory/InMemoryLookupTable.java', 'deeplearning4j-ui-parent/deeplearning4j-play/src/main/java/org/deeplearning4j/ui/module/tsne/TsneModule.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/5078/5029

deeplearning4j

deeplearning4j

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

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

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

Unable to load pre-trained weights on dl4j from keras

closes

#### Issue Description I am trying to load pretrained wieghts from python on dl4j ComputationGraph org.deeplearning4j.nn.modelimport.keras.KerasModelImport.importKerasModelAndWeights(KerasModelImport.java:193) here is the error: HDF5-DIAG: Error detected in HDF5 (1.10.1) thread 0: #000: H5A.c line 436 in H5Aopen(): unable to load attribute info from object header for attribute: 'weight_names' major: Attribute minor: Unable to initialize object #001: H5Oattribute.c line 528 in H5O_attr_open_by_name(): can't locate attribute: 'weight_names' major: Attribute minor: Object not found #### Version Information * Deeplearning4j 1.0.0-alpha * MacOS Sierra * keras (2.1.4) * TF(1.3.0) * cpu #### Contributing // loading the model try{ model = KerasModelImport.importKerasModelAndWeights(model_json, model_weights); } catch (Exception e) { e.printStackTrace(); return null; }

3afd3f36940cb1d13cb34a6bfc98b70d86bb8bc5

677d6f5ec475b3f0506793c20f7fa2cf2309007f

https://github.com/deeplearning4j/deeplearning4j/compare/3afd3f36940cb1d13cb34a6bfc98b70d86bb8bc5...677d6f5ec475b3f0506793c20f7fa2cf2309007f

diff --git a/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasModelBuilder.java b/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasModelBuilder.java index 5fda8bd49a..ae0912b255 100644 --- a/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasModelBuilder.java +++ b/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasModelBuilder.java @@ -118,8 +118,13 @@ public class KerasModelBuilder implements Cloneable, Closeable { return this; } - public KerasModelBuilder weightsHdf5Filename(String weightsHdf5Filename) { + public KerasModelBuilder weightsHdf5Filename(String weightsHdf5Filename) + throws InvalidKerasConfigurationException { this.weightsArchive = new Hdf5Archive(weightsHdf5Filename); + this.weightsRoot = config.getTrainingWeightsRoot(); + if (!this.weightsArchive.hasAttribute(config.getTrainingModelConfigAttribute())) + throw new InvalidKerasConfigurationException( + "Model configuration attribute missing from " + weightsHdf5Filename + " archive."); return this; } @@ -143,7 +148,8 @@ public class KerasModelBuilder implements Cloneable, Closeable { return sequentialModel; } - @Override public void close() { + @Override + public void close() { if (trainingArchive != null && trainingArchive != weightsArchive) { trainingArchive.close(); trainingArchive = null;

['deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasModelBuilder.java']

{'.java': 1}

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

Link data missing on emulated application nodes

fixes

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

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

resolve

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); }

['commons/src/main/java/com/navercorp/pinpoint/common/util/ApplicationMapStatisticsUtils.java', 'web/src/main/java/com/navercorp/pinpoint/web/mapper/ApplicationNameMapper.java', 'web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApplicationIndexDao.java', 'web/src/main/java/com/navercorp/pinpoint/web/mapper/MapStatisticsCalleeMapper.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/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

Web throws NPE when filtering calls with RPC internal types

resolve

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/DefaultFilterBuilder.java', 'web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java', 'web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.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

Web throws NPE when filtering calls with RPC internal types

fix

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

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

Handle cases where collected cpu load is NaN

fixes

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

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

fixes

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

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

fixes

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

Fixed invalid classloading when using the AspectJ + Spring AOP

fix

- 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);

['profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/JarProfilerPluginClassInjector.java', 'bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/PinpointStarter.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

Unsampled Continuation is not collected for transaction metric.

fixed

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 a side effect of Arcus interceptor

fixed

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/FutureGetInterceptor.java', 'profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/ApiInterceptor.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/32319/32289

quarkusio

quarkus

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

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

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

Quarkus 3.0.0.Alpha4 introduces a performance regression

fixes

### Describe the bug A drop in mean throughput performance has been spotted while validating Camel Quarkus 3.0.0-M1 staging release upstream: ``` 2.16.0 | 30m | 38804.35 req/s [+0.00%] | 22357.99 req/s [+0.00%] | OK | 3.0.0-M1 | 30m | 38857.07 req/s [+0.14%] | 21166.75 req/s [-5.33%] | Potential performance regression | ``` After investigation, it looks like the regression has been introduced when we switched to Quarkus 3.0.0.Alpha4. From this version onward, there is a noticeable log related to direct buffers that could be a good candidate to explain the regression as shown below: ``` 2023-03-29 19:32:02,511 INFO [io.net.uti.int.PlatformDependent] (Thread-1) Your platform does not provide complete low-level API for accessing direct buffers reliably. Unless explicitly requested, heap buffer will always be preferred to avoid potential system instability. ``` And we see in the native-image command line that a new argument has been introduced: `-J-Dio.netty.noUnsafe=true` This new behavior comes from commit below: https://github.com/quarkusio/quarkus/commit/ca155cae76c7caf7d6c4bbf27e9ac22305d2dbf0 I've then tested with `-Dquarkus.native.additional-build-args=-J-Dio.netty.noUnsafe=false` and the performance regression is gone. Somehow, it could mean that netty could not use unsafe and so couldn't use direct buffers. In the end resulting in a performance penalty. ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? The simplest way to to reproduce would be to run the Camel Quarkus performance regression tool, something like: ``` git clone git@github.com:apache/camel-quarkus.git git checkout aa942c217a3dab5900ff175964641b798ccc62b5 mvn clean install -Dquickly cd tooling/performance-regression java -jar target/quarkus-app/quarkus-run.jar -an 2.16.0 3.0.0-SNAPSHOT ``` After 45 minutes run on a machine equally loaded over that period, it should print a report like: ``` Camel Quarkus Throughput Performance Increase Compared to Previous Version Camel Quarkus version | Duration | JVM req/s [%increase] | Native req/s [%increase] | Status | ------------------------------------------------------------------------------------------------------------------------------------ 2.16.0 | 30m | 38804.35 req/s [+0.00%] | 22357.99 req/s [+0.00%] | OK | 3.0.0-SNAPSHOT | 30m | 38857.07 req/s [+0.14%] | 21166.75 req/s [-5.33%] | Potential performance regression | ``` ### Output of `uname -a` or `ver` Linux me.csb 4.18.0-425.13.1.el8_7.x86_64 #1 SMP Thu Feb 2 13:01:45 EST 2023 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` 22.3.1.0-Final Mandrel Distribution (Java Version 17.0.6+10) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.0.0.Alpha4 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) 3.8.7 ### Additional information _No response_

34accfcd59171845a4e79605dacf24205767caee

54a4d81e70c261bd7abf82e2893f5bd7be5577d7

https://github.com/quarkusio/quarkus/compare/34accfcd59171845a4e79605dacf24205767caee...54a4d81e70c261bd7abf82e2893f5bd7be5577d7

diff --git a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java index 13171bec796..365f1ac191f 100644 --- a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java +++ b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java @@ -31,7 +31,6 @@ import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildI import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.UnsafeAccessedFieldBuildItem; import io.quarkus.deployment.logging.LogCleanupFilterBuildItem; -import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; import io.quarkus.netty.BossEventLoopGroup; import io.quarkus.netty.MainEventLoopGroup; import io.quarkus.netty.runtime.EmptyByteBufStub; @@ -78,7 +77,7 @@ class NettyProcessor { return new SystemPropertyBuildItem("io.netty.machineId", nettyMachineId); } - @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) + @BuildStep NativeImageConfigBuildItem build( NettyBuildTimeConfig config, BuildProducer<ReflectiveClassBuildItem> reflectiveClass, @@ -95,8 +94,6 @@ class NettyProcessor { String maxOrder = calculateMaxOrder(config.allocatorMaxOrder, minMaxOrderBuildItems, false); NativeImageConfigBuildItem.Builder builder = NativeImageConfigBuildItem.builder() - // disable unsafe usage to allow io.netty.internal.PlarformDependent0 to be reinitialized without issues - .addNativeImageSystemProperty("io.netty.noUnsafe", "true") // Use small chunks to avoid a lot of wasted space. Default is 16mb * arenas (derived from core count) // Since buffers are cached to threads, the malloc overhead is temporary anyway .addNativeImageSystemProperty("io.netty.allocator.maxOrder", maxOrder) @@ -112,14 +109,8 @@ class NettyProcessor { .addRuntimeInitializedClass("io.netty.buffer.ByteBufUtil") // The default channel id uses the process id, it should not be cached in the native image. .addRuntimeInitializedClass("io.netty.channel.DefaultChannelId") - // Make sure to re-initialize platform dependent classes/values at runtime - .addRuntimeReinitializedClass("io.netty.util.internal.PlatformDependent") - .addRuntimeReinitializedClass("io.netty.util.internal.PlatformDependent0") .addNativeImageSystemProperty("io.netty.leakDetection.level", "DISABLED"); - // Also set io.netty.noUnsafe at runtime - systemProperties.produce(new SystemPropertyBuildItem("io.netty.noUnsafe", "true")); - if (QuarkusClassLoader.isClassPresentAtRuntime("io.netty.handler.codec.http.HttpObjectEncoder")) { builder .addRuntimeInitializedClass("io.netty.handler.codec.http.HttpObjectEncoder") @@ -168,7 +159,8 @@ class NettyProcessor { log.debug("Not registering Netty native kqueue classes as they were not found"); } - return builder.build(); + return builder //TODO: make configurable + .build(); } @BuildStep

['extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.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/32309/32246

quarkusio

quarkus

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

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

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

Quarkus doesn't detect Docker rootless anymore

fixes

### Describe the bug Starting from ``2.16.4.Final``, Quarkus cannot detect ```Docker rootless``` anymore. Reason for that is a faulty implemenation in ``ContainerRuntimeUtil.getRootlessStateFor``: ```java private static boolean getRootlessStateFor(ContainerRuntime containerRuntime) { ...... try (InputStream inputStream = rootlessProcess.getInputStream(); InputStreamReader inputStreamReader = new InputStreamReader(inputStream); BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) { Predicate<String> stringPredicate; // Docker includes just "rootless" under SecurityOptions, while podman includes "rootless: <boolean>" ---> if (containerRuntime == ContainerRuntime.DOCKER) { <-- ContainerRuntime.DOCKER is null stringPredicate = line -> line.trim().equals("rootless"); } else { stringPredicate = line -> line.trim().equals("rootless: true"); } return bufferedReader.lines().anyMatch(stringPredicate); } ..... } /** * Supported Container runtimes */ public enum ContainerRuntime { DOCKER, PODMAN; private final boolean rootless; ContainerRuntime() { this.rootless = getRootlessStateFor(this); } public String getExecutableName() { return this.name().toLowerCase(); } public boolean isRootless() { return rootless; } } ``` This condition ``containerRuntime == ContainerRuntime.DOCKER`` always evaluates to false, since ContainerRuntime.DOCKER is null. That's because ``getRootlessStateFor`` is being called during constructor execution of ContainerRuntime. Thus we end up in the ``podman`` case, even when ``Docker`` is being detected! ### Expected behavior Quarkus should detect ``Docker rootless`` properly :-) ### Actual behavior Quarkus native container builds aren't working on Docker rootless anymore, because the rootless detection fails. Therefor the container isn't started as root, but rather non root which leads to file permission issues .. ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` 5.4.228 ...... x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` 17 ### GraalVM version (if different from Java) GraalVM 22.3.0 Java 17 CE ### Quarkus version or git rev 2.16.4.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Maven 3.8.6 ### Additional information ``` Docker version 20.10.22, build 3a2c30b runner@....:/$ docker info Client: Context: default Debug Mode: false Server: Containers: 0 Running: 0 Paused: 0 Stopped: 0 Images: 0 Server Version: 20.10.22 Storage Driver: vfs Logging Driver: json-file Cgroup Driver: none Cgroup Version: 1 Plugins: Volume: local Network: bridge host ipvlan macvlan null overlay Log: awslogs fluentd gcplogs gelf journald json-file local logentries splunk syslog Swarm: inactive Runtimes: io.containerd.runc.v2 io.containerd.runtime.v1.linux runc Default Runtime: runc Init Binary: docker-init containerd version: 78f51771157abb6c9ed224c22013cdf09962315d runc version: v1.1.4-0-g5fd4c4d1 init version: de40ad0 Security Options: seccomp Profile: default **rootless** Kernel Version: 5.4.228-132.418.amzn2.x86_64 Operating System: Ubuntu 22.04.1 LTS (containerized) OSType: linux Architecture: x86_64 CPUs: 4 Total Memory: 15.34GiB Name: ...... Docker Root Dir: /home/runner/.local/share/docker Debug Mode: false Registry: https://index.docker.io/v1/ Labels: ... Experimental: false Insecure Registries: 127.0.0.0/8 Live Restore Enabled: false Product License: Community Engine WARNING: Running in rootless-mode without cgroups. To enable cgroups in rootless-mode, you need to boot the system in cgroup v2 mode. ```

5f5f11880a5b38f538adc0fac12fe9f15e3982a1

f2f24bed7f45e832e34458fc783b270be7007839

https://github.com/quarkusio/quarkus/compare/5f5f11880a5b38f538adc0fac12fe9f15e3982a1...f2f24bed7f45e832e34458fc783b270be7007839

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java index ef53e1b4f7b..ccca09727a2 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java @@ -42,8 +42,7 @@ public abstract class NativeImageBuildContainerRunner extends NativeImageBuildRu @Override public void setup(boolean processInheritIODisabled) { - if (containerRuntime == ContainerRuntimeUtil.ContainerRuntime.DOCKER - || containerRuntime == ContainerRuntimeUtil.ContainerRuntime.PODMAN) { + if (containerRuntime != ContainerRuntimeUtil.ContainerRuntime.UNAVAILABLE) { log.infof("Using %s to run the native image builder", containerRuntime.getExecutableName()); // we pull the docker image in order to give users an indication of which step the process is at // it's not strictly necessary we do this, however if we don't the subsequent version command 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 e9f1c1125ef..c5e50652d4d 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 @@ -1,8 +1,6 @@ package io.quarkus.deployment.pkg.steps; import static io.quarkus.deployment.pkg.steps.LinuxIDUtil.getLinuxID; -import static io.quarkus.runtime.util.ContainerRuntimeUtil.ContainerRuntime.DOCKER; -import static io.quarkus.runtime.util.ContainerRuntimeUtil.ContainerRuntime.PODMAN; import java.nio.file.Path; import java.util.ArrayList; @@ -21,14 +19,14 @@ public class NativeImageBuildLocalContainerRunner extends NativeImageBuildContai super(nativeConfig); if (SystemUtils.IS_OS_LINUX) { final ArrayList<String> containerRuntimeArgs = new ArrayList<>(Arrays.asList(baseContainerRuntimeArgs)); - if (containerRuntime == DOCKER && containerRuntime.isRootless()) { + if (containerRuntime.isDocker() && containerRuntime.isRootless()) { Collections.addAll(containerRuntimeArgs, "--user", String.valueOf(0)); } else { String uid = getLinuxID("-ur"); String gid = getLinuxID("-gr"); if (uid != null && gid != null && !uid.isEmpty() && !gid.isEmpty()) { Collections.addAll(containerRuntimeArgs, "--user", uid + ":" + gid); - if (containerRuntime == PODMAN && containerRuntime.isRootless()) { + if (containerRuntime.isPodman() && containerRuntime.isRootless()) { // Needed to avoid AccessDeniedExceptions containerRuntimeArgs.add("--userns=keep-id"); } @@ -47,7 +45,7 @@ public class NativeImageBuildLocalContainerRunner extends NativeImageBuildContai } final String selinuxBindOption; - if (SystemUtils.IS_OS_MAC && containerRuntime == PODMAN) { + if (SystemUtils.IS_OS_MAC && containerRuntime.isPodman()) { selinuxBindOption = ""; } else { selinuxBindOption = ":z"; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/UpxCompressionBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/UpxCompressionBuildStep.java index 9174db0e4c7..a4880647973 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/UpxCompressionBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/UpxCompressionBuildStep.java @@ -126,8 +126,7 @@ public class UpxCompressionBuildStep { String gid = getLinuxID("-gr"); if (uid != null && gid != null && !uid.isEmpty() && !gid.isEmpty()) { Collections.addAll(commandLine, "--user", uid + ":" + gid); - if (containerRuntime == ContainerRuntimeUtil.ContainerRuntime.PODMAN - && containerRuntime.isRootless()) { + if (containerRuntime.isPodman() && containerRuntime.isRootless()) { // Needed to avoid AccessDeniedExceptions commandLine.add("--userns=keep-id"); } diff --git a/core/runtime/src/main/java/io/quarkus/runtime/util/ContainerRuntimeUtil.java b/core/runtime/src/main/java/io/quarkus/runtime/util/ContainerRuntimeUtil.java index 1ae65cc8a5b..c2d254d25ed 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/util/ContainerRuntimeUtil.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/util/ContainerRuntimeUtil.java @@ -31,10 +31,7 @@ public final class ContainerRuntimeUtil { } /** - * @return {@link ContainerRuntime#DOCKER} if it's available, or {@link ContainerRuntime#PODMAN} - * if the podman - * executable exists in the environment or if the docker executable is an alias to podman, - * or {@link ContainerRuntime#UNAVAILABLE} if no container runtime is available and the required arg is false. + * @return a fully resolved {@link ContainerRuntime} indicating if Docker or Podman is available and in rootless mode or not * @throws IllegalStateException if no container runtime was found to build the image */ public static ContainerRuntime detectContainerRuntime() { @@ -42,66 +39,88 @@ public final class ContainerRuntimeUtil { } public static ContainerRuntime detectContainerRuntime(boolean required) { - final ContainerRuntime containerRuntime = loadContainerRuntimeFromSystemProperty(); + ContainerRuntime containerRuntime = loadContainerRuntimeFromSystemProperty(); if (containerRuntime != null) { return containerRuntime; - } else { - // Docker version 19.03.14, build 5eb3275d40 - String dockerVersionOutput; - boolean dockerAvailable; - // Check if Podman is installed - // podman version 2.1.1 - String podmanVersionOutput; - boolean podmanAvailable; - if (CONTAINER_EXECUTABLE != null) { - if (CONTAINER_EXECUTABLE.trim().equalsIgnoreCase("docker")) { - dockerVersionOutput = getVersionOutputFor(ContainerRuntime.DOCKER); - dockerAvailable = dockerVersionOutput.contains("Docker version"); - if (dockerAvailable) { - storeContainerRuntimeInSystemProperty(ContainerRuntime.DOCKER); - return ContainerRuntime.DOCKER; - } - } - if (CONTAINER_EXECUTABLE.trim().equalsIgnoreCase("podman")) { - podmanVersionOutput = getVersionOutputFor(ContainerRuntime.PODMAN); - podmanAvailable = podmanVersionOutput.startsWith("podman version"); - if (podmanAvailable) { - storeContainerRuntimeInSystemProperty(ContainerRuntime.PODMAN); - return ContainerRuntime.PODMAN; - } + } + + ContainerRuntime containerRuntimeEnvironment = getContainerRuntimeEnvironment(); + if (containerRuntimeEnvironment == ContainerRuntime.UNAVAILABLE) { + storeContainerRuntimeInSystemProperty(ContainerRuntime.UNAVAILABLE); + + if (required) { + throw new IllegalStateException("No container runtime was found. " + + "Make sure you have either Docker or Podman installed in your environment."); + } + + return ContainerRuntime.UNAVAILABLE; + } + + // we have a working container environment, let's resolve it fully + containerRuntime = fullyResolveContainerRuntime(containerRuntimeEnvironment); + + storeContainerRuntimeInSystemProperty(containerRuntime); + + return containerRuntime; + } + + private static ContainerRuntime getContainerRuntimeEnvironment() { + // Docker version 19.03.14, build 5eb3275d40 + String dockerVersionOutput; + boolean dockerAvailable; + // Check if Podman is installed + // podman version 2.1.1 + String podmanVersionOutput; + boolean podmanAvailable; + + if (CONTAINER_EXECUTABLE != null) { + if (CONTAINER_EXECUTABLE.trim().equalsIgnoreCase("docker")) { + dockerVersionOutput = getVersionOutputFor(ContainerRuntime.DOCKER); + dockerAvailable = dockerVersionOutput.contains("Docker version"); + if (dockerAvailable) { + return ContainerRuntime.DOCKER; } - log.warn("quarkus.native.container-runtime config property must be set to either podman or docker " + - "and the executable must be available. Ignoring it."); } - dockerVersionOutput = getVersionOutputFor(ContainerRuntime.DOCKER); - dockerAvailable = dockerVersionOutput.contains("Docker version"); - if (dockerAvailable) { - // Check if "docker" is an alias to "podman" - if (dockerVersionOutput.startsWith("podman version") || - dockerVersionOutput.startsWith("podman.exe version")) { - storeContainerRuntimeInSystemProperty(ContainerRuntime.PODMAN); + if (CONTAINER_EXECUTABLE.trim().equalsIgnoreCase("podman")) { + podmanVersionOutput = getVersionOutputFor(ContainerRuntime.PODMAN); + podmanAvailable = podmanVersionOutput.startsWith("podman version"); + if (podmanAvailable) { return ContainerRuntime.PODMAN; } - storeContainerRuntimeInSystemProperty(ContainerRuntime.DOCKER); - return ContainerRuntime.DOCKER; } - podmanVersionOutput = getVersionOutputFor(ContainerRuntime.PODMAN); - podmanAvailable = podmanVersionOutput.startsWith("podman version") || - podmanVersionOutput.startsWith("podman.exe version"); - if (podmanAvailable) { - storeContainerRuntimeInSystemProperty(ContainerRuntime.PODMAN); + log.warn("quarkus.native.container-runtime config property must be set to either podman or docker " + + "and the executable must be available. Ignoring it."); + } + + dockerVersionOutput = getVersionOutputFor(ContainerRuntime.DOCKER); + dockerAvailable = dockerVersionOutput.contains("Docker version"); + if (dockerAvailable) { + // Check if "docker" is an alias to "podman" + if (dockerVersionOutput.startsWith("podman version") || + dockerVersionOutput.startsWith("podman.exe version")) { return ContainerRuntime.PODMAN; } + return ContainerRuntime.DOCKER; + } + podmanVersionOutput = getVersionOutputFor(ContainerRuntime.PODMAN); + podmanAvailable = podmanVersionOutput.startsWith("podman version") || + podmanVersionOutput.startsWith("podman.exe version"); + if (podmanAvailable) { + return ContainerRuntime.PODMAN; + } - storeContainerRuntimeInSystemProperty(ContainerRuntime.UNAVAILABLE); + return ContainerRuntime.UNAVAILABLE; + } - if (required) { - throw new IllegalStateException("No container runtime was found. " - + "Make sure you have either Docker or Podman installed in your environment."); - } + private static ContainerRuntime fullyResolveContainerRuntime(ContainerRuntime containerRuntimeEnvironment) { + boolean rootless = getRootlessStateFor(containerRuntimeEnvironment); - return ContainerRuntime.UNAVAILABLE; + if (!rootless) { + return containerRuntimeEnvironment; } + + return containerRuntimeEnvironment == ContainerRuntime.DOCKER ? ContainerRuntime.DOCKER_ROOTLESS + : ContainerRuntime.PODMAN_ROOTLESS; } private static ContainerRuntime loadContainerRuntimeFromSystemProperty() { @@ -195,16 +214,19 @@ public final class ContainerRuntimeUtil { * Supported Container runtimes */ public enum ContainerRuntime { - DOCKER("docker" + (OS.current() == OS.WINDOWS ? ".exe" : "")), - PODMAN("podman" + (OS.current() == OS.WINDOWS ? ".exe" : "")), - UNAVAILABLE(null); + DOCKER("docker", false), + DOCKER_ROOTLESS("docker", true), + PODMAN("podman", false), + PODMAN_ROOTLESS("podman", true), + UNAVAILABLE(null, false); - private Boolean rootless; + private final String executableName; - private String executableName; + private final boolean rootless; - ContainerRuntime(String executableName) { - this.executableName = executableName; + ContainerRuntime(String executableName, boolean rootless) { + this.executableName = executableName + (OS.current() == OS.WINDOWS ? ".exe" : ""); + this.rootless = rootless; } public String getExecutableName() { @@ -215,17 +237,15 @@ public final class ContainerRuntimeUtil { return executableName; } + public boolean isDocker() { + return this == DOCKER || this == DOCKER_ROOTLESS; + } + + public boolean isPodman() { + return this == PODMAN || this == PODMAN_ROOTLESS; + } + public boolean isRootless() { - if (rootless != null) { - return rootless; - } else { - if (this != ContainerRuntime.UNAVAILABLE) { - rootless = getRootlessStateFor(this); - } else { - throw new IllegalStateException("No container runtime was found. " - + "Make sure you have either Docker or Podman installed in your environment."); - } - } return rootless; }

['core/runtime/src/main/java/io/quarkus/runtime/util/ContainerRuntimeUtil.java', 'core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java', 'core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalContainerRunner.java', 'core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/UpxCompressionBuildStep.java']

{'.java': 4}

Java

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

Apache License 2.0

quarkusio/quarkus/32278/32152

quarkusio

quarkus

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

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

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

Quarkus 2.13 test extension tests fail with the 22.3 mandrel builder image

fixes

### Describe the bug The integration tests fail with the 22.3 mandrel builder image. Filing this for tracking purposes: ``` [INFO] ------------------------------------------------------- [INFO] T E S T S [INFO] ------------------------------------------------------- [INFO] Running io.quarkus.it.extension.ClasspathInGraalITCase Executing "/home/runner/work/mandrel/mandrel/quarkus/integration-tests/test-extension/tests/target/quarkus-integration-test-test-extension-tests-999-SNAPSHOT-runner -Dquarkus.http.port=8081 -Dquarkus.http.ssl-port=8444 -Dtest.url=http://localhost:8081 -Dquarkus.log.file.path=/home/runner/work/mandrel/mandrel/quarkus/integration-tests/test-extension/tests/target/quarkus.log -Dquarkus.log.file.enable=true" Mar 25, 2023 2:19:24 AM io.quarkus.runtime.ApplicationLifecycleManager run ERROR: Failed to start application (with profile prod) java.lang.ClassNotFoundException: io.quarkus.extest.runtime.config.RunTimeConfigBuilder at java.base@17.0.6/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:52) at java.base@17.0.6/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:188) at java.base@17.0.6/java.lang.ClassLoader.loadClass(ClassLoader.java:132) at io.quarkus.runtime.configuration.ConfigUtils.configBuilder(ConfigUtils.java:189) at io.quarkus.runtime.generated.Config.readConfig(Unknown Source) at io.quarkus.deployment.steps.RuntimeConfigSetup.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:110) at io.quarkus.runtime.Quarkus.run(Quarkus.java:70) at io.quarkus.runtime.Quarkus.run(Quarkus.java:43) at io.quarkus.runtime.Quarkus.run(Quarkus.java:123) at io.quarkus.runner.GeneratedMain.main(Unknown Source) ``` ### Expected behavior Test extension tests pass with the builder image. ### Actual behavior Test throws `ClassNotFoundException` at boot. ### How to Reproduce? Run integration tests extension tests with the 22.3 builder image. ### 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 See https://github.com/graalvm/mandrel/actions/runs/4516801805/jobs/7955690955#step:11:1120

ae4f5673759bbb231790f620fc1d7bdedc1790ed

28ea5889386030b7cf7a76b0effd2f1b95ad0446

https://github.com/quarkusio/quarkus/compare/ae4f5673759bbb231790f620fc1d7bdedc1790ed...28ea5889386030b7cf7a76b0effd2f1b95ad0446

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java index 33453e60485..3d48d5f38f6 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java @@ -265,6 +265,11 @@ public class ConfigGenerationBuildStep { runtimeMappings.addAll(configItem.getReadResult().getBuildTimeRunTimeMappings()); runtimeMappings.addAll(configItem.getReadResult().getRunTimeMappings()); + Set<String> runtimeConfigBuilderClassNames = runTimeConfigBuilders.stream() + .map(RunTimeConfigBuilderBuildItem::getBuilderClassName).collect(toSet()); + reflectiveClass + .produce(new ReflectiveClassBuildItem(false, false, runtimeConfigBuilderClassNames.toArray(new String[0]))); + RunTimeConfigurationGenerator.GenerateOperation .builder() .setBuildTimeReadResult(configItem.getReadResult()) @@ -285,8 +290,7 @@ public class ConfigGenerationBuildStep { .setRuntimeConfigSourceProviders(discoveredConfigSourceProviders) .setRuntimeConfigSourceFactories(discoveredConfigSourceFactories) .setRuntimeConfigMappings(runtimeMappings) - .setRuntimeConfigBuilders( - runTimeConfigBuilders.stream().map(RunTimeConfigBuilderBuildItem::getBuilderClassName).collect(toSet())) + .setRuntimeConfigBuilders(runtimeConfigBuilderClassNames) .build() .run(); }

['core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.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/23298/23217

quarkusio

quarkus

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

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

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

Dev mode captures console input destined to the application

fixes

### Describe the bug Running an interactive CLI (Quarkus command mode) in Quarkus dev mode (`mvn quarkus:dev`), Quarkus dev mode partially captures the keystrokes. ### Expected behavior I would expect the dev mode to capture the keystrokes only if the application didn't consume them before. Or if this is not possible, then I would expect a way to configure a modifier key to access the dev mode shortcuts, and the application to get everything when the modifier key is not pressed. ### Actual behavior The pattern I found is that: * for an input that is part of the dev mode shortcuts (eg `h`): the keystroke is captured by the dev mode and doesn't go to the application * for an input that is not part of those shortcuts (eg `m`): the keystroke goes once to the application and is lost once (so if I type `m` twice, it appears only once for the application). ### How to Reproduce? Please find a reproducer in https://github.com/PierreBtz/quarkus-termio-bug. Steps to reproduce: * Build the project (`mvn package`). * Verify that it works properly with the uber-jar, you have two commands: `java -jar target/quarkus-textio-bug-1.0.0-SNAPSHOT-runner.jar textio` and `java -jar target/quarkus-textio-bug-1.0.0-SNAPSHOT-runner.jar reader` reading an input from Console and displaying it. One command uses a basic `InputStreamReader`, the other [TextIO](https://text-io.beryx.org/releases/latest/) (which is how I noticed the problem initially...). * You can also verify it works with a native executable. * Run `mvn quarkus:dev -Dquarkus.args="textio"` and observe how part of the inputs are captured by the Quarkus dev mode. ### Output of `uname -a` or `ver` Darwin Pierres-MacBook-Pro-2.local 21.2.0 Darwin Kernel Version 21.2.0: Sun Nov 28 20:28:41 PST 2021; root:xnu-8019.61.5~1/RELEASE_ARM64_T6000 x86_64 ### Output of `java -version` openjdk version "11.0.13" 2021-10-19 LTS OpenJDK Runtime Environment Zulu11.52+13-CA (build 11.0.13+8-LTS) OpenJDK 64-Bit Server VM Zulu11.52+13-CA (build 11.0.13+8-LTS, mixed mode) ### GraalVM version (if different from Java) gu --version GraalVM Updater 21.3.0 ### Quarkus version or git rev 2.6.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) ### Additional information _No response_

e32f01e310eb7e08099edc73982a1b0bc6cea4e0

cd7bc3a4d18afdb1385896bfcf08271a9b3b772e

https://github.com/quarkusio/quarkus/compare/e32f01e310eb7e08099edc73982a1b0bc6cea4e0...cd7bc3a4d18afdb1385896bfcf08271a9b3b772e

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java b/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java index 3eb446e39c0..b7e144bbbdd 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java @@ -86,6 +86,7 @@ public class AeshConsole extends QuarkusConsole { } }, "Console Shutdown Hook")); prompt = registerStatusLine(0); + } private void updatePromptOnChange(StringBuilder buffer, int newLines) { @@ -222,6 +223,26 @@ public class AeshConsole extends QuarkusConsole { }); // Keyboard handling conn.setStdinHandler(keys -> { + + QuarkusConsole.StateChangeInputStream redirectIn = QuarkusConsole.REDIRECT_IN; + //see if the users application wants to read the keystrokes: + int pos = 0; + while (pos < keys.length) { + if (!redirectIn.acceptInput(keys[pos])) { + break; + } + ++pos; + } + if (pos > 0) { + if (pos == keys.length) { + return; + } + //the app only consumed some keys + //stick the rest in a new array + int[] newKeys = new int[keys.length - pos]; + System.arraycopy(keys, pos, newKeys, 0, newKeys.length); + keys = newKeys; + } try { if (delegateConnection != null) { //console mode diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java index b9710dc97a4..06c2e574642 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java @@ -47,8 +47,11 @@ public class ConsoleHelper { connection.setStdinHandler(new Consumer<int[]>() { @Override public void accept(int[] ints) { + QuarkusConsole.StateChangeInputStream redirectIn = QuarkusConsole.REDIRECT_IN; for (int i : ints) { - queue.add(i); + if (redirectIn != null && !redirectIn.acceptInput(i)) { + queue.add(i); + } } } }); diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java b/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java index bc6b3766e88..faca9f2dc0e 100644 --- a/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java +++ b/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java @@ -1,9 +1,13 @@ package io.quarkus.dev.console; +import java.io.IOException; +import java.io.InputStream; +import java.io.InterruptedIOException; import java.io.PrintStream; import java.util.List; import java.util.Locale; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.LinkedBlockingDeque; import java.util.function.BiPredicate; import java.util.function.Consumer; @@ -52,9 +56,12 @@ public abstract class QuarkusConsole { public final static PrintStream ORIGINAL_OUT = System.out; public final static PrintStream ORIGINAL_ERR = System.err; + public final static InputStream ORIGINAL_IN = System.in; public static PrintStream REDIRECT_OUT = null; public static PrintStream REDIRECT_ERR = null; + public static StateChangeInputStream REDIRECT_IN; + protected volatile boolean userReadInProgress; public synchronized static void installRedirects() { if (redirectsInstalled) { @@ -67,8 +74,10 @@ public abstract class QuarkusConsole { QuarkusConsole.INSTANCE.isInputSupported(); REDIRECT_OUT = new RedirectPrintStream(false); REDIRECT_ERR = new RedirectPrintStream(true); + REDIRECT_IN = new StateChangeInputStream(); System.setOut(REDIRECT_OUT); System.setErr(REDIRECT_ERR); + System.setIn(REDIRECT_IN); } public synchronized static void uninstallRedirects() { @@ -86,8 +95,10 @@ public abstract class QuarkusConsole { REDIRECT_ERR.close(); REDIRECT_ERR = null; } + REDIRECT_IN = null; System.setOut(ORIGINAL_OUT); System.setErr(ORIGINAL_ERR); + System.setIn(ORIGINAL_IN); redirectsInstalled = false; } @@ -176,4 +187,69 @@ public abstract class QuarkusConsole { return false; } + protected void userReadStart() { + + } + + protected void userReadStop() { + + } + + public static class StateChangeInputStream extends InputStream { + + private final LinkedBlockingDeque<Integer> queue = new LinkedBlockingDeque<>(); + + private volatile boolean reading; + + public synchronized boolean acceptInput(int input) { + if (reading) { + queue.add(input); + notifyAll(); + return true; + } + return false; + } + + @Override + public synchronized int read() throws IOException { + reading = true; + try { + while (queue.isEmpty()) { + try { + wait(); + } catch (InterruptedException e) { + throw new InterruptedIOException(); + } + } + return queue.pollFirst(); + } finally { + reading = false; + } + } + + @Override + public synchronized int read(byte[] b, int off, int len) throws IOException { + reading = true; + int read = 0; + try { + while (read < len) { + while (queue.isEmpty()) { + try { + wait(); + } catch (InterruptedException e) { + throw new InterruptedIOException(); + } + } + byte byteValue = queue.poll().byteValue(); + b[read++] = byteValue; + if (byteValue == '\n' || byteValue == '\r') { + return read; + } + } + return read; + } finally { + reading = false; + } + } + } }

['core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java', 'core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java', 'core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.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/23333/23318

quarkusio

quarkus

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

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

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

A @Disposes @Named method doesn't work / is not invoked

resolves

### Describe the bug With this simple configuration ``` @Singleton @Named("myInput") public Input input() { return new Input(); } public void startInput( @Observes StartupEvent evt, @Named("myInput") Input input ) { log.info("Started input..."); } public void stopInput( @Disposes @Named("myInput") AutoCloseable input ) throws Exception { log.info("Stopping input..."); input.close(); } ``` The `stopInput` method is never invoked when the app is stopped. ### Expected behavior The `stopInput` method should be invoked when the app / test is stopped. ### Actual behavior The `stopInput` method is NOT invoked when the app / test is stopped. ### How to Reproduce? Run this repo's SimpleTest from IDE * https://github.com/alesj/quarkus_cl130/tree/named1 You should see this stacktrace ``` Jan 31, 2022 5:21:39 PM io.quarkus.test.junit.QuarkusTestExtension$ExtensionState close ERROR: Failed to shutdown Quarkus java.lang.RuntimeException: Unable to stop Quarkus test resource com.alesj.qcl.test.SimpleTestResource@3eee3e2b at io.quarkus.test.common.TestResourceManager.close(TestResourceManager.java:152) at io.quarkus.test.junit.QuarkusTestExtension$4.close(QuarkusTestExtension.java:290) at io.quarkus.test.junit.QuarkusTestExtension$ExtensionState.close(QuarkusTestExtension.java:1189) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.jupiter.engine.execution.ExtensionValuesStore.lambda$closeAllStoredCloseableValues$3(ExtensionValuesStore.java:68) at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:183) at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:197) at java.base/java.util.ArrayList.forEach(ArrayList.java:1511) at java.base/java.util.stream.SortedOps$RefSortingSink.end(SortedOps.java:395) at java.base/java.util.stream.Sink$ChainedReference.end(Sink.java:258) at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:510) at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499) at java.base/java.util.stream.ForEachOps$ForEachOp.evaluateSequential(ForEachOps.java:150) at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(ForEachOps.java:173) at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) at java.base/java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:596) at org.junit.jupiter.engine.execution.ExtensionValuesStore.closeAllStoredCloseableValues(ExtensionValuesStore.java:68) at org.junit.jupiter.engine.descriptor.AbstractExtensionContext.close(AbstractExtensionContext.java:77) at org.junit.jupiter.engine.execution.JupiterEngineExecutionContext.close(JupiterEngineExecutionContext.java:53) at org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor.cleanUp(JupiterEngineDescriptor.java:67) at org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor.cleanUp(JupiterEngineDescriptor.java:29) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$cleanUp$10(NodeTestTask.java:167) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.cleanUp(NodeTestTask.java:167) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:98) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:35) at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:57) at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:54) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:107) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:88) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.lambda$execute$0(EngineExecutionOrchestrator.java:54) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.withInterceptedStreams(EngineExecutionOrchestrator.java:67) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:52) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:114) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:86) at org.junit.platform.launcher.core.DefaultLauncherSession$DelegatingLauncher.execute(DefaultLauncherSession.java:86) at org.junit.platform.launcher.core.SessionPerRequestLauncher.execute(SessionPerRequestLauncher.java:53) at com.intellij.junit5.JUnit5IdeaTestRunner.startRunnerWithArgs(JUnit5IdeaTestRunner.java:71) at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33) at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235) at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54) Caused by: java.lang.IllegalStateException at com.alesj.qcl.test.SimpleTestResource.stop(SimpleTestResource.java:22) at io.quarkus.test.common.TestResourceManager.close(TestResourceManager.java:150) ``` ### 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.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

651c3d3fbf891f7c00412f04020f6d49f69fe77f

26f64ca9ac9e996c4cc5def9472933f4b6d6366a

https://github.com/quarkusio/quarkus/compare/651c3d3fbf891f7c00412f04020f6d49f69fe77f...26f64ca9ac9e996c4cc5def9472933f4b6d6366a

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java index 0cabd420434..66f0320e880 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java @@ -1029,8 +1029,9 @@ public class BeanDeployment { for (MethodInfo producerMethod : producerMethods) { BeanInfo declaringBean = beanClassToBean.get(producerMethod.declaringClass()); if (declaringBean != null) { - BeanInfo producerMethodBean = Beans.createProducerMethod(producerMethod, declaringBean, this, - findDisposer(declaringBean, producerMethod, disposers), injectionPointTransformer); + Set<Type> beanTypes = Types.getProducerMethodTypeClosure(producerMethod, this); + BeanInfo producerMethodBean = Beans.createProducerMethod(beanTypes, producerMethod, declaringBean, this, + findDisposer(beanTypes, declaringBean, producerMethod, disposers), injectionPointTransformer); if (producerMethodBean != null) { beans.add(producerMethodBean); injectionPoints.addAll(producerMethodBean.getAllInjectionPoints()); @@ -1041,8 +1042,9 @@ public class BeanDeployment { for (FieldInfo producerField : producerFields) { BeanInfo declaringBean = beanClassToBean.get(producerField.declaringClass()); if (declaringBean != null) { + Set<Type> beanTypes = Types.getProducerFieldTypeClosure(producerField, this); BeanInfo producerFieldBean = Beans.createProducerField(producerField, declaringBean, this, - findDisposer(declaringBean, producerField, disposers)); + findDisposer(beanTypes, declaringBean, producerField, disposers)); if (producerFieldBean != null) { beans.add(producerFieldBean); } @@ -1102,20 +1104,11 @@ public class BeanDeployment { } } - private DisposerInfo findDisposer(BeanInfo declaringBean, AnnotationTarget annotationTarget, List<DisposerInfo> disposers) { + private DisposerInfo findDisposer(Set<Type> beanTypes, BeanInfo declaringBean, AnnotationTarget annotationTarget, + List<DisposerInfo> disposers) { List<DisposerInfo> found = new ArrayList<>(); - Type beanType; Set<AnnotationInstance> qualifiers = new HashSet<>(); - List<AnnotationInstance> allAnnotations; - if (Kind.FIELD.equals(annotationTarget.kind())) { - allAnnotations = annotationTarget.asField().annotations(); - beanType = annotationTarget.asField().type(); - } else if (Kind.METHOD.equals(annotationTarget.kind())) { - allAnnotations = annotationTarget.asMethod().annotations(); - beanType = annotationTarget.asMethod().returnType(); - } else { - throw new RuntimeException("Unsupported annotation target: " + annotationTarget); - } + Collection<AnnotationInstance> allAnnotations = getAnnotations(annotationTarget); allAnnotations.forEach(a -> extractQualifiers(a).forEach(qualifiers::add)); for (DisposerInfo disposer : disposers) { if (disposer.getDeclaringBean().equals(declaringBean)) { @@ -1125,8 +1118,14 @@ public class BeanDeployment { hasQualifier = false; } } - if (hasQualifier && beanResolver.matches(disposer.getDisposedParameterType(), beanType)) { - found.add(disposer); + if (hasQualifier) { + Type disposedParamType = disposer.getDisposedParameterType(); + for (Type beanType : beanTypes) { + if (beanResolver.matches(disposedParamType, beanType)) { + found.add(disposer); + break; + } + } } } } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java index 765b196b2df..fcfe9841063 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java @@ -69,11 +69,11 @@ public final class Beans { return null; } - static BeanInfo createProducerMethod(MethodInfo producerMethod, BeanInfo declaringBean, BeanDeployment beanDeployment, + static BeanInfo createProducerMethod(Set<Type> beanTypes, MethodInfo producerMethod, BeanInfo declaringBean, + BeanDeployment beanDeployment, DisposerInfo disposer, InjectionPointModifier transformer) { Set<AnnotationInstance> qualifiers = new HashSet<>(); List<ScopeInfo> scopes = new ArrayList<>(); - Set<Type> types = Types.getProducerMethodTypeClosure(producerMethod, beanDeployment); Integer priority = null; boolean isAlternative = false; boolean isDefaultBean = false; @@ -169,7 +169,7 @@ public final class Beans { } List<Injection> injections = Injection.forBean(producerMethod, declaringBean, beanDeployment, transformer); - BeanInfo bean = new BeanInfo(producerMethod, beanDeployment, scope, types, qualifiers, injections, declaringBean, + BeanInfo bean = new BeanInfo(producerMethod, beanDeployment, scope, beanTypes, qualifiers, injections, declaringBean, disposer, isAlternative, stereotypes, name, isDefaultBean, null, priority); for (Injection injection : injections) { injection.init(bean); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java index 705516ecc6b..af2f4e4960d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java @@ -102,13 +102,13 @@ public class DisposerTest { static final AtomicInteger DESTROYED = new AtomicInteger(); - static final AtomicReference<String> DISPOSED = new AtomicReference<>(); + static final AtomicReference<CharSequence> DISPOSED = new AtomicReference<>(); @MyQualifier @Produces String produce = toString(); - void dipose(@Disposes @MyQualifier String value) { + void dipose(@Disposes @MyQualifier CharSequence value) { DISPOSED.set(value); }

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java', 'independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.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/22942/22862

quarkusio

quarkus

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

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

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

Rest Client exausts Threads.

resolves

### Describe the bug This is a major issue for us. I have dozens of services in prod that from time to time they freeze due to thread exhaustion. The vertex event loop stalls. his can be traced back to unconfigured timeouts on rest clients that hog connections. We need to go to all rest clients and specify connection and read timeouts on configurations, like: ``` com.td.wfm.common.client.SomeRestClientClass/mp-rest/connectTimeout=500 com.td.wfm.common.client.SomeRestClientClass/mp-rest/readTimeout=1000 ``` If you use programatic rest creation you must: ``` return RestClientBuilder.newBuilder() .baseUri(URI.create(uri)) .connectTimeout(connectionTimeout, TimeUnit.MILLISECONDS) .readTimeout(readTimeout, TimeUnit.MILLISECONDS) //... ``` There are many issues related with this. See: https://github.com/quarkusio/quarkus/issues/15056 https://github.com/quarkusio/quarkus/issues/15383 https://github.com/quarkusio/quarkus/issues/15191 This happens on 1.13.7.Final but I believe 2.* suffers from the same problem. ### Expected behavior If the REST Client connection is half closed in the other side, it will timeout after a default amount of time. ### Actual behavior If the REST Client connection is half closed in the other side it will never timeout. ### How to Reproduce? You need a rest client calling an endpoint in a loop, in different threads. The other side must hold the connection and not reply. ### 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 1.13.7.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

7813adb7dc24384d3bf9a7224f5e1882c888316e

dfe9cc709ad6c5062b855c04d1e404034ad1a605

https://github.com/quarkusio/quarkus/compare/7813adb7dc24384d3bf9a7224f5e1882c888316e...dfe9cc709ad6c5062b855c04d1e404034ad1a605

diff --git a/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java b/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java index 10e0d804735..ce58a3a5bf0 100644 --- a/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java +++ b/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java @@ -95,6 +95,20 @@ public class RestClientsConfig { public RestClientLoggingConfig logging; + /** + * Global default connect timeout for automatically generated REST Clients. The attribute specifies a timeout + * in milliseconds that a client should wait to connect to the remote endpoint. + */ + @ConfigItem(defaultValue = "15000", defaultValueDocumentation = "15000 ms") + public Long connectTimeout; + + /** + * Global default read timeout for automatically generated REST Clients. The attribute specifies a timeout + * in milliseconds that a client should wait for a response from the remote endpoint. + */ + @ConfigItem(defaultValue = "30000", defaultValueDocumentation = "30000 ms") + public Long readTimeout; + public RestClientConfig getClientConfig(String configKey) { if (configKey == null) { return RestClientConfig.EMPTY; diff --git a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientBase.java b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientBase.java index 5a00ee54881..4600ff79c6f 100644 --- a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientBase.java +++ b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientBase.java @@ -269,16 +269,16 @@ public class RestClientBase { } void configureTimeouts(RestClientBuilder builder) { - Optional<Long> connectTimeout = oneOf(clientConfigByClassName().connectTimeout, - clientConfigByConfigKey().connectTimeout); - if (connectTimeout.isPresent()) { - builder.connectTimeout(connectTimeout.get(), TimeUnit.MILLISECONDS); + Long connectTimeout = oneOf(clientConfigByClassName().connectTimeout, + clientConfigByConfigKey().connectTimeout).orElse(this.configRoot.connectTimeout); + if (connectTimeout != null) { + builder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS); } - Optional<Long> readTimeout = oneOf(clientConfigByClassName().readTimeout, - clientConfigByConfigKey().readTimeout); - if (readTimeout.isPresent()) { - builder.readTimeout(readTimeout.get(), TimeUnit.MILLISECONDS); + Long readTimeout = oneOf(clientConfigByClassName().readTimeout, + clientConfigByConfigKey().readTimeout).orElse(this.configRoot.readTimeout); + if (readTimeout != null) { + builder.readTimeout(readTimeout, TimeUnit.MILLISECONDS); } } @@ -322,10 +322,13 @@ public class RestClientBase { return this.configRoot.getClientConfig(this.proxyType); } - private static <T> Optional<T> oneOf(Optional<T> o1, Optional<T> o2) { - if (o1.isPresent()) { - return o1; + @SafeVarargs + private static <T> Optional<T> oneOf(Optional<T>... optionals) { + for (Optional<T> o : optionals) { + if (o.isPresent()) { + return o; + } } - return o2; + return Optional.empty(); } } diff --git a/extensions/resteasy-classic/rest-client/runtime/src/test/java/io/quarkus/restclient/runtime/RestClientBaseTest.java b/extensions/resteasy-classic/rest-client/runtime/src/test/java/io/quarkus/restclient/runtime/RestClientBaseTest.java index b8d330756d2..149560eb383 100644 --- a/extensions/resteasy-classic/rest-client/runtime/src/test/java/io/quarkus/restclient/runtime/RestClientBaseTest.java +++ b/extensions/resteasy-classic/rest-client/runtime/src/test/java/io/quarkus/restclient/runtime/RestClientBaseTest.java @@ -99,6 +99,23 @@ public class RestClientBaseTest { Mockito.verify(restClientBuilderMock).property("resteasy.connectionPoolSize", 103); } + @Test + public void testGlobalTimeouts() { + RestClientsConfig configRoot = new RestClientsConfig(); + configRoot.connectTimeout = 5000L; + configRoot.readTimeout = 10000L; + RestClientBuilder restClientBuilderMock = Mockito.mock(RestClientBuilder.class); + RestClientBase restClientBase = new RestClientBase(TestClient.class, + "http://localhost:8080", + "test-client", + null, + configRoot); + restClientBase.configureTimeouts(restClientBuilderMock); + + Mockito.verify(restClientBuilderMock).connectTimeout(5000, TimeUnit.MILLISECONDS); + Mockito.verify(restClientBuilderMock).readTimeout(10000, TimeUnit.MILLISECONDS); + } + /** * This method creates a Quarkus style configuration object (which would normally be created based on the MP config * properties, but it's easier to instantiate it directly here). diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilder.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilder.java index 1f3fb2ee0c6..aa3e93ed981 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilder.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilder.java @@ -310,16 +310,16 @@ public class RestClientCDIDelegateBuilder<T> { } private void configureTimeouts(RestClientBuilder builder) { - Optional<Long> connectTimeout = oneOf(clientConfigByClassName().connectTimeout, - clientConfigByConfigKey().connectTimeout); - if (connectTimeout.isPresent()) { - builder.connectTimeout(connectTimeout.get(), TimeUnit.MILLISECONDS); + Long connectTimeout = oneOf(clientConfigByClassName().connectTimeout, + clientConfigByConfigKey().connectTimeout).orElse(this.configRoot.connectTimeout); + if (connectTimeout != null) { + builder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS); } - Optional<Long> readTimeout = oneOf(clientConfigByClassName().readTimeout, - clientConfigByConfigKey().readTimeout); - if (readTimeout.isPresent()) { - builder.readTimeout(readTimeout.get(), TimeUnit.MILLISECONDS); + Long readTimeout = oneOf(clientConfigByClassName().readTimeout, + clientConfigByConfigKey().readTimeout).orElse(this.configRoot.readTimeout); + if (readTimeout != null) { + builder.readTimeout(readTimeout, TimeUnit.MILLISECONDS); } } @@ -359,10 +359,13 @@ public class RestClientCDIDelegateBuilder<T> { return this.configRoot.getClientConfig(jaxrsInterface); } - private static <T> Optional<T> oneOf(Optional<T> o1, Optional<T> o2) { - if (o1.isPresent()) { - return o1; + @SafeVarargs + private static <T> Optional<T> oneOf(Optional<T>... optionals) { + for (Optional<T> o : optionals) { + if (o.isPresent()) { + return o; + } } - return o2; + return Optional.empty(); } } diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/test/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilderTest.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/test/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilderTest.java index a04647b57dc..c43bb7d913d 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/test/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilderTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/test/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilderTest.java @@ -97,6 +97,22 @@ public class RestClientCDIDelegateBuilderTest { HttpPostRequestEncoder.EncoderMode.HTML5); } + @Test + public void testGlobalTimeouts() { + RestClientsConfig configRoot = new RestClientsConfig(); + configRoot.connectTimeout = 5000L; + configRoot.readTimeout = 10000L; + configRoot.multipartPostEncoderMode = Optional.empty(); + RestClientBuilderImpl restClientBuilderMock = Mockito.mock(RestClientBuilderImpl.class); + new RestClientCDIDelegateBuilder<>(TestClient.class, + "http://localhost:8080", + "test-client", + configRoot).build(restClientBuilderMock); + + Mockito.verify(restClientBuilderMock).connectTimeout(5000, TimeUnit.MILLISECONDS); + Mockito.verify(restClientBuilderMock).readTimeout(10000, TimeUnit.MILLISECONDS); + } + private static RestClientsConfig createSampleConfiguration() { RestClientConfig clientConfig = new RestClientConfig(); clientConfig.url = Optional.of("http://localhost");

['extensions/resteasy-classic/rest-client/runtime/src/test/java/io/quarkus/restclient/runtime/RestClientBaseTest.java', 'extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilder.java', 'extensions/resteasy-reactive/rest-client-reactive/runtime/src/test/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilderTest.java', 'extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java', 'extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientBase.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/22732/19063

quarkusio

quarkus

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

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

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

NPE in LambdaHttpHandler (amazon-lambda-http extension)

fixes

### Describe the bug While testing a Quarkus Lambda function, I hit the following NPE: ERROR [qua.ama.lam.http] (main) Request Failure: java.lang.NullPointerException at io.quarkus.amazon.lambda.http.LambdaHttpHandler.nettyDispatch(LambdaHttpHandler.java:171) at io.quarkus.amazon.lambda.http.LambdaHttpHandler.handleRequest(LambdaHttpHandler.java:63) at io.quarkus.amazon.lambda.http.LambdaHttpHandler.handleRequest(LambdaHttpHandler.java:43) at io.quarkus.amazon.lambda.runtime.AmazonLambdaRecorder.handle(AmazonLambdaRecorder.java:71) at io.quarkus.amazon.lambda.runtime.QuarkusStreamHandler.handleRequest(QuarkusStreamHandler.java:58) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.base/java.lang.reflect.Method.invoke(Unknown Source) at lambdainternal.EventHandlerLoader$StreamMethodRequestHandler.handleRequest(EventHandlerLoader.java:375) at lambdainternal.EventHandlerLoader$2.call(EventHandlerLoader.java:899) at lambdainternal.AWSLambda.startRuntime(AWSLambda.java:257) at lambdainternal.AWSLambda.startRuntime(AWSLambda.java:192) at lambdainternal.AWSLambda.main(AWSLambda.java:187) Would be nicer to get a proper error message. I'm willing to open a PR, just wondering what would be the best way to fix/ validate this? @patriot1burke @richiethom @HardNorth ### Expected behavior A proper error message ### Actual behavior NullPointerException ### How to Reproduce? 1. Open a deployed Quarkus Lambda function in AWS console 2. Hit Test button 3. NPE is shown in Log output section ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` Java 11 (Corretto) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.1.0 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Maven 3.8.1 ### Additional information _No response_

6a36ecf6d078769c0f5095b83d858afce5a7b79e

151897a299dbe3e4665171c9a989922fcabe84dd

https://github.com/quarkusio/quarkus/compare/6a36ecf6d078769c0f5095b83d858afce5a7b79e...151897a299dbe3e4665171c9a989922fcabe84dd

diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java index 7236fe332fe..dea92dbf76d 100644 --- a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java +++ b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java @@ -167,8 +167,16 @@ public class LambdaHttpHandler implements RequestHandler<APIGatewayV2HTTPEvent, quarkusHeaders.setContextObject(Context.class, context); quarkusHeaders.setContextObject(APIGatewayV2HTTPEvent.class, request); quarkusHeaders.setContextObject(APIGatewayV2HTTPEvent.RequestContext.class, request.getRequestContext()); + HttpMethod httpMethod = null; + if (request.getRequestContext() != null && request.getRequestContext().getHttp() != null + && request.getRequestContext().getHttp().getMethod() != null) { + httpMethod = HttpMethod.valueOf(request.getRequestContext().getHttp().getMethod()); + } + if (httpMethod == null) { + throw new IllegalStateException("Missing HTTP method in request event"); + } DefaultHttpRequest nettyRequest = new DefaultHttpRequest(HttpVersion.HTTP_1_1, - HttpMethod.valueOf(request.getRequestContext().getHttp().getMethod()), ofNullable(request.getRawQueryString()) + httpMethod, ofNullable(request.getRawQueryString()) .filter(q -> !q.isEmpty()).map(q -> request.getRawPath() + '?' + q).orElse(request.getRawPath()), quarkusHeaders); if (request.getHeaders() != null) { //apparently this can be null if no headers are sent

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

{'.java': 1}

Java

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

Apache License 2.0

quarkusio/quarkus/22744/22731

quarkusio

quarkus

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

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

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

NPE when adding new registry in Quarkus CLI

fixes

### Describe the bug When new registry is added into freshly installed Quarkus CLI, the operation fails with NullPointerException. ### Expected behavior New registry is added successfully. ### Actual behavior Exception in console: ``` java.lang.NullPointerException at io.quarkus.registry.config.RegistriesConfigMapperHelper.serialize(RegistriesConfigMapperHelper.java:45) at io.quarkus.registry.config.RegistriesConfig$Mutable.persist(RegistriesConfig.java:111) at io.quarkus.cli.RegistryAddCommand.call(RegistryAddCommand.java:54) at io.quarkus.cli.RegistryAddCommand.call(RegistryAddCommand.java:12) at picocli.CommandLine.executeUserObject(CommandLine.java:1953) at picocli.CommandLine.access$1300(CommandLine.java:145) at picocli.CommandLine$RunLast.executeUserObjectOfLastSubcommandWithSameParent(CommandLine.java:2358) at picocli.CommandLine$RunLast.handle(CommandLine.java:2352) at picocli.CommandLine$RunLast.handle(CommandLine.java:2314) at picocli.CommandLine$AbstractParseResultHandler.execute(CommandLine.java:2179) at picocli.CommandLine$RunLast.execute(CommandLine.java:2316) at picocli.CommandLine.execute(CommandLine.java:2078) at io.quarkus.cli.QuarkusCli.run(QuarkusCli.java:50) at io.quarkus.cli.QuarkusCli_ClientProxy.run(Unknown Source) at io.quarkus.runtime.ApplicationLifecycleManager.run(ApplicationLifecycleManager.java:125) at io.quarkus.runtime.Quarkus.run(Quarkus.java:67) at io.quarkus.runtime.Quarkus.run(Quarkus.java:41) at io.quarkus.cli.Main.main(Main.java:9) ``` ### How to Reproduce? Steps to reproduce: 1. `jbang app uninstall quarkus` 2. `rm -r ~/.quarkus/` 3. `jbang app install --fresh --force quarkus@quarkusio` 4. ``` $ quarkus version 2.6.1.Final # 2.5.2.Final worked as expected ``` 5. `quarkus registry add registry.quarkus.redhat.com` ### Output of `uname -a` or `ver` OS name: "linux", version: "5.15.6-100.fc34.x86_64" ### Output of `java -version` 11.0.13, vendor: Eclipse Adoptium ### 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_

aed1114b1aded4611a16817841d7659e3821db8a

df807fbf7e4901784b6fa00899f821428fc2d55d

https://github.com/quarkusio/quarkus/compare/aed1114b1aded4611a16817841d7659e3821db8a...df807fbf7e4901784b6fa00899f821428fc2d55d

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java b/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java index 016147cb321..7ce770d8546 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java @@ -30,16 +30,13 @@ public class RegistryAddCommand extends BaseRegistryCommand { existingConfig = Files.exists(configYaml); } + registryClient.refreshRegistryCache(output); final RegistriesConfig.Mutable config; - if (existingConfig) { - registryClient.refreshRegistryCache(output); - config = registryClient.resolveConfig().mutable(); - if (config.getSource().getFilePath() == null) { - output.error("Can only modify file-based configuration. Config source is " + config.getSource().describe()); - return CommandLine.ExitCode.SOFTWARE; - } - } else { + if (configYaml != null && !existingConfig) { + // we're creating a new configuration for a new file config = RegistriesConfig.builder(); + } else { + config = registryClient.resolveConfig().mutable(); } boolean persist = false; @@ -48,10 +45,10 @@ public class RegistryAddCommand extends BaseRegistryCommand { } if (persist) { - if (existingConfig) { - config.persist(); - } else { + if (configYaml != null) { config.persist(configYaml); + } else { + config.persist(); } } return CommandLine.ExitCode.OK; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java index dd969f9982e..495e8f3827e 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java @@ -217,7 +217,9 @@ public class RegistriesConfigImpl implements RegistriesConfig { static void persistConfigSource(RegistriesConfigImpl config) throws IOException { Path targetFile = config.configSource.getFilePath(); - if (targetFile == null) { + if (config.configSource == ConfigSource.DEFAULT) { + targetFile = RegistriesConfigLocator.getDefaultConfigYamlLocation(); + } else if (targetFile == null) { throw new UnsupportedOperationException( String.format("Can not write configuration as it was read from an alternate source: %s", config.configSource.describe())); diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java index f26ac04d706..66ce462cf0d 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java @@ -159,8 +159,6 @@ public class RegistriesConfigLocator { } /** - * TODO: compare set *.json.RegistriesConfigLocator#initFromEnvironmentOrNull - * * @param map A Map containing environment variables, e.g. {@link System#getenv()} * @return A RegistriesConfig object initialized from environment variables. */

['independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java', 'devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java', 'independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.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/22767/22765

quarkusio

quarkus

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

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

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

Status Code and Message Mismatch in WebApplicationException

fixes

### Describe the bug When using the RESTEasy Reactive Client the HTTP status message doesn't match the HTTP status code. ### Expected behavior The HTTP status message is expected to match the status code ### Actual behavior ```java @Test void testWebApplicationException() { assertEquals("HTTP 428 Precondition required", new WebApplicationException(428).getMessage()); // HTTP 428 Expectation Failed // should be: HTTP 428 Precondition required assertEquals("HTTP 429 Too Many Requests", new WebApplicationException(429).getMessage()); // HTTP 429 Precondition Required // should be: HTTP 429 Too Many Requests assertEquals("431 Request Header Fields Too Large", new WebApplicationException(431).getMessage()); // HTTP 431 Too Many Requests // should be: HTTP 431 Request Header Fields Too Large } // taken from Response.class // // REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"), // /** // * 417 Expectation Failed, see {@link <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.18">HTTP/1.1 documentation</a>}. // * // * @since 2.0 // */ // EXPECTATION_FAILED(417, "Expectation Failed"), // /** // * 428 Precondition required, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-3">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // PRECONDITION_REQUIRED(428, "Precondition Required"), // /** // * 429 Too Many Requests, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-4">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // TOO_MANY_REQUESTS(429, "Too Many Requests"), // /** // * 431 Request Header Fields Too Large, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-5">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // REQUEST_HEADER_FIELDS_TOO_LARGE(431, "Request Header Fields Too Large"), ``` ### How to Reproduce? run the JBang script: ```java ///usr/bin/env jbang "$0" "$@" ; exit $? //JAVAC_OPTIONS -parameters //JAVA_OPTIONS -Djava.util.logging.manager=org.jboss.logmanager.LogManager //DEPS io.quarkus:quarkus-rest-client-reactive:2.6.1.Final //DEPS io.quarkus:quarkus-arc:2.6.1.Final import static java.lang.System.*; import io.quarkus.runtime.annotations.QuarkusMain; import io.quarkus.runtime.Quarkus; import javax.inject.Inject; import org.jboss.logging.Logger; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; @QuarkusMain public class webapplicationexception { public static void main(String... args) { System.out.println("Expected: " + Response.Status.PRECONDITION_REQUIRED.getStatusCode() + " " + Response.Status.PRECONDITION_REQUIRED.getReasonPhrase()); System.out.println("Got: " + new WebApplicationException(428).getMessage()); System.out.println(); System.out.println("Expected: " + Response.Status.TOO_MANY_REQUESTS.getStatusCode() + " " + Response.Status.TOO_MANY_REQUESTS.getReasonPhrase()); System.out.println("Got: " + new WebApplicationException(429).getMessage()); System.out.println(); System.out.println("Expected: " + Response.Status.REQUEST_HEADER_FIELDS_TOO_LARGE.getStatusCode() + " " + Response.Status.REQUEST_HEADER_FIELDS_TOO_LARGE.getReasonPhrase()); System.out.println("Got: " + new WebApplicationException(431).getMessage()); } // taken from public enum Status implements StatusType in Response.class // // REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"), // /** // * 417 Expectation Failed, see {@link <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.18">HTTP/1.1 documentation</a>}. // * // * @since 2.0 // */ // EXPECTATION_FAILED(417, "Expectation Failed"), // /** // * 428 Precondition required, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-3">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // PRECONDITION_REQUIRED(428, "Precondition Required"), // /** // * 429 Too Many Requests, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-4">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // TOO_MANY_REQUESTS(429, "Too Many Requests"), // /** // * 431 Request Header Fields Too Large, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-5">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // REQUEST_HEADER_FIELDS_TOO_LARGE(431, "Request Header Fields Too Large"), } ``` ### Output of `uname -a` or `ver` Darwin cdh.localdomain 21.2.0 Darwin Kernel Version 21.2.0: Sun Nov 28 20:29:10 PST 2021; root:xnu-8019.61.5~1/RELEASE_ARM64_T8101 arm64 ### Output of `java -version` java version "17" 2021-09-14 LTS Java(TM) SE Runtime Environment (build 17+35-LTS-2724) Java HotSpot(TM) 64-Bit Server VM (build 17+35-LTS-2724, mixed mode, sharing) ### 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`) Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d) Maven home: ~/.m2/wrapper/dists/apache-maven-3.8.1-bin/2l5mhf2pq2clrde7f7qp1rdt5m/apache-maven-3.8.1 Java version: 17, vendor: Oracle Corporation, runtime: /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home Default locale: de_AT, platform encoding: UTF-8 OS name: "mac os x", version: "12.1", arch: "aarch64", family: "mac" ### Additional information _No response_

2e9d5d5bc80c737a3a540d411b71459d106d4052

4716194b4eb7e151e8e54192598d1191a567ab7e

https://github.com/quarkusio/quarkus/compare/2e9d5d5bc80c737a3a540d411b71459d106d4052...4716194b4eb7e151e8e54192598d1191a567ab7e

diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java index 6d074fa75f2..df452fb0532 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java @@ -32,6 +32,8 @@ public abstract class AbstractRestResponseBuilder<T> extends RestResponse.Respon static { defaultReasonPhrases.put(100, "Continue"); defaultReasonPhrases.put(101, "Switching Protocols"); + defaultReasonPhrases.put(102, "Processing"); + defaultReasonPhrases.put(103, "Early Hints"); defaultReasonPhrases.put(200, "OK"); defaultReasonPhrases.put(201, "Created"); defaultReasonPhrases.put(202, "Accepted"); @@ -39,6 +41,8 @@ public abstract class AbstractRestResponseBuilder<T> extends RestResponse.Respon defaultReasonPhrases.put(204, "No Content"); defaultReasonPhrases.put(205, "Reset Content"); defaultReasonPhrases.put(206, "Partial Content"); + defaultReasonPhrases.put(208, "Already Reported"); + defaultReasonPhrases.put(226, "IM Used"); defaultReasonPhrases.put(300, "Multiple Choices"); defaultReasonPhrases.put(301, "Moved Permanently"); defaultReasonPhrases.put(302, "Found"); @@ -65,16 +69,22 @@ public abstract class AbstractRestResponseBuilder<T> extends RestResponse.Respon defaultReasonPhrases.put(415, "Unsupported Media Type"); defaultReasonPhrases.put(416, "Requested Range Not Satisfiable"); defaultReasonPhrases.put(417, "Expectation Failed"); + defaultReasonPhrases.put(421, "Misdirected Request"); defaultReasonPhrases.put(426, "Upgrade Required"); - defaultReasonPhrases.put(428, "Expectation Failed"); - defaultReasonPhrases.put(429, "Precondition Required"); - defaultReasonPhrases.put(431, "Too Many Requests"); + defaultReasonPhrases.put(428, "Precondition Required"); + defaultReasonPhrases.put(429, "Too Many Requests"); + defaultReasonPhrases.put(431, "Request Header Fields Too Large"); + defaultReasonPhrases.put(451, "Unavailable For Legal Reasons"); defaultReasonPhrases.put(500, "Internal Server Error"); defaultReasonPhrases.put(501, "Not Implemented"); defaultReasonPhrases.put(502, "Bad Gateway"); defaultReasonPhrases.put(503, "Service Unavailable"); defaultReasonPhrases.put(504, "Gateway Timeout"); defaultReasonPhrases.put(505, "HTTP Version Not Supported"); + defaultReasonPhrases.put(506, "Variant Also Negotiates"); + defaultReasonPhrases.put(507, "Insufficient Storage"); + defaultReasonPhrases.put(508, "Loop Detected"); + defaultReasonPhrases.put(510, "Not Extended"); defaultReasonPhrases.put(511, "Network Authentication Required"); }

['independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.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/22769/22699

quarkusio

quarkus

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

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

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

2.6 - Error with config locations

fixes

### Describe the bug I have an `application.yaml` that gets used for all projects (containing things like `ignored-split-packages`). With the `ConfigGenerationBuildStep` changes in 2.6 I now get an exception during builds because of the following lines in my `build.gradle` file. ```groovy build { // Shared Quarkus configuration applied to all projects def shareConfig = rootProject.projectDir.toURI().toString() + "/conf/quarkus" System.setProperty("quarkus.config.locations", "${shareConfig}") } ``` It looks like `ConfigGenerationBuildStep` doesn't seem to like the URI string format (see exception below). I also tried `toAbsolutePath()` instead of `toURI().toString()`, but then it pushed the error to `bstractLocationConfigSourceLoader`, which didn't like the drive letter when in Windows (see exception below). ### Expected behavior Successful build ### Actual behavior Error using `toURI().toString()` ``` Caused by: java.nio.file.InvalidPathException: Illegal char <:> at index 4: file:/C:/my/git//conf/quarkus at io.quarkus.deployment.steps.ConfigGenerationBuildStep.lambda$watchConfigFiles$0(ConfigGenerationBuildStep.java:259) at io.quarkus.deployment.steps.ConfigGenerationBuildStep.watchConfigFiles(ConfigGenerationBuildStep.java:257) ``` Error using `toAbsolutePath()` ``` Caused by: java.lang.IllegalArgumentException: SRCFG00033: Scheme C not supported at io.smallrye.config.AbstractLocationConfigSourceLoader.loadConfigSources(AbstractLocationConfigSourceLoader.java:101) at io.smallrye.config.AbstractLocationConfigSourceLoader.loadConfigSources(AbstractLocationConfigSourceLoader.java:80) at io.smallrye.config.AbstractLocationConfigSourceFactory.getConfigSources(AbstractLocationConfigSourceFactory.java:30) at io.smallrye.config.PropertiesLocationConfigSourceFactory.getConfigSources(PropertiesLocationConfigSourceFactory.java:16) at io.smallrye.config.ConfigurableConfigSource.unwrap(ConfigurableConfigSource.java:53) at io.smallrye.config.ConfigurableConfigSource.getConfigSources(ConfigurableConfigSource.java:49) at io.smallrye.config.SmallRyeConfig$ConfigSources.mapLateSources(SmallRyeConfig.java:618) at io.smallrye.config.SmallRyeConfig$ConfigSources.<init>(SmallRyeConfig.java:529) at io.smallrye.config.SmallRyeConfig.<init>(SmallRyeConfig.java:66) at io.smallrye.config.SmallRyeConfigBuilder.build(SmallRyeConfigBuilder.java:419) at io.quarkus.deployment.ExtensionLoader.loadStepsFrom(ExtensionLoader.java:173) at io.quarkus.deployment.QuarkusAugmentor.run(QuarkusAugmentor.java:108) at io.quarkus.runner.bootstrap.AugmentActionImpl.runAugment(AugmentActionImpl.java:328) ``` ### How to Reproduce? ```groovy build { // Shared Quarkus configuration applied to all projects def shareConfig = rootProject.projectDir.toURI().toString() + "/conf/quarkus" System.setProperty("quarkus.config.locations", "${shareConfig}") } ``` or ```groovy build { // Shared Quarkus configuration applied to all projects def shareConfig = rootProject.projectDir.getAbsolutePath() + "/conf/quarkus" System.setProperty("quarkus.config.locations", "${shareConfig}") } ``` ### Output of `uname -a` or `ver` MINGW64_NT-10.0-19042 ### Output of `java -version` OpenJDK 11.0.11 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.3.3 ### Additional information _No response_

2e9d5d5bc80c737a3a540d411b71459d106d4052

c1a065c3cc1a52edeec5ac513ac09173510bae74

https://github.com/quarkusio/quarkus/compare/2e9d5d5bc80c737a3a540d411b71459d106d4052...c1a065c3cc1a52edeec5ac513ac09173510bae74

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java index af8f03468ff..0793c514d43 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java @@ -260,8 +260,8 @@ public class ConfigGenerationBuildStep { for (URI location : locations) { Path path = location.getScheme() != null ? Paths.get(location) : Paths.get(location.getPath()); if (!Files.isDirectory(path)) { - configWatchedFiles.add(location.toString()); - configWatchedFiles.add(appendProfileToFilename(location.toString(), profile)); + configWatchedFiles.add(path.toString()); + configWatchedFiles.add(appendProfileToFilename(path.toString(), profile)); } } });

['core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.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/22809/22792

quarkusio

quarkus

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

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

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

Continuous testing fails when `@QuarkusMainTest` and a `@ConfigMapping` are involved

fixes

### Describe the bug Running a test annotated with `@QuarkusMainTest` in continuous testing mode where another test tests a config mapping defined by `@ConfigMapping` causes the test to fail with a `ClassCastException`: ``` Caused by: java.lang.ClassCastException: class io.quarkus.test.junit.RunningAppConfigResolver$1 cannot be cast to class io.smallrye.config.SmallRyeConfig (io.quarkus.test.junit.RunningAppConfigResolver$1 and io.smallrye.config.SmallRyeConfig are in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @6c85b253) at io.quarkus.deployment.steps.ConfigGenerationBuildStep.watchConfigFiles(ConfigGenerationBuildStep.java:241) 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.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:887) at io.quarkus.builder.BuildContext.run(BuildContext.java:277) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1452) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) ``` It is important that the test testing the `@ConfigMapping` is run before the `@QuarkusMainTest`. The other way round the behavior couldn't be observed. The tests pass when run with `./mvnw clean verify` ### Expected behavior Tests passing when run with `./mvnw clean verify` also pass when run in continuous testing mode. ### Actual behavior When a test using an injected `@ConfigMapping` is run before a `@QuarkusMainTest` the `@QuarkusMainTest` fails with a class cast exception: ``` Caused by: java.lang.ClassCastException: class io.quarkus.test.junit.RunningAppConfigResolver$1 cannot be cast to class io.smallrye.config.SmallRyeConfig (io.quarkus.test.junit.RunningAppConfigResolver$1 and io.smallrye.config.SmallRyeConfig are in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @6c85b253) at io.quarkus.deployment.steps.ConfigGenerationBuildStep.watchConfigFiles(ConfigGenerationBuildStep.java:241) 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.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:887) at io.quarkus.builder.BuildContext.run(BuildContext.java:277) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1452) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) ``` ### How to Reproduce? 1. Download the demo at tag [QuarkusMainTestFailWithConfigMapping](https://github.com/itbh-at/quarkus-main-test/releases/tag/QuarkusMainTestFailWithConfigMapping) 2. Run `quarkus dev` 3. Start tests -> fail 4. Remove the `@QuarkusMainTest` -> pass 5. Add again the `@QuarkusMainTest` and remove `ConfigurationTest` -> pass 6. Add `ConfigurationTest` again 7. Rename `ConfigurationTest.java` to `GreetingConfigurationTest.java` to ensure it is run after the `@QuarkusMainTest` in `GreetingCommandTest.java` 8. Run the test in `quarkus dev` -> fail, but not because of the `ClassCastException` but because of what is described in #22790 8. Make sure the app looks the same as after the download and exit `quarkus dev` 9. Run `./mvnw clean verify` -> pass ### Output of `uname -a` or `ver` Darwin cdh 21.2.0 Darwin Kernel Version 21.2.0: Sun Nov 28 20:29:10 PST 2021; root:xnu-8019.61.5~1/RELEASE_ARM64_T8101 arm64 ### Output of `java -version` java version "17" 2021-09-14 LTS Java(TM) SE Runtime Environment (build 17+35-LTS-2724) Java HotSpot(TM) 64-Bit Server VM (build 17+35-LTS-2724, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d) Maven home: ~/.m2/wrapper/dists/apache-maven-3.8.1-bin/2l5mhf2pq2clrde7f7qp1rdt5m/apache-maven-3.8.1 Java version: 17, vendor: Oracle Corporation, runtime: /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home Default locale: de_AT, platform encoding: UTF-8 OS name: "mac os x", version: "12.1", arch: "aarch64", family: "mac" ### Additional information _No response_

d31c534d288497b71f363b4b0f8e22100184fabe

76842aefc2bfd0023fbbc19829d433388ce7201f

https://github.com/quarkusio/quarkus/compare/d31c534d288497b71f363b4b0f8e22100184fabe...76842aefc2bfd0023fbbc19829d433388ce7201f

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java index 0793c514d43..0d5f07a2337 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java @@ -72,7 +72,6 @@ import io.quarkus.runtime.configuration.RuntimeOverrideConfigSource; import io.smallrye.config.ConfigMappings.ConfigClassWithPrefix; import io.smallrye.config.ConfigSourceFactory; import io.smallrye.config.PropertiesLocationConfigSourceFactory; -import io.smallrye.config.SmallRyeConfig; public class ConfigGenerationBuildStep { @@ -238,7 +237,7 @@ public class ConfigGenerationBuildStep { public void watchConfigFiles(BuildProducer<HotDeploymentWatchedFileBuildItem> watchedFiles) { List<String> configWatchedFiles = new ArrayList<>(); - SmallRyeConfig config = (SmallRyeConfig) ConfigProvider.getConfig(); + Config config = ConfigProvider.getConfig(); String userDir = System.getProperty("user.dir"); // Main files

['core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.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/22816/20492

quarkusio

quarkus

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

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

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

Class PostgreSQL10Dialect not found on Quarkus in Google App Engine java11?

fixes

### Describe the bug I wanted to deploy my quarkus application including hibernate panache to GCP app engine standard and got the error: Class PostgreSQL10Dialect not found on Quarkus ### Expected behavior Successful startup of quarkus on GCP app engine standard ### Actual behavior I've set up my quarkus application regarding to https://quarkus.io/guides/deploying-to-google-cloud Created a Cloud SQL instance. And happily deployed the java11 app the first time to GAE. :-) But - on startup quarkus fails with this reason: ``` Caused by: java.lang.ClassNotFoundException: org.hibernate.dialect.PostgreSQL10Dialect at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:581) at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:178) at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522) at java.base/java.lang.Class.forName0(Native Method) at java.base/java.lang.Class.forName(Class.java:398) at io.quarkus.hibernate.orm.runtime.service.FlatClassLoaderService.classForName(FlatClassLoaderService.java:36) ``` Looking at the jar: ``` $ jar tvf foodie-1.0-SNAPSHOT-runner.jar | fgrep PostgreSQL10Dialect 1184 Tue Sep 28 20:12:07 CEST 2021 io/quarkus/hibernate/orm/runtime/dialect/QuarkusPostgreSQL10Dialect.class 990 Tue Sep 28 20:12:08 CEST 2021 org/hibernate/dialect/PostgreSQL10Dialect.class ``` Any hints how to proceed? application.properties: ``` quarkus.package.type=uber-jar quarkus.datasource.db-kind=other %dev.quarkus.datasource.jdbc.url=jdbc:postgresql:///quarkus quarkus.datasource.jdbc.url=jdbc:postgresql:///quarkus quarkus.datasource.jdbc.driver=org.postgresql.Driver quarkus.datasource.jdbc.additional-jdbc-properties.cloudSqlInstance=addlogic-foodiefnf-1:europe-west3:quarkus quarkus.datasource.jdbc.additional-jdbc-properties.socketFactory=com.google.cloud.sql.postgres.SocketFactory quarkus.hibernate-orm.dialect=org.hibernate.dialect.PostgreSQL10Dialect ``` Extract from pom.xml: ``` <maven.compiler.target>11</maven.compiler.target> <quarkus-plugin.version>2.2.3.Final</quarkus-plugin.version> <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> <quarkus.platform.version>2.2.3.Final</quarkus.platform.version> <postgres-socket-factory.version>1.3.3</postgres-socket-factory.version> [...] <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-jdbc-postgresql</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-hibernate-orm-panache</artifactId> </dependency> <dependency> <groupId>com.google.cloud.sql</groupId> <artifactId>postgres-socket-factory</artifactId> <version>${postgres-socket-factory.version}</version> </dependency> ``` Sidenote on deployment? ---------------------------- How to investigate this warning on ´mvn clean package appengine:deploy´? ``` [INFO] Staging the application to: D:\eclipse\eclipse-workspace\code-with-quarkus\target\appengine-staging [INFO] Detected App Engine app.yaml based application. Okt. 01, 2021 8:08:38 AM com.google.cloud.tools.appengine.operations.AppYamlProjectStaging copyArtifactJarClasspath WARNING: Could not copy 'Class-Path' jar: D:\eclipse\eclipse-workspace\code-with-quarkus\target referenced in MANIFEST.MF ``` Just a sidenote as deployment with `gcloud app deploy target/code-with-quarkus-1.0.0-SNAPSHOT-runner.jar` gives no WARNINFS and has same effects. Alternative with mysql is functioning ===================================== I've tried an alternative with mysql, which is functioning in the same MCVE and another testing project which I have set up. pom.xml ``` <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-jdbc-mysql</artifactId> </dependency> <dependency> <groupId>com.google.cloud.sql</groupId> <artifactId>mysql-socket-factory-connector-j-8</artifactId> <version>1.3.3</version> </dependency> ``` application.properties ``` # https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/blob/main/docs/jdbc-mysql.md quarkus.datasource.db-kind=other quarkus.datasource.jdbc.url=jdbc:mysql:///quarkus quarkus.datasource.jdbc.driver=com.mysql.cj.jdbc.Driver quarkus.datasource.username=root quarkus.datasource.password=quarkus quarkus.datasource.jdbc.additional-jdbc-properties.cloudSqlInstance=addlogic-foodiefnf-1:europe-west3:quarkusmysql quarkus.datasource.jdbc.additional-jdbc-properties.socketFactory=com.google.cloud.sql.mysql.SocketFactory quarkus.hibernate-orm.dialect=org.hibernate.dialect.MySQL8Dialect ``` ***So this makes me more curious why it is not working with PostgreSQL.*** ### How to Reproduce? An MCVE reproducer project can be found at `git@gitlab.com:addlogic/code-with-quarkus.git#` See README for reproduction steps. ### Output of `uname -a` or `ver` CYGWIN_NT-10.0 levante2b 3.2.0(0.340/5/3) 2021-03-29 08:42 x86_64 Cygwin ### Output of `java -version` $ java -version java version "11.0.11" 2021-04-20 LTS Java(TM) SE Runtime Environment 18.9 (build 11.0.11+9-LTS-194) Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.11+9-LTS-194, mixed mode) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.2.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) apache-maven-3.8.1 ### Additional information _No response_

376d631081852877d8781a20b4666e8220057360

bfabc1c06609c99115cb4dc78a73c96c6f3c2df9

https://github.com/quarkusio/quarkus/compare/376d631081852877d8781a20b4666e8220057360...bfabc1c06609c99115cb4dc78a73c96c6f3c2df9

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java index 33e03cd274b..cd1436fca8e 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java @@ -19,10 +19,20 @@ public class CharsetConverter implements Converter<Charset>, Serializable { @Override public Charset convert(String value) { + if (value == null) { + return null; + } + + String trimmedCharset = value.trim(); + + if (trimmedCharset.isEmpty()) { + return null; + } + try { - return Charset.forName(value); + return Charset.forName(trimmedCharset); } catch (Exception e) { - throw new IllegalArgumentException("Unable to create Charset from: '" + value + "'", e); + throw new IllegalArgumentException("Unable to create Charset from: '" + trimmedCharset + "'", e); } } } diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java index 4588db6b50e..f0f8eabbedf 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java @@ -10,8 +10,15 @@ public class TrimmedStringConverter implements Converter<String> { @Override public String convert(String s) { if (s == null) { - return s; + return null; } - return s.trim(); + + String trimmedString = s.trim(); + + if (trimmedString.isEmpty()) { + return null; + } + + return trimmedString; } } diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java index 2b9c324b2a2..6d5e3877ac7 100644 --- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java +++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java @@ -4,6 +4,8 @@ import java.util.Optional; import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConvertWith; +import io.quarkus.runtime.configuration.TrimmedStringConverter; @ConfigGroup public class DataSourceJdbcBuildTimeConfig { @@ -18,6 +20,7 @@ public class DataSourceJdbcBuildTimeConfig { * The datasource driver class name */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> driver = Optional.empty(); /** diff --git a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java index 82c9f351e8c..d22a84034e5 100644 --- a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java +++ b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java @@ -4,6 +4,8 @@ import java.util.Optional; import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConvertWith; +import io.quarkus.runtime.configuration.TrimmedStringConverter; @ConfigGroup public class DataSourceRuntimeConfig { @@ -24,6 +26,7 @@ public class DataSourceRuntimeConfig { * The credentials provider name */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> credentialsProvider = Optional.empty(); /** @@ -35,5 +38,6 @@ public class DataSourceRuntimeConfig { * For Vault it is: vault-credentials-provider. Not necessary if there is only one credentials provider available. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> credentialsProviderName = Optional.empty(); } diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java index b7e4ad913de..c0018f9e2ab 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java @@ -14,6 +14,8 @@ import org.hibernate.engine.query.spi.QueryPlanCache; import io.quarkus.runtime.annotations.ConfigDocSection; import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConvertWith; +import io.quarkus.runtime.configuration.TrimmedStringConverter; @ConfigGroup public class HibernateOrmConfigPersistenceUnit { @@ -23,11 +25,13 @@ public class HibernateOrmConfigPersistenceUnit { * <p> * If undefined, it will use the default datasource. */ + @ConvertWith(TrimmedStringConverter.class) public Optional<String> datasource; /** * The packages in which the entities affected to this persistence unit are located. */ + @ConvertWith(TrimmedStringConverter.class) public Optional<Set<String>> packages; /** @@ -71,6 +75,7 @@ public class HibernateOrmConfigPersistenceUnit { */ // @formatter:on @ConfigItem(defaultValueDocumentation = "import.sql in DEV, TEST ; no-file otherwise") + @ConvertWith(TrimmedStringConverter.class) public Optional<List<String>> sqlLoadScript; /** @@ -103,6 +108,7 @@ public class HibernateOrmConfigPersistenceUnit { * Class name of the Hibernate PhysicalNamingStrategy implementation */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> physicalNamingStrategy; /** @@ -111,6 +117,7 @@ public class HibernateOrmConfigPersistenceUnit { * Class name of the Hibernate ImplicitNamingStrategy implementation */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> implicitNamingStrategy; /** @@ -130,6 +137,7 @@ public class HibernateOrmConfigPersistenceUnit { * @asciidoclet */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> metadataBuilderContributor; /** @@ -139,6 +147,7 @@ public class HibernateOrmConfigPersistenceUnit { * Pass `no-file` to force Hibernate ORM to ignore `META-INF/orm.xml`. */ @ConfigItem(defaultValueDocumentation = "META-INF/orm.xml if it exists; no-file otherwise") + @ConvertWith(TrimmedStringConverter.class) public Optional<Set<String>> mappingFiles; /** @@ -201,6 +210,7 @@ public class HibernateOrmConfigPersistenceUnit { * @asciidoclet */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> multitenant; /** @@ -208,6 +218,7 @@ public class HibernateOrmConfigPersistenceUnit { * if not set. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> multitenantSchemaDatasource; /** @@ -259,6 +270,7 @@ public class HibernateOrmConfigPersistenceUnit { // TODO should it be dialects //TODO should it be shortcuts like "postgresql" "h2" etc @ConfigItem(name = ConfigItem.PARENT) + @ConvertWith(TrimmedStringConverter.class) public Optional<String> dialect; /** @@ -269,6 +281,7 @@ public class HibernateOrmConfigPersistenceUnit { * @asciidoclet */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> storageEngine; public boolean isAnyPropertySet() { @@ -342,6 +355,7 @@ public class HibernateOrmConfigPersistenceUnit { * The time zone pushed to the JDBC driver. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> timezone; /** diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java index b3676ba8270..98bb49330d9 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java @@ -5,6 +5,8 @@ import java.util.Optional; import io.quarkus.runtime.annotations.ConfigDocSection; import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConvertWith; +import io.quarkus.runtime.configuration.TrimmedStringConverter; @ConfigGroup public class HibernateOrmRuntimeConfigPersistenceUnit { @@ -49,12 +51,14 @@ public class HibernateOrmRuntimeConfigPersistenceUnit { * The default catalog to use for the database objects. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> defaultCatalog; /** * The default schema to use for the database objects. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> defaultSchema; public boolean isAnyPropertySet() { @@ -92,6 +96,7 @@ public class HibernateOrmRuntimeConfigPersistenceUnit { * Accepted values: `none`, `create`, `drop-and-create`, `drop`, `update`, `validate`. */ @ConfigItem(name = ConfigItem.PARENT, defaultValue = "none") + @ConvertWith(TrimmedStringConverter.class) public String generation = "none"; /** @@ -122,18 +127,21 @@ public class HibernateOrmRuntimeConfigPersistenceUnit { * Accepted values: `none`, `create`, `drop-and-create`, `drop`, `update`, `validate`. */ @ConfigItem(name = ConfigItem.PARENT, defaultValue = "none") + @ConvertWith(TrimmedStringConverter.class) public String generation = "none"; /** * Filename or URL where the database create DDL file should be generated. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> createTarget = Optional.empty(); /** * Filename or URL where the database drop DDL file should be generated. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> dropTarget = Optional.empty(); public boolean isAnyPropertySet() {

['extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java', 'extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java', 'core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java', 'extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java', 'core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java', 'extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java']

{'.java': 6}

Java

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

Apache License 2.0

quarkusio/quarkus/22850/22847

quarkusio

quarkus

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

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

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

RESTEasy Reactive: null fields in multipart responses cause NullPointerException

fix

### Describe the bug When trying to return a multipart response with null fields (see the code below), MultipartMessageBodyWriter throws a NullPointerException ### Expected behavior _No response_ ### Actual behavior ```java 2022-01-12 23:13:34,634 ERROR [io.qua.ver.htt.run.QuarkusErrorHandler] (executor-thread-0) HTTP Request to /give-me-file/empty failed, error id: d54b7825-d1ce-4881-a049-01b23da53ee4-1: java.lang.NullPointerException: Cannot invoke "Object.getClass()" because "entity" is null at org.jboss.resteasy.reactive.server.core.multipart.MultipartMessageBodyWriter.serialiseEntity(MultipartMessageBodyWriter.java:120) at org.jboss.resteasy.reactive.server.core.multipart.MultipartMessageBodyWriter.write(MultipartMessageBodyWriter.java:83) at org.jboss.resteasy.reactive.server.core.multipart.MultipartMessageBodyWriter.writeMultiformData(MultipartMessageBodyWriter.java:57) at org.jboss.resteasy.reactive.server.core.multipart.MultipartMessageBodyWriter.writeResponse(MultipartMessageBodyWriter.java:44) at org.jboss.resteasy.reactive.server.core.ServerSerialisers.invokeWriter(ServerSerialisers.java:207) at org.jboss.resteasy.reactive.server.core.ServerSerialisers.invokeWriter(ServerSerialisers.java:178) at org.jboss.resteasy.reactive.server.core.serialization.FixedEntityWriter.write(FixedEntityWriter.java:26) at org.jboss.resteasy.reactive.server.handlers.ResponseWriterHandler.handle(ResponseWriterHandler.java:32) at org.jboss.resteasy.reactive.server.handlers.ResponseWriterHandler.handle(ResponseWriterHandler.java:15) at org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext.run(AbstractResteasyReactiveContext.java:141) 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(Thread.java:833) ``` ### How to Reproduce? ```java @Path("/give-me-file") public static class Resource { @GET @Produces(MediaType.MULTIPART_FORM_DATA) @Path("/empty") public MultipartData getEmptyData() { return new MultipartData(null, null, null); } } public static class MultipartData { @RestForm @PartType(MediaType.TEXT_PLAIN) public String name; @RestForm @PartType(MediaType.APPLICATION_OCTET_STREAM) public File file; @RestForm @PartType(MediaType.APPLICATION_JSON) public Panda panda; public MultipartData() { } public MultipartData(String name, File file, Panda panda) { this.name = name; this.file = file; this.panda = panda; } } public static class Panda { public String weight; public String height; public String mood; public Panda() { } public Panda(String weight, String height, String mood) { this.weight = weight; this.height = height; this.mood = mood; } } ``` ### Output of `uname -a` or `ver` Linux ryzen 5.15.12-200.fc35.x86_64 #1 SMP Wed Dec 29 15:03:38 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "17.0.1" 2021-10-19 OpenJDK Runtime Environment Temurin-17.0.1+12 (build 17.0.1+12) OpenJDK 64-Bit Server VM Temurin-17.0.1+12 (build 17.0.1+12, mixed mode, sharing) ### GraalVM version (if different from Java) n/a ### Quarkus version or git rev main ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.3 (ff8e977a158738155dc465c6a97ffaf31982d739) Maven home: /home/michal/.sdkman/candidates/maven/current Java version: 17.0.1, vendor: Eclipse Adoptium, runtime: /home/michal/.sdkman/candidates/java/17.0.1-tem Default locale: pl_PL, platform encoding: UTF-8 OS name: "linux", version: "5.15.12-200.fc35.x86_64", arch: "amd64", family: "unix" ### Additional information _No response_

a02661469ef1764127e74e7e5f10847e279e19c9

d3e3ad5c3668f3652ff2748989c1796514941244

https://github.com/quarkusio/quarkus/compare/a02661469ef1764127e74e7e5f10847e279e19c9...d3e3ad5c3668f3652ff2748989c1796514941244

diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResource.java index 8f5cfcb2006..9288930b311 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResource.java @@ -49,4 +49,14 @@ public class MultipartOutputResource { return response; } + @GET + @Path("/with-null-fields") + @Produces(MediaType.MULTIPART_FORM_DATA) + public MultipartOutputFileResponse nullFields() { + MultipartOutputFileResponse response = new MultipartOutputFileResponse(); + response.name = null; + response.file = null; + return response; + } + } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java index b1333f243d2..b33a1cd1a7c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java @@ -67,6 +67,17 @@ public class MultipartOutputUsingBlockingEndpointsTest extends AbstractMultipart assertContainsFile(response, "file", MediaType.APPLICATION_OCTET_STREAM, "lorem.txt"); } + @Test + public void testWithNullFields() { + RestAssured + .given() + .get("/multipart/output/with-null-fields") + .then() + .contentType(ContentType.MULTIPART) + .log().all() + .statusCode(200); // should return 200 with no parts + } + private void assertContainsFile(String response, String name, String contentType, String fileName) { String[] lines = response.split("--"); assertThat(lines).anyMatch(line -> line.contains(String.format(EXPECTED_CONTENT_DISPOSITION_FILE_PART, name, fileName)) diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java index efcfcc83eed..b836994dc4d 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java @@ -69,20 +69,22 @@ public class MultipartMessageBodyWriter extends ServerMessageBodyWriter.AllWrite Charset charset = requestContext.getDeployment().getRuntimeConfiguration().body().defaultCharset(); String boundaryLine = "--" + boundary; for (PartItem part : parts) { - // write boundary: --... - writeLine(outputStream, boundaryLine, charset); - // write content disposition header - writeLine(outputStream, HttpHeaders.CONTENT_DISPOSITION + ": form-data; name=\"" + part.getName() + "\"" - + getFileNameIfFile(part.getValue()), charset); - // write content content type - writeLine(outputStream, HttpHeaders.CONTENT_TYPE + ": " + part.getType(), charset); - // extra line - writeLine(outputStream, charset); - - // write content - write(outputStream, serialiseEntity(part.getValue(), part.getType(), requestContext)); - // extra line - writeLine(outputStream, charset); + if (part.getValue() != null) { + // write boundary: --... + writeLine(outputStream, boundaryLine, charset); + // write content disposition header + writeLine(outputStream, HttpHeaders.CONTENT_DISPOSITION + ": form-data; name=\"" + part.getName() + "\"" + + getFileNameIfFile(part.getValue()), charset); + // write content content type + writeLine(outputStream, HttpHeaders.CONTENT_TYPE + ": " + part.getType(), charset); + // extra line + writeLine(outputStream, charset); + + // write content + write(outputStream, serialiseEntity(part.getValue(), part.getType(), requestContext)); + // extra line + writeLine(outputStream, charset); + } } // write boundary: -- ... --

['extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java', 'extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResource.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.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/22879/22507

quarkusio

quarkus

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

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

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

Qute: "No template found for path ..." only in Eclipse IDE

close

### Describe the bug When I run a Quarkus app from within Eclipse, I get an io.quarkus.qute.TemplateException that the specified template can not be found. On the other hand, if I run `./gradlew quarkusDev` from the command line, it works perfectly. Also when I build the app and then run the compiled quarkus-app.jar ### Expected behavior Quarkus (or Eclipse) should find the existing template in `src/main/resources/templates`. ### Actual behavior A "io.quarkus.qute.TemplateException: No template found for path ..." exception is thrown. ### How to Reproduce? I created a minimal project here https://github.com/mailq/qutebug Run it as Java Application from within the Eclipse IDE (2021-12) and experience the exception. Run it with `./gradlew quarkusDev` at the command prompt and you get the correct output from the rendered template. ### Output of `uname -a` or `ver` Linux desktop 5.11.0-41-generic #45-Ubuntu SMP Fri Nov 5 11:37:01 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "17.0.1" 2021-10-19 OpenJDK Runtime Environment (build 17.0.1+12-Ubuntu-121.04) OpenJDK 64-Bit Server VM (build 17.0.1+12-Ubuntu-121.04, mixed mode, sharing) ### GraalVM version (if different from Java) none ### Quarkus version or git rev 2.6.0-Final, wasn't also working with 2.5 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.3.2 (wrapper) ### Additional information Eclipse IDE for Enterprise Java and Web Developers (includes Incubating components) Version: 2021-12 (4.22.0) Build id: 20211202-1639

43a9ef753db6e9c167b79f7cd7deb482097a0734

4602c59fe031bc354358a274c59aa4bf43b45857

https://github.com/quarkusio/quarkus/compare/43a9ef753db6e9c167b79f7cd7deb482097a0734...4602c59fe031bc354358a274c59aa4bf43b45857

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java index 3f90687f610..b0390e2bc91 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java @@ -4,6 +4,7 @@ import io.quarkus.bootstrap.app.AdditionalDependency; import io.quarkus.bootstrap.app.CuratedApplication; import io.quarkus.bootstrap.app.QuarkusBootstrap; import io.quarkus.bootstrap.model.ApplicationModel; +import io.quarkus.bootstrap.model.PathsCollection; import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import io.quarkus.bootstrap.util.BootstrapUtils; @@ -15,6 +16,8 @@ import io.quarkus.maven.dependency.ResolvedDependency; import java.io.Closeable; import java.io.IOException; import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; import java.util.Map; /** @@ -45,12 +48,20 @@ public class IDELauncherImpl implements Closeable { final ApplicationModel quarkusModel = BuildToolHelper.enableGradleAppModelForDevMode(classesDir); context.put(BootstrapConstants.SERIALIZED_APP_MODEL, BootstrapUtils.serializeAppModel(quarkusModel, false)); - final Path launchingModulePath = quarkusModel.getApplicationModule().getMainSources().getSourceDirs().iterator() + ArtifactSources mainSources = quarkusModel.getApplicationModule().getMainSources(); + + final Path launchingModulePath = mainSources.getSourceDirs().iterator() .next().getOutputDir(); + List<Path> applicationRoots = new ArrayList<>(); + applicationRoots.add(launchingModulePath); + for (SourceDir resourceDir : mainSources.getResourceDirs()) { + applicationRoots.add(resourceDir.getOutputDir()); + } + // Gradle uses a different output directory for classes, we override the one used by the IDE builder.setProjectRoot(launchingModulePath) - .setApplicationRoot(launchingModulePath) + .setApplicationRoot(PathsCollection.from(applicationRoots)) .setTargetDirectory(quarkusModel.getApplicationModule().getBuildDir().toPath()); for (ResolvedDependency dep : quarkusModel.getDependencies()) {

['independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.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/22917/22911

quarkusio

quarkus

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

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

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

CLI cannot remove registry from the list

resolves

### Describe the bug Registries added to cli cannot be removed ### Expected behavior Attempts to remove registries from config should be successfull ### Actual behavior Attempt to remove a registry from the list leads to error `Can only remove registries from an existing configuration. The specified config file does not exist: null` ### How to Reproduce? 1. `quarkus registry add quarkus.example.com` 2. Check the list: ``` $ quarkus registry Configured Quarkus extension registries: registry.quarkus.io quarkus.example.com (Config source: file: ~/.quarkus/config.yaml) ``` 2. `$ quarkus registry remove quarkus.example.com` ### Output of `uname -a` or `ver` OS name: "linux", version: "5.15.6-100.fc34.x86_64" ### Output of `java -version` 11.0.13, vendor: Eclipse Adoptium ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

0ab516441721f5b4eab72acabf2afd3817d84326

1827376df1afc4d543ace1a12673bab00219d892

https://github.com/quarkusio/quarkus/compare/0ab516441721f5b4eab72acabf2afd3817d84326...1827376df1afc4d543ace1a12673bab00219d892

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java b/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java index 7ce770d8546..284b57a0c63 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java @@ -7,6 +7,7 @@ import java.util.List; import io.quarkus.cli.registry.BaseRegistryCommand; import io.quarkus.registry.config.RegistriesConfig; +import io.quarkus.registry.config.RegistryConfig; import picocli.CommandLine; @CommandLine.Command(name = "add", sortOptions = false, showDefaultValues = true, mixinStandardHelpOptions = false, header = "Add a Quarkus extension registry", description = "%n" @@ -30,7 +31,6 @@ public class RegistryAddCommand extends BaseRegistryCommand { existingConfig = Files.exists(configYaml); } - registryClient.refreshRegistryCache(output); final RegistriesConfig.Mutable config; if (configYaml != null && !existingConfig) { // we're creating a new configuration for a new file @@ -38,6 +38,7 @@ public class RegistryAddCommand extends BaseRegistryCommand { } else { config = registryClient.resolveConfig().mutable(); } + registryClient.refreshRegistryCache(output); boolean persist = false; for (String registryId : registryIds) { @@ -45,6 +46,10 @@ public class RegistryAddCommand extends BaseRegistryCommand { } if (persist) { + output.printText("Configured registries:"); + for (RegistryConfig rc : config.getRegistries()) { + output.printText("- " + rc.getId()); + } if (configYaml != null) { config.persist(configYaml); } else { diff --git a/devtools/cli/src/main/java/io/quarkus/cli/RegistryRemoveCommand.java b/devtools/cli/src/main/java/io/quarkus/cli/RegistryRemoveCommand.java index 27b27916167..b98aa196299 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/RegistryRemoveCommand.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/RegistryRemoveCommand.java @@ -7,6 +7,7 @@ import java.util.List; import io.quarkus.cli.registry.BaseRegistryCommand; import io.quarkus.registry.config.RegistriesConfig; +import io.quarkus.registry.config.RegistryConfig; import picocli.CommandLine; @CommandLine.Command(name = "remove", sortOptions = false, showDefaultValues = true, mixinStandardHelpOptions = false, header = "Remove a Quarkus extension registry", description = "%n" @@ -31,18 +32,13 @@ public class RegistryRemoveCommand extends BaseRegistryCommand { } final RegistriesConfig.Mutable config; - if (existingConfig) { - registryClient.refreshRegistryCache(output); - config = registryClient.resolveConfig().mutable(); - if (config.getSource().getFilePath() == null) { - output.error("Can only modify file-based configuration. Config source is " + config.getSource().describe()); - return CommandLine.ExitCode.SOFTWARE; - } + if (configYaml != null && !existingConfig) { + // we're creating a new configuration for a new file + config = RegistriesConfig.builder(); } else { - output.error("Can only remove registries from an existing configuration. The specified config file does not exist: " - + configYaml); - return CommandLine.ExitCode.SOFTWARE; + config = registryClient.resolveConfig().mutable(); } + registryClient.refreshRegistryCache(output); boolean persist = false; for (String registryId : registryIds) { @@ -50,7 +46,15 @@ public class RegistryRemoveCommand extends BaseRegistryCommand { } if (persist) { - config.persist(); + output.printText("Configured registries:"); + for (RegistryConfig rc : config.getRegistries()) { + output.printText("- " + rc.getId()); + } + if (configYaml != null) { + config.persist(configYaml); + } else { + config.persist(); + } } return CommandLine.ExitCode.OK; } diff --git a/devtools/cli/src/main/java/io/quarkus/cli/common/OutputOptionMixin.java b/devtools/cli/src/main/java/io/quarkus/cli/common/OutputOptionMixin.java index 402dcc83643..27047474844 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/common/OutputOptionMixin.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/common/OutputOptionMixin.java @@ -12,7 +12,6 @@ import io.quarkus.devtools.messagewriter.MessageWriter; import picocli.CommandLine; import picocli.CommandLine.Help.ColorScheme; import picocli.CommandLine.Model.CommandSpec; -import picocli.CommandLine.Spec; public class OutputOptionMixin implements MessageWriter { @@ -83,7 +82,7 @@ public class OutputOptionMixin implements MessageWriter { return CommandLine.Help.Ansi.AUTO.enabled(); } - public void printText(String[] text) { + public void printText(String... text) { for (String line : text) { out().println(colorScheme().ansi().new Text(line, colorScheme())); }

['devtools/cli/src/main/java/io/quarkus/cli/common/OutputOptionMixin.java', 'devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java', 'devtools/cli/src/main/java/io/quarkus/cli/RegistryRemoveCommand.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/22928/21250

quarkusio

quarkus

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

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

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

AnnotationRegisteredProvidersImplementation are in unnamed module of loader 'app'

fixes

### Describe the bug Running this with `jbang TodosAdd.java inbox` ``` ///usr/bin/env jbang "$0" "$@" ; exit $? // Update the Quarkus version to what you want here or run jbang with // `-Dquarkus.version=<version>` to override it. //DEPS io.quarkus:quarkus-bom:${quarkus.version:2.6.0.Final}@pom //DEPS io.quarkus:quarkus-picocli //DEPS io.quarkus:quarkus-rest-client-reactive-jackson //Q:CONFIG quarkus.banner.enabled=false //Q:CONFIG quarkus.log.level=ALL //Q:CONFIG quarkus.rest-client.DayCaptain.url=https://daycaptain.com/ //JAVAC_OPTIONS -parameters import static java.lang.String.format; import static java.lang.System.out; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.Date; import javax.ws.rs.GET; import javax.ws.rs.HeaderParam; import javax.ws.rs.NameBinding; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.ext.Provider; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; @CommandLine.Command(name = "todos-add", mixinStandardHelpOptions = true) public class TodosAdd { @RestClient DayCaptain captain; @Command(description = "Add the task to the backlog inbox") int inbox(@Parameters() String task) { out.println(format("Adding '%s' to DayCaptain inbox: ", task)); captain.addToBacklog("Bearer token", task); return 0; }; } @RegisterRestClient @RegisterProvider(LoggingFilter.class) interface DayCaptain { @POST @Path("/backlog-items") void addToBacklog(@HeaderParam("Authorization") String auth,String string); } class LoggingFilter implements ContainerRequestFilter { @Override public void filter(ContainerRequestContext requestContext) throws IOException { // TODO Auto-generated method stub } } ``` fails to find and register the LoggingFilter and the output mesage/error isn't helping... ### Expected behavior log the filter or have error message that gives hint on what possible solution are. ### Actual behavior ``` Exception in thread "main" java.lang.IllegalAccessError: failed to access class LoggingFilter from class io.quarkus.rest.client.reactive.runtime.AnnotationRegisteredProvidersImplementation (LoggingFilter and io.quarkus.rest.client.reactive.runtime.AnnotationRegisteredProvidersImplementation are in unnamed module of loader 'app') at io.quarkus.rest.client.reactive.runtime.AnnotationRegisteredProvidersImplementation.<init>(AnnotationRegisteredProvidersImplementation.zig:24) at io.quarkus.rest.client.reactive.runtime.AnnotationRegisteredProvidersImplementation_Bean.create(AnnotationRegisteredProvidersImplementation_Bean.zig:107) at io.quarkus.rest.client.reactive.runtime.AnnotationRegisteredProvidersImplementation_Bean.create(AnnotationRegisteredProvidersImplementation_Bean.zig:122) at io.quarkus.arc.impl.AbstractSharedContext.createInstanceHandle(AbstractSharedContext.java:96) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:29) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:26) 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:26) at io.quarkus.rest.client.reactive.runtime.AnnotationRegisteredProvidersImplementation_Bean.get(AnnotationRegisteredProvidersImplementation_Bean.zig:154) at io.quarkus.rest.client.reactive.runtime.AnnotationRegisteredProvidersImplementation_Bean.get(AnnotationRegisteredProvidersImplementation_Bean.zig:170) at io.quarkus.arc.impl.ArcContainerImpl.beanInstanceHandle(ArcContainerImpl.java:440) at io.quarkus.arc.impl.ArcContainerImpl.beanInstanceHandle(ArcContainerImpl.java:453) at io.quarkus.arc.impl.ArcContainerImpl.instanceHandle(ArcContainerImpl.java:423) at io.quarkus.arc.impl.ArcContainerImpl.instance(ArcContainerImpl.java:232) at io.quarkus.rest.client.reactive.runtime.RestClientBuilderImpl.build(RestClientBuilderImpl.java:253) at io.quarkus.rest.client.reactive.runtime.RestClientCDIDelegateBuilder.build(RestClientCDIDelegateBuilder.java:71) at io.quarkus.rest.client.reactive.runtime.RestClientCDIDelegateBuilder.build(RestClientCDIDelegateBuilder.java:59) at io.quarkus.rest.client.reactive.runtime.RestClientCDIDelegateBuilder.createDelegate(RestClientCDIDelegateBuilder.java:42) at io.quarkus.rest.client.reactive.runtime.RestClientReactiveCDIWrapperBase.<init>(RestClientReactiveCDIWrapperBase.java:16) at DayCaptain$$CDIWrapper.<init>(DayCaptain$$CDIWrapper.zig:21) at DayCaptain$$CDIWrapper_ClientProxy.<init>(DayCaptain$$CDIWrapper_ClientProxy.zig:24) at DayCaptain$$CDIWrapper_Bean.proxy(DayCaptain$$CDIWrapper_Bean.zig:40) at DayCaptain$$CDIWrapper_Bean.get(DayCaptain$$CDIWrapper_Bean.zig:229) at DayCaptain$$CDIWrapper_Bean.get(DayCaptain$$CDIWrapper_Bean.zig:245) at TodosAdd_Bean.create(TodosAdd_Bean.zig:154) at TodosAdd_Bean.get(TodosAdd_Bean.zig:209) at TodosAdd_Bean.get(TodosAdd_Bean.zig:244) at io.quarkus.arc.impl.InstanceImpl.getBeanInstance(InstanceImpl.java:210) at io.quarkus.arc.impl.InstanceImpl.getInternal(InstanceImpl.java:196) at io.quarkus.arc.impl.InstanceImpl.get(InstanceImpl.java:93) at io.quarkus.picocli.runtime.DefaultPicocliCommandLineFactory.create(DefaultPicocliCommandLineFactory.java:43) at io.quarkus.picocli.runtime.DefaultPicocliCommandLineFactory_ClientProxy.create(DefaultPicocliCommandLineFactory_ClientProxy.zig:155) at io.quarkus.picocli.runtime.PicocliCommandLineProducer.picocliCommandLine(PicocliCommandLineProducer.java:23) at io.quarkus.picocli.runtime.PicocliCommandLineProducer_ProducerMethod_picocliCommandLine_9215511af8bf79a5b9761758f9829960bca3fec0_Bean.create(PicocliCommandLineProducer_ProducerMethod_picocliCommandLine_9215511af8bf79a5b9761758f9829960bca3fec0_Bean.zig:154) at io.quarkus.picocli.runtime.PicocliCommandLineProducer_ProducerMethod_picocliCommandLine_9215511af8bf79a5b9761758f9829960bca3fec0_Bean.get(PicocliCommandLineProducer_ProducerMethod_picocliCommandLine_9215511af8bf79a5b9761758f9829960bca3fec0_Bean.zig:184) at io.quarkus.picocli.runtime.PicocliCommandLineProducer_ProducerMethod_picocliCommandLine_9215511af8bf79a5b9761758f9829960bca3fec0_Bean.get(PicocliCommandLineProducer_ProducerMethod_picocliCommandLine_9215511af8bf79a5b9761758f9829960bca3fec0_Bean.zig:219) at io.quarkus.picocli.runtime.PicocliRunner_Bean.create(PicocliRunner_Bean.zig:203) at io.quarkus.picocli.runtime.PicocliRunner_Bean.get(PicocliRunner_Bean.zig:261) at io.quarkus.picocli.runtime.PicocliRunner_Bean.get(PicocliRunner_Bean.zig:296) at io.quarkus.arc.impl.ArcContainerImpl.beanInstanceHandle(ArcContainerImpl.java:440) at io.quarkus.arc.impl.ArcContainerImpl.beanInstanceHandle(ArcContainerImpl.java:453) at io.quarkus.arc.impl.BeanManagerImpl.getReference(BeanManagerImpl.java:59) at io.quarkus.runtime.ApplicationLifecycleManager.run(ApplicationLifecycleManager.java:123) at io.quarkus.runtime.Quarkus.run(Quarkus.java:67) at io.quarkus.runtime.Quarkus.run(Quarkus.java:41) at io.quarkus.runner.GeneratedMain.main(GeneratedMain.zig:30) ``` ### 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_

8e6518f20782a318f070e1fc754160eb9b39903b

d6e95a72ed9dffe4fcc578286785b12bdd880900

https://github.com/quarkusio/quarkus/compare/8e6518f20782a318f070e1fc754160eb9b39903b...d6e95a72ed9dffe4fcc578286785b12bdd880900

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java index bbc4440da68..9afb121558e 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java @@ -648,7 +648,7 @@ public final class RunTimeConfigurationGenerator { FieldDescriptor fd = convertersByType.get(type); if (fd == null) { // it's an unknown - final ResultHandle clazzHandle = converterSetup.loadClass(additionalType); + final ResultHandle clazzHandle = converterSetup.loadClassFromTCCL(additionalType); fd = FieldDescriptor.of(cc.getClassName(), "conv$" + converterIndex++, Converter.class); ResultHandle converter = converterSetup.invokeVirtualMethod(SRC_GET_CONVERTER, clinitConfig, clazzHandle); cc.getFieldCreator(fd).setModifiers(Opcodes.ACC_STATIC | Opcodes.ACC_FINAL); @@ -664,10 +664,10 @@ public final class RunTimeConfigurationGenerator { final Class<?> type = entry.getValue(); if (bootstrapConfigSetupNeeded()) { readBootstrapConfig.invokeVirtualMethod(SRCB_WITH_CONVERTER, bootstrapBuilder, - readBootstrapConfig.loadClass(type), + readBootstrapConfig.loadClassFromTCCL(type), readBootstrapConfig.load(100), readBootstrapConfig.readStaticField(descriptor)); } - readConfig.invokeVirtualMethod(SRCB_WITH_CONVERTER, runTimeBuilder, readConfig.loadClass(type), + readConfig.invokeVirtualMethod(SRCB_WITH_CONVERTER, runTimeBuilder, readConfig.loadClassFromTCCL(type), readConfig.load(100), readConfig.readStaticField(descriptor)); } } @@ -1596,12 +1596,12 @@ public final class RunTimeConfigurationGenerator { // TODO: temporary until type param inference is in if (convertWith == HyphenateEnumConverter.class.asSubclass(Converter.class)) { converter = converterSetup.newInstance(MethodDescriptor.ofConstructor(convertWith, Class.class), - converterSetup.loadClass(type.getLeafType())); + converterSetup.loadClassFromTCCL(type.getLeafType())); } else { converter = converterSetup.newInstance(MethodDescriptor.ofConstructor(convertWith)); } } else { - final ResultHandle clazzHandle = converterSetup.loadClass(leaf.getLeafType()); + final ResultHandle clazzHandle = converterSetup.loadClassFromTCCL(leaf.getLeafType()); converter = converterSetup.invokeVirtualMethod(SRC_GET_CONVERTER, clinitConfig, clazzHandle); storeConverter = true; } @@ -1610,7 +1610,7 @@ public final class RunTimeConfigurationGenerator { final ResultHandle nestedConv = instanceCache .get(getOrCreateConverterInstance(field, arrayOf.getElementType())); converter = converterSetup.invokeStaticMethod(CONVS_NEW_ARRAY_CONVERTER, nestedConv, - converterSetup.loadClass(arrayOf.getArrayType())); + converterSetup.loadClassFromTCCL(arrayOf.getArrayType())); } else if (type instanceof CollectionOf) { final CollectionOf collectionOf = (CollectionOf) type; final ResultHandle nestedConv = instanceCache diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java index aad00181672..6576169a626 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java @@ -472,7 +472,8 @@ public class RuntimeUpdatesProcessor implements HotReplacementContext, Closeable for (Path i : changedClassResults.changedClasses) { byte[] bytes = Files.readAllBytes(i); String name = indexer.index(new ByteArrayInputStream(bytes)).name().toString(); - defs[index++] = new ClassDefinition(Thread.currentThread().getContextClassLoader().loadClass(name), + defs[index++] = new ClassDefinition( + Thread.currentThread().getContextClassLoader().loadClass(name), classTransformers.apply(name, bytes)); } Index current = indexer.complete(); diff --git a/core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java b/core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java index 54a5125d951..db67bdaed9e 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java @@ -220,14 +220,14 @@ public class ProxyFactory<T> { if (methodInfo.getParameterCount() > 0) { Parameter[] methodInfoParameters = methodInfo.getParameters(); for (int i = 0; i < methodInfo.getParameterCount(); i++) { - ResultHandle paramClass = mc.loadClass(methodInfoParameters[i].getType()); + ResultHandle paramClass = mc.loadClassFromTCCL(methodInfoParameters[i].getType()); mc.writeArrayValue(getDeclaredMethodParamsArray, i, paramClass); } } ResultHandle method = mc.invokeVirtualMethod( MethodDescriptor.ofMethod(Class.class, "getDeclaredMethod", Method.class, String.class, Class[].class), - mc.loadClass(methodInfo.getDeclaringClass()), mc.load(methodInfo.getName()), + mc.loadClassFromTCCL(methodInfo.getDeclaringClass()), mc.load(methodInfo.getName()), getDeclaredMethodParamsArray); // result = invocationHandler.invoke(...) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java index 02b65f5e4ff..0cfef746ae1 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java @@ -789,7 +789,7 @@ public class BytecodeRecorderImpl implements RecorderContext { return new DeferredParameter() { @Override ResultHandle doLoad(MethodContext context, MethodCreator method, ResultHandle array) { - return method.loadClass((Class) param); + return method.loadClassFromTCCL((Class) param); } }; } @@ -1766,7 +1766,7 @@ public class BytecodeRecorderImpl implements RecorderContext { retValue = valueMethod.load(value.asChar()); break; case CLASS: - retValue = valueMethod.loadClass(value.asClass().toString()); + retValue = valueMethod.loadClassFromTCCL(value.asClass().toString()); break; case ARRAY: retValue = arrayValue(value, valueMethod, method, annotationClass); @@ -1793,7 +1793,7 @@ public class BytecodeRecorderImpl implements RecorderContext { Type[] classArray = value.asClassArray(); retValue = valueMethod.newArray(componentType(method), valueMethod.load(classArray.length)); for (int i = 0; i < classArray.length; i++) { - valueMethod.writeArrayValue(retValue, i, valueMethod.loadClass(classArray[i].name().toString())); + valueMethod.writeArrayValue(retValue, i, valueMethod.loadClassFromTCCL(classArray[i].name().toString())); } break; case STRING: diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java index 8483cf713e1..162ff3880dc 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java @@ -414,7 +414,7 @@ public class MainClassBuildStep { MethodCreator mv = file.getMethodCreator("main", void.class, String[].class); mv.setModifiers(Modifier.PUBLIC | Modifier.STATIC); mv.invokeStaticMethod(MethodDescriptor.ofMethod(Quarkus.class, "run", void.class, Class.class, String[].class), - mv.loadClass(quarkusApplicationClassName), + mv.loadClassFromTCCL(quarkusApplicationClassName), mv.getMethodParam(0)); mv.returnValue(null); file.close(); diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java index 40263647a89..9e7a72807f6 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java @@ -56,7 +56,7 @@ import io.quarkus.runtime.graal.WeakReflection; public class NativeImageAutoFeatureStep { - private static final String GRAAL_AUTOFEATURE = "io/quarkus/runner/AutoFeature"; + private static final String GRAAL_AUTOFEATURE = "io.quarkus.runner.AutoFeature"; private static final MethodDescriptor VERSION_CURRENT = ofMethod(Version.class, "getCurrent", Version.class); private static final MethodDescriptor VERSION_COMPARE_TO = ofMethod(Version.class, "compareTo", int.class, int[].class); @@ -152,14 +152,14 @@ public class NativeImageAutoFeatureStep { } ResultHandle imageSingleton = overallCatch.invokeStaticMethod(IMAGE_SINGLETONS_LOOKUP, - overallCatch.loadClass("org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport")); + overallCatch.loadClassFromTCCL("org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport")); overallCatch.invokeInterfaceMethod(BUILD_TIME_INITIALIZATION, imageSingleton, overallCatch.load(""), // empty string means everything overallCatch.load("Quarkus build time init default")); if (!runtimeInitializedClassBuildItems.isEmpty()) { - ResultHandle thisClass = overallCatch.loadClass(GRAAL_AUTOFEATURE); + ResultHandle thisClass = overallCatch.loadClassFromTCCL(GRAAL_AUTOFEATURE); ResultHandle cl = overallCatch.invokeVirtualMethod(ofMethod(Class.class, "getClassLoader", ClassLoader.class), thisClass); ResultHandle classes = overallCatch.newArray(Class.class, @@ -191,7 +191,7 @@ public class NativeImageAutoFeatureStep { // hack in reinitialization of process info classes if (!runtimeReinitializedClassBuildItems.isEmpty()) { - ResultHandle thisClass = overallCatch.loadClass(GRAAL_AUTOFEATURE); + ResultHandle thisClass = overallCatch.loadClassFromTCCL(GRAAL_AUTOFEATURE); ResultHandle cl = overallCatch.invokeVirtualMethod(ofMethod(Class.class, "getClassLoader", ClassLoader.class), thisClass); ResultHandle quarkus = overallCatch.load("Quarkus"); @@ -208,7 +208,7 @@ public class NativeImageAutoFeatureStep { } if (!proxies.isEmpty()) { - ResultHandle proxySupportClass = overallCatch.loadClass(DYNAMIC_PROXY_REGISTRY); + ResultHandle proxySupportClass = overallCatch.loadClassFromTCCL(DYNAMIC_PROXY_REGISTRY); ResultHandle proxySupport = overallCatch.invokeStaticMethod( IMAGE_SINGLETONS_LOOKUP, proxySupportClass); @@ -229,7 +229,7 @@ public class NativeImageAutoFeatureStep { /* Resource includes and excludes */ if (!resourcePatterns.isEmpty()) { ResultHandle resourcesRegistrySingleton = overallCatch.invokeStaticMethod(IMAGE_SINGLETONS_LOOKUP, - overallCatch.loadClass("com.oracle.svm.core.configure.ResourcesRegistry")); + overallCatch.loadClassFromTCCL("com.oracle.svm.core.configure.ResourcesRegistry")); TryBlock tc = overallCatch.tryBlock(); ResultHandle currentThread = tc.invokeStaticMethod(ofMethod(Thread.class, "currentThread", Thread.class)); @@ -250,7 +250,7 @@ public class NativeImageAutoFeatureStep { greaterThan21_2.load("org.graalvm.nativeimage.impl.ConfigurationCondition"), greaterThan21_2.load(false), tccl); greaterThan21_2.writeArrayValue(argTypes, 0, configurationConditionClass); - greaterThan21_2.writeArrayValue(argTypes, 1, greaterThan21_2.loadClass(String.class)); + greaterThan21_2.writeArrayValue(argTypes, 1, greaterThan21_2.loadClassFromTCCL(String.class)); greaterThan21_2.assign(resourcesArgTypes, argTypes); ResultHandle args = greaterThan21_2.newArray(Object.class, greaterThan21_2.load(2)); ResultHandle alwaysTrueMethod = greaterThan21_2.invokeStaticMethod(LOOKUP_METHOD, @@ -267,17 +267,17 @@ public class NativeImageAutoFeatureStep { /* GraalVM < 21.3 */ BytecodeCreator smallerThan21_3 = graalVm21_3Test.falseBranch(); argTypes = smallerThan21_3.newArray(Class.class, smallerThan21_3.load(1)); - smallerThan21_3.writeArrayValue(argTypes, 0, smallerThan21_3.loadClass(String.class)); + smallerThan21_3.writeArrayValue(argTypes, 0, smallerThan21_3.loadClassFromTCCL(String.class)); smallerThan21_3.assign(resourcesArgTypes, argTypes); args = smallerThan21_3.newArray(Object.class, smallerThan21_3.load(1)); smallerThan21_3.assign(resourcesArgs, args); smallerThan21_3.assign(argsIndex, smallerThan21_3.load(0)); ResultHandle ignoreResourcesMethod = tc.invokeStaticMethod(LOOKUP_METHOD, - tc.loadClass("com.oracle.svm.core.configure.ResourcesRegistry"), + tc.loadClassFromTCCL("com.oracle.svm.core.configure.ResourcesRegistry"), tc.load("ignoreResources"), resourcesArgTypes); ResultHandle addResourcesMethod = tc.invokeStaticMethod(LOOKUP_METHOD, - tc.loadClass("com.oracle.svm.core.configure.ResourcesRegistry"), + tc.loadClassFromTCCL("com.oracle.svm.core.configure.ResourcesRegistry"), tc.load("addResources"), resourcesArgTypes); for (NativeImageResourcePatternsBuildItem resourcePatternsItem : resourcePatterns) { @@ -303,20 +303,20 @@ public class NativeImageAutoFeatureStep { AssignableResultHandle registerMethod = overallCatch.createVariable(Method.class); AssignableResultHandle locClass = overallCatch.createVariable(Class.class); TryBlock locTryBlock = overallCatch.tryBlock(); - ResultHandle legacyLocClass = locTryBlock.loadClass(LEGACY_LOCALIZATION_FEATURE); + ResultHandle legacyLocClass = locTryBlock.loadClassFromTCCL(LEGACY_LOCALIZATION_FEATURE); locTryBlock.assign(locClass, legacyLocClass); - ResultHandle legacyParams = locTryBlock.marshalAsArray(Class.class, locTryBlock.loadClass(String.class)); + ResultHandle legacyParams = locTryBlock.marshalAsArray(Class.class, locTryBlock.loadClassFromTCCL(String.class)); ResultHandle legacyRegisterMethod = locTryBlock.invokeVirtualMethod( ofMethod(Class.class, "getDeclaredMethod", Method.class, String.class, Class[].class), legacyLocClass, locTryBlock.load("addBundleToCache"), legacyParams); locTryBlock.assign(registerMethod, legacyRegisterMethod); - CatchBlockCreator locCatchBlock = locTryBlock.addCatch(NoClassDefFoundError.class); - ResultHandle newLocClass = locCatchBlock.loadClass(LOCALIZATION_FEATURE); + CatchBlockCreator locCatchBlock = locTryBlock.addCatch(ClassNotFoundException.class); + ResultHandle newLocClass = locCatchBlock.loadClassFromTCCL(LOCALIZATION_FEATURE); locCatchBlock.assign(locClass, newLocClass); - ResultHandle newParams = locCatchBlock.marshalAsArray(Class.class, locCatchBlock.loadClass(String.class)); + ResultHandle newParams = locCatchBlock.marshalAsArray(Class.class, locCatchBlock.loadClassFromTCCL(String.class)); ResultHandle newRegisterMethod = locCatchBlock.invokeVirtualMethod( ofMethod(Class.class, "getDeclaredMethod", Method.class, String.class, Class[].class), newLocClass, locCatchBlock.load("prepareBundle"), newParams); @@ -402,7 +402,7 @@ public class NativeImageAutoFeatureStep { ResultHandle paramArray = tc.newArray(Class.class, tc.load(ctor.getParams().length)); for (int i = 0; i < ctor.getParams().length; ++i) { String type = ctor.getParams()[i]; - tc.writeArrayValue(paramArray, i, tc.loadClass(type)); + tc.writeArrayValue(paramArray, i, tc.loadClassFromTCCL(type)); } ResultHandle fhandle = tc.invokeVirtualMethod( ofMethod(Class.class, "getDeclaredConstructor", Constructor.class, Class[].class), clazz, @@ -423,7 +423,7 @@ public class NativeImageAutoFeatureStep { ResultHandle paramArray = tc.newArray(Class.class, tc.load(method.getParams().length)); for (int i = 0; i < method.getParams().length; ++i) { String type = method.getParams()[i]; - tc.writeArrayValue(paramArray, i, tc.loadClass(type)); + tc.writeArrayValue(paramArray, i, tc.loadClassFromTCCL(type)); } ResultHandle fhandle = tc.invokeVirtualMethod( ofMethod(Class.class, "getDeclaredMethod", Method.class, String.class, Class[].class), clazz, @@ -527,7 +527,7 @@ public class NativeImageAutoFeatureStep { CatchBlockCreator print = overallCatch.addCatch(Throwable.class); print.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), print.getCaughtException()); - beforeAn.loadClass("io.quarkus.runner.ApplicationImpl"); + beforeAn.loadClassFromTCCL("io.quarkus.runner.ApplicationImpl"); beforeAn.returnValue(null); file.close(); @@ -540,7 +540,7 @@ public class NativeImageAutoFeatureStep { TryBlock requiredCatch = requiredFeatures.tryBlock(); ResultHandle serializationFeatureClass = requiredCatch - .loadClass("com.oracle.svm.reflect.serialize.hosted.SerializationFeature"); + .loadClassFromTCCL("com.oracle.svm.reflect.serialize.hosted.SerializationFeature"); ResultHandle requiredFeaturesList = requiredCatch.invokeStaticMethod( ofMethod("java.util.Collections", "singletonList", List.class, Object.class), serializationFeatureClass); @@ -569,7 +569,7 @@ public class NativeImageAutoFeatureStep { greaterThan21_3.load("org.graalvm.nativeimage.hosted.RuntimeSerialization"), greaterThan21_3.load(false), tccl); ResultHandle registerArgTypes = greaterThan21_3.newArray(Class.class, greaterThan21_3.load(1)); - greaterThan21_3.writeArrayValue(registerArgTypes, 0, greaterThan21_3.loadClass(Class[].class)); + greaterThan21_3.writeArrayValue(registerArgTypes, 0, greaterThan21_3.loadClassFromTCCL(Class[].class)); ResultHandle registerLookupMethod = greaterThan21_3.invokeStaticMethod(LOOKUP_METHOD, runtimeSerializationClass, greaterThan21_3.load("register"), registerArgTypes); ResultHandle registerArgs = greaterThan21_3.newArray(Object.class, greaterThan21_3.load(1)); @@ -592,8 +592,8 @@ public class NativeImageAutoFeatureStep { serializationRegistryClass); ResultHandle addReflectionsLookupArgs = tc.newArray(Class.class, tc.load(2)); - tc.writeArrayValue(addReflectionsLookupArgs, 0, tc.loadClass(Class.class)); - tc.writeArrayValue(addReflectionsLookupArgs, 1, tc.loadClass(Class.class)); + tc.writeArrayValue(addReflectionsLookupArgs, 0, tc.loadClassFromTCCL(Class.class)); + tc.writeArrayValue(addReflectionsLookupArgs, 1, tc.loadClassFromTCCL(Class.class)); ResultHandle addReflectionsLookupMethod = tc.invokeStaticMethod(LOOKUP_METHOD, addReflectionsClass, tc.load("addReflections"), addReflectionsLookupArgs); @@ -616,7 +616,8 @@ public class NativeImageAutoFeatureStep { ifIsExternalizable.writeArrayValue(array1, 0, classClass); ResultHandle externalizableLookupMethod = ifIsExternalizable.invokeStaticMethod(LOOKUP_METHOD, - ifIsExternalizable.loadClass(ObjectStreamClass.class), ifIsExternalizable.load("getExternalizableConstructor"), + ifIsExternalizable.loadClassFromTCCL(ObjectStreamClass.class), + ifIsExternalizable.load("getExternalizableConstructor"), array1); ResultHandle array2 = ifIsExternalizable.newArray(Object.class, tc.load(1)); @@ -665,7 +666,7 @@ public class NativeImageAutoFeatureStep { newSerializationConstructor); ResultHandle getConstructorAccessor = tc.invokeStaticMethod( - LOOKUP_METHOD, tc.loadClass(Constructor.class), tc.load("getConstructorAccessor"), + LOOKUP_METHOD, tc.loadClassFromTCCL(Constructor.class), tc.load("getConstructorAccessor"), tc.newArray(Class.class, tc.load(0))); ResultHandle accessor = tc.invokeVirtualMethod( diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java index 1263eb50bf3..45d844d6899 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java @@ -352,7 +352,7 @@ final class ClassConfigPropertiesUtil { MethodDescriptor.ofMethod(Config.class, "getOptionalValue", Optional.class, String.class, Class.class), mpConfig, methodCreator.load(fullConfigName), - methodCreator.loadClass(genericType.name().toString())); + methodCreator.loadClassFromTCCL(genericType.name().toString())); createWriteValue(methodCreator, configObject, field, setter, useFieldAccess, setterValue); } else { // convert the String value and populate an Optional with it diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java index a6c78c961a2..2490c0c3729 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java @@ -60,13 +60,13 @@ final class ConfigPropertiesUtil { Class.class, IntFunction.class), smallryeConfig, bytecodeCreator.load(propertyName), - bytecodeCreator.loadClass(determineSingleGenericType(resultType, declaringClass).name().toString()), + bytecodeCreator.loadClassFromTCCL(determineSingleGenericType(resultType, declaringClass).name().toString()), collectionFactory); } else { return bytecodeCreator.invokeInterfaceMethod( MethodDescriptor.ofMethod(Config.class, "getValue", Object.class, String.class, Class.class), config, bytecodeCreator.load(propertyName), - bytecodeCreator.loadClass(resultType.name().toString())); + bytecodeCreator.loadClassFromTCCL(resultType.name().toString())); } } @@ -101,14 +101,14 @@ final class ConfigPropertiesUtil { Class.class, IntFunction.class), smallryeConfig, bytecodeCreator.load(propertyName), - bytecodeCreator.loadClass(determineSingleGenericType(resultType, declaringClass).name().toString()), + bytecodeCreator.loadClassFromTCCL(determineSingleGenericType(resultType, declaringClass).name().toString()), collectionFactory); } else { optionalValue = bytecodeCreator.invokeInterfaceMethod( MethodDescriptor.ofMethod(Config.class, "getOptionalValue", Optional.class, String.class, Class.class), config, bytecodeCreator.load(propertyName), - bytecodeCreator.loadClass(resultType.name().toString())); + bytecodeCreator.loadClassFromTCCL(resultType.name().toString())); } ResultHandle isPresent = bytecodeCreator diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java index b609af73d89..63110d34b64 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java @@ -188,7 +188,7 @@ final class InterfaceConfigPropertiesUtil { ResultHandle configInstanceHandle = methodCreator.invokeInterfaceMethod( ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class), - arcContainer, methodCreator.loadClass(Config.class), + arcContainer, methodCreator.loadClassFromTCCL(Config.class), methodCreator.newArray(Annotation.class, 0)); ResultHandle config = methodCreator.invokeInterfaceMethod( ofMethod(InstanceHandle.class, "get", Object.class), configInstanceHandle); @@ -227,7 +227,7 @@ final class InterfaceConfigPropertiesUtil { String.class, Class.class), config, methodCreator.load(fullConfigName), - methodCreator.loadClass(genericType.name().toString())); + methodCreator.loadClassFromTCCL(genericType.name().toString())); methodCreator.returnValue(result); } else { // convert the String value and populate an Optional with it diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/YamlListObjectHandler.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/YamlListObjectHandler.java index 87b0c87b8cc..48cf6a06075 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/YamlListObjectHandler.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/YamlListObjectHandler.java @@ -105,7 +105,7 @@ class YamlListObjectHandler { wrapperClassName.replace('.', '/'))) .build()) { MethodCreator getClazz = cc.getMethodCreator("getClazz", Class.class).setModifiers(Modifier.PROTECTED); - getClazz.returnValue(getClazz.loadClass(wrapperClassName)); + getClazz.returnValue(getClazz.loadClassFromTCCL(wrapperClassName)); // generate the getFieldNameMap method by searching for fields annotated with @ConfigProperty List<AnnotationInstance> configPropertyInstances = classInfo.annotations().get(DotNames.CONFIG_PROPERTY); diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java index 89e6c51ff22..d4473748aa2 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java @@ -293,13 +293,13 @@ public class InterceptedStaticMethodsProcessor { // 2. Method method = Reflections.findMethod(...) ResultHandle[] paramsHandles = new ResultHandle[3]; - paramsHandles[0] = init.loadClass(method.declaringClass().name().toString()); + paramsHandles[0] = init.loadClassFromTCCL(method.declaringClass().name().toString()); paramsHandles[1] = init.load(method.name()); if (!method.parameters().isEmpty()) { ResultHandle paramsArray = init.newArray(Class.class, init.load(method.parameters().size())); for (ListIterator<Type> iterator = method.parameters().listIterator(); iterator.hasNext();) { init.writeArrayValue(paramsArray, iterator.nextIndex(), - init.loadClass(iterator.next().name().toString())); + init.loadClassFromTCCL(iterator.next().name().toString())); } paramsHandles[2] = paramsArray; } else { diff --git a/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java b/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java index 151b329722e..8c8f677d925 100755 --- a/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java +++ b/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java @@ -276,7 +276,7 @@ public class JacksonProcessor { customize.load(jacksonModule.getName())); for (JacksonModuleBuildItem.Item item : jacksonModule.getItems()) { - ResultHandle targetClass = customize.loadClass(item.getTargetClassName()); + ResultHandle targetClass = customize.loadClassFromTCCL(item.getTargetClassName()); String serializerClassName = item.getSerializerClassName(); if (serializerClassName != null && !serializerClassName.isEmpty()) { diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java index ae3cd68ed94..88ef1cbe948 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java @@ -111,7 +111,7 @@ final class RepositoryDataAccessImplementor implements DataAccessImplementor { ResultHandle arcContainer = creator.invokeStaticMethod(ofMethod(Arc.class, "container", ArcContainer.class)); ResultHandle instanceHandle = creator.invokeInterfaceMethod( ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class), - arcContainer, creator.loadClass(repositoryClassName), creator.newArray(Annotation.class, 0)); + arcContainer, creator.loadClassFromTCCL(repositoryClassName), creator.newArray(Annotation.class, 0)); ResultHandle instance = creator.invokeInterfaceMethod( ofMethod(InstanceHandle.class, "get", Object.class), instanceHandle); diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/RepositoryDataAccessImplementor.java b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/RepositoryDataAccessImplementor.java index b8e072ffff3..b65b30cf2b0 100644 --- a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/RepositoryDataAccessImplementor.java +++ b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/RepositoryDataAccessImplementor.java @@ -86,7 +86,7 @@ final class RepositoryDataAccessImplementor implements DataAccessImplementor { ResultHandle arcContainer = creator.invokeStaticMethod(ofMethod(Arc.class, "container", ArcContainer.class)); ResultHandle instanceHandle = creator.invokeInterfaceMethod( ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class), - arcContainer, creator.loadClass(repositoryClassName), creator.newArray(Annotation.class, 0)); + arcContainer, creator.loadClassFromTCCL(repositoryClassName), creator.newArray(Annotation.class, 0)); ResultHandle instance = creator.invokeInterfaceMethod( ofMethod(InstanceHandle.class, "get", Object.class), instanceHandle); diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java index bd9bdab09ac..d221b32e3ff 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java @@ -178,7 +178,7 @@ public final class UpdateMethodImplementor extends StandardMethodImplementor { ResultHandle arcContainer = creator.invokeStaticMethod(ofMethod(Arc.class, "container", ArcContainer.class)); ResultHandle instanceHandle = creator.invokeInterfaceMethod( ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class), - arcContainer, creator.loadClass(UpdateExecutor.class), creator.newArray(Annotation.class, 0)); + arcContainer, creator.loadClassFromTCCL(UpdateExecutor.class), creator.newArray(Annotation.class, 0)); ResultHandle instance = creator.invokeInterfaceMethod( ofMethod(InstanceHandle.class, "get", Object.class), instanceHandle); diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/HalMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/HalMethodImplementor.java index 02fec9a314b..5ffeec55fa2 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/HalMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/HalMethodImplementor.java @@ -41,7 +41,7 @@ abstract class HalMethodImplementor extends StandardMethodImplementor { String collectionName) { return creator.newInstance( MethodDescriptor.ofConstructor(HalCollectionWrapper.class, Collection.class, Class.class, String.class), - entities, creator.loadClass(entityType), + entities, creator.loadClassFromTCCL(entityType), creator.load(collectionName)); } } diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java index b9a2be71da7..ec44629f8e9 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java @@ -173,7 +173,7 @@ public final class UpdateHalMethodImplementor extends HalMethodImplementor { ResultHandle arcContainer = creator.invokeStaticMethod(ofMethod(Arc.class, "container", ArcContainer.class)); ResultHandle instanceHandle = creator.invokeInterfaceMethod( ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class), - arcContainer, creator.loadClass(UpdateExecutor.class), creator.newArray(Annotation.class, 0)); + arcContainer, creator.loadClassFromTCCL(UpdateExecutor.class), creator.newArray(Annotation.class, 0)); ResultHandle instance = creator.invokeInterfaceMethod( ofMethod(InstanceHandle.class, "get", Object.class), instanceHandle); diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java index 399e39af460..71543ab8293 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java @@ -53,7 +53,7 @@ public final class ResponseImplementor { ResultHandle instance = creator.invokeInterfaceMethod( MethodDescriptor.ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class), - arcContainer, creator.loadClass(ResourceLinksProvider.class), creator.loadNull()); + arcContainer, creator.loadClassFromTCCL(ResourceLinksProvider.class), creator.loadNull()); ResultHandle linksProvider = creator.invokeInterfaceMethod( MethodDescriptor.ofMethod(InstanceHandle.class, "get", Object.class), instance); diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteDevConsoleRecorder.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteDevConsoleRecorder.java index 6953cf9fc84..820c34bdffb 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteDevConsoleRecorder.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteDevConsoleRecorder.java @@ -15,11 +15,18 @@ public class QuteDevConsoleRecorder { public void setupRenderer() { //setup the render handler that is used to handle the template //this is invoked from the deployment side + ClassLoader tccl = Thread.currentThread().getContextClassLoader(); DevConsoleManager.setGlobal(RENDER_HANDLER, new BiFunction<String, Object, String>() { @Override public String apply(String template, Object data) { - Engine engine = Arc.container().instance(Engine.class).get(); - return engine.getTemplate(template).render(data); + var old = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(tccl); + Engine engine = Arc.container().instance(Engine.class).get(); + return engine.getTemplate(template).render(data); + } finally { + Thread.currentThread().setContextClassLoader(old); + } } }); } diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteErrorPageSetup.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteErrorPageSetup.java index 6ae56338da2..c6408c5a560 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteErrorPageSetup.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteErrorPageSetup.java @@ -229,7 +229,8 @@ public class QuteErrorPageSetup implements HotReplacementSetup { private int getLineCharacterStart(Object origin) { int lineCharacter = 0; try { - Method getLineCharacter = origin.getClass().getClassLoader().loadClass(ORIGIN).getMethod("getLineCharacterStart"); + Method getLineCharacter = origin.getClass().getClassLoader().loadClass(ORIGIN) + .getMethod("getLineCharacterStart"); lineCharacter = (int) getLineCharacter.invoke(origin); } catch (NoSuchMethodException | SecurityException | ClassNotFoundException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { diff --git a/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/ReactiveRoutesProcessor.java b/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/ReactiveRoutesProcessor.java index bc8aa1b8cec..2498aca5336 100644 --- a/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/ReactiveRoutesProcessor.java +++ b/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/ReactiveRoutesProcessor.java @@ -725,7 +725,7 @@ class ReactiveRoutesProcessor { ResultHandle failureClass = invoke.invokeVirtualMethod(Methods.GET_CLASS, failure); BytecodeCreator failureTypeIsNotAssignable = invoke .ifFalse(invoke.invokeVirtualMethod(Methods.IS_ASSIGNABLE_FROM, - invoke.loadClass(failureType.name().toString()), failureClass)) + invoke.loadClassFromTCCL(failureType.name().toString()), failureClass)) .trueBranch(); failureTypeIsNotAssignable.invokeInterfaceMethod(Methods.NEXT, routingContext); failureTypeIsNotAssignable.returnValue(null); @@ -1424,7 +1424,7 @@ class ReactiveRoutesProcessor { BytecodeCreator bodyNotNull = bodyIfNotNull.trueBranch(); bodyNotNull.assign(ret, bodyNotNull.invokeVirtualMethod(Methods.JSON_OBJECT_MAP_TO, bodyAsJson, - invoke.loadClass(paramType.name().toString()))); + bodyNotNull.loadClassFromTCCL(paramType.name().toString()))); BytecodeCreator bodyNull = bodyIfNotNull.falseBranch(); bodyNull.assign(ret, bodyNull.loadNull()); return ret; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java b/extensions/resteasy-classic/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java index 9bb233bad8e..a8e32234020 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java @@ -249,14 +249,14 @@ class RestClientProcessor { configurator.scope(scope); configurator.creator(m -> { // return new RestClientBase(proxyType, baseUri).create(); - ResultHandle interfaceHandle = m.loadClass(restClientName.toString()); + ResultHandle interfaceHandle = m.loadClassFromTCCL(restClientName.toString()); ResultHandle baseUriHandle = m.load(getAnnotationParameter(entry.getValue(), "baseUri")); ResultHandle configKeyHandle = configKey.isPresent() ? m.load(configKey.get()) : m.loadNull(); ResultHandle annotationProvidersHandle; if (!annotationProviders.isEmpty()) { annotationProvidersHandle = m.newArray(Class.class, annotationProviders.size()); for (int i = 0; i < annotationProviders.size(); i++) { - m.writeArrayValue(annotationProvidersHandle, i, m.loadClass(annotationProviders.get(i))); + m.writeArrayValue(annotationProvidersHandle, i, m.loadClassFromTCCL(annotationProviders.get(i))); } } else { annotationProvidersHandle = m.loadNull(); diff --git a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java index 93f61f897b3..8cf6d8be030 100644 --- a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java +++ b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java @@ -63,7 +63,8 @@ public class RestClientRecorder { for (String providerToRegister : providersToRegister) { try { providerFactory - .registerProvider(Thread.currentThread().getContextClassLoader().loadClass(providerToRegister.trim()), + .registerProvider( + Thread.currentThread().getContextClassLoader().loadClass(providerToRegister.trim()), isBuiltIn); } catch (ClassNotFoundException e) { throw new RuntimeException("Unable to find class for provider " + providerToRegister, e); diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java index 83191b0cf23..372f2f24ced 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java @@ -529,11 +529,11 @@ public class JaxrsClientReactiveProcessor { } else if (type.kind() == CLASS) { genericType = ctor.newInstance( MethodDescriptor.ofConstructor(GenericType.class, java.lang.reflect.Type.class), - ctor.loadClass(type.asClassType().name().toString())); + ctor.loadClassFromTCCL(type.asClassType().name().toString())); } else if (type.kind() == ARRAY) { genericType = ctor.newInstance( MethodDescriptor.ofConstructor(GenericType.class, java.lang.reflect.Type.class), - ctor.loadClass(type.asArrayType().name().toString())); + ctor.loadClassFromTCCL(type.asArrayType().name().toString())); } else if (type.kind() == PRIMITIVE) { throw new IllegalArgumentException("Primitive types are not supported for multipart response mapping. " + "Please use a wrapper class instead"); @@ -1520,7 +1520,7 @@ public class JaxrsClientReactiveProcessor { methodCreator.invokeVirtualMethod(MethodDescriptor.ofMethod(QuarkusMultipartForm.class, "entity", QuarkusMultipartForm.class, String.class, Object.class, String.class, Class.class), multipartForm, methodCreator.load(field.name()), fieldValue, methodCreator.load(partType), - methodCreator.loadClass(field.type().name().toString()))); + methodCreator.loadClassFromTCCL(field.type().name().toString()))); } /** @@ -1892,12 +1892,12 @@ public class JaxrsClientReactiveProcessor { String.class, Entity.class, Class.class), async, tryBlock.load(httpMethod), entity, - tryBlock.loadClass(simpleReturnType)); + tryBlock.loadClassFromTCCL(simpleReturnType)); } } else if (returnCategory == ReturnCategory.UNI || returnCategory == ReturnCategory.COROUTINE) { ResultHandle rx = tryBlock.invokeInterfaceMethod( MethodDescriptor.ofMethod(Invocation.Builder.class, "rx", RxInvoker.class, Class.class), - builder, tryBlock.loadClass(UniInvoker.class)); + builder, tryBlock.loadClassFromTCCL(UniInvoker.class)); ResultHandle uniInvoker = tryBlock.checkCast(rx, UniInvoker.class); // with entity if (genericReturnType != null) { @@ -1913,7 +1913,7 @@ public class JaxrsClientReactiveProcessor { Uni.class, String.class, Entity.class, Class.class), uniInvoker, tryBlock.load(httpMethod), entity, - tryBlock.loadClass(simpleReturnType)); + tryBlock.loadClassFromTCCL(simpleReturnType)); } if (returnCategory == ReturnCategory.COROUTINE) { result = tryBlock.invokeStaticMethod( @@ -1924,7 +1924,7 @@ public class JaxrsClientReactiveProcessor { } else if (returnCategory == ReturnCategory.MULTI) { ResultHandle rx = tryBlock.invokeInterfaceMethod( MethodDescriptor.ofMethod(Invocation.Builder.class, "rx", RxInvoker.class, Class.class), - builder, tryBlock.loadClass(MultiInvoker.class)); + builder, tryBlock.loadClassFromTCCL(MultiInvoker.class)); ResultHandle multiInvoker = tryBlock.checkCast(rx, MultiInvoker.class); // with entity if (genericReturnType != null) { @@ -1940,7 +1940,7 @@ public class JaxrsClientReactiveProcessor { Object.class, String.class, Entity.class, Class.class), multiInvoker, tryBlock.load(httpMethod), entity, - tryBlock.loadClass(simpleReturnType)); + tryBlock.loadClassFromTCCL(simpleReturnType)); } } else { if (genericReturnType != null) { @@ -1954,7 +1954,7 @@ public class JaxrsClientReactiveProcessor { MethodDescriptor.ofMethod(Invocation.Builder.class, "method", Object.class, String.class, Entity.class, Class.class), builder, tryBlock.load(httpMethod), entity, - tryBlock.loadClass(simpleReturnType)); + tryBlock.loadClassFromTCCL(simpleReturnType)); } } } else { @@ -1975,12 +1975,12 @@ public class JaxrsClientReactiveProcessor { String.class, Class.class), async, tryBlock.load(httpMethod), - tryBlock.loadClass(simpleReturnType)); + tryBlock.loadClassFromTCCL(simpleReturnType)); } } else if (returnCategory == ReturnCategory.UNI || returnCategory == ReturnCategory.COROUTINE) { ResultHandle rx = tryBlock.invokeInterfaceMethod( MethodDescriptor.ofMethod(Invocation.Builder.class, "rx", RxInvoker.class, Class.class), - builder, tryBlock.loadClass(UniInvoker.class)); + builder, tryBlock.loadClassFromTCCL(UniInvoker.class)); ResultHandle uniInvoker = tryBlock.checkCast(rx, UniInvoker.class); if (genericReturnType != null) { result = tryBlock.invokeVirtualMethod( @@ -1994,7 +1994,7 @@ public class JaxrsClientReactiveProcessor { Uni.class, String.class, Class.class), uniInvoker, tryBlock.load(httpMethod), - tryBlock.loadClass(simpleReturnType)); + tryBlock.loadClassFromTCCL(simpleReturnType)); } if (returnCategory == ReturnCategory.COROUTINE) { result = tryBlock.invokeStaticMethod( @@ -2005,7 +2005,7 @@ public class JaxrsClientReactiveProcessor { } else if (returnCategory == ReturnCategory.MULTI) { ResultHandle rx = tryBlock.invokeInterfaceMethod( MethodDescriptor.ofMethod(Invocation.Builder.class, "rx", RxInvoker.class, Class.class), - builder, tryBlock.loadClass(MultiInvoker.class)); + builder, tryBlock.loadClassFromTCCL(MultiInvoker.class)); ResultHandle multiInvoker = tryBlock.checkCast(rx, MultiInvoker.class); if (genericReturnType != null) { result = tryBlock.invokeVirtualMethod( @@ -2019,7 +2019,7 @@ public class JaxrsClientReactiveProcessor { Object.class, String.class, Class.class), multiInvoker, tryBlock.load(httpMethod), - tryBlock.loadClass(simpleReturnType)); + tryBlock.loadClassFromTCCL(simpleReturnType)); } } else { if (genericReturnType != null) { @@ -2032,7 +2032,7 @@ public class JaxrsClientReactiveProcessor { MethodDescriptor.ofMethod(Invocation.Builder.class, "method", Object.class, String.class, Class.class), builder, tryBlock.load(httpMethod), - tryBlock.loadClass(simpleReturnType)); + tryBlock.loadClassFromTCCL(simpleReturnType)); } } } @@ -2204,7 +2204,7 @@ public class JaxrsClientReactiveProcessor { paramArray = methodCreator.invokeVirtualMethod( MethodDescriptor.ofMethod(RestClientBase.class, "convertParamArray", Object[].class, Object[].class, Class.class), - client, paramArray, methodCreator.loadClass(componentType)); + client, paramArray, methodCreator.loadClassFromTCCL(componentType)); return methodCreator.invokeInterfaceMethod( MethodDescriptor.ofMethod(WebTarget.class, "queryParam", WebTarget.class, @@ -2229,7 +2229,7 @@ public class JaxrsClientReactiveProcessor { headerParamHandle = invoBuilderEnricher.invokeVirtualMethod( MethodDescriptor.ofMethod(RestClientBase.class, "convertParam", Object.class, Object.class, Class.class), client, headerParamHandle, - invoBuilderEnricher.loadClass(paramType)); + invoBuilderEnricher.loadClassFromTCCL(paramType)); invoBuilderEnricher.assign(invocationBuilder, invoBuilderEnricher.invokeInterfaceMethod( @@ -2243,7 +2243,7 @@ public class JaxrsClientReactiveProcessor { ResultHandle handle = methodCreator.invokeVirtualMethod( MethodDescriptor.ofMethod(RestClientBase.class, "convertParam", Object.class, Object.class, Class.class), client, pathParamHandle, - methodCreator.loadClass(parameterType)); + methodCreator.loadClassFromTCCL(parameterType)); methodCreator.assign(methodTarget, methodCreator.invokeInterfaceMethod(WEB_TARGET_RESOLVE_TEMPLATE_METHOD, methodTarget, @@ -2255,7 +2255,7 @@ public class JaxrsClientReactiveProcessor { cookieParamHandle = invoBuilderEnricher.invokeVirtualMethod( MethodDescriptor.ofMethod(RestClientBase.class, "convertParam", Object.class, Object.class, Class.class), client, cookieParamHandle, - invoBuilderEnricher.loadClass(paramType)); + invoBuilderEnricher.loadClassFromTCCL(paramType)); invoBuilderEnricher.assign(invocationBuilder, invoBuilderEnricher.invokeInterfaceMethod( MethodDescriptor.ofMethod(Invocation.Builder.class, "cookie", Invocation.Builder.class, String.class, diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java index 88ef8823de5..a0cac54126f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java @@ -104,7 +104,7 @@ class MicroProfileRestClientEnricher implements JaxrsClientReactiveEnricher { ResultHandle instanceHandle = constructor.invokeInterfaceMethod( MethodDescriptor.ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class), - containerHandle, constructor.loadClass(headersFactoryClass), + containerHandle, constructor.loadClassFromTCCL(headersFactoryClass), constructor.newArray(Annotation.class, 0)); clientHeadersFactory = constructor .invokeInterfaceMethod(MethodDescriptor.ofMethod(InstanceHandle.class, "get", Object.class), @@ -264,12 +264,12 @@ class MicroProfileRestClientEnricher implements JaxrsClientReactiveEnricher { private FieldDescriptor createJavaMethodField(ClassCreator classCreator, MethodCreator clinit, ClassInfo interfaceClass, MethodInfo method, int methodIndex) { - ResultHandle interfaceClassHandle = clinit.loadClass(interfaceClass.toString()); + ResultHandle interfaceClassHandle = clinit.loadClassFromTCCL(interfaceClass.toString()); ResultHandle parameterArray = clinit.newArray(Class.class, method.parameters().size()); for (int i = 0; i < method.parameters().size(); i++) { String parameterClass = method.parameters().get(i).name().toString(); - clinit.writeArrayValue(parameterArray, i, clinit.loadClass(parameterClass)); + clinit.writeArrayValue(parameterArray, i, clinit.loadClassFromTCCL(parameterClass)); } ResultHandle javaMethodHandle = clinit.invokeVirtualMethod( diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java index 463f447d69f..e5c23d8755e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java @@ -276,7 +276,7 @@ class RestClientReactiveProcessor { MethodDescriptor.ofMethod(AnnotationRegisteredProviders.class, "addGlobalProvider", void.class, Class.class, int.class), - constructor.getThis(), constructor.loadClass(providerClass.name().toString()), + constructor.getThis(), constructor.loadClassFromTCCL(providerClass.name().toString()), constructor.load(priority)); } } @@ -306,7 +306,7 @@ class RestClientReactiveProcessor { priority = priorityAnnotationValue.asInt(); } - constructor.invokeInterfaceMethod(MAP_PUT, map, constructor.loadClass(className), + constructor.invokeInterfaceMethod(MAP_PUT, map, constructor.loadClassFromTCCL(className), constructor.load(priority)); } String ifaceName = annotationsForClass.getKey(); @@ -461,7 +461,7 @@ class RestClientReactiveProcessor { MethodDescriptor.ofConstructor(RestClientReactiveCDIWrapperBase.class, Class.class, String.class, String.class), constructor.getThis(), - constructor.loadClass(jaxrsInterface.toString()), + constructor.loadClassFromTCCL(jaxrsInterface.toString()), baseUriHandle, configKey.isPresent() ? constructor.load(configKey.get()) : constructor.loadNull()); constructor.returnValue(null); diff --git a/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java b/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java index 3ce853b88b0..706bce494bb 100644 --- a/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java +++ b/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java @@ -375,13 +375,13 @@ class QuarkusSecurityJpaProcessor { ResultHandle session = methodCreator.invokeInterfaceMethod( MethodDescriptor.ofMethod(EntityManager.class, "unwrap", Object.class, Class.class), methodCreator.getMethodParam(0), - methodCreator.loadClass(Session.class)); + methodCreator.loadClassFromTCCL(Session.class)); // SimpleNaturalIdLoadAccess<PlainUserEntity> naturalIdLoadAccess = session.bySimpleNaturalId(PlainUserEntity.class); ResultHandle naturalIdLoadAccess = methodCreator.invokeInterfaceMethod( MethodDescriptor.ofMethod(Session.class, "bySimpleNaturalId", SimpleNaturalIdLoadAccess.class, Class.class), methodCreator.checkCast(session, Session.class), - methodCreator.loadClass(jpaSecurityDefinition.annotatedClass.name().toString())); + methodCreator.loadClassFromTCCL(jpaSecurityDefinition.annotatedClass.name().toString())); // PlainUserEntity user = naturalIdLoadAccess.load(request.getUsername()); user = methodCreator.invokeInterfaceMethod( MethodDescriptor.ofMethod(SimpleNaturalIdLoadAccess.class, "load", diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/JacksonSerdeGenerator.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/JacksonSerdeGenerator.java index 42c45eecb6d..1e7fb12f6fe 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/JacksonSerdeGenerator.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/JacksonSerdeGenerator.java @@ -45,7 +45,8 @@ public class JacksonSerdeGenerator { .superClass(ObjectMapperDeserializer.class).build(); MethodCreator constructor = creator.getMethodCreator("<init>", void.class); MethodDescriptor superConstructor = MethodDescriptor.ofConstructor(ObjectMapperDeserializer.class, Class.class); - constructor.invokeSpecialMethod(superConstructor, constructor.getThis(), constructor.loadClass(type.name().toString())); + constructor.invokeSpecialMethod(superConstructor, constructor.getThis(), + constructor.loadClassFromTCCL(type.name().toString())); constructor.returnValue(null); constructor.close(); creator.close(); diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java index 27646834d6e..763bb2a64e8 100644 --- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java +++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java @@ -100,7 +100,7 @@ public class SpringDataRepositoryCreator { ctor.invokeSpecialMethod(MethodDescriptor.ofMethod(Object.class, "<init>", void.class), ctor.getThis()); // initialize the entityClass field ctor.writeInstanceField(entityClassFieldCreator.getFieldDescriptor(), ctor.getThis(), - ctor.loadClass(entityTypeStr)); + ctor.loadClassFromTCCL(entityTypeStr)); ctor.returnValue(null); } diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/CrudMethodsImplementor.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/CrudMethodsImplementor.java index d24ce324cb1..cc782fe5289 100644 --- a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/CrudMethodsImplementor.java +++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/CrudMethodsImplementor.java @@ -128,7 +128,7 @@ public class CrudMethodsImplementor implements ResourceMethodsImplementor { ResultHandle arcContainer = creator.invokeStaticMethod(ofMethod(Arc.class, "container", ArcContainer.class)); ResultHandle instanceHandle = creator.invokeInterfaceMethod( ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class), - arcContainer, creator.loadClass(repositoryInterface), creator.newArray(Annotation.class, 0)); + arcContainer, creator.loadClassFromTCCL(repositoryInterface), creator.newArray(Annotation.class, 0)); ResultHandle instance = creator.invokeInterfaceMethod( ofMethod(InstanceHandle.class, "get", Object.class), instanceHandle); creator.ifNull(instance) diff --git a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ControllerAdviceExceptionMapperGenerator.java b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ControllerAdviceExceptionMapperGenerator.java index 57c525e7f8e..68d6ce31ecd 100644 --- a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ControllerAdviceExceptionMapperGenerator.java +++ b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ControllerAdviceExceptionMapperGenerator.java @@ -268,7 +268,7 @@ class ControllerAdviceExceptionMapperGenerator extends AbstractExceptionMapperGe private ResultHandle controllerAdviceInstance(MethodCreator toResponse) { if (isResteasyClassic) { - ResultHandle controllerAdviceClass = toResponse.loadClass(declaringClassName); + ResultHandle controllerAdviceClass = toResponse.loadClassFromTCCL(declaringClassName); ResultHandle container = toResponse .invokeStaticMethod(MethodDescriptor.ofMethod(Arc.class, "container", ArcContainer.class)); @@ -292,7 +292,7 @@ class ControllerAdviceExceptionMapperGenerator extends AbstractExceptionMapperGe ResultHandle instance = methodCreator.invokeInterfaceMethod( MethodDescriptor.ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class), - container, methodCreator.loadClass(beanClassName), methodCreator.loadNull()); + container, methodCreator.loadClassFromTCCL(beanClassName), methodCreator.loadNull()); return methodCreator.invokeInterfaceMethod( MethodDescriptor.ofMethod(InstanceHandle.class, "get", Object.class), instance); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java index 94e5e2d0e53..5045888ff0b 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java @@ -184,12 +184,12 @@ public class AnnotationLiteralGenerator extends AbstractGenerator { ResultHandle array = staticConstructor.newArray(returnTypeName, clazzArray.length); for (int i = 0; i < clazzArray.length; ++i) { staticConstructor.writeArrayValue(array, staticConstructor.load(i), - staticConstructor.loadClass(clazzArray[i].name().toString())); + staticConstructor.loadClassFromTCCL(clazzArray[i].name().toString())); } staticConstructor.writeStaticField(fieldCreator.getFieldDescriptor(), array); } else { staticConstructor.writeStaticField(fieldCreator.getFieldDescriptor(), - staticConstructor.loadClass(defaultValue.asClass().name().toString())); + staticConstructor.loadClassFromTCCL(defaultValue.asClass().name().toString())); } } @@ -239,7 +239,7 @@ public class AnnotationLiteralGenerator extends AbstractGenerator { FieldDescriptor.of(literalClassName, defaultValueStaticFieldName(method), method.returnType().name().toString())); } else { - retValue = valueMethod.loadClass(value.asClass().toString()); + retValue = valueMethod.loadClassFromTCCL(value.asClass().toString()); } break; case ARRAY: @@ -271,7 +271,7 @@ public class AnnotationLiteralGenerator extends AbstractGenerator { Type[] classArray = value.asClassArray(); retValue = valueMethod.newArray(componentType(method), valueMethod.load(classArray.length)); for (int i = 0; i < classArray.length; i++) { - valueMethod.writeArrayValue(retValue, i, valueMethod.loadClass(classArray[i].name() + valueMethod.writeArrayValue(retValue, i, valueMethod.loadClassFromTCCL(classArray[i].name() .toString())); } } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java index 8c012e64800..557d1d2952b 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java @@ -205,7 +205,7 @@ public class BeanGenerator extends AbstractGenerator { valHandle = constructor.newInstance(MethodDescriptor.ofConstructor(Double.class, double.class), constructor.load(((Double) entry.getValue()).doubleValue())); } else if (entry.getValue() instanceof Class) { - valHandle = constructor.loadClass((Class<?>) entry.getValue()); + valHandle = constructor.loadClassFromTCCL((Class<?>) entry.getValue()); } else if (entry.getValue() instanceof Boolean) { valHandle = constructor.load((Boolean) entry.getValue()); } @@ -756,7 +756,7 @@ public class BeanGenerator extends AbstractGenerator { int stereotypesIndex = 0; for (StereotypeInfo stereotype : bean.getStereotypes()) { constructor.writeArrayValue(stereotypesArray, constructor.load(stereotypesIndex++), - constructor.loadClass(stereotype.getTarget().name().toString())); + constructor.loadClassFromTCCL(stereotype.getTarget().name().toString())); } constructor.writeInstanceField( FieldDescriptor.of(beanCreator.getClassName(), FIELD_NAME_STEREOTYPES, Set.class.getName()), @@ -795,7 +795,7 @@ public class BeanGenerator extends AbstractGenerator { callback.declaringClass().name(), callback.name())); reflectionRegistration.registerMethod(callback); destroy.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD, - destroy.loadClass(callback.declaringClass().name().toString()), + destroy.loadClassFromTCCL(callback.declaringClass().name().toString()), destroy.load(callback.name()), destroy.newArray(Class.class, destroy.load(0)), destroy.getMethodParam(0), destroy.newArray(Object.class, destroy.load(0))); @@ -862,12 +862,12 @@ public class BeanGenerator extends AbstractGenerator { ResultHandle argsArray = destroy.newArray(Object.class, destroy.load(referenceHandles.length)); for (int i = 0; i < referenceHandles.length; i++) { destroy.writeArrayValue(paramTypesArray, i, - destroy.loadClass(disposerMethod.parameters().get(i).name().toString())); + destroy.loadClassFromTCCL(disposerMethod.parameters().get(i).name().toString())); destroy.writeArrayValue(argsArray, i, referenceHandles[i]); } reflectionRegistration.registerMethod(disposerMethod); destroy.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD, - destroy.loadClass(disposerMethod.declaringClass().name().toString()), + destroy.loadClassFromTCCL(disposerMethod.declaringClass().name().toString()), destroy.load(disposerMethod.name()), paramTypesArray, declaringProviderInstanceHandle, argsArray); } else { destroy.invokeVirtualMethod(MethodDescriptor.of(disposerMethod), declaringProviderInstanceHandle, @@ -1039,12 +1039,12 @@ public class BeanGenerator extends AbstractGenerator { ResultHandle argsArray = creator.newArray(Object.class, creator.load(providerHandles.size())); for (int i = 0; i < injectionPoints.size(); i++) { creator.writeArrayValue(paramTypesArray, i, - creator.loadClass(injectionPoints.get(i).getType().name().toString())); + creator.loadClassFromTCCL(injectionPoints.get(i).getType().name().toString())); creator.writeArrayValue(argsArray, i, providerHandles.get(i)); } registration.registerMethod(constructor); return creator.invokeStaticMethod(MethodDescriptors.REFLECTIONS_NEW_INSTANCE, - creator.loadClass(constructor.declaringClass().name().toString()), + creator.loadClassFromTCCL(constructor.declaringClass().name().toString()), paramTypesArray, argsArray); } else { // new SimpleBean(foo) @@ -1067,7 +1067,8 @@ public class BeanGenerator extends AbstractGenerator { registration.registerMethod(noArgsConstructor); return creator.invokeStaticMethod(MethodDescriptors.REFLECTIONS_NEW_INSTANCE, - creator.loadClass(noArgsConstructor.declaringClass().name().toString()), paramTypesArray, argsArray); + creator.loadClassFromTCCL(noArgsConstructor.declaringClass().name().toString()), paramTypesArray, + argsArray); } else { // new SimpleBean() return creator.newInstance(MethodDescriptor.ofConstructor(providerTypeName)); @@ -1114,7 +1115,8 @@ public class BeanGenerator extends AbstractGenerator { String.format("Producer field %s#%s", producerField.declaringClass().name(), producerField.name())); reflectionRegistration.registerField(producerField); create.assign(instanceHandle, create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_READ_FIELD, - create.loadClass(producerField.declaringClass().name().toString()), create.load(producerField.name()), + create.loadClassFromTCCL(producerField.declaringClass().name().toString()), + create.load(producerField.name()), declaringProviderInstanceHandle)); } else { ResultHandle readFieldHandle; @@ -1203,12 +1205,13 @@ public class BeanGenerator extends AbstractGenerator { ResultHandle argsArray = create.newArray(Object.class, create.load(referenceHandles.length)); for (int i = 0; i < referenceHandles.length; i++) { create.writeArrayValue(paramTypesArray, i, - create.loadClass(producerMethod.parameters().get(i).name().toString())); + create.loadClassFromTCCL(producerMethod.parameters().get(i).name().toString())); create.writeArrayValue(argsArray, i, referenceHandles[i]); } reflectionRegistration.registerMethod(producerMethod); create.assign(instanceHandle, create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD, - create.loadClass(producerMethod.declaringClass().name().toString()), create.load(producerMethod.name()), + create.loadClassFromTCCL(producerMethod.declaringClass().name().toString()), + create.load(producerMethod.name()), paramTypesArray, declaringProviderInstanceHandle, argsArray)); @@ -1354,10 +1357,10 @@ public class BeanGenerator extends AbstractGenerator { paramTypes.add(injectionPoint.getType().name().toString()); } ResultHandle[] paramsHandles = new ResultHandle[2]; - paramsHandles[0] = create.loadClass(providerType.className()); + paramsHandles[0] = create.loadClassFromTCCL(providerType.className()); ResultHandle paramsArray = create.newArray(Class.class, create.load(paramTypes.size())); for (ListIterator<String> iterator = paramTypes.listIterator(); iterator.hasNext();) { - create.writeArrayValue(paramsArray, iterator.nextIndex(), create.loadClass(iterator.next())); + create.writeArrayValue(paramsArray, iterator.nextIndex(), create.loadClassFromTCCL(iterator.next())); } paramsHandles[1] = paramsArray; constructorHandle = create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_CONSTRUCTOR, @@ -1366,7 +1369,7 @@ public class BeanGenerator extends AbstractGenerator { } else { // constructor = Reflections.findConstructor(Foo.class) ResultHandle[] paramsHandles = new ResultHandle[2]; - paramsHandles[0] = create.loadClass(providerType.className()); + paramsHandles[0] = create.loadClassFromTCCL(providerType.className()); paramsHandles[1] = create.newArray(Class.class, create.load(0)); constructorHandle = create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_CONSTRUCTOR, paramsHandles); @@ -1453,7 +1456,7 @@ public class BeanGenerator extends AbstractGenerator { } reflectionRegistration.registerField(injectedField); tryBlock.invokeStaticMethod(MethodDescriptors.REFLECTIONS_WRITE_FIELD, - tryBlock.loadClass(injectedField.declaringClass().name().toString()), + tryBlock.loadClassFromTCCL(injectedField.declaringClass().name().toString()), tryBlock.load(injectedField.name()), instanceHandle, referenceHandle); } else { @@ -1500,12 +1503,12 @@ public class BeanGenerator extends AbstractGenerator { ResultHandle argsArray = create.newArray(Object.class, create.load(referenceHandles.length)); for (int i = 0; i < referenceHandles.length; i++) { create.writeArrayValue(paramTypesArray, i, - create.loadClass(initializerMethod.parameters().get(i).name().toString())); + create.loadClassFromTCCL(initializerMethod.parameters().get(i).name().toString())); create.writeArrayValue(argsArray, i, referenceHandles[i]); } reflectionRegistration.registerMethod(initializerMethod); create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD, - create.loadClass(initializerMethod.declaringClass().name().toString()), + create.loadClassFromTCCL(initializerMethod.declaringClass().name().toString()), create.load(methodInjection.target.asMethod().name()), paramTypesArray, instanceHandle, argsArray); @@ -1562,7 +1565,7 @@ public class BeanGenerator extends AbstractGenerator { } reflectionRegistration.registerMethod(callback); create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD, - create.loadClass(callback.declaringClass().name().toString()), + create.loadClassFromTCCL(callback.declaringClass().name().toString()), create.load(callback.name()), create.newArray(Class.class, create.load(0)), instanceHandle, create.newArray(Object.class, create.load(0))); } else { @@ -1658,7 +1661,7 @@ public class BeanGenerator extends AbstractGenerator { */ protected void implementGetScope(BeanInfo bean, ClassCreator beanCreator) { MethodCreator getScope = beanCreator.getMethodCreator("getScope", Class.class).setModifiers(ACC_PUBLIC); - getScope.returnValue(getScope.loadClass(bean.getScope().getDotName().toString())); + getScope.returnValue(getScope.loadClassFromTCCL(bean.getScope().getDotName().toString())); } /** @@ -1758,7 +1761,7 @@ public class BeanGenerator extends AbstractGenerator { protected void implementGetBeanClass(BeanInfo bean, ClassCreator beanCreator) { MethodCreator getBeanClass = beanCreator.getMethodCreator("getBeanClass", Class.class).setModifiers(ACC_PUBLIC); - getBeanClass.returnValue(getBeanClass.loadClass(bean.getBeanClass().toString())); + getBeanClass.returnValue(getBeanClass.loadClassFromTCCL(bean.getBeanClass().toString())); } protected void implementGetName(BeanInfo bean, ClassCreator beanCreator) { @@ -1848,7 +1851,7 @@ public class BeanGenerator extends AbstractGenerator { if (Kind.FIELD.equals(injectionPoint.getTarget().kind())) { FieldInfo field = injectionPoint.getTarget().asField(); javaMemberHandle = constructor.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_FIELD, - constructor.loadClass(field.declaringClass().name().toString()), + constructor.loadClassFromTCCL(field.declaringClass().name().toString()), constructor.load(field.name())); reflectionRegistration.registerField(field); } else { @@ -1857,11 +1860,11 @@ public class BeanGenerator extends AbstractGenerator { if (method.name().equals(Methods.INIT)) { // Reflections.findConstructor(org.foo.SimpleBean.class,java.lang.String.class) ResultHandle[] paramsHandles = new ResultHandle[2]; - paramsHandles[0] = constructor.loadClass(method.declaringClass().name().toString()); + paramsHandles[0] = constructor.loadClassFromTCCL(method.declaringClass().name().toString()); ResultHandle paramsArray = constructor.newArray(Class.class, constructor.load(method.parameters().size())); for (ListIterator<Type> iterator = method.parameters().listIterator(); iterator.hasNext();) { constructor.writeArrayValue(paramsArray, iterator.nextIndex(), - constructor.loadClass(iterator.next().name().toString())); + constructor.loadClassFromTCCL(iterator.next().name().toString())); } paramsHandles[1] = paramsArray; javaMemberHandle = constructor.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_CONSTRUCTOR, @@ -1869,12 +1872,12 @@ public class BeanGenerator extends AbstractGenerator { } else { // Reflections.findMethod(org.foo.SimpleBean.class,"foo",java.lang.String.class) ResultHandle[] paramsHandles = new ResultHandle[3]; - paramsHandles[0] = constructor.loadClass(method.declaringClass().name().toString()); + paramsHandles[0] = constructor.loadClassFromTCCL(method.declaringClass().name().toString()); paramsHandles[1] = constructor.load(method.name()); ResultHandle paramsArray = constructor.newArray(Class.class, constructor.load(method.parameters().size())); for (ListIterator<Type> iterator = method.parameters().listIterator(); iterator.hasNext();) { constructor.writeArrayValue(paramsArray, iterator.nextIndex(), - constructor.loadClass(iterator.next().name().toString())); + constructor.loadClassFromTCCL(iterator.next().name().toString())); } paramsHandles[2] = paramsArray; javaMemberHandle = constructor.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_METHOD, paramsHandles); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java index 3e8ebe33560..d1732780ece 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java @@ -219,7 +219,7 @@ public class ClientProxyGenerator extends AbstractGenerator { ResultHandle paramTypesArray = forward.newArray(Class.class, forward.load(method.parameters().size())); int idx = 0; for (Type param : method.parameters()) { - forward.writeArrayValue(paramTypesArray, idx++, forward.loadClass(param.name().toString())); + forward.writeArrayValue(paramTypesArray, idx++, forward.loadClassFromTCCL(param.name().toString())); } ResultHandle argsArray = forward.newArray(Object.class, forward.load(params.length)); idx = 0; @@ -228,7 +228,7 @@ public class ClientProxyGenerator extends AbstractGenerator { } reflectionRegistration.registerMethod(method); ret = forward.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD, - forward.loadClass(method.declaringClass().name().toString()), + forward.loadClassFromTCCL(method.declaringClass().name().toString()), forward.load(method.name()), paramTypesArray, delegate, argsArray); } else { // make sure we do not use the original method descriptor as it could point to diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java index 0abe720689d..a05e9df7555 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java @@ -111,7 +111,7 @@ public class ComponentsProviderGenerator extends AbstractGenerator { SETUP_PACKAGE)); } getComponents.invokeInterfaceMethod(MethodDescriptors.MAP_PUT, transitiveBindingsHandle, - getComponents.loadClass(entry.getKey().toString()), bindingsHandle); + getComponents.loadClassFromTCCL(entry.getKey().toString()), bindingsHandle); } ResultHandle beansHandle = getComponents.invokeInterfaceMethod( diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java index 44b49307c7c..dd2c94b4b61 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java @@ -118,7 +118,7 @@ public final class ContextConfigurator { valHandle = mc.newInstance(MethodDescriptor.ofConstructor(Double.class, double.class), mc.load(((Double) entry.getValue()).doubleValue())); } else if (entry.getValue() instanceof Class) { - valHandle = mc.loadClass((Class<?>) entry.getValue()); + valHandle = mc.loadClassFromTCCL((Class<?>) entry.getValue()); } else if (entry.getValue() instanceof Boolean) { valHandle = mc.load((Boolean) entry.getValue()); } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java index ea624b9a01d..3fda9c0f9c0 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java @@ -240,12 +240,12 @@ public class InterceptorGenerator extends BeanGenerator { interceptorMethod.name())); // Use reflection fallback ResultHandle paramTypesArray = trueBranch.newArray(Class.class, trueBranch.load(1)); - trueBranch.writeArrayValue(paramTypesArray, 0, trueBranch.loadClass(invocationContextClass)); + trueBranch.writeArrayValue(paramTypesArray, 0, trueBranch.loadClassFromTCCL(invocationContextClass)); ResultHandle argsArray = trueBranch.newArray(Object.class, trueBranch.load(1)); trueBranch.writeArrayValue(argsArray, 0, intercept.getMethodParam(2)); reflectionRegistration.registerMethod(interceptorMethod); ret = trueBranch.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD, - trueBranch.loadClass(interceptorMethod.declaringClass() + trueBranch.loadClassFromTCCL(interceptorMethod.declaringClass() .name() .toString()), trueBranch.load(interceptorMethod.name()), paramTypesArray, intercept.getMethodParam(1), argsArray); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java index 076ce3a4041..1c8b160f004 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java @@ -256,7 +256,7 @@ public class ObserverGenerator extends AbstractGenerator { protected void implementGetBeanClass(ClassCreator observerCreator, DotName beanClass) { MethodCreator getBeanClass = observerCreator.getMethodCreator("getBeanClass", Class.class).setModifiers(ACC_PUBLIC); - getBeanClass.returnValue(getBeanClass.loadClass(beanClass.toString())); + getBeanClass.returnValue(getBeanClass.loadClassFromTCCL(beanClass.toString())); } protected void implementGetPriority(ClassCreator observerCreator, ObserverInfo observer) { @@ -405,12 +405,12 @@ public class ObserverGenerator extends AbstractGenerator { ResultHandle argsArray = notify.newArray(Object.class, notify.load(referenceHandles.length)); for (int i = 0; i < referenceHandles.length; i++) { notify.writeArrayValue(paramTypesArray, i, - notify.loadClass(observer.getObserverMethod().parameters().get(i).name().toString())); + notify.loadClassFromTCCL(observer.getObserverMethod().parameters().get(i).name().toString())); notify.writeArrayValue(argsArray, i, referenceHandles[i]); } reflectionRegistration.registerMethod(observer.getObserverMethod()); notify.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD, - notify.loadClass(observer.getObserverMethod().declaringClass().name().toString()), + notify.loadClassFromTCCL(observer.getObserverMethod().declaringClass().name().toString()), notify.load(observer.getObserverMethod().name()), paramTypesArray, declaringProviderInstanceHandle, argsArray); } else { diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java index 0bc52304ca8..009e5436b0c 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java @@ -312,13 +312,13 @@ public class SubclassGenerator extends AbstractGenerator { // 2. Method method = Reflections.findMethod(org.jboss.weld.arc.test.interceptors.SimpleBean.class,"foo",java.lang.String.class) ResultHandle[] paramsHandles = new ResultHandle[3]; - paramsHandles[0] = constructor.loadClass(providerTypeName); + paramsHandles[0] = constructor.loadClassFromTCCL(providerTypeName); paramsHandles[1] = constructor.load(method.name()); if (!parameters.isEmpty()) { ResultHandle paramsArray = constructor.newArray(Class.class, constructor.load(parameters.size())); for (ListIterator<Type> iterator = parameters.listIterator(); iterator.hasNext();) { constructor.writeArrayValue(paramsArray, iterator.nextIndex(), - constructor.loadClass(iterator.next().name().toString())); + constructor.loadClassFromTCCL(iterator.next().name().toString())); } paramsHandles[2] = paramsArray; } else { diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java index f00797f3257..28284991d4e 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java @@ -152,21 +152,21 @@ public final class Types { } else if (Kind.PRIMITIVE.equals(type.kind())) { switch (type.asPrimitiveType().primitive()) { case INT: - return creator.loadClass(int.class); + return creator.loadClassFromTCCL(int.class); case LONG: - return creator.loadClass(long.class); + return creator.loadClassFromTCCL(long.class); case BOOLEAN: - return creator.loadClass(boolean.class); + return creator.loadClassFromTCCL(boolean.class); case BYTE: - return creator.loadClass(byte.class); + return creator.loadClassFromTCCL(byte.class); case CHAR: - return creator.loadClass(char.class); + return creator.loadClassFromTCCL(char.class); case DOUBLE: - return creator.loadClass(double.class); + return creator.loadClassFromTCCL(double.class); case FLOAT: - return creator.loadClass(float.class); + return creator.loadClassFromTCCL(float.class); case SHORT: - return creator.loadClass(short.class); + return creator.loadClassFromTCCL(short.class); default: throw new IllegalArgumentException("Unsupported primitive type: " + type); } diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java index bc0c4c35c7b..7c817c702d3 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java @@ -129,7 +129,8 @@ public class CuratedApplication implements Serializable, AutoCloseable { public AugmentAction createAugmentor(String functionName, Map<String, Object> props) { try { Class<?> augmentor = getAugmentClassLoader().loadClass(AUGMENTOR); - Function<Object, List<?>> function = (Function<Object, List<?>>) getAugmentClassLoader().loadClass(functionName) + Function<Object, List<?>> function = (Function<Object, List<?>>) getAugmentClassLoader() + .loadClass(functionName) .getDeclaredConstructor() .newInstance(); List<?> res = function.apply(props); diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java index e01caefe310..b580963bb6c 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java @@ -238,7 +238,8 @@ public class BootstrapMavenOptions { @SuppressWarnings("unchecked") private static Map<String, Object> invokeParser(ClassLoader cl, String[] args) throws ClassNotFoundException { try { - final Class<?> parserCls = cl.loadClass("io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptionsParser"); + final Class<?> parserCls = cl + .loadClass("io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptionsParser"); final Method parseMethod = parserCls.getMethod("parse", String[].class); return (Map<String, Object>) parseMethod.invoke(null, (Object) args); } catch (ClassNotFoundException e) { diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java index 4faedb00254..576a92e305b 100644 --- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java +++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java @@ -312,7 +312,7 @@ public class ExtensionMethodGenerator { // Last param is varargs Type varargsParam = params.get(lastIdx).type; ResultHandle componentType = tryCatch - .loadClass(varargsParam.asArrayType().component().name().toString()); + .loadClassFromTCCL(varargsParam.asArrayType().component().name().toString()); ResultHandle varargsResults = tryCatch.invokeVirtualMethod( Descriptors.EVALUATED_PARAMS_GET_VARARGS_RESULTS, evaluatedParamsHandle, tryCatch.load(evaluated.size()), componentType); @@ -357,7 +357,7 @@ public class ExtensionMethodGenerator { // Test base object class ResultHandle baseClass = appliesTo.invokeVirtualMethod(Descriptors.GET_CLASS, base); // Perform autoboxing for primitives - ResultHandle testClass = appliesTo.loadClass(box(params.getFirst(ParamKind.BASE).type).name().toString()); + ResultHandle testClass = appliesTo.loadClassFromTCCL(box(params.getFirst(ParamKind.BASE).type).name().toString()); ResultHandle baseClassTest = appliesTo.invokeVirtualMethod(Descriptors.IS_ASSIGNABLE_FROM, testClass, baseClass); BytecodeCreator baseNotAssignable = appliesTo.ifTrue(baseClassTest).falseBranch(); @@ -557,7 +557,7 @@ public class ExtensionMethodGenerator { // Last param is varargs Type varargsParam = params.get(lastIdx).type; ResultHandle componentType = tryCatch - .loadClass(varargsParam.asArrayType().component().name().toString()); + .loadClassFromTCCL(varargsParam.asArrayType().component().name().toString()); ResultHandle varargsResults = tryCatch.invokeVirtualMethod( Descriptors.EVALUATED_PARAMS_GET_VARARGS_RESULTS, whenEvaluatedParams, tryCatch.load(evaluated.size()), componentType); diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java index fd82ed2807b..275f196f9d1 100644 --- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java +++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java @@ -784,7 +784,8 @@ public class ValueResolverGenerator { } // Then we need to create an array for the last argument Type varargsParam = parameterTypes.get(parameterTypes.size() - 1); - ResultHandle componentType = tryCatch.loadClass(varargsParam.asArrayType().component().name().toString()); + ResultHandle componentType = tryCatch + .loadClassFromTCCL(varargsParam.asArrayType().component().name().toString()); ResultHandle varargsResults = tryCatch.invokeVirtualMethod(Descriptors.EVALUATED_PARAMS_GET_VARARGS_RESULTS, evaluatedParams, tryCatch.load(parameterTypes.size()), componentType); // E.g. String, String, String -> String, String[] @@ -853,27 +854,27 @@ public class ValueResolverGenerator { if (org.jboss.jandex.Type.Kind.PRIMITIVE.equals(paramType.kind())) { switch (paramType.asPrimitiveType().primitive()) { case INT: - return creator.loadClass(Integer.class); + return creator.loadClassFromTCCL(Integer.class); case LONG: - return creator.loadClass(Long.class); + return creator.loadClassFromTCCL(Long.class); case BOOLEAN: - return creator.loadClass(Boolean.class); + return creator.loadClassFromTCCL(Boolean.class); case BYTE: - return creator.loadClass(Byte.class); + return creator.loadClassFromTCCL(Byte.class); case CHAR: - return creator.loadClass(Character.class); + return creator.loadClassFromTCCL(Character.class); case DOUBLE: - return creator.loadClass(Double.class); + return creator.loadClassFromTCCL(Double.class); case FLOAT: - return creator.loadClass(Float.class); + return creator.loadClassFromTCCL(Float.class); case SHORT: - return creator.loadClass(Short.class); + return creator.loadClassFromTCCL(Short.class); default: throw new IllegalArgumentException("Unsupported primitive type: " + paramType); } } // TODO: we should probably use the TCCL to load the param type - return creator.loadClass(paramType.name().toString()); + return creator.loadClassFromTCCL(paramType.name().toString()); } private BytecodeCreator createMatchScope(BytecodeCreator bytecodeCreator, String methodName, int methodParams, @@ -911,7 +912,7 @@ public class ValueResolverGenerator { // Test base object class ResultHandle baseClass = baseNotNullBranch.invokeVirtualMethod(Descriptors.GET_CLASS, base); - ResultHandle testClass = baseNotNullBranch.loadClass(clazz.name().toString()); + ResultHandle testClass = baseNotNullBranch.loadClassFromTCCL(clazz.name().toString()); ResultHandle test = baseNotNullBranch.invokeVirtualMethod(Descriptors.IS_ASSIGNABLE_FROM, testClass, baseClass); BytecodeCreator baseAssignableBranch = baseNotNullBranch.ifNonZero(test).trueBranch(); baseAssignableBranch.returnValue(baseAssignableBranch.load(true)); diff --git a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/FieldExtractor.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/FieldExtractor.java index 7217063d675..2f1d0ee5593 100644 --- a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/FieldExtractor.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/FieldExtractor.java @@ -21,7 +21,7 @@ public class FieldExtractor extends ValueExtractor { ResultHandle extract(BytecodeCreator bytecodeCreator, ResultHandle containingObject) { MethodDescriptor readField = MethodDescriptor.ofMethod(ReflectionUtil.class, "readField", Object.class, Object.class, Class.class, String.class); - return bytecodeCreator.invokeStaticMethod(readField, containingObject, bytecodeCreator.loadClass(className), + return bytecodeCreator.invokeStaticMethod(readField, containingObject, bytecodeCreator.loadClassFromTCCL(className), bytecodeCreator.load(fieldName)); } } diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratorUtils.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratorUtils.java index 57b6b2a8821..714c75bb7bb 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratorUtils.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratorUtils.java @@ -31,7 +31,7 @@ public final class GeneratorUtils { public static ResultHandle unwrapObject(MethodCreator m, ResultHandle qrReqCtxHandle, DotName classType) { return m.invokeVirtualMethod(ofMethod(ResteasyReactiveRequestContext.class, "unwrap", Object.class, Class.class), - qrReqCtxHandle, m.loadClass(classType.toString())); + qrReqCtxHandle, m.loadClassFromTCCL(classType.toString())); } public static ResultHandle runtimeResourceHandle(MethodCreator filterMethod, ResultHandle qrReqCtxHandle) { diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java index 28591f2ab65..69a8dc37be4 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java @@ -124,14 +124,14 @@ public final class MultipartPopulatorGenerator { * private static MediaType status_mediaType; * * static { - * map_type = DeploymentUtils.loadClass("java.util.Map"); + * map_type = DeploymentUtils.loadClassFromTCCL("java.util.Map"); * map_genericType = TypeSignatureParser.parse("Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;"); * map_mediaType = MediaType.valueOf("application/json"); - * Class var0 = DeploymentUtils.loadClass("org.acme.getting.started.Person"); + * Class var0 = DeploymentUtils.loadClassFromTCCL("org.acme.getting.started.Person"); * person_type = var0; * person_genericType = var0; * person_mediaType = MediaType.valueOf("application/json"); - * Class var1 = DeploymentUtils.loadClass("org.acme.getting.started.Status"); + * Class var1 = DeploymentUtils.loadClassFromTCCL("org.acme.getting.started.Status"); * status_type = var1; * status_genericType = var1; * status_mediaType = MediaType.valueOf("text/plain");

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java', 'extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java', 'extensions/resteasy-classic/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java', 'extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/ReactiveRoutesProcessor.java', 'extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java', 'independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java', 'independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java', 'extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java', 'independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/FieldExtractor.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java', 'extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java', 'core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java', 'core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java', 'independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratorUtils.java', 'extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java', 'extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteDevConsoleRecorder.java', 'extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/YamlListObjectHandler.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java', 'extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java', 'independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java', 'extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java', 'core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java', 'extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/HalMethodImplementor.java', 'extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/CrudMethodsImplementor.java', 'extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/JacksonSerdeGenerator.java', 'independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java', 'core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java', 'extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java', 'extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ControllerAdviceExceptionMapperGenerator.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java', 'independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java', 'extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteErrorPageSetup.java', 'extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/RepositoryDataAccessImplementor.java', 'core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java', 'core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java', 'extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java', 'extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java']

{'.java': 47}

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/23295/22833

quarkusio

quarkus

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

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

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

org.objectweb.asm.ClassTooLargeException when building a project with 2K+ Hibernate entities (hbm.xmls).

fixes

### Describe the bug When we are trying to build our project with 2K+ Hibernate Entities (hbm.xmls) we are getting below exception. ``` [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 57.961 s [INFO] Finished at: 2022-01-12T16:57:23+05:30 [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:999-SNAPSHOT:build (quarkus-final-build-before-package) on project dna-wireless-service: Failed to build quarkus application: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [ERROR] [error]: Build step io.quarkus.deployment.steps.MainClassBuildStep#build threw an exception: org.objectweb.asm.ClassTooLargeException: Class too large: io/quarkus/deployment/steps/HibernateOrmProcessor$build1373687952 [ERROR] at org.objectweb.asm.ClassWriter.toByteArray(ClassWriter.java:599) [ERROR] at io.quarkus.gizmo.ClassCreator.writeTo(ClassCreator.java:214) [ERROR] at io.quarkus.gizmo.ClassCreator.close(ClassCreator.java:225) [ERROR] at io.quarkus.deployment.recording.BytecodeRecorderImpl.writeBytecode(BytecodeRecorderImpl.java:595) [ERROR] at io.quarkus.deployment.steps.MainClassBuildStep.writeRecordedBytecode(MainClassBuildStep.java:436) [ERROR] at io.quarkus.deployment.steps.MainClassBuildStep.build(MainClassBuildStep.java:168) [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:566) [ERROR] at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:887) [ERROR] at io.quarkus.builder.BuildContext.run(BuildContext.java:277) [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:829) [ERROR] at org.jboss.threads.JBossThread.run(JBossThread.java:501) ``` ### Expected behavior Build to go through successfully. ### Actual behavior Build failure. ### How to Reproduce? 1. Compile a project with large set of entities (2K+) ### Output of `uname -a` or `ver` Linux ubuntu 4.15.0-159-generic #167-Ubuntu SMP Tue Sep 21 08:55:05 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "11.0.11" 2021-04-20 OpenJDK Runtime Environment (build 11.0.11+9-Ubuntu-0ubuntu2.18.04) OpenJDK 64-Bit Server VM (build 11.0.11+9-Ubuntu-0ubuntu2.18.04, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d) ### Additional information _No response_

644e46fb11603edbc130d77830597e15fd7b4f88

0b7a4b458229182ec92fe95b2a6f887da8b600c4

https://github.com/quarkusio/quarkus/compare/644e46fb11603edbc130d77830597e15fd7b4f88...0b7a4b458229182ec92fe95b2a6f887da8b600c4

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java index 0cfef746ae1..9ce8bf24ff3 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java @@ -108,6 +108,7 @@ public class BytecodeRecorderImpl implements RecorderContext { private static final MethodDescriptor COLLECTION_ADD = ofMethod(Collection.class, "add", boolean.class, Object.class); private static final MethodDescriptor MAP_PUT = ofMethod(Map.class, "put", Object.class, Object.class, Object.class); + public static final String CREATE_ARRAY = "$quarkus$createArray"; private final boolean staticInit; private final ClassLoader classLoader; @@ -517,7 +518,10 @@ public class BytecodeRecorderImpl implements RecorderContext { //when this is true it is no longer possible to allocate items in the array. this is a guard against programmer error loadComplete = true; //now we now know many items we have, create the array - ResultHandle array = mainMethod.newArray(Object.class, deferredParameterCount); + + MethodDescriptor createArrayDescriptor = ofMethod(mainMethod.getMethodDescriptor().getDeclaringClass(), CREATE_ARRAY, + "[Ljava/lang/Object;"); + ResultHandle array = mainMethod.invokeVirtualMethod(createArrayDescriptor, mainMethod.getThis()); //this context manages the creation of new methods //it tracks the number of instruction groups and when they hit a threshold it @@ -592,6 +596,8 @@ public class BytecodeRecorderImpl implements RecorderContext { } context.close(); mainMethod.returnValue(null); + var createArray = file.getMethodCreator(createArrayDescriptor); + createArray.returnValue(createArray.newArray(Object.class, deferredParameterCount)); file.close(); } @@ -1516,8 +1522,6 @@ public class BytecodeRecorderImpl implements RecorderContext { for (SerializationStep i : setupSteps) { //then prepare the steps (i.e. creating the values to be placed into this object) i.prepare(context); - } - for (SerializationStep i : setupSteps) { //now actually run the steps (i.e. actually stick the values into the object) context.writeInstruction(new InstructionGroup() { @Override @@ -1866,7 +1870,7 @@ public class BytecodeRecorderImpl implements RecorderContext { /** * The function that is called to read the value for use. This may be by reading the value from the Object[] - * array, or is may be a direct ldc instruction in the case of primitives. + * array, or is can be a direct ldc instruction in the case of primitives. * <p> * Code in this method is run in a single instruction group, so large objects should be serialized in the * {@link #doPrepare(MethodContext)} method instead @@ -1894,15 +1898,17 @@ public class BytecodeRecorderImpl implements RecorderContext { abstract class DeferredArrayStoreParameter extends DeferredParameter { - final int arrayIndex; + int arrayIndex = -1; final String returnType; + ResultHandle originalResultHandle; + ResultHandle originalArrayResultHandle; + MethodCreator originalRhMethod; DeferredArrayStoreParameter(String expectedType) { returnType = expectedType; if (loadComplete) { throw new RuntimeException("Cannot create new DeferredArrayStoreParameter after array has been allocated"); } - arrayIndex = deferredParameterCount++; } DeferredArrayStoreParameter(Object target, Class<?> expectedType) { @@ -1918,7 +1924,6 @@ public class BytecodeRecorderImpl implements RecorderContext { if (loadComplete) { throw new RuntimeException("Cannot create new DeferredArrayStoreParameter after array has been allocated"); } - arrayIndex = deferredParameterCount++; } /** @@ -1933,8 +1938,9 @@ public class BytecodeRecorderImpl implements RecorderContext { context.writeInstruction(new InstructionGroup() { @Override public void write(MethodContext context, MethodCreator method, ResultHandle array) { - ResultHandle val = createValue(context, method, array); - method.writeArrayValue(array, arrayIndex, val); + originalResultHandle = createValue(context, method, array); + originalRhMethod = method; + originalArrayResultHandle = array; } }); prepared = true; @@ -1942,6 +1948,16 @@ public class BytecodeRecorderImpl implements RecorderContext { @Override final ResultHandle doLoad(MethodContext context, MethodCreator method, ResultHandle array) { + if (!prepared) { + prepare(context); + } + if (method == originalRhMethod) { + return originalResultHandle; + } + if (arrayIndex == -1) { + arrayIndex = deferredParameterCount++; + originalRhMethod.writeArrayValue(originalArrayResultHandle, arrayIndex, originalResultHandle); + } ResultHandle resultHandle = method.readArrayValue(array, arrayIndex); if (returnType == null) { return resultHandle; @@ -2050,10 +2066,14 @@ public class BytecodeRecorderImpl implements RecorderContext { //we don't want to have to go back to the array every time //so we cache the result handles within the scope of the current method int arrayIndex = ((DeferredArrayStoreParameter) parameter).arrayIndex; - if (currentMethodCache.containsKey(arrayIndex)) { + if (arrayIndex > 0 && currentMethodCache.containsKey(arrayIndex)) { return currentMethodCache.get(arrayIndex); } ResultHandle loaded = parameter.doLoad(this, currentMethod, currentMethod.getMethodParam(1)); + arrayIndex = ((DeferredArrayStoreParameter) parameter).arrayIndex; + if (arrayIndex < 0) { + return loaded; + } if (parent.currentMethod == currentMethod) { currentMethodCache.put(arrayIndex, loaded); return loaded; diff --git a/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java b/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java index 6fa3cbc65e3..499e7e8e310 100644 --- a/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java +++ b/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java @@ -189,7 +189,7 @@ public class BytecodeRecorderTestCase { public void testLargeCollection() throws Exception { List<TestJavaBean> beans = new ArrayList<>(); - for (int i = 0; i < 10000; ++i) { + for (int i = 0; i < 100000; ++i) { beans.add(new TestJavaBean("A string", 99)); }

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

{'.java': 2}

Java

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

Apache License 2.0

quarkusio/quarkus/23038/22595

quarkusio

quarkus

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

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

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

Quarkus doesn’t send X-Ray traces to AWS for sub-segments in Native build while using RESTEasy “controller” based approach

fix

### Describe the bug I an using "Controller" based approach using RESTEasy. I have added Quarkus AWS Xray dependency in my POM.xml.. And then we are instrumenting calls to AWS Services using below dependency: <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-xray-recorder-sdk-aws-sdk-v2-instrumentor</artifactId> <version>2.10.0</version> </dependency> Also, we create manual sub-segment for external API calls.. However, Quarkus send sub-segment traces to XRay in the JVM build.. But in Native build, it does not send any sub-segments... also, there is no error thrown. In cloudwatch logs, it says "TRACE_ID missing. It works for native build in AWS Lambda "Handler" based approach but not in "Controller" based approach in RESTEasy. Attaching the screenshots of JVM and Native Build below: ### Expected behavior It should create and show sub-segments in the graph also. ### Actual behavior It does not show the sub-segments in Native build. ### How to Reproduce? [https://github.com/amitkumar7566/xray-native-image-test](url) ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` java 11 ### GraalVM version (if different from Java) 21.3-java11 ### Quarkus version or git rev 2.6.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) maven ### Additional information _No response_

d959a1f1c772622db5933a71d623ebf2b71b8388

c34afc71358ce289112ede25bdb089a9e52f7805

https://github.com/quarkusio/quarkus/compare/d959a1f1c772622db5933a71d623ebf2b71b8388...c34afc71358ce289112ede25bdb089a9e52f7805

diff --git a/extensions/amazon-lambda-xray/runtime/src/main/java/io/quarkus/amazon/lambda/xray/graal/LambdaSegmentContextSubstitution.java b/extensions/amazon-lambda-xray/runtime/src/main/java/io/quarkus/amazon/lambda/xray/graal/LambdaSegmentContextSubstitution.java deleted file mode 100644 index bd68ad06ee1..00000000000 --- a/extensions/amazon-lambda-xray/runtime/src/main/java/io/quarkus/amazon/lambda/xray/graal/LambdaSegmentContextSubstitution.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.quarkus.amazon.lambda.xray.graal; - -import com.amazonaws.xray.contexts.LambdaSegmentContext; -import com.amazonaws.xray.entities.TraceHeader; -import com.oracle.svm.core.annotate.Substitute; -import com.oracle.svm.core.annotate.TargetClass; - -import io.quarkus.amazon.lambda.runtime.TraceId; - -@TargetClass(LambdaSegmentContext.class) -public final class LambdaSegmentContextSubstitution { - - @Substitute - private static TraceHeader getTraceHeaderFromEnvironment() { - return TraceHeader.fromString(TraceId.getTraceId()); - } - -} diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java index 4bb45bba97e..03d2883bb28 100644 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java @@ -25,6 +25,7 @@ public abstract class AbstractLambdaPollLoop { private final ObjectReader cognitoIdReader; private final ObjectReader clientCtxReader; private final LaunchMode launchMode; + private static final String LAMBDA_TRACE_HEADER_PROP = "com.amazonaws.xray.traceHeader"; public AbstractLambdaPollLoop(ObjectMapper objectMapper, ObjectReader cognitoIdReader, ObjectReader clientCtxReader, LaunchMode launchMode) { @@ -102,7 +103,9 @@ public abstract class AbstractLambdaPollLoop { } } String traceId = requestConnection.getHeaderField(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY); - TraceId.setTraceId(traceId); + if (traceId != null) { + System.setProperty(LAMBDA_TRACE_HEADER_PROP, traceId); + } URL url = AmazonLambdaApi.invocationResponse(baseUrl, requestId); if (isStream()) { HttpURLConnection responseConnection = responseStream(url); diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/TraceId.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/TraceId.java deleted file mode 100644 index 60fc529c20b..00000000000 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/TraceId.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.quarkus.amazon.lambda.runtime; - -public class TraceId { - private static ThreadLocal<String> traceHeader = new ThreadLocal<>(); - - public static void setTraceId(String id) { - traceHeader.set(id); - } - - public static String getTraceId() { - return traceHeader.get(); - } - - public static void clearTraceId() { - traceHeader.set(null); - } -}

['extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java', 'extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/TraceId.java', 'extensions/amazon-lambda-xray/runtime/src/main/java/io/quarkus/amazon/lambda/xray/graal/LambdaSegmentContextSubstitution.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/23040/23011

quarkusio

quarkus

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

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

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

Warnings about MetricCollectingClientInterceptor and MetricCollectingServerInterceptor when using grpc and micrometer

fix

### Describe the bug Warnings about `MetricCollectingClientInterceptor` and `MetricCollectingServerInterceptor` when using grpc and micrometer Warnings: - At least one unused gRPC client interceptor found: io.micrometer.core.instrument.binder.grpc.MetricCollectingClientInterceptor. If there are meant to be used globally, annotate them with @GlobalInterceptor. - At least one unused gRPC interceptor found: io.micrometer.core.instrument.binder.grpc.MetricCollectingServerInterceptor. If there are meant to be used globally, annotate them with @GlobalInterceptor. These warnings should be fixed or at least silenced using `LogCleanupFilterBuildItem` ``` [INFO] --- quarkus-maven-plugin:2.6.2.Final:build (default) @ code-with-quarkus --- [INFO] [org.jboss.threads] JBoss Threads version 3.4.2.Final [WARNING] [io.quarkus.grpc.deployment.GrpcClientProcessor] At least one unused gRPC client interceptor found: io.micrometer.core.instrument.binder.grpc.MetricCollectingClientInterceptor. If there are meant to be used globally, annotate them with @GlobalInterceptor. [WARNING] [io.quarkus.grpc.deployment.GrpcServerProcessor] At least one unused gRPC interceptor found: io.micrometer.core.instrument.binder.grpc.MetricCollectingServerInterceptor. If there are meant to be used globally, annotate them with @GlobalInterceptor. [INFO] [io.quarkus.deployment.QuarkusAugmentor] Quarkus augmentation completed in 921ms ``` ### Expected behavior No warnings ### Actual behavior Warnings ``` [INFO] --- quarkus-maven-plugin:2.6.2.Final:build (default) @ code-with-quarkus --- [INFO] [org.jboss.threads] JBoss Threads version 3.4.2.Final [WARNING] [io.quarkus.grpc.deployment.GrpcClientProcessor] At least one unused gRPC client interceptor found: io.micrometer.core.instrument.binder.grpc.MetricCollectingClientInterceptor. If there are meant to be used globally, annotate them with @GlobalInterceptor. [WARNING] [io.quarkus.grpc.deployment.GrpcServerProcessor] At least one unused gRPC interceptor found: io.micrometer.core.instrument.binder.grpc.MetricCollectingServerInterceptor. If there are meant to be used globally, annotate them with @GlobalInterceptor. [INFO] [io.quarkus.deployment.QuarkusAugmentor] Quarkus augmentation completed in 921ms ``` ### How to Reproduce? - select `Micrometer` and `gRPC` on https://code.quarkus.io/ - download the app - run `mvn clean package` ### Output of `uname -a` or `ver` macOS Monterey ### Output of `java -version` Java 17 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

ad516dc3ead0e8efcda412068201eb0011a47807

ef6d5f2821d94b27e721e247ef2e4b72f9e7c6cd

https://github.com/quarkusio/quarkus/compare/ad516dc3ead0e8efcda412068201eb0011a47807...ef6d5f2821d94b27e721e247ef2e4b72f9e7c6cd

diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java index 54953a2aea2..862779c9b4a 100644 --- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java +++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java @@ -5,6 +5,7 @@ import static io.quarkus.grpc.deployment.GrpcDotNames.ADD_BLOCKING_CLIENT_INTERC import static io.quarkus.grpc.deployment.GrpcDotNames.CONFIGURE_STUB; import static io.quarkus.grpc.deployment.GrpcDotNames.CREATE_CHANNEL_METHOD; import static io.quarkus.grpc.deployment.GrpcDotNames.RETRIEVE_CHANNEL_METHOD; +import static io.quarkus.grpc.deployment.GrpcInterceptors.MICROMETER_INTERCEPTORS; import static io.quarkus.grpc.deployment.ResourceRegistrationUtils.registerResourcesForProperties; import java.util.ArrayList; @@ -359,6 +360,11 @@ public class GrpcClientProcessor { // The rest, if anything stays, should be logged as problematic Set<String> superfluousInterceptors = new HashSet<>(interceptors.nonGlobalInterceptors); + // Remove the metrics interceptors + for (String MICROMETER_INTERCEPTOR : MICROMETER_INTERCEPTORS) { + superfluousInterceptors.remove(MICROMETER_INTERCEPTOR); + } + List<AnnotationInstance> found = new ArrayList<>(index.getAnnotations(GrpcDotNames.REGISTER_CLIENT_INTERCEPTOR)); for (AnnotationInstance annotation : index.getAnnotations(GrpcDotNames.REGISTER_CLIENT_INTERCEPTOR_LIST)) { for (AnnotationInstance nested : annotation.value().asNestedArray()) { diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcInterceptors.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcInterceptors.java index 0e154ea4394..0722cf9d445 100644 --- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcInterceptors.java +++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcInterceptors.java @@ -5,6 +5,7 @@ import static io.quarkus.grpc.deployment.GrpcDotNames.GLOBAL_INTERCEPTOR; import java.lang.reflect.Modifier; import java.util.Collection; import java.util.HashSet; +import java.util.List; import java.util.Set; import org.jboss.jandex.ClassInfo; @@ -13,6 +14,10 @@ import org.jboss.jandex.IndexView; final class GrpcInterceptors { + static final List<String> MICROMETER_INTERCEPTORS = List.of( + "io.micrometer.core.instrument.binder.grpc.MetricCollectingClientInterceptor", + "io.micrometer.core.instrument.binder.grpc.MetricCollectingServerInterceptor"); + final Set<String> globalInterceptors; final Set<String> nonGlobalInterceptors; diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java index 4c0ad8692e3..7b440777f96 100644 --- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java +++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java @@ -4,6 +4,7 @@ import static io.quarkus.deployment.Feature.GRPC_SERVER; import static io.quarkus.grpc.deployment.GrpcDotNames.BLOCKING; import static io.quarkus.grpc.deployment.GrpcDotNames.NON_BLOCKING; import static io.quarkus.grpc.deployment.GrpcDotNames.TRANSACTIONAL; +import static io.quarkus.grpc.deployment.GrpcInterceptors.MICROMETER_INTERCEPTORS; import static java.util.Arrays.asList; import java.lang.reflect.Modifier; @@ -385,6 +386,11 @@ public class GrpcServerProcessor { // the rest, if anything stays, should be logged as problematic Set<String> superfluousInterceptors = new HashSet<>(interceptors.nonGlobalInterceptors); + // Remove the metrics interceptors + for (String MICROMETER_INTERCEPTOR : MICROMETER_INTERCEPTORS) { + superfluousInterceptors.remove(MICROMETER_INTERCEPTOR); + } + List<AnnotationInstance> found = new ArrayList<>(index.getAnnotations(GrpcDotNames.REGISTER_INTERCEPTOR)); for (AnnotationInstance annotation : index.getAnnotations(GrpcDotNames.REGISTER_INTERCEPTORS)) { for (AnnotationInstance nested : annotation.value().asNestedArray()) {

['extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java', 'extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcInterceptors.java', 'extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.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/23123/23110

quarkusio

quarkus

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

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

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

quarkus-resteasy-reactive PathMatcher allows any extra character in the end of valid path

fixes

### Describe the bug when using **quarkus-resteasy-reactive**, appending any extra character in the end of a valid path doesn't result in 404 but instead gets to the existing valid route making simple `@Path("hello")` resource, will return a response when calling /hello, but also /helloX (X = any character) and /helloX/, while the invalid paths should result in 404 appending more than 1 character results in a valid behaviour and returns 404 seems that the `PathMatcher` treats the last character as if it was a trailing slash since in some places in the code only the length of the remaining path part is checked (I suppose for performance reasons?) **quarkus-resteasy** PathMatcher does behave as expected ### Expected behavior `/hello` should return a response `/helloX` and `/helloX/` should return 404 (X == any character) ### Actual behavior `/hello` should return a response `/helloX` and `/helloX/` return same response as `/hello` ### How to Reproduce? create a starter quarkus project with quarkus-resteasy-reactive extension add a simple hello resource (kotlin version) ``` @Path("hello") class HelloResource { @GET @Produces(MediaType.TEXT_PLAIN) fun hello() : String { return "Hello" } } ``` ### Output of `uname -a` or `ver` Darwin MacBook-Pro.local 20.6.0 Darwin Kernel Version 20.6.0; root:xnu-7195.141.8~1/RELEASE_X86_64 x86_64 ### Output of `java -version` openjdk version "16.0.2" 2021-07-20; OpenJDK Runtime Environment Corretto-16.0.2.7.1 (build 16.0.2+7) ### GraalVM version (if different from Java) - ### Quarkus version or git rev 2.6.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 6.9 ### Additional information _No response_

5d51dfe58c802953790b76056ce160acfd745673

bf677b08faacad5aae8963a1a224aeb4907c1bc5

https://github.com/quarkusio/quarkus/compare/5d51dfe58c802953790b76056ce160acfd745673...bf677b08faacad5aae8963a1a224aeb4907c1bc5

diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java index b2baf6c67dc..62b9c71d3f7 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java @@ -104,11 +104,13 @@ public class RequestMapper<T> { params[paramCount] = null; } boolean fullMatch = matchPos == pathLength; - if (!prefixAllowed && !fullMatch) { + boolean doPrefixMatch = false; + if (!fullMatch) { //according to the spec every template ends with (/.*)? - prefixAllowed = path.charAt(matchPos) == '/' && matchPos == pathLength - 1; + doPrefixMatch = (matchPos == 1 || path.charAt(matchPos) == '/') //matchPos == 1 corresponds to '/' as a root level match + && (prefixAllowed || matchPos == pathLength - 1); //if prefix is allowed, or the remainder is only a trailing / } - if (matched && (fullMatch || prefixAllowed)) { + if (matched && (fullMatch || doPrefixMatch)) { String remaining; if (fullMatch) { remaining = ""; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/RestPathTestCase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/RestPathTestCase.java index 4cbf79afa1f..e7261aeac94 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/RestPathTestCase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/RestPathTestCase.java @@ -24,8 +24,9 @@ public class RestPathTestCase { @Test public void testRestPath() { RestAssured.basePath = "/"; - RestAssured.when().get("/foo/hello").then().statusCode(200).body(Matchers.is("hello")); RestAssured.when().get("/foo/hello/nested").then().statusCode(200).body(Matchers.is("world hello")); + RestAssured.when().get("/foo/helloX").then().statusCode(404); + RestAssured.when().get("/foo/hello").then().statusCode(200).body(Matchers.is("hello")); } @Test

['independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/RestPathTestCase.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.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/23160/23055

quarkusio

quarkus

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

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

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

Resource method String param annotated with @RestForm not decoded automatically

fixes

### Describe the bug It seems that a String resource method param annotated with `@RestForm` is not decoded automatically. AFAIK the spec version of this annotation, i.e. `@FormParam` is decoded unless used together with `@Encoded`. ### 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_

a78f749866954756bcbdb8b6895aedd29786d452

41f2d2092d7f3a8e238554e65dd74bd7b15539f2

https://github.com/quarkusio/quarkus/compare/a78f749866954756bcbdb8b6895aedd29786d452...41f2d2092d7f3a8e238554e65dd74bd7b15539f2

diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java index 935c5524811..15537bae367 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java @@ -32,15 +32,15 @@ public class FormParamTest { @Test void shouldPassFormParam() { FormClient formClient = RestClientBuilder.newBuilder().baseUri(baseUri).build(FormClient.class); - String result = formClient.directForm("par1", "par2"); - assertThat(result).isEqualTo("root formParam1:par1,formParam2:par2"); + String result = formClient.directForm("par1", "par 2"); + assertThat(result).isEqualTo("root formParam1:par1,formParam2:par 2"); } @Test void shouldPassFormParamFromSubResource() { FormClient formClient = RestClientBuilder.newBuilder().baseUri(baseUri).build(FormClient.class); - String result = formClient.subForm("par1", "par2").form("spar1", "spar2"); - assertThat(result).isEqualTo("sub rootParam1:par1,rootParam2:par2,subParam1:spar1,subParam2:spar2"); + String result = formClient.subForm("par1", "par 2").form("spar1", "spar 2"); + assertThat(result).isEqualTo("sub rootParam1:par1,rootParam2:par 2,subParam1:spar1,subParam2:spar 2"); } public interface FormClient { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java index 147ed710da7..853aec49f10 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java @@ -99,35 +99,13 @@ public class URLUtils { if (buffer != null) { buffer.setLength(0); } - boolean needToChange = false; int numChars = s.length(); int i = 0; while (i < numChars) { char c = s.charAt(i); - if (c == '+') { - if (formEncoding) { - if (!needToChange) { - if (buffer == null) { - buffer = new StringBuilder(); - } - buffer.append(s, 0, i); - } - buffer.append(' '); - i++; - } else { - i++; - if (needToChange) { - buffer.append(c); - } - } - } else if (c == '%' || c > 127) { - if (!needToChange) { - if (buffer == null) { - buffer = new StringBuilder(); - } - buffer.append(s, 0, i); - needToChange = true; - } + if (c == '%' || c > 127 || c == '+') { + buffer = new StringBuilder(); + buffer.append(s, 0, i); /* * Starting with this instance of a character * that needs to be encoded, process all @@ -232,16 +210,16 @@ public class URLUtils { String decoded = new String(bytes, 0, pos, enc); buffer.append(decoded); + return buffer.toString(); } catch (NumberFormatException e) { throw failedToDecodeURL(s, enc, e); } - break; } else { i++; } } - return (needToChange ? buffer.toString() : s); + return s; } private static RuntimeException failedToDecodeURL(String s, Charset enc, Throwable o) {

['independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java', 'extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.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/23178/23113

quarkusio

quarkus

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

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

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

Native build with quarkus-jdbc-oracle + quarkus-jdbc-db2 extension dependencies fails

fixes

### Describe the bug Usage of the JDBC Driver extension for Oracle is causing the native build to fail when used together with the JDBC Driver extension for DB2 as following: ``` [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] Running Quarkus native-image plugin on GraalVM 21.3.0 Java 17 CE (Java Version 17.0.1+12-jvmci-21.3-b05) [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildRunner] /mnt/c/Develop/graalvm-17-linux/bin/native-image -J-Djava.util.logging.manager=org.jboss.logmanager.LogManager -J-Dsun.nio.ch.maxUpdateArraySize=100 -J-DCoordinatorEnvironmentBean.transactionStatusManagerEnable=false -J-DQuarkusWithJcc=true -J-Dvertx.logger-delegate-factory-class-name=io.quarkus.vertx.core.runtime.VertxLogDelegateFactory -J-Dvertx.disableDnsResolver=true -J-Dio.netty.leakDetection.level=DISABLED -J-Dio.netty.allocator.maxOrder=3 -J-Duser.language=en -J-Duser.country= -J-Dfile.encoding=UTF-8 -H:-ParseOnce -J--add-exports=java.security.jgss/sun.security.krb5=ALL-UNNAMED -J--add-opens=java.base/java.text=ALL-UNNAMED -H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy\$BySpaceAndTime -H:+JNI -H:+AllowFoldMethods -J-Djava.awt.headless=true -H:FallbackThreshold=0 --allow-incomplete-classpath -H:+ReportExceptionStackTraces -H:+AddAllCharsets -H:EnableURLProtocols=http,https -H:NativeLinkerOption=-no-pie -H:-UseServiceLoaderFeature -H:+StackTrace -J--add-exports=java.base/sun.security.action=ALL-UNNAMED --exclude-config .*com\.oracle\.database\.jdbc.* /META-INF/native-image/(?:native-image\.properties|reflect-config\.json) -J--add-exports=java.management/sun.management=ALL-UNNAMED code-with-quarkus-1.0.0-SNAPSHOT-runner -jar code-with-quarkus-1.0.0-SNAPSHOT-runner.jar [code-with-quarkus-1.0.0-SNAPSHOT-runner:1269] classlist: 5,771.23 ms, 0.94 GB [code-with-quarkus-1.0.0-SNAPSHOT-runner:1269] (cap): 4,138.60 ms, 0.93 GB [code-with-quarkus-1.0.0-SNAPSHOT-runner:1269] setup: 8,837.75 ms, 0.94 GB The bundle named: com/sun/rowset/RowSetResourceBundle, 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. 00:45:15,392 INFO [org.jbo.threads] JBoss Threads version 3.4.2.Final To see how the classes got initialized, use --trace-class-initialization=oracle.jdbc.driver.OracleDriver,oracle.jdbc.OracleDriver [code-with-quarkus-1.0.0-SNAPSHOT-runner:1269] analysis: 56,966.08 ms, 5.26 GB Error: Classes that should be initialized at run time got initialized during image building: oracle.jdbc.driver.OracleDriver the class was requested to be initialized at run time (from feature io.quarkus.runner.AutoFeature.beforeAnalysis with 'OracleDriver.class'). To see why oracle.jdbc.driver.OracleDriver got initialized use --trace-class-initialization=oracle.jdbc.driver.OracleDriver oracle.jdbc.OracleDriver the class was requested to be initialized at run time (from feature io.quarkus.runner.AutoFeature.beforeAnalysis with 'OracleDriver.class' and subtype of oracle.jdbc.driver.OracleDriver). To see why oracle.jdbc.OracleDriver got initialized use --trace-class-initialization=oracle.jdbc.OracleDriver com.oracle.svm.core.util.UserError$UserException: Classes that should be initialized at run time got initialized during image building: oracle.jdbc.driver.OracleDriver the class was requested to be initialized at run time (from feature io.quarkus.runner.AutoFeature.beforeAnalysis with 'OracleDriver.class'). To see why oracle.jdbc.driver.OracleDriver got initialized use --trace-class-initialization=oracle.jdbc.driver.OracleDriver oracle.jdbc.OracleDriver the class was requested to be initialized at run time (from feature io.quarkus.runner.AutoFeature.beforeAnalysis with 'OracleDriver.class' and subtype of oracle.jdbc.driver.OracleDriver). To see why oracle.jdbc.OracleDriver got initialized use --trace-class-initialization=oracle.jdbc.OracleDriver at com.oracle.svm.core.util.UserError.abort(UserError.java:73) at com.oracle.svm.hosted.classinitialization.ConfigurableClassInitialization.checkDelayedInitialization(ConfigurableClassInitialization.java:555) at com.oracle.svm.hosted.classinitialization.ClassInitializationFeature.duringAnalysis(ClassInitializationFeature.java:168) at com.oracle.svm.hosted.NativeImageGenerator.lambda$runPointsToAnalysis$12(NativeImageGenerator.java:727) at com.oracle.svm.hosted.FeatureHandler.forEachFeature(FeatureHandler.java:73) at com.oracle.svm.hosted.NativeImageGenerator.runPointsToAnalysis(NativeImageGenerator.java:727) at com.oracle.svm.hosted.NativeImageGenerator.doRun(NativeImageGenerator.java:529) at com.oracle.svm.hosted.NativeImageGenerator.run(NativeImageGenerator.java:488) at com.oracle.svm.hosted.NativeImageGeneratorRunner.buildImage(NativeImageGeneratorRunner.java:403) at com.oracle.svm.hosted.NativeImageGeneratorRunner.build(NativeImageGeneratorRunner.java:569) at com.oracle.svm.hosted.NativeImageGeneratorRunner.main(NativeImageGeneratorRunner.java:122) at com.oracle.svm.hosted.NativeImageGeneratorRunner$JDK9Plus.main(NativeImageGeneratorRunner.java:599) [code-with-quarkus-1.0.0-SNAPSHOT-runner:1269] [total]: 72,514.57 ms, 5.26 GB # Printing build artifacts to: /mnt/c/Develop/workspace/code-with-quarkus/target/code-with-quarkus-1.0.0-SNAPSHOT-native-image-source-jar/code-with-quarkus-1.0.0-SNAPSHOT-runner.build_artifacts.txt Error: Image build request failed with exit status 1 [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 02:00 min [INFO] Finished at: 2022-01-23T00:45:51+01:00 [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal io.quarkus.platform:quarkus-maven-plugin:2.6.3.Final:build (default) on project code-with-quarkus: 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.NativeImageBuildStep#build threw an exception: java.lang.RuntimeException: Failed to build native image [ERROR] at io.quarkus.deployment.pkg.steps.NativeImageBuildStep.build(NativeImageBuildStep.java:250) [ERROR] at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [ERROR] at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) [ERROR] at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [ERROR] at java.base/java.lang.reflect.Method.invoke(Method.java:568) [ERROR] at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:887) [ERROR] at io.quarkus.builder.BuildContext.run(BuildContext.java:277) [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:833) [ERROR] at org.jboss.threads.JBossThread.run(JBossThread.java:501) [ERROR] Caused by: java.lang.RuntimeException: Image generation failed. Exit code: 1 [ERROR] at io.quarkus.deployment.pkg.steps.NativeImageBuildStep.imageGenerationFailed(NativeImageBuildStep.java:386) [ERROR] at io.quarkus.deployment.pkg.steps.NativeImageBuildStep.build(NativeImageBuildStep.java:229) [ERROR] ... 11 more [ERROR] -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException ``` ### Expected behavior I expect to be able to build natively using both extensions by the same application. ### Actual behavior The native build is failing. ### How to Reproduce? - Clone https://github.com/bvahdat/code-with-quarkus2 - Run `./mvnw package -Pnative` ### Output of `uname -a` or `ver` Linux XYZ 4.4.0-18362-Microsoft #1801-Microsoft Sat Sep 11 15:28:00 PST 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "17.0.1" 2021-10-19 OpenJDK Runtime Environment GraalVM CE 21.3.0 (build 17.0.1+12-jvmci-21.3-b05) OpenJDK 64-Bit Server VM GraalVM CE 21.3.0 (build 17.0.1+12-jvmci-21.3-b05, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) ### Additional information _No response_

fedc0698d0ae0a1de62354a7f649eb0077346ead

66cd29ef9af47263dad98958e368a33b03f5da1e

https://github.com/quarkusio/quarkus/compare/fedc0698d0ae0a1de62354a7f649eb0077346ead...66cd29ef9af47263dad98958e368a33b03f5da1e

diff --git a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java index 4717048d953..87376ec0425 100644 --- a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java +++ b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java @@ -67,8 +67,12 @@ public final class OracleMetadataOverrides { @BuildStep void runtimeInitializeDriver(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitialized) { //These re-implement all the "--initialize-at-build-time" arguments found in the native-image.properties : - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.OracleDriver")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.OracleDriver")); + + // Override: the original metadata marks the drivers as "runtime initialized" but this makes it incompatible with + // other systems (e.g. DB2 drivers) as it makes them incompatible with the JDK DriverManager integrations: + // the DriverManager will typically (and most likely) need to load all drivers in a different phase. + // runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.OracleDriver")); + // runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.OracleDriver")); // The Oracle driver's metadata hints to require java.sql.DriverManager to be initialized at runtime, but: // A) I disagree with the fact that a driver makes changes outside of its scope (java.sql in this case)

['extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.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/23185/23167

quarkusio

quarkus

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

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

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

LinkageError when hot reloading project using classes in external dependencies

fixes

### Describe the bug I have following structure in my reproducer project: External dependency: * A class called Configuration. This is a simple pojo, no cdi bean * META-INF/beans.xml file Quarkus project: * ConfigurationProducer - a cdi producer, creating an applicationscoped instance of the Configuration * ConfigurationValidator - Startup bean, which validates the produced Configuration in an PostConstruct * GreetingResource - a simple inject of the Configuration On first quarkus:dev, this app starts flawlessly. If I now hot reload, I get the exception from below. This only happens with 2.7.0.CR1. With 2.6.3.Final, this exception did not happen. ### Expected behavior No exceptions when hot reloading, like in 2.6.3.Final ### Actual behavior ``` 2022-01-25 09:30:46,446 INFO [io.quarkus] (Quarkus Main Thread) hot-reload-producer stopped in 0.013s __ ____ __ _____ ___ __ ____ ______ --/ __ \/ / / / _ | / _ \/ //_/ / / / __/ -/ /_/ / /_/ / __ |/ , _/ ,< / /_/ /\ \ --\___\_\____/_/ |_/_/|_/_/|_|\____/___/ 2022-01-25 09:30:48,222 ERROR [io.qua.run.Application] (Quarkus Main Thread) Failed to start application (with profile dev): java.lang.LinkageError: loader constraint violation: when r esolving method 'void com.acme.spi.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_ClientProxy.<init>(org.acme.ConfigurationProducer_ProducerMet hod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean)' the class loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @73843e83 of the current class, org/acme/Configurati onProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean, and the class loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @4461c7e3 for the method's defining class, com/acme/spi/ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_ClientProxy, have different Class objects for the type org/acme/Con figurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean used in the signature (org.acme.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125 f3f16fd0e1923dbf7b49ecb1a_Bean is in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @73843e83, parent loader io.quarkus.bootstrap.classloading.QuarkusCla ssLoader @4461c7e3; com.acme.spi.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_ClientProxy is in unnamed module of loader io.quarkus.bootstrap .classloading.QuarkusClassLoader @4461c7e3, parent loader 'app') at org.acme.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean.proxy(Unknown Source) at org.acme.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean.get(Unknown Source) at org.acme.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean.get(Unknown Source) at org.acme.ConfigurationValidator_Bean.create(Unknown Source) at org.acme.ConfigurationValidator_Bean.create(Unknown Source) at io.quarkus.arc.impl.AbstractSharedContext.createInstanceHandle(AbstractSharedContext.java:101) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:29) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:26) 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:26) at io.quarkus.arc.impl.ClientProxies.getApplicationScopedDelegate(ClientProxies.java:18) at org.acme.ConfigurationValidator_ClientProxy.arc$delegate(Unknown Source) at org.acme.ConfigurationValidator_ClientProxy.arc_contextualInstance(Unknown Source) at org.acme.ConfigurationValidator_Observer_Synthetic_d70cd75bf32ab6598217b9a64a8473d65e248c05.notify(Unknown Source) at io.quarkus.arc.impl.EventImpl$Notifier.notifyObservers(EventImpl.java:320) at io.quarkus.arc.impl.EventImpl$Notifier.notify(EventImpl.java:302) at io.quarkus.arc.impl.EventImpl.fire(EventImpl.java:73) at io.quarkus.arc.runtime.ArcRecorder.fireLifecycleEvent(ArcRecorder.java:128) at io.quarkus.arc.runtime.ArcRecorder.handleLifecycleEvents(ArcRecorder.java:97) 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:104) at io.quarkus.runtime.Quarkus.run(Quarkus.java:67) at io.quarkus.runtime.Quarkus.run(Quarkus.java:41) at io.quarkus.runtime.Quarkus.run(Quarkus.java:120) 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:103) at java.base/java.lang.Thread.run(Thread.java:833) 2022-01-25 09:30:48,223 ERROR [io.qua.dep.dev.IsolatedDevModeMain] (Aesh InputStream Reader) Failed to start quarkus: java.lang.RuntimeException: java.lang.RuntimeException: Failed to start quarkus at io.quarkus.dev.appstate.ApplicationStateNotification.waitForApplicationStart(ApplicationStateNotification.java:51) at io.quarkus.runner.bootstrap.StartupActionImpl.runMainClass(StartupActionImpl.java:122) at io.quarkus.deployment.dev.IsolatedDevModeMain.restartApp(IsolatedDevModeMain.java:233) at io.quarkus.deployment.dev.IsolatedDevModeMain.restartCallback(IsolatedDevModeMain.java:214) at io.quarkus.deployment.dev.RuntimeUpdatesProcessor.doScan(RuntimeUpdatesProcessor.java:522) at io.quarkus.deployment.console.ConsoleStateManager.forceRestart(ConsoleStateManager.java:141) at io.quarkus.deployment.console.ConsoleStateManager.lambda$installBuiltins$0(ConsoleStateManager.java:98) at io.quarkus.deployment.console.ConsoleStateManager$1.accept(ConsoleStateManager.java:73) at io.quarkus.deployment.console.ConsoleStateManager$1.accept(ConsoleStateManager.java:46) at io.quarkus.deployment.console.AeshConsole.lambda$setup$1(AeshConsole.java:249) at org.aesh.terminal.EventDecoder.accept(EventDecoder.java:118) at org.aesh.terminal.EventDecoder.accept(EventDecoder.java:31) at org.aesh.terminal.io.Decoder.write(Decoder.java:133) at org.aesh.readline.tty.terminal.TerminalConnection.openBlocking(TerminalConnection.java:216) at org.aesh.readline.tty.terminal.TerminalConnection.openBlocking(TerminalConnection.java:203) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635) at java.base/java.lang.Thread.run(Thread.java:833) Caused by: java.lang.RuntimeException: Failed to start quarkus 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:104) at io.quarkus.runtime.Quarkus.run(Quarkus.java:67) at io.quarkus.runtime.Quarkus.run(Quarkus.java:41) at io.quarkus.runtime.Quarkus.run(Quarkus.java:120) 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:103) ... 1 more Caused by: java.lang.LinkageError: loader constraint violation: when resolving method 'void com.acme.spi.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7 b49ecb1a_ClientProxy.<init>(org.acme.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean)' the class loader io.quarkus.bootstrap.classloading.Q uarkusClassLoader @73843e83 of the current class, org/acme/ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean, and the class loader io.quarkus .bootstrap.classloading.QuarkusClassLoader @4461c7e3 for the method's defining class, com/acme/spi/ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb 1a_ClientProxy, have different Class objects for the type org/acme/ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean used in the signature (o rg.acme.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean is in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @73843e83, parent loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @4461c7e3; com.acme.spi.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b4 9ecb1a_ClientProxy is in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @4461c7e3, parent loader 'app') at org.acme.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean.proxy(Unknown Source) at org.acme.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean.get(Unknown Source) at org.acme.ConfigurationProducer_ProducerMethod_configure_583a1d0f9a47125f3f16fd0e1923dbf7b49ecb1a_Bean.get(Unknown Source) at org.acme.ConfigurationValidator_Bean.create(Unknown Source) at org.acme.ConfigurationValidator_Bean.create(Unknown Source) at io.quarkus.arc.impl.AbstractSharedContext.createInstanceHandle(AbstractSharedContext.java:101) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:29) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:26) 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:26) at io.quarkus.arc.impl.ClientProxies.getApplicationScopedDelegate(ClientProxies.java:18) at org.acme.ConfigurationValidator_ClientProxy.arc$delegate(Unknown Source) at org.acme.ConfigurationValidator_ClientProxy.arc_contextualInstance(Unknown Source) at org.acme.ConfigurationValidator_Observer_Synthetic_d70cd75bf32ab6598217b9a64a8473d65e248c05.notify(Unknown Source) at io.quarkus.arc.impl.EventImpl$Notifier.notifyObservers(EventImpl.java:320) at io.quarkus.arc.impl.EventImpl$Notifier.notify(EventImpl.java:302) at io.quarkus.arc.impl.EventImpl.fire(EventImpl.java:73) at io.quarkus.arc.runtime.ArcRecorder.fireLifecycleEvent(ArcRecorder.java:128) at io.quarkus.arc.runtime.ArcRecorder.handleLifecycleEvents(ArcRecorder.java:97) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent1144526294.deploy_0(Unknown Source) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent1144526294.deploy(Unknown Source) ... 13 more 2022-01-25 09:30:48,243 INFO [io.qua.dep.dev.RuntimeUpdatesProcessor] (Aesh InputStream Reader) Live reload total time: 1.817s ``` ### How to Reproduce? 1. Download the reproducer: [hot-reload-reproducer-spi.zip](https://github.com/quarkusio/quarkus/files/7931939/hot-reload-reproducer-spi.zip) 2. cd spi 3. mvn clean install 4. cd ../hot-reload-producer 5. mvn clean compile quarkus:dev 6. press s for a force restart 7. exception form above happens. The same exception happens on a normal hot reload as well. 8. downgrade to 2.6.3.Final, and start again 9. No exception on force restart ### Output of `uname -a` or `ver` MSYS_NT-10.0-19043 NANB7NLNVP2 3.1.7-340.x86_64 2021-03-26 22:17 UTC x86_64 Msys ### Output of `java -version` openjdk 17 2021-09-14 OpenJDK Runtime Environment Temurin-17+35 (build 17+35) OpenJDK 64-Bit Server VM Temurin-17+35 (build 17+35, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.0.CR1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.3 (ff8e977a158738155dc465c6a97ffaf31982d739) Maven home: C:\eclipse\tools\apache-maven Java version: 17, vendor: Eclipse Adoptium, runtime: C:\eclipse\tools\java\17 Default locale: de_DE, platform encoding: Cp1252 OS name: "windows 10", version: "10.0", arch: "amd64", family: "windows" ### Additional information _No response_

70074316e385e2f3c07c8058e376b76e007fbed2

903202f1fac88ce7e1f21dd25b6acc2b92b38750

https://github.com/quarkusio/quarkus/compare/70074316e385e2f3c07c8058e376b76e007fbed2...903202f1fac88ce7e1f21dd25b6acc2b92b38750

diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java deleted file mode 100644 index 4ebf0abe4de..00000000000 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java +++ /dev/null @@ -1,50 +0,0 @@ -package io.quarkus.arc.test.unproxyable; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.IOException; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -import io.quarkus.arc.test.unproxyable.some.Resource; -import io.quarkus.test.QuarkusUnitTest; - -// This test aims to test the https://github.com/quarkusio/quarkus/issues/22815 in Quarkus integration -// There is a duplicate test for ArC standalone: io.quarkus.arc.test.clientproxy.constructor.ProducerReturnTypePackagePrivateNoArgsConstructorTest -public class ProducerReturnTypePackagePrivateNoArgsConstructorTest { - - @RegisterExtension - static final QuarkusUnitTest config = new QuarkusUnitTest() - .withApplicationRoot(root -> root - .addClasses(ProducerReturnTypePackagePrivateNoArgsConstructorTest.class, ResourceProducer.class, - Resource.class)); - - @Inject - Instance<Resource> instance; - - @Test - public void testProducer() throws IOException { - assertTrue(instance.isResolvable()); - assertEquals(5, instance.get().ping()); - } - - @Singleton - static class ResourceProducer { - - @ApplicationScoped - @Produces - Resource resource() { - return Resource.from(5); - } - - } - -} diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/some/Resource.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/some/Resource.java deleted file mode 100644 index de4455f18f6..00000000000 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/some/Resource.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.quarkus.arc.test.unproxyable.some; - -public abstract class Resource { - - Resource() { - } - - public static Resource from(int ping) { - return new Resource() { - - @Override - public int ping() { - return ping; - } - }; - } - - public abstract int ping(); - -} diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java index 786837e2c0b..8c34ecf0969 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java @@ -895,7 +895,7 @@ public class BeanDeployment { // non-inherited stuff: for (MethodInfo method : beanClass.methods()) { - if (method.isSynthetic()) { + if (Methods.isSynthetic(method)) { continue; } if (annotationStore.getAnnotations(method).isEmpty()) { @@ -922,7 +922,7 @@ public class BeanDeployment { while (aClass != null) { for (MethodInfo method : aClass.methods()) { Methods.MethodKey methodDescriptor = new Methods.MethodKey(method); - if (method.isSynthetic() || Methods.isOverriden(methodDescriptor, methods)) { + if (Methods.isSynthetic(method) || Methods.isOverriden(methodDescriptor, methods)) { continue; } methods.add(methodDescriptor); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java index 8c012e64800..678eb0f7018 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java @@ -1793,7 +1793,7 @@ public class BeanGenerator extends AbstractGenerator { private String getProxyTypeName(BeanInfo bean, String baseName) { StringBuilder proxyTypeName = new StringBuilder(); - proxyTypeName.append(bean.getClientProxyPackageName()); + proxyTypeName.append(bean.getTargetPackageName()); if (proxyTypeName.length() > 0) { proxyTypeName.append("."); } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java index d9f1bc15ca8..98a89c8cacc 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java @@ -492,22 +492,6 @@ public class BeanInfo implements InjectionTargetInfo { return packageName; } - public String getClientProxyPackageName() { - if (isProducerField() || isProducerMethod()) { - AnnotationTarget target = getTarget().get(); - DotName typeName = target.kind() == Kind.FIELD ? target.asField().type().name() - : target.asMethod().returnType().name(); - String packageName = DotNames.packageName(typeName); - if (packageName.startsWith("java.")) { - // It is not possible to place a class in a JDK package - packageName = AbstractGenerator.DEFAULT_PACKAGE; - } - return packageName; - } else { - return getTargetPackageName(); - } - } - void validate(List<Throwable> errors, List<BeanDeploymentValidator> validators, Consumer<BytecodeTransformer> bytecodeTransformerConsumer, Set<DotName> classesReceivingNoArgsCtor) { Beans.validateBean(this, errors, validators, bytecodeTransformerConsumer, classesReceivingNoArgsCtor); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java index 3e8ebe33560..62a7320b42b 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java @@ -78,22 +78,13 @@ public class ClientProxyGenerator extends AbstractGenerator { Collection<Resource> generate(BeanInfo bean, String beanClassName, Consumer<BytecodeTransformer> bytecodeTransformerConsumer, boolean transformUnproxyableClasses) { - DotName testedName; - // For producers we need to test the produced type - if (bean.isProducerField()) { - testedName = bean.getTarget().get().asField().type().name(); - } else if (bean.isProducerMethod()) { - testedName = bean.getTarget().get().asMethod().returnType().name(); - } else { - testedName = bean.getBeanClass(); - } - ResourceClassOutput classOutput = new ResourceClassOutput(applicationClassPredicate.test(testedName), + ResourceClassOutput classOutput = new ResourceClassOutput(applicationClassPredicate.test(bean.getBeanClass()), generateSources); ProviderType providerType = new ProviderType(bean.getProviderType()); ClassInfo providerClass = getClassByName(bean.getDeployment().getBeanArchiveIndex(), providerType.name()); String baseName = getBaseName(bean, beanClassName); - String targetPackage = bean.getClientProxyPackageName(); + String targetPackage = bean.getTargetPackageName(); String generatedName = generatedNameFromTarget(targetPackage, baseName, CLIENT_PROXY_SUFFIX); if (existingClasses.contains(generatedName)) { return Collections.emptyList(); 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 e43012e89b1..f2e4453b343 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 @@ -42,9 +42,10 @@ final class Methods { public static final String INIT = "<init>"; // static initializer public static final String CLINIT = "<clinit>"; + // copied from java.lang.reflect.Modifier.SYNTHETIC + static final int SYNTHETIC = 0x00001000; // copied from java.lang.reflect.Modifier.BRIDGE static final int BRIDGE = 0x00000040; - public static final String TO_STRING = "toString"; private static final List<String> IGNORED_METHODS = initIgnoredMethods(); @@ -59,6 +60,10 @@ final class Methods { private Methods() { } + static boolean isSynthetic(MethodInfo method) { + return (method.flags() & SYNTHETIC) != 0; + } + static boolean isBridge(MethodInfo method) { return (method.flags() & BRIDGE) != 0; } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java deleted file mode 100644 index 8fa51503cc2..00000000000 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package io.quarkus.arc.test.clientproxy.constructor; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import io.quarkus.arc.Arc; -import io.quarkus.arc.ClientProxy; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.clientproxy.constructor.some.Resource; -import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -// This test aims to test the https://github.com/quarkusio/quarkus/issues/22815 in ArC standalone -// There is a duplicate test for Quarkus integration: io.quarkus.arc.test.unproxyable.ProducerReturnTypePackagePrivateNoArgsConstructorTest -public class ProducerReturnTypePackagePrivateNoArgsConstructorTest { - - @RegisterExtension - public ArcTestContainer container = new ArcTestContainer(ResourceProducer.class); - - @Test - public void testProducer() throws IOException { - Resource res = Arc.container().instance(Resource.class).get(); - assertNotNull(res); - assertTrue(res instanceof ClientProxy); - assertEquals(5, res.ping()); - } - - @Singleton - static class ResourceProducer { - - @ApplicationScoped - @Produces - Resource resource() { - return Resource.from(5); - } - - } - -} diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/some/Resource.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/some/Resource.java deleted file mode 100644 index e45ce995299..00000000000 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/some/Resource.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.quarkus.arc.test.clientproxy.constructor.some; - -public abstract class Resource { - - Resource() { - } - - public static Resource from(int ping) { - return new Resource() { - - @Override - public int ping() { - return ping; - } - }; - } - - public abstract int ping(); - -}

['extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java', 'extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/some/Resource.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java', 'independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/some/Resource.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java', 'independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java']

{'.java': 9}

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/23207/21905

quarkusio

quarkus

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

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

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

Adding first registry in CLI erases the default one

fixes

### Describe the bug By default, registry list in CLI contains a default registry `registry.quarkus.io` and there is an option to add new registries. Although, if user adds a new registry, e.g. `registry.quarkus.redhat.com`, then the default registry will be silently removed from the list and became inaccessible. ### Expected behavior Default registry stays in the list, registries are never removed without explicit user request. ### Actual behavior Default registry is removed from the list. ### How to Reproduce? 1. Install quarkus afresh or remove/rename file ~/.quarkus/config.yaml 2. Check default registry. ``` $ quarkus registry list Configured Quarkus extension registries: registry.quarkus.io ``` 3. Check existing extensions. ``` $ quarkus ext list | wc -l 920 ``` 4. Add non-default registry: ` quarkus registry add registry.quarkus.redhat.com` 5. Check registry list: ``` $ quarkus registry list Configured Quarkus extension registries: registry.quarkus.redhat.com #registry.quarkus.io is not in the list (Read from ~/.quarkus/config.yaml) ``` 6. Check existing extensions. ``` $ quarkus ext list | wc -l 170 # at least some extensions are not accessible any more ``` ### Output of `uname -a` or `ver` 5.14.17-201.fc34.x86_64 ### Output of `java -version` Java version: 11.0.13, vendor: Eclipse Adoptium ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.5.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.4 ### Additional information _No response_

0171a9bc8796297eb0d0d9056dccaf0ec39c5f6f

208e848060f8c4ade8ebd583a70700d665bde770

https://github.com/quarkusio/quarkus/compare/0171a9bc8796297eb0d0d9056dccaf0ec39c5f6f...208e848060f8c4ade8ebd583a70700d665bde770

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java b/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java index f9f2c5fc46a..c9d7449d4b9 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java @@ -1,5 +1,7 @@ package io.quarkus.cli; +import static io.quarkus.registry.Constants.DEFAULT_REGISTRY_ID; + import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -48,7 +50,16 @@ public class RegistryAddCommand extends BaseRegistryCommand { if (persist) { output.printText("Configured registries:"); for (RegistryConfig rc : config.getRegistries()) { - output.printText("- " + rc.getId()); + if (!existingConfig && config.getRegistries().size() == 1 + && !rc.getId().equals(DEFAULT_REGISTRY_ID)) { + output.warn( + rc.getId() + " is the only registry configured in the config file.\n" + rc.getId() + + " replaced the Default registry: " + + DEFAULT_REGISTRY_ID); + } else { + output.printText("- " + rc.getId()); + } + } if (configYaml != null) { config.persist(configYaml);

['devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.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/23219/23218

quarkusio

quarkus

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

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

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

Native compilation fails with unresolved type during parsing

fixes

### Describe the bug I have a CLI project that is using the following extensions: - quarkus-picocli - quarkus-qute - quarkus-rest-client-reactive-jackson It also depends on: - quarkus-arc - quarkus-devtools-registry-client When I'm compiling the project to native using `mvn package -Dnative` it fails. ### Expected behavior Native compilation should work. ### Actual behavior Build fails with the following exception: ``` Error: Unsupported features in 4 methods Detailed message: Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.aayushatharva.brotli4j.encoder.Encoder$Parameters. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.BrotliEncoder.<init>(BrotliEncoder.java:53) Call path from entry point to io.netty.handler.codec.compression.BrotliEncoder.<init>(Object): at io.netty.handler.codec.compression.BrotliEncoder.<init>(BrotliEncoder.java:52) at io.netty.handler.codec.http2.CompressorHttp2ConnectionEncoder.newContentCompressor(CompressorHttp2ConnectionEncoder.java:263) at io.netty.handler.codec.http2.CompressorHttp2ConnectionEncoder.newCompressor(CompressorHttp2ConnectionEncoder.java:333) at io.netty.handler.codec.http2.CompressorHttp2ConnectionEncoder.writeHeaders(CompressorHttp2ConnectionEncoder.java:206) at io.netty.handler.codec.http2.Http2ConnectionHandler.handleServerHeaderDecodeSizeError(Http2ConnectionHandler.java:741) at io.netty.handler.codec.http2.Http2ConnectionHandler.onStreamError(Http2ConnectionHandler.java:717) at io.vertx.core.http.impl.VertxHttp2ConnectionHandler.onStreamError(VertxHttp2ConnectionHandler.java:145) at io.netty.handler.codec.http2.Http2ConnectionHandler.onError(Http2ConnectionHandler.java:634) at io.netty.handler.codec.http2.Http2ConnectionHandler.flush(Http2ConnectionHandler.java:193) at io.netty.channel.AbstractChannelHandlerContext.invokeFlush0(AbstractChannelHandlerContext.java:750) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:765) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.aayushatharva.brotli4j.encoder.Encoder. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(BrotliEncoder.java:79) Call path from entry point to io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(ChannelHandlerContext, ByteBuf, boolean): at io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(BrotliEncoder.java:73) at io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(BrotliEncoder.java:33) at io.netty.handler.codec.MessageToByteEncoder.write(MessageToByteEncoder.java:105) at io.netty.channel.AbstractChannelHandlerContext.invokeWrite0(AbstractChannelHandlerContext.java:717) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:764) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.github.luben.zstd.Zstd. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.ZstdEncoder.allocateBuffer(ZstdEncoder.java:107) Call path from entry point to io.netty.handler.codec.compression.ZstdEncoder.allocateBuffer(ChannelHandlerContext, ByteBuf, boolean): at io.netty.handler.codec.compression.ZstdEncoder.allocateBuffer(ZstdEncoder.java:91) at io.netty.handler.codec.compression.ZstdEncoder.flush(ZstdEncoder.java:164) at io.netty.channel.AbstractChannelHandlerContext.invokeFlush0(AbstractChannelHandlerContext.java:750) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:765) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.github.luben.zstd.Zstd. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.ZstdEncoder.flushBufferedData(ZstdEncoder.java:143) Call path from entry point to io.netty.handler.codec.compression.ZstdEncoder.flushBufferedData(ByteBuf): at io.netty.handler.codec.compression.ZstdEncoder.flushBufferedData(ZstdEncoder.java:138) at io.netty.handler.codec.compression.ZstdEncoder.flush(ZstdEncoder.java:165) at io.netty.channel.AbstractChannelHandlerContext.invokeFlush0(AbstractChannelHandlerContext.java:750) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:765) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) com.oracle.svm.core.util.UserError$UserException: Unsupported features in 4 methods Detailed message: Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.aayushatharva.brotli4j.encoder.Encoder$Parameters. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.BrotliEncoder.<init>(BrotliEncoder.java:53) Call path from entry point to io.netty.handler.codec.compression.BrotliEncoder.<init>(Object): at io.netty.handler.codec.compression.BrotliEncoder.<init>(BrotliEncoder.java:52) at io.netty.handler.codec.http2.CompressorHttp2ConnectionEncoder.newContentCompressor(CompressorHttp2ConnectionEncoder.java:263) at io.netty.handler.codec.http2.CompressorHttp2ConnectionEncoder.newCompressor(CompressorHttp2ConnectionEncoder.java:333) at io.netty.handler.codec.http2.CompressorHttp2ConnectionEncoder.writeHeaders(CompressorHttp2ConnectionEncoder.java:206) at io.netty.handler.codec.http2.Http2ConnectionHandler.handleServerHeaderDecodeSizeError(Http2ConnectionHandler.java:741) at io.netty.handler.codec.http2.Http2ConnectionHandler.onStreamError(Http2ConnectionHandler.java:717) at io.vertx.core.http.impl.VertxHttp2ConnectionHandler.onStreamError(VertxHttp2ConnectionHandler.java:145) at io.netty.handler.codec.http2.Http2ConnectionHandler.onError(Http2ConnectionHandler.java:634) at io.netty.handler.codec.http2.Http2ConnectionHandler.flush(Http2ConnectionHandler.java:193) at io.netty.channel.AbstractChannelHandlerContext.invokeFlush0(AbstractChannelHandlerContext.java:750) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:765) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.aayushatharva.brotli4j.encoder.Encoder. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(BrotliEncoder.java:79) Call path from entry point to io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(ChannelHandlerContext, ByteBuf, boolean): at io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(BrotliEncoder.java:73) at io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(BrotliEncoder.java:33) at io.netty.handler.codec.MessageToByteEncoder.write(MessageToByteEncoder.java:105) at io.netty.channel.AbstractChannelHandlerContext.invokeWrite0(AbstractChannelHandlerContext.java:717) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:764) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.github.luben.zstd.Zstd. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.ZstdEncoder.allocateBuffer(ZstdEncoder.java:107) Call path from entry point to io.netty.handler.codec.compression.ZstdEncoder.allocateBuffer(ChannelHandlerContext, ByteBuf, boolean): at io.netty.handler.codec.compression.ZstdEncoder.allocateBuffer(ZstdEncoder.java:91) at io.netty.handler.codec.compression.ZstdEncoder.flush(ZstdEncoder.java:164) at io.netty.channel.AbstractChannelHandlerContext.invokeFlush0(AbstractChannelHandlerContext.java:750) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:765) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.github.luben.zstd.Zstd. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.ZstdEncoder.flushBufferedData(ZstdEncoder.java:143) Call path from entry point to io.netty.handler.codec.compression.ZstdEncoder.flushBufferedData(ByteBuf): at io.netty.handler.codec.compression.ZstdEncoder.flushBufferedData(ZstdEncoder.java:138) at io.netty.handler.codec.compression.ZstdEncoder.flush(ZstdEncoder.java:165) at io.netty.channel.AbstractChannelHandlerContext.invokeFlush0(AbstractChannelHandlerContext.java:750) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:765) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) at com.oracle.svm.core.util.UserError.abort(UserError.java:87) at com.oracle.svm.hosted.FallbackFeature.reportAsFallback(FallbackFeature.java:233) at com.oracle.svm.hosted.NativeImageGenerator.runPointsToAnalysis(NativeImageGenerator.java:759) at com.oracle.svm.hosted.NativeImageGenerator.doRun(NativeImageGenerator.java:529) at com.oracle.svm.hosted.NativeImageGenerator.run(NativeImageGenerator.java:488) at com.oracle.svm.hosted.NativeImageGeneratorRunner.buildImage(NativeImageGeneratorRunner.java:403) at com.oracle.svm.hosted.NativeImageGeneratorRunner.build(NativeImageGeneratorRunner.java:569) at com.oracle.svm.hosted.NativeImageGeneratorRunner.main(NativeImageGeneratorRunner.java:122) at com.oracle.svm.hosted.NativeImageGeneratorRunner$JDK9Plus.main(NativeImageGeneratorRunner.java:599) Caused by: com.oracle.graal.pointsto.constraints.UnsupportedFeatureException: Unsupported features in 4 methods Detailed message: Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.aayushatharva.brotli4j.encoder.Encoder$Parameters. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.BrotliEncoder.<init>(BrotliEncoder.java:53) Call path from entry point to io.netty.handler.codec.compression.BrotliEncoder.<init>(Object): at io.netty.handler.codec.compression.BrotliEncoder.<init>(BrotliEncoder.java:52) at io.netty.handler.codec.http2.CompressorHttp2ConnectionEncoder.newContentCompressor(CompressorHttp2ConnectionEncoder.java:263) at io.netty.handler.codec.http2.CompressorHttp2ConnectionEncoder.newCompressor(CompressorHttp2ConnectionEncoder.java:333) at io.netty.handler.codec.http2.CompressorHttp2ConnectionEncoder.writeHeaders(CompressorHttp2ConnectionEncoder.java:206) at io.netty.handler.codec.http2.Http2ConnectionHandler.handleServerHeaderDecodeSizeError(Http2ConnectionHandler.java:741) at io.netty.handler.codec.http2.Http2ConnectionHandler.onStreamError(Http2ConnectionHandler.java:717) at io.vertx.core.http.impl.VertxHttp2ConnectionHandler.onStreamError(VertxHttp2ConnectionHandler.java:145) at io.netty.handler.codec.http2.Http2ConnectionHandler.onError(Http2ConnectionHandler.java:634) at io.netty.handler.codec.http2.Http2ConnectionHandler.flush(Http2ConnectionHandler.java:193) at io.netty.channel.AbstractChannelHandlerContext.invokeFlush0(AbstractChannelHandlerContext.java:750) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:765) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.aayushatharva.brotli4j.encoder.Encoder. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(BrotliEncoder.java:79) Call path from entry point to io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(ChannelHandlerContext, ByteBuf, boolean): at io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(BrotliEncoder.java:73) at io.netty.handler.codec.compression.BrotliEncoder.allocateBuffer(BrotliEncoder.java:33) at io.netty.handler.codec.MessageToByteEncoder.write(MessageToByteEncoder.java:105) at io.netty.channel.AbstractChannelHandlerContext.invokeWrite0(AbstractChannelHandlerContext.java:717) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:764) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.github.luben.zstd.Zstd. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.ZstdEncoder.allocateBuffer(ZstdEncoder.java:107) Call path from entry point to io.netty.handler.codec.compression.ZstdEncoder.allocateBuffer(ChannelHandlerContext, ByteBuf, boolean): at io.netty.handler.codec.compression.ZstdEncoder.allocateBuffer(ZstdEncoder.java:91) at io.netty.handler.codec.compression.ZstdEncoder.flush(ZstdEncoder.java:164) at io.netty.channel.AbstractChannelHandlerContext.invokeFlush0(AbstractChannelHandlerContext.java:750) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:765) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) Error: com.oracle.graal.pointsto.constraints.UnresolvedElementException: Discovered unresolved type during parsing: com.github.luben.zstd.Zstd. To diagnose the issue you can use the --allow-incomplete-classpath option. The missing type is then reported at run time when it is accessed the first time. Trace: at parsing io.netty.handler.codec.compression.ZstdEncoder.flushBufferedData(ZstdEncoder.java:143) Call path from entry point to io.netty.handler.codec.compression.ZstdEncoder.flushBufferedData(ByteBuf): at io.netty.handler.codec.compression.ZstdEncoder.flushBufferedData(ZstdEncoder.java:138) at io.netty.handler.codec.compression.ZstdEncoder.flush(ZstdEncoder.java:165) at io.netty.channel.AbstractChannelHandlerContext.invokeFlush0(AbstractChannelHandlerContext.java:750) at io.netty.channel.AbstractChannelHandlerContext.invokeWriteAndFlush(AbstractChannelHandlerContext.java:765) at io.netty.channel.AbstractChannelHandlerContext$WriteTask.run(AbstractChannelHandlerContext.java:1071) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:596) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) at com.oracle.svm.core.code.IsolateEnterStub.PosixJavaThreads_pthreadStartRoutine_e1f4a8c0039f8337338252cd8734f63a79b5e3df(generated:0) at com.oracle.graal.pointsto.constraints.UnsupportedFeatures.report(UnsupportedFeatures.java:129) at com.oracle.svm.hosted.NativeImageGenerator.runPointsToAnalysis(NativeImageGenerator.java:756) ... 6 more [rhbq-supported-extension-generator-1.0.0-SNAPSHOT-runner:16029] [total]: 31 709,83 ms, 3,40 GB ``` ### How to Reproduce? I can provide access to a private github repo on request, @gastaldi and @cescoffier are already invited ### Output of `uname -a` or `ver` Darwin tqvarnst-mac 20.6.0 Darwin Kernel Version 20.6.0: Tue Oct 12 18:33:42 PDT 2021; root:xnu-7195.141.8~1/RELEASE_X86_64 x86_64 ### 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) openjdk version "11.0.13" 2021-10-19 OpenJDK Runtime Environment GraalVM CE 21.3.0 (build 11.0.13+7-jvmci-21.3-b05) OpenJDK 64-Bit Server VM GraalVM CE 21.3.0 (build 11.0.13+7-jvmci-21.3-b05, mixed mode, sharing) ### Quarkus version or git rev 2.6.3.Final< ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information This could be related to this commit: https://github.com/quarkusio/quarkus/commit/919b71c257e5ff853f158da1b033bbc701b7965c

755349c3f4a993d263e560267dd3c27c1e3a2263

3654e5810f4ec3a039637e4bb702597080d604b2

https://github.com/quarkusio/quarkus/compare/755349c3f4a993d263e560267dd3c27c1e3a2263...3654e5810f4ec3a039637e4bb702597080d604b2

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/graal/HttpContentCompressorSubstitutions.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/HttpContentCompressorSubstitutions.java similarity index 98% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/graal/HttpContentCompressorSubstitutions.java rename to extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/HttpContentCompressorSubstitutions.java index 37dac442fbc..0871ac396b3 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/graal/HttpContentCompressorSubstitutions.java +++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/HttpContentCompressorSubstitutions.java @@ -1,4 +1,4 @@ -package io.quarkus.vertx.http.runtime.graal; +package io.quarkus.netty.runtime.graal; import static io.netty.handler.codec.http.HttpHeaderValues.DEFLATE; import static io.netty.handler.codec.http.HttpHeaderValues.GZIP;

['extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/graal/HttpContentCompressorSubstitutions.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/23322/23315

quarkusio

quarkus

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

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

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

Gradle Task quarkusRemoteDev not working with version 2.6.3

close

### Describe the bug `./gradlew quarkusRemoteDev` not working on Quarkus version 2.6.3 (also same on 2.6.1 and 2.6.2) ### Expected behavior `./gradlew quarkusRemoteDev` runs quarkus in remote dev mode ### Actual behavior ``` 18:27:54: Executing 'quarkusRemoteDev'... > Task :compileJava > Task :processResources > Task :classes > Task :quarkusRemoteDev FAILED 3 actionable tasks: 3 executed FAILURE: Build failed with an exception. * What went wrong: A problem was found with the configuration of task ':quarkusRemoteDev' (type 'QuarkusRemoteDev'). - In plugin 'io.quarkus' type 'io.quarkus.gradle.tasks.QuarkusRemoteDev' property 'quarkusDevConfiguration' doesn't have a configured value. Reason: This property isn't marked as optional and no value has been configured. Possible solutions: 1. Assign a value to 'quarkusDevConfiguration'. 2. Mark property 'quarkusDevConfiguration' as optional. Please refer to https://docs.gradle.org/7.3.3/userguide/validation_problems.html#value_not_set for more details about this problem. * Try: > Run with --stacktrace option to get the stack trace. > Run with --info or --debug option to get more log output. > Run with --scan to get full insights. * Get more help at https://help.gradle.org BUILD FAILED in 1s 18:27:56: Execution finished 'quarkusRemoteDev'. ``` ### How to Reproduce? Steps to reproduce the behaviour: 1. Download and unpack empty project with gradle from code.quarkus.io 2. Run `./gradlew quarkusRemoteDev` inside the folder ### Output of `uname -a` or `ver` Microsoft Windows [Version 10.0.18363.2037] ### Output of `java -version` openjdk version "11.0.13" 2021-10-19 ### GraalVM version (if different from Java) OpenJDK 64-Bit Server VM GraalVM CE 21.3.0 (build 11.0.13+7-jvmci-21.3-b05, mixed mode, sharing) ### Quarkus version or git rev 2.6.3 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.3.3 ### Additional information _No response_

c70a2478580b43b348f2b1b6cfa77a2d7e3264b4

54c8cdb872f2897c6e451bddbe42fea8971d5590

https://github.com/quarkusio/quarkus/compare/c70a2478580b43b348f2b1b6cfa77a2d7e3264b4...54c8cdb872f2897c6e451bddbe42fea8971d5590

diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java index 2a801469594..a914d10adea 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java @@ -205,7 +205,10 @@ public class QuarkusPlugin implements Plugin<Project> { quarkusGenerateCodeTests); task.setQuarkusDevConfiguration(devModeConfiguration); }); - quarkusRemoteDev.configure(task -> task.dependsOn(classesTask, resourcesTask)); + quarkusRemoteDev.configure(task -> { + task.dependsOn(classesTask, resourcesTask); + task.setQuarkusDevConfiguration(devModeConfiguration); + }); quarkusTest.configure(task -> { task.dependsOn(classesTask, resourcesTask, testClassesTask, testResourcesTask, quarkusGenerateCode,

['devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.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/27916/27913

quarkusio

quarkus

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

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

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

quarkus-redis-client: 'fromCoordinate(double, double)' has private access in 'io.quarkus.redis.datasource.geo.GeoSearchArgs' blocking my usage of geosearch FROMLONLAT

fix

### Describe the bug According to the manual of Redis geosearch command, it supports to calculate the nearist points from the given longitude and latitude as below. However when I want to use this command via quarkus-redis-client, I found the GeoSearchArgs.fromCoordinate() had private access thus I couldn't use it in my code. I believe this method should have public access as the same as GeoSearchArgs.fromMember(). GEOSEARCH key <FROMMEMBER member | FROMLONLAT longitude latitude> <BYRADIUS radius <M | KM | FT | MI> | BYBOX width height <M | KM | FT | MI>> [ASC | DESC] [COUNT count [ANY]] [WITHCOORD] [WITHDIST] [WITHHASH] ### Expected behavior GeoSearchArgs.fromCoordinate() should have public access as the same as GeoSearchArgs.fromMember(). ### Actual behavior GeoSearchArgs.fromCoordinate() has private access so I cannot use geosearch FROMLONLAT. ### How to Reproduce? n/a ### Output of `uname -a` or `ver` Linux a176656f74a6 5.4.0-117-generic ### Output of `java -version` openjdk version "17.0.4" 2022-07-19 ### GraalVM version (if different from Java) OpenJDK 64-Bit Server VM GraalVM CE 22.2.0 (build 17.0.4+8-jvmci-22.2-b06, mixed mode, sharing) ### Quarkus version or git rev 2.12.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) mavem 3.8.6 ### Additional information _No response_

6e10b215fa2689171c9c3bb9fd3cc7986fe1e2ff

33c8625210a7691d7439d3df351bd771fe72b2a5

https://github.com/quarkusio/quarkus/compare/6e10b215fa2689171c9c3bb9fd3cc7986fe1e2ff...33c8625210a7691d7439d3df351bd771fe72b2a5

diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/geo/GeoSearchArgs.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/geo/GeoSearchArgs.java index 2070507f362..29b2cd9140f 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/geo/GeoSearchArgs.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/geo/GeoSearchArgs.java @@ -56,7 +56,7 @@ public class GeoSearchArgs<V> implements RedisCommandExtraArguments { * @param latitude the latitude * @return the current {@code GeoSearchArgs} */ - private GeoSearchArgs<V> fromCoordinate(double longitude, double latitude) { + public GeoSearchArgs<V> fromCoordinate(double longitude, double latitude) { this.longitude = longitude; this.latitude = latitude; return this; diff --git a/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/GeoCommandsTest.java b/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/GeoCommandsTest.java index 0d2a365de53..ea34b4ef21c 100644 --- a/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/GeoCommandsTest.java +++ b/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/GeoCommandsTest.java @@ -494,6 +494,17 @@ public class GeoCommandsTest extends DatasourceTestBase { assertThat(gv.geohash).isEmpty(); }); + args = new GeoSearchArgs<Place>().fromCoordinate(CRUSSOL_LONGITUDE, CRUSSOL_LATITUDE) + .byRadius(5, GeoUnit.KM).withCoordinates().withDistance().descending(); + places = geo.geosearch(key, args); + assertThat(places).hasSize(1).allSatisfy(gv -> { + assertThat(gv.member).isEqualTo(Place.crussol); + assertThat(gv.longitude).isNotEmpty(); + assertThat(gv.latitude).isNotEmpty(); + assertThat(gv.distance).isNotEmpty(); + assertThat(gv.geohash).isEmpty(); + }); + } @Test

['extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/GeoCommandsTest.java', 'extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/geo/GeoSearchArgs.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/23397/23269

quarkusio

quarkus

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

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

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

Hibernate Reactive Session/EntityManager is closed

fixes

### Describe the bug This may look similar to #22433 (which was fixed in `2.6.3.Final`) but this time the reproducer includes a resteasy-reactive request filter (see `RequestFilter` in the reproducer). Here's the exception which is thrown randomly when the app is processing concurrent requests: ``` 2022-01-28 15:11:21,411 ERROR [org.hib.rea.errors] (vert.x-eventloop-thread-4) HR000057: Failed to execute statement [$1select fruit0_.id as id1_0_, fruit0_.name as name2_0_ from known_fruits fruit0_ order by fruit0_.name]: $2could not execute query: java.util.concurrent.CompletionException: java.lang.IllegalStateException: Session/EntityManager is closed at java.base/java.util.concurrent.CompletableFuture.encodeThrowable(CompletableFuture.java:314) at java.base/java.util.concurrent.CompletableFuture.completeThrowable(CompletableFuture.java:319) at java.base/java.util.concurrent.CompletableFuture$UniCompose.tryFire(CompletableFuture.java:1081) at java.base/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:506) at java.base/java.util.concurrent.CompletableFuture.complete(CompletableFuture.java:2073) at io.vertx.core.Future.lambda$toCompletionStage$2(Future.java:360) 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.sqlclient.impl.QueryResultBuilder.tryComplete(QueryResultBuilder.java:102) at io.vertx.sqlclient.impl.QueryResultBuilder.tryComplete(QueryResultBuilder.java:35) at io.vertx.core.Promise.complete(Promise.java:66) at io.vertx.core.Promise.handle(Promise.java:51) at io.vertx.core.Promise.handle(Promise.java:29) 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.safeExecute(AbstractEventExecutor.java:164) at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:469) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:503) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:986) 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:829) Caused by: java.lang.IllegalStateException: Session/EntityManager is closed at org.hibernate.internal.AbstractSharedSessionContract.checkOpen(AbstractSharedSessionContract.java:407) at org.hibernate.engine.spi.SharedSessionContractImplementor.checkOpen(SharedSessionContractImplementor.java:148) at org.hibernate.reactive.session.impl.ReactiveSessionImpl.checkOpen(ReactiveSessionImpl.java:1558) at org.hibernate.internal.AbstractSharedSessionContract.checkOpenOrWaitingForAutoClose(AbstractSharedSessionContract.java:413) at org.hibernate.internal.SessionImpl.getEntityUsingInterceptor(SessionImpl.java:603) at org.hibernate.loader.Loader.getRow(Loader.java:1610) at org.hibernate.loader.Loader.getRowFromResultSet(Loader.java:748) at org.hibernate.loader.Loader.getRowsFromResultSet(Loader.java:1047) at org.hibernate.reactive.loader.hql.impl.ReactiveQueryLoader.getRowsFromResultSet(ReactiveQueryLoader.java:223) at org.hibernate.reactive.loader.ReactiveLoaderBasedResultSetProcessor.reactiveExtractResults(ReactiveLoaderBasedResultSetProcessor.java:73) at org.hibernate.reactive.loader.hql.impl.ReactiveQueryLoader$1.reactiveExtractResults(ReactiveQueryLoader.java:72) at org.hibernate.reactive.loader.ReactiveLoader.reactiveProcessResultSet(ReactiveLoader.java:145) at org.hibernate.reactive.loader.ReactiveLoader.lambda$doReactiveQueryAndInitializeNonLazyCollections$0(ReactiveLoader.java:77) at java.base/java.util.concurrent.CompletableFuture$UniCompose.tryFire(CompletableFuture.java:1072) ... 21 more 2022-01-28 15:11:21,413 ERROR [io.qua.ver.htt.run.QuarkusErrorHandler] (vert.x-eventloop-thread-4) HTTP Request to /fruits failed, error id: 51fc210d-cc94-487b-bfb9-5c5b593badfb-17: java.lang.IllegalStateException: Session/EntityManager is closed at org.hibernate.internal.AbstractSharedSessionContract.checkOpen(AbstractSharedSessionContract.java:407) at org.hibernate.engine.spi.SharedSessionContractImplementor.checkOpen(SharedSessionContractImplementor.java:148) at org.hibernate.reactive.session.impl.ReactiveSessionImpl.checkOpen(ReactiveSessionImpl.java:1558) at org.hibernate.internal.AbstractSharedSessionContract.checkOpenOrWaitingForAutoClose(AbstractSharedSessionContract.java:413) at org.hibernate.internal.SessionImpl.getEntityUsingInterceptor(SessionImpl.java:603) at org.hibernate.loader.Loader.getRow(Loader.java:1610) at org.hibernate.loader.Loader.getRowFromResultSet(Loader.java:748) at org.hibernate.loader.Loader.getRowsFromResultSet(Loader.java:1047) at org.hibernate.reactive.loader.hql.impl.ReactiveQueryLoader.getRowsFromResultSet(ReactiveQueryLoader.java:223) at org.hibernate.reactive.loader.ReactiveLoaderBasedResultSetProcessor.reactiveExtractResults(ReactiveLoaderBasedResultSetProcessor.java:73) at org.hibernate.reactive.loader.hql.impl.ReactiveQueryLoader$1.reactiveExtractResults(ReactiveQueryLoader.java:72) at org.hibernate.reactive.loader.ReactiveLoader.reactiveProcessResultSet(ReactiveLoader.java:145) at org.hibernate.reactive.loader.ReactiveLoader.lambda$doReactiveQueryAndInitializeNonLazyCollections$0(ReactiveLoader.java:77) at java.base/java.util.concurrent.CompletableFuture$UniCompose.tryFire(CompletableFuture.java:1072) at java.base/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:506) at java.base/java.util.concurrent.CompletableFuture.complete(CompletableFuture.java:2073) at io.vertx.core.Future.lambda$toCompletionStage$2(Future.java:360) 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.sqlclient.impl.QueryResultBuilder.tryComplete(QueryResultBuilder.java:102) at io.vertx.sqlclient.impl.QueryResultBuilder.tryComplete(QueryResultBuilder.java:35) at io.vertx.core.Promise.complete(Promise.java:66) at io.vertx.core.Promise.handle(Promise.java:51) at io.vertx.core.Promise.handle(Promise.java:29) 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.safeExecute(AbstractEventExecutor.java:164) at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:469) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:503) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:986) 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:829) 2022-01-28 15:11:21,414 ERROR [org.jbo.res.rea.com.cor.AbstractResteasyReactiveContext] (vert.x-eventloop-thread-4) Request failed: java.lang.IllegalStateException: Session/EntityManager is closed at org.hibernate.internal.AbstractSharedSessionContract.checkOpen(AbstractSharedSessionContract.java:407) at org.hibernate.engine.spi.SharedSessionContractImplementor.checkOpen(SharedSessionContractImplementor.java:148) at org.hibernate.reactive.session.impl.ReactiveSessionImpl.checkOpen(ReactiveSessionImpl.java:1558) at org.hibernate.internal.AbstractSharedSessionContract.checkOpenOrWaitingForAutoClose(AbstractSharedSessionContract.java:413) at org.hibernate.internal.SessionImpl.getEntityUsingInterceptor(SessionImpl.java:603) at org.hibernate.loader.Loader.getRow(Loader.java:1610) at org.hibernate.loader.Loader.getRowFromResultSet(Loader.java:748) at org.hibernate.loader.Loader.getRowsFromResultSet(Loader.java:1047) at org.hibernate.reactive.loader.hql.impl.ReactiveQueryLoader.getRowsFromResultSet(ReactiveQueryLoader.java:223) at org.hibernate.reactive.loader.ReactiveLoaderBasedResultSetProcessor.reactiveExtractResults(ReactiveLoaderBasedResultSetProcessor.java:73) at org.hibernate.reactive.loader.hql.impl.ReactiveQueryLoader$1.reactiveExtractResults(ReactiveQueryLoader.java:72) at org.hibernate.reactive.loader.ReactiveLoader.reactiveProcessResultSet(ReactiveLoader.java:145) at org.hibernate.reactive.loader.ReactiveLoader.lambda$doReactiveQueryAndInitializeNonLazyCollections$0(ReactiveLoader.java:77) at java.base/java.util.concurrent.CompletableFuture$UniCompose.tryFire(CompletableFuture.java:1072) at java.base/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:506) at java.base/java.util.concurrent.CompletableFuture.complete(CompletableFuture.java:2073) at io.vertx.core.Future.lambda$toCompletionStage$2(Future.java:360) 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.sqlclient.impl.QueryResultBuilder.tryComplete(QueryResultBuilder.java:102) at io.vertx.sqlclient.impl.QueryResultBuilder.tryComplete(QueryResultBuilder.java:35) at io.vertx.core.Promise.complete(Promise.java:66) at io.vertx.core.Promise.handle(Promise.java:51) at io.vertx.core.Promise.handle(Promise.java:29) 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.safeExecute(AbstractEventExecutor.java:164) at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:469) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:503) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:986) 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:829) ``` ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? Reproducer: https://github.com/gwenneg/quarkus-hibernate-reactive-server-request-filter Steps to reproduce the behavior: - Start the app with `./mvnw clean quarkus:dev` - Run [jmeter.test.plan.zip](https://github.com/quarkusio/quarkus/files/7959301/jmeter.test.plan.zip) with JMeter - The exception should show up in the log eventually ⚠️ If you change the Quarkus version to `2.3.1.Final`, the exception should never be thrown. As a consequence, this looks like a regression to us but I'll wait for a confirmation on that specific point before tagging the issue as a regression. ### Output of `uname -a` or `ver` Linux glepage.remote.csb 4.18.0-348.2.1.el8_5.x86_64 #1 SMP Mon Nov 8 13:30:15 EST 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "11.0.13" 2021-10-19 LTS ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.3.Final and 2.7.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

047180b5b3d1916de98bca121fd8f9b3b723eeab

96c64fd8f09c02a497e2db366c64dd9196582442

https://github.com/quarkusio/quarkus/compare/047180b5b3d1916de98bca121fd8f9b3b723eeab...96c64fd8f09c02a497e2db366c64dd9196582442

diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java index 0157be32611..692fba4f7c2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java @@ -60,26 +60,14 @@ public class VertxResteasyReactiveRequestContext extends ResteasyReactiveRequest this.devModeTccl = devModeTccl; context.addHeadersEndHandler(this); String expect = request.getHeader(HttpHeaderNames.EXPECT); - ContextInternal internal = ((ConnectionBase) context.request().connection()).getContext(); - if (!vertxContextPropsToCopy.isEmpty()) { - ContextInternal current = (ContextInternal) Vertx.currentContext(); - Map<Object, Object> internalLocalContextData = internal.localContextData(); - Map<Object, Object> currentLocalContextData = current.localContextData(); - for (int i = 0; i < vertxContextPropsToCopy.size(); i++) { - String name = vertxContextPropsToCopy.get(i); - Object value = currentLocalContextData.get(name); - if (value != null) { - internalLocalContextData.put(name, value); - } - } - } + ContextInternal current = (ContextInternal) Vertx.currentContext(); if (expect != null && expect.equalsIgnoreCase(CONTINUE)) { continueState = ContinueState.REQUIRED; } this.contextExecutor = new Executor() { @Override public void execute(Runnable command) { - internal.runOnContext(new Handler<Void>() { + current.runOnContext(new Handler<Void>() { @Override public void handle(Void unused) { command.run();

['independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.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/31472/31469

quarkusio

quarkus

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

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

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

Warnings about lack of "Hibernate Validator", despite no validation annotations being used

fixes

### Describe the bug I have an application, which uses `quartz`,`agroal` and `hibernate-panache` and saves data into DB on regular intervals. After update to the latest 999-SNAPSHOT(1d45952917c72a12eed6b9351f6ecdca813637a8) it now shows multiple warnings about `jakarta.validation.NoProviderFoundException` being thrown. The application doesn't use any code from `javax.validation` or `jakarta.validation` packages. Adding `quarkus-hibernate-validator` solves this problem. Nothing of sorts is mentioned in the migration guide[1]. [1] https://docs.jboss.org/hibernate/orm/6.0/migration-guide/migration-guide.html ### Expected behavior The application should work without warnings, and should not require `quarkus-hibernate-validator` ### Actual behavior ``` (JPA Startup Thread) Error calling `jakarta.validation.Validation#buildDefaultValidatorFactory`: jakarta.validation.NoProviderFoundException: Unable to create a Configuration, because no Jakarta Bean Validation provider could be found. Add a provider like Hibernate Validator (RI) to your classpath. at jakarta.validation.Validation$GenericBootstrapImpl.configure(Validation.java:291) at jakarta.validation.Validation.buildDefaultValidatorFactory(Validation.java:103) at org.hibernate.boot.beanvalidation.TypeSafeActivator.getValidatorFactory(TypeSafeActivator.java:483) at org.hibernate.boot.beanvalidation.TypeSafeActivator.activate(TypeSafeActivator.java:83) 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 org.hibernate.boot.beanvalidation.BeanValidationIntegrator.integrate(BeanValidationIntegrator.java:140) at org.hibernate.internal.SessionFactoryImpl.integrate(SessionFactoryImpl.java:451) at org.hibernate.internal.SessionFactoryImpl.<init>(SessionFactoryImpl.java:247) at org.hibernate.internal.SessionFactoryImpl.<init>(SessionFactoryImpl.java:200) at io.quarkus.hibernate.orm.runtime.boot.FastBootEntityManagerFactoryBuilder.build(FastBootEntityManagerFactoryBuilder.java:78) at io.quarkus.hibernate.orm.runtime.FastBootHibernatePersistenceProvider.createEntityManagerFactory(FastBootHibernatePersistenceProvider.java:73) at jakarta.persistence.Persistence.createEntityManagerFactory(Persistence.java:80) at jakarta.persistence.Persistence.createEntityManagerFactory(Persistence.java:55) at io.quarkus.hibernate.orm.runtime.JPAConfig$LazyPersistenceUnit.get(JPAConfig.java:167) at io.quarkus.hibernate.orm.runtime.JPAConfig$1.run(JPAConfig.java:68) at java.base/java.lang.Thread.run(Thread.java:833) ``` ### How to Reproduce? 1. ` git clone git@github.com:fedinskiy/beefy-scenarios.git -b reproducer/hibernate-6` 2. `beefy-scenarios/017-quartz-cluster` 3. `mvn clean verify #exceptions in logs` 4. add ``` <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-hibernate-validator</artifactId> </dependency>``` to pom.xml 5. Run `mvn clean verify # no exceptions in app logs ` 6. If command in step 3 uses ` -Dquarkus.platform.version=3.0.0.Alpha4`, then the app works even without `hibernate-validator` The app doesn't use any validation: `find src/ | xargs grep 'validation'` ### Output of `uname -a` or `ver` 6.0.18-300.fc37.x86_64 ### Output of `java -version` 17.0.5, vendor: GraalVM Community ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 1d45952917c72a12eed6b9351f6ecdca813637a8 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 (84538c9988a25aec085021c365c560670ad80f63) ### Additional information Probably related to https://github.com/quarkusio/quarkus/pull/31235

cf9223e422079664a79e570bbb1e5d2e7b86ba83

bc142cafa61977994c732fed4f9068d3cb8c0758

https://github.com/quarkusio/quarkus/compare/cf9223e422079664a79e570bbb1e5d2e7b86ba83...bc142cafa61977994c732fed4f9068d3cb8c0758

diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java index b5549222fa7..9014034a299 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java @@ -27,5 +27,12 @@ public final class HibernateLogFilterBuildStep { filters.produce(new LogCleanupFilterBuildItem("org.hibernate.jpa.internal.util.LogHelper", "HHH000204")); filters.produce(new LogCleanupFilterBuildItem("SQL dialect", "HHH000400")); filters.produce(new LogCleanupFilterBuildItem("org.hibernate.orm.beans", "HHH10005002", "HHH10005004")); + // Disable info logging for Bean Validation implementation not being present: + // it is perfectly valid when set to auto. The error is logged in the caller if it has to be logged. + filters.produce(new LogCleanupFilterBuildItem("org.hibernate.boot.beanvalidation.TypeSafeActivator", + "Error calling ")); + // Silence incubating settings warnings as we will use some for compatibility + filters.produce(new LogCleanupFilterBuildItem("org.hibernate.orm.incubating", + "HHH90006001")); } }

['extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.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/31728/30744

quarkusio

quarkus

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

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

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

[Quarkus Native] ClassNotFoundException: com.github.benmanes.caffeine.cache.SSSW

fixes

### Describe the bug Using the Cache API with ``caffeine`` leads to the following exception when running ``Quarkus 2.16.0.Final`` in ```native``` mode: ``` 2023-01-31 13:56:54,211 ERROR [io.qua.run.Application] (main) Failed to start application (with profile [prod]): java.lang.ClassNotFoundException: com.github.benmanes.caffeine.cache.SSSW at java.base@17.0.5/java.lang.Class.forName(DynamicHub.java:1132) at java.base@17.0.5/java.lang.Class.forName(DynamicHub.java:1105) at com.github.benmanes.caffeine.cache.LocalCacheFactory.loadFactory(LocalCacheFactory.java:84) at com.github.benmanes.caffeine.cache.LocalCacheFactory.newBoundedLocalCache(LocalCacheFactory.java:40) at com.github.benmanes.caffeine.cache.BoundedLocalCache$BoundedLocalAsyncCache.<init>(BoundedLocalCache.java:4216) at com.github.benmanes.caffeine.cache.Caffeine.buildAsync(Caffeine.java:1096) at io.quarkus.cache.runtime.caffeine.CaffeineCacheImpl.<init>(CaffeineCacheImpl.java:71) at io.quarkus.cache.runtime.caffeine.CaffeineCacheManagerBuilder$1.get(CaffeineCacheManagerBuilder.java:56) at io.quarkus.cache.runtime.caffeine.CaffeineCacheManagerBuilder$1.get(CaffeineCacheManagerBuilder.java:34) at io.quarkus.cache.CacheManager_7ace4235729bbc654ace276b403267860dc707de_Synthetic_Bean.createSynthetic(Unknown Source) at io.quarkus.cache.CacheManager_7ace4235729bbc654ace276b403267860dc707de_Synthetic_Bean.create(Unknown Source) at io.quarkus.cache.CacheManager_7ace4235729bbc654ace276b403267860dc707de_Synthetic_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.arc.impl.ClientProxies.getApplicationScopedDelegate(ClientProxies.java:21) at io.quarkus.cache.CacheManager_7ace4235729bbc654ace276b403267860dc707de_Synthetic_ClientProxy.arc$delegate(Unknown Source) at io.quarkus.cache.CacheManager_7ace4235729bbc654ace276b403267860dc707de_Synthetic_ClientProxy.getCacheNames(Unknown Source) at io.quarkus.cache.runtime.CacheManagerInitializer.onStartup(CacheManagerInitializer.java:14) at java.base@17.0.5/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.arc.impl.Reflections.invokeMethod(Reflections.java:170) at io.quarkus.cache.runtime.CacheManagerInitializer_Observer_onStartup_8dc69ad76cf9cc31e6928ed65580a8d3fd18a734.notify(Unknown Source) at io.quarkus.arc.impl.EventImpl$Notifier.notifyObservers(EventImpl.java:328) at io.quarkus.arc.impl.EventImpl$Notifier.notify(EventImpl.java:310) at io.quarkus.arc.impl.EventImpl.fire(EventImpl.java:78) at io.quarkus.arc.runtime.ArcRecorder.fireLifecycleEvent(ArcRecorder.java:131) at io.quarkus.arc.runtime.ArcRecorder.handleLifecycleEvents(ArcRecorder.java:100) 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:108) 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) ``` ### Expected behavior _No response_ ### Actual behavior This issue is related to the ``native`` mode only. The ``JVM`` mode is working just fine. It also looks like it's just an issue with ```2.16.0.Final```, with ```2.15.3.Final``` everything works as expected, even in the ``native`` mode. ### How to Reproduce? 1. Define a ``Quarkus 2.16.0.Final`` dependency 2. Add the ``@CacheResult`` annotation to an interceptable method 3. Run your app in ``native`` mode ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` openjdk 17.0.2 2022-01-18 ### GraalVM version (if different from Java) GraalVM 22.3.0 Java 17 CE ### Quarkus version or git rev Quarkus 2.16.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) mvn ### Additional information The native build is conducted with the help of ``quay.io/quarkus/ubi-quarkus-native-image:22.3-java17``

3d53ddf3c8612504f325bd23ea6d07f65040ac0e

8746898ebbf3861c7ab4b300a2ac91ee0d2ba09f

https://github.com/quarkusio/quarkus/compare/3d53ddf3c8612504f325bd23ea6d07f65040ac0e...8746898ebbf3861c7ab4b300a2ac91ee0d2ba09f

diff --git a/extensions/caffeine/runtime/src/main/java/io/quarkus/caffeine/runtime/graal/CacheConstructorsFeature.java b/extensions/caffeine/runtime/src/main/java/io/quarkus/caffeine/runtime/graal/CacheConstructorsFeature.java index 8456a80860c..ac2bf2db5b4 100644 --- a/extensions/caffeine/runtime/src/main/java/io/quarkus/caffeine/runtime/graal/CacheConstructorsFeature.java +++ b/extensions/caffeine/runtime/src/main/java/io/quarkus/caffeine/runtime/graal/CacheConstructorsFeature.java @@ -80,6 +80,8 @@ public class CacheConstructorsFeature implements Feature { "com.github.benmanes.caffeine.cache.PSMS", "com.github.benmanes.caffeine.cache.PSW", "com.github.benmanes.caffeine.cache.PSMW", + "com.github.benmanes.caffeine.cache.PSAMW", + "com.github.benmanes.caffeine.cache.PSAWMW", "com.github.benmanes.caffeine.cache.PSWMS", "com.github.benmanes.caffeine.cache.PSWMW", "com.github.benmanes.caffeine.cache.SILMS", @@ -88,6 +90,7 @@ public class CacheConstructorsFeature implements Feature { "com.github.benmanes.caffeine.cache.SSLMS", "com.github.benmanes.caffeine.cache.SSMS", "com.github.benmanes.caffeine.cache.SSMSA", + "com.github.benmanes.caffeine.cache.SSMSAW", "com.github.benmanes.caffeine.cache.SSMSW", "com.github.benmanes.caffeine.cache.SSW", }; @@ -102,6 +105,7 @@ public class CacheConstructorsFeature implements Feature { "com.github.benmanes.caffeine.cache.SSSMS", "com.github.benmanes.caffeine.cache.SSSMSA", "com.github.benmanes.caffeine.cache.SSSMSW", + "com.github.benmanes.caffeine.cache.SSSMSAW", "com.github.benmanes.caffeine.cache.SSSW" }; }

['extensions/caffeine/runtime/src/main/java/io/quarkus/caffeine/runtime/graal/CacheConstructorsFeature.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/31726/31722

quarkusio

quarkus

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

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

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

Multiple duplicate traces when deploying into Kubernetes

fix

### Describe the bug When performing a deployment to Kubernetes, I can see these duplicate traces: ``` [INFO] [io.quarkus.kubernetes.deployment.KubernetesDeploy] Kubernetes API Server at 'https://127.0.0.1:38293/' successfully contacted. [INFO] [io.quarkus.kubernetes.deployment.KubernetesDeploy] Kubernetes API Server at 'https://127.0.0.1:38293/' successfully contacted. [INFO] [io.quarkus.kubernetes.deployment.KubernetesDeploy] Kubernetes API Server at 'https://127.0.0.1:38293/' successfully contacted. [INFO] [io.quarkus.kubernetes.deployment.KubernetesDeploy] Kubernetes API Server at 'https://127.0.0.1:38293/' successfully contacted. [INFO] [io.quarkus.deployment.pkg.steps.JarResultBuildStep] The decompiled output can be found at: /home/jcarvaja/sources/personal/quarkus-examples/kubernetes-docker/target/decompiled ``` ### Expected behavior This trace should be printed only once. ### 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_

bbb56f92d755ac529c4df04147639d88ed2dda39

3093492e8e88dcbcc455f8f2ff62f4de24b97708

https://github.com/quarkusio/quarkus/compare/bbb56f92d755ac529c4df04147639d88ed2dda39...3093492e8e88dcbcc455f8f2ff62f4de24b97708

diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java index 7961676eab0..d2acba0da79 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java @@ -65,7 +65,7 @@ public class KubernetesDeploy { + masterURL + "' could not be determined. Please ensure that a valid token is being used.")); } - log.info("Kubernetes API Server at '" + masterURL + "' successfully contacted."); + log.debugf("Kubernetes API Server at '" + masterURL + "' successfully contacted."); log.debugf("Kubernetes Version: %s.%s", version.getMajor(), version.getMinor()); serverFound = true; return Result.enabled(); diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java index 0bc527a2f9d..d98164e5551 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java @@ -72,7 +72,7 @@ public class KubernetesDeployer { Optional<String> activeContainerImageCapability = ContainerImageCapabilitiesUtil .getActiveContainerImageCapability(capabilities); - //If container image actions are explicilty disabled block deployment even if a container image capability is not present. + //If container image actions are explicitly disabled block deployment even if a container image capability is not present. if (!containerImageConfig.isBuildExplicitlyDisabled() && !containerImageConfig.isPushExplicitlyDisabled() && activeContainerImageCapability.isEmpty()) { // we can't throw an exception here, because it could prevent the Kubernetes resources from being generated

['extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java', 'extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.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/31630/31267

quarkusio

quarkus

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

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

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

Issue with id population when using MongoDb with Panache in native

fixes

### Describe the bug When persisting an entity in mongodb, it should populate the id. It is working launching quarkus in dev mode, but when I build it natively id keeps being null. ### Expected behavior When persisting, it should populate the value of the generated _id in mongodb. ### Actual behavior Value is null after persisting ### How to Reproduce? Get repo: https://github.com/ZimiZones/mongodb-id-generation Launch MongoDb: `docker run --rm -d --name mongo -p 27017:27017 mongo:6.0.4` Launch in dev: `quarkus dev` Send request: `curl --location 'http://localhost:8080/fasta_dbs'` It should return: {"id":"something here","name":"random name"} It is working! Build natively: ./gradlew build -Dquarkus.package.type=native -Dquarkus.native.container-build=true Launch and run the same request. Record had been created in mongodb but you will have an error because id is null. ### Output of `uname -a` or `ver` Linux WSL ### Output of `java -version` 17.0.4 ### GraalVM version (if different from Java) 22.3.1.r17-grl ### Quarkus version or git rev 2.16.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 8.0 ### Additional information _No response_

fdd65c47aecf93f9a324348206287e63bc24caa8

be154567f906fe876cc52dff136e1f35ace044a9

https://github.com/quarkusio/quarkus/compare/fdd65c47aecf93f9a324348206287e63bc24caa8...be154567f906fe876cc52dff136e1f35ace044a9

diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java index add4b85f039..4d8fc91bfa4 100644 --- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java +++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java @@ -161,11 +161,13 @@ public class MongoClientProcessor { reflectiveClassNames.addAll(commandListeners.getCommandListenerClassNames()); List<ReflectiveClassBuildItem> reflectiveClass = reflectiveClassNames.stream() - .map(s -> new ReflectiveClassBuildItem(true, true, false, s)) + .map(s -> ReflectiveClassBuildItem.builder(s).methods(true).build()) .collect(Collectors.toCollection(ArrayList::new)); // ChangeStreamDocument needs to be registered for reflection with its fields. - reflectiveClass.add(new ReflectiveClassBuildItem(true, true, true, ChangeStreamDocument.class.getName())); - reflectiveClass.add(new ReflectiveClassBuildItem(true, true, false, UpdateDescription.class.getName())); + reflectiveClass.add(ReflectiveClassBuildItem.builder(ChangeStreamDocument.class).methods(true).fields(true).build()); + reflectiveClass.add(ReflectiveClassBuildItem.builder(UpdateDescription.class).methods(true).build()); + // ObjectId is often used on identifier, so we also register it + reflectiveClass.add(ReflectiveClassBuildItem.builder(ObjectId.class).methods(true).fields(true).build()); return reflectiveClass; } diff --git a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java index b36e8f46a0e..09ef71fb729 100644 --- a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java +++ b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java @@ -279,7 +279,7 @@ public abstract class BasePanacheMongoResourceProcessor { transformers.produce(new BytecodeTransformerBuildItem(modelClass, entityEnhancer)); //register for reflection entity classes - reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, modelClass)); + reflectiveClass.produce(ReflectiveClassBuildItem.builder(modelClass).fields(true).methods(true).build()); // Register for building the property mapping cache propertyMappingClass.produce(new PropertyMappingClassBuildStep(modelClass));

['extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java', 'extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.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/31581/31558

quarkusio

quarkus

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

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

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

JUnit @Nested Inner Classes with @BeforeAll and @Transactional annotations fail on initialization after upgrading to 2.16.3.Final

fixes

### Describe the bug After upgrading from version `2.15.3.Final` to `2.16.3.Final`, Tests on Inner Classes annotated with `@Nested` and methods annotated with `@BeforeAll` and `@Transactional` fail on initialization. ### Expected behavior Tests on Inner Classes annotated with JUnit @Nested annotation should keep working as in the previous version (`2.15.3.Final`). ### Actual behavior After upgrading from version 2.15.3.Final to 2.16.3.Final, Tests on Inner Classes annotated with `@Nested` and methods annotated with `@BeforeAll` and `@Transactional` fail on initialization. ```shell java.lang.RuntimeException: java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.arc.deployment.ArcProcessor#generateResources threw an exception: javax.enterprise.inject.spi.DeploymentException: Found 2 deployment problems: [1] The INNER class org.acme.FruitResourceTest$AnotherFruitInnerClass declares an interceptor binding but it must be ignored per CDI rules [2] The INNER class org.acme.FruitResourceTest$AFruitInnerClass declares an interceptor binding but it must be ignored per CDI rules at io.quarkus.arc.processor.BeanDeployment.processErrors(BeanDeployment.java:1231) at io.quarkus.arc.processor.BeanProcessor.processValidationErrors(BeanProcessor.java:161) at io.quarkus.arc.deployment.ArcProcessor.generateResources(ArcProcessor.java:559) 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.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:909) at io.quarkus.builder.BuildContext.run(BuildContext.java:281) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Suppressed: java.lang.IllegalStateException: The INNER class org.acme.FruitResourceTest$AnotherFruitInnerClass declares an interceptor binding but it must be ignored per CDI rules at io.quarkus.arc.deployment.WrongAnnotationUsageProcessor.detect(WrongAnnotationUsageProcessor.java:100) ... 11 more Suppressed: java.lang.IllegalStateException: The INNER class org.acme.FruitResourceTest$AFruitInnerClass declares an interceptor binding but it must be ignored per CDI rules at io.quarkus.arc.deployment.WrongAnnotationUsageProcessor.detect(WrongAnnotationUsageProcessor.java:100) ... 11 more ``` ## Test Class: ```java package org.acme; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import javax.transaction.Transactional; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS; @QuarkusTest @QuarkusTestResource(PostgresTestResource.class) @TestInstance(PER_CLASS) class FruitResourceTest { @BeforeAll void doSomeImportantStuffBeforeAllTests() { // } @Nested @DisplayName("This is a special Test in an Inner class") @TestInstance(PER_CLASS) class AFruitInnerClass { @BeforeAll // Commenting out @Transactional annotations makes tests to pass. @Transactional static void doSomeImportantStuffBeforeAllTests() { // } @Test void testGetFruitByIdEndpoint() { given() .when().get("/fruits/1") .then() .statusCode(200) .body(containsString("Banana")); } } @Nested @DisplayName("This is a special Test in an Inner class") @TestInstance(PER_CLASS) class AnotherFruitInnerClass { @BeforeAll // Commenting out @Transactional annotations makes tests to pass. @Transactional static void doSomeImportantStuffBeforeAllTests() { // } @Test void testGetFruitByIdEndpointAgain() { given() .when().get("/fruits/1") .then() .statusCode(200) .body(containsString("Banana")); } } } ``` ### How to Reproduce? Steps to reproduce the issue: Reproducer repository: https://github.com/fernandobalieiro/quarkus-nested-test-error 1. `git clone https://github.com/fernandobalieiro/quarkus-nested-test-error` 2. `cd quarkus-nested-test-error` 3. Run `./mvnw clean test ` 4. Tests will fail with the following result: ```shell [INFO] [INFO] Results: [INFO] [ERROR] Errors: [ERROR] FruitResourceTest » Runtime java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.arc.deployment.ArcProcessor#generateResources threw an exception: javax.enterprise.inject.spi.DeploymentException: Found 2 deployment problems: [1] The INNER class org.acme.FruitResourceTest$AnotherFruitInnerClass declares an interceptor binding but it must be ignored per CDI rules [2] The INNER class org.acme.FruitResourceTest$AFruitInnerClass declares an interceptor binding but it must be ignored per CDI rules at io.quarkus.arc.processor.BeanDeployment.processErrors(BeanDeployment.java:1231) at io.quarkus.arc.processor.BeanProcessor.processValidationErrors(BeanProcessor.java:161) at io.quarkus.arc.deployment.ArcProcessor.generateResources(ArcProcessor.java:559) 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.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:909) at io.quarkus.builder.BuildContext.run(BuildContext.java:281) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Suppressed: java.lang.IllegalStateException: The INNER class org.acme.FruitResourceTest$AnotherFruitInnerClass declares an interceptor binding but it must be ignored per CDI rules at io.quarkus.arc.deployment.WrongAnnotationUsageProcessor.detect(WrongAnnotationUsageProcessor.java:100) ... 11 more Suppressed: java.lang.IllegalStateException: The INNER class org.acme.FruitResourceTest$AFruitInnerClass declares an interceptor binding but it must be ignored per CDI rules at io.quarkus.arc.deployment.WrongAnnotationUsageProcessor.detect(WrongAnnotationUsageProcessor.java:100) ... 11 more [INFO] [ERROR] Tests run: 1, Failures: 0, Errors: 1, Skipped: 0 [INFO] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 15.029 s [INFO] Finished at: 2023-03-02T17:26:30Z [INFO] ------------------------------------------------------------------------ ``` ### Output of `uname -a` or `ver` Linux neo 5.19.0-35-generic #36~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Fri Feb 17 15:17:25 UTC 2 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk 17.0.1 2021-10-19 OpenJDK Runtime Environment GraalVM CE 21.3.0 (build 17.0.1+12-jvmci-21.3-b05) OpenJDK 64-Bit Server VM GraalVM CE 21.3.0 (build 17.0.1+12-jvmci-21.3-b05, mixed mode, sharing) ### GraalVM version (if different from Java) CE 21.3.0 (build 17.0.1+12-jvmci-21.3-b05, mixed mode, sharing) ### Quarkus version or git rev 2.16.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) Maven home: /home/neo/.m2/wrapper/dists/apache-maven-3.8.4-bin/52ccbt68d252mdldqsfsn03jlf/apache-maven-3.8.4 Java version: 17.0.2, vendor: GraalVM Community, runtime: /home/neo/.asdf/installs/java/graalvm-22.0.0.2+java17 Default locale: en_US, platform encoding: UTF-8 OS name: "linux", version: "5.19.0-35-generic", arch: "amd64", family: "unix" ### Additional information _No response_

c9d19099ea1dd87f9ee375aa6424a0d9f691ddb4

5d3a353c1b0cc92b15c41ae8d1f7f08ac9d7d4f3

https://github.com/quarkusio/quarkus/compare/c9d19099ea1dd87f9ee375aa6424a0d9f691ddb4...5d3a353c1b0cc92b15c41ae8d1f7f08ac9d7d4f3

diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java index a68213e6271..5bbd2bdfcc3 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java @@ -13,7 +13,9 @@ import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.ClassInfo.NestingType; import org.jboss.jandex.DotName; +import org.jboss.jandex.FieldInfo; import org.jboss.jandex.IndexView; +import org.jboss.jandex.MethodInfo; import io.quarkus.arc.deployment.ValidationPhaseBuildItem.ValidationErrorBuildItem; import io.quarkus.arc.processor.Annotations; @@ -72,35 +74,66 @@ public class WrongAnnotationUsageProcessor { NestingType nestingType = clazz.nestingType(); if (NestingType.ANONYMOUS == nestingType || NestingType.LOCAL == nestingType || (NestingType.INNER == nestingType && !Modifier.isStatic(clazz.flags()))) { - // Annotations declared on the class, incl. the annotations added via transformers - Collection<AnnotationInstance> classAnnotations = transformedAnnotations.getAnnotations(clazz); - if (classAnnotations.isEmpty() && clazz.annotationsMap().isEmpty()) { - continue; - } - if (scopeAnnotations.isScopeIn(classAnnotations)) { + // Annotations declared on the class level, incl. the annotations added via transformers + Collection<AnnotationInstance> classLevelAnnotations = transformedAnnotations.getAnnotations(clazz); + if (scopeAnnotations.isScopeIn(classLevelAnnotations)) { validationErrors.produce(new ValidationErrorBuildItem( new IllegalStateException(String.format( "The %s class %s has a scope annotation but it must be ignored per the CDI rules", clazz.nestingType().toString(), clazz.name().toString())))); - } else if (clazz.annotationsMap().containsKey(DotNames.OBSERVES)) { - validationErrors.produce(new ValidationErrorBuildItem( - new IllegalStateException(String.format( - "The %s class %s declares an observer method but it must be ignored per the CDI rules", - clazz.nestingType().toString(), clazz.name().toString())))); - } else if (clazz.annotationsMap().containsKey(DotNames.PRODUCES)) { - validationErrors.produce(new ValidationErrorBuildItem( - new IllegalStateException(String.format( - "The %s class %s declares a producer but it must be ignored per the CDI rules", - clazz.nestingType().toString(), clazz.name().toString())))); - } else if (Annotations.containsAny(classAnnotations, interceptorResolverBuildItem.getInterceptorBindings()) - || Annotations.containsAny(clazz.annotations(), - interceptorResolverBuildItem.getInterceptorBindings())) { - // detect interceptor bindings on nested classes + } else if (Annotations.containsAny(classLevelAnnotations, + interceptorResolverBuildItem.getInterceptorBindings())) { + // detect interceptor bindings declared at nested class level validationErrors.produce(new ValidationErrorBuildItem( new IllegalStateException(String.format( "The %s class %s declares an interceptor binding but it must be ignored per CDI rules", clazz.nestingType().toString(), clazz.name().toString())))); } + + // iterate over methods and verify those + // note that since JDK 16, you can have static method inside inner non-static class + for (MethodInfo methodInfo : clazz.methods()) { + // annotations declared on method level, incl. the annotations added via transformers + Collection<AnnotationInstance> methodAnnotations = transformedAnnotations.getAnnotations(methodInfo); + if (methodAnnotations.isEmpty()) { + continue; + } + if (Annotations.contains(methodAnnotations, DotNames.OBSERVES) + || Annotations.contains(methodAnnotations, DotNames.OBSERVES_ASYNC)) { + validationErrors.produce(new ValidationErrorBuildItem( + new IllegalStateException(String.format( + "The method %s in the %s class %s declares an observer method but it must be ignored per the CDI rules", + methodInfo.name(), clazz.nestingType().toString(), clazz.name().toString())))); + } else if (Annotations.contains(methodAnnotations, DotNames.PRODUCES)) { + validationErrors.produce(new ValidationErrorBuildItem( + new IllegalStateException(String.format( + "The method %s in the %s class %s declares a producer but it must be ignored per the CDI rules", + methodInfo.name(), clazz.nestingType().toString(), clazz.name().toString())))); + } else if (!Modifier.isStatic(methodInfo.flags()) && Annotations.containsAny(methodAnnotations, + interceptorResolverBuildItem.getInterceptorBindings())) { + // detect interceptor bindings declared at nested class methods + validationErrors.produce(new ValidationErrorBuildItem( + new IllegalStateException(String.format( + "The method %s in the %s class %s declares an interceptor binding but it must be ignored per CDI rules", + methodInfo.name(), clazz.nestingType().toString(), clazz.name().toString())))); + } + + } + + // iterate over all fields, check for incorrect producer declarations + for (FieldInfo fieldInfo : clazz.fields()) { + // annotations declared on field level, incl. the annotations added via transformers + Collection<AnnotationInstance> fieldAnnotations = transformedAnnotations.getAnnotations(fieldInfo); + if (fieldAnnotations.isEmpty()) { + continue; + } + if (Annotations.contains(fieldAnnotations, DotNames.PRODUCES)) { + validationErrors.produce(new ValidationErrorBuildItem( + new IllegalStateException(String.format( + "The field %s in the %s class %s declares a producer but it must be ignored per the CDI rules", + fieldInfo.name(), clazz.nestingType().toString(), clazz.name().toString())))); + } + } } } }

['extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.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/31477/31449

quarkusio

quarkus

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

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

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

Qute: VarArgs processing error with 1 element

fixes

### Describe the bug @mkouba I'm submitting this based on your suggesting to file here in Quarkus to fix https://github.com/quarkiverse/quarkus-renarde/issues/102 I have a method on my User class which is a RenardeUser, etc. I have a method called `hasUserRole(String... roleNames)` that I'd like to pass in a list of roles to check from my Qute templates in a single method call instead of multiple calls. This works IF I pass in a list of roles like `{#if inject:user && inject:user.hasUserRole("webadmin", "admin", "support")}` but I get an exception during RUNTIME if I try to pass in a single value, ie. `{#if inject:user && inject:user.hasUserRole("admin")}` The project compiles and starts up just fine but dies when I access the page with the single permission check. ``` 2023-02-26 17:27:11,348 ERROR [org.jbo.res.rea.com.cor.AbstractResteasyReactiveContext] (executor-thread-1) Request failed: java.lang.ClassCastException: class java.lang.String cannot be cast to class [Ljava.lang.String; (java.lang.String and [Ljava.lang.String; are in module java.base of loader 'bootstrap') ``` ### Expected behavior VarAgs with a single parameter should also work ### Actual behavior Get the error: ``` 2023-02-26 17:27:11,348 ERROR [org.jbo.res.rea.com.cor.AbstractResteasyReactiveContext] (executor-thread-1) Request failed: java.lang.ClassCastException: class java.lang.String cannot be cast to class [Ljava.lang.String; (java.lang.String and [Ljava.lang.String; are in module java.base of loader 'bootstrap') ``` ### 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 2.16.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

cb1c4f0f6183bb2a09d0f86ad9b2256599b0421a

ed1f03a804de5979b8ae8df63971142d23422f7a

https://github.com/quarkusio/quarkus/compare/cb1c4f0f6183bb2a09d0f86ad9b2256599b0421a...ed1f03a804de5979b8ae8df63971142d23422f7a

diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java index 0cf8f640c66..957bae5ac11 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java @@ -2,7 +2,11 @@ package io.quarkus.qute.deployment.varargs; import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.Arrays; + import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; @@ -22,7 +26,13 @@ public class VarargsMethodTest { .addAsResource(new StringAsset("{foo.getStr}:{foo.getStr('foo','bar','baz')}"), "templates/foo.txt") .addAsResource(new StringAsset("{fmt.format('a','b','c')}"), - "templates/bar.txt")); + "templates/bar.txt") + .addAsResource(new StringAsset("{foo.getInt}:{foo.getInt(1)}:{foo.getInt(1,2,3)}"), + "templates/baz.txt") + .addAsResource( + new StringAsset( + "{cdi:qux.getBoolean(1)}:{cdi:qux.getBoolean(1, true, false)}:{cdi:qux.getBoolean(2, false)}"), + "templates/qux.txt"));; @Inject Template foo; @@ -30,15 +40,24 @@ public class VarargsMethodTest { @Inject Template bar; + @Inject + Template baz; + + @Inject + Template qux; + @Test public void testVarargs() { assertEquals("ok:foo:bar baz", foo.data("foo", new Foo()).render()); assertEquals(" b a", bar.data("fmt", "%2$2s%1$2s").render()); + assertEquals("[]:[1]:[1, 2, 3]", baz.data("foo", new Foo()).render()); + assertEquals("1 []:1 [true, false]:2 [false]", qux.render()); } @TemplateData(properties = false) public static class Foo { + // This one is ignored String getStr(String foo) { return foo; } @@ -52,6 +71,10 @@ public class VarargsMethodTest { return foo + String.format(":%s %s", args[0], args[1]); } + public String getInt(int... args) { + return Arrays.toString(args); + } + @TemplateExtension static String format(String fmt, Object... args) { return String.format(fmt, args); @@ -59,4 +82,14 @@ public class VarargsMethodTest { } + @Named + @Singleton + public static class Qux { + + public String getBoolean(int first, Boolean... args) { + return first + " " + Arrays.toString(args); + } + + } + } diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java index fe00046e029..05e62a4f268 100644 --- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java +++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java @@ -690,21 +690,41 @@ public class ValueResolverGenerator { exception.invokeVirtualMethod(Descriptors.COMPLETABLE_FUTURE_COMPLETE_EXCEPTIONALLY, whenRet, exception.getCaughtException()); + ResultHandle[] realParamsHandle = paramsHandle; + if (isVarArgs(method)) { + // For varargs the number of results may be higher than the number of method params + // First get the regular params + realParamsHandle = new ResultHandle[parameterTypes.size()]; + for (int i = 0; i < parameterTypes.size() - 1; i++) { + ResultHandle resultHandle = tryCatch.invokeVirtualMethod(Descriptors.EVALUATED_PARAMS_GET_RESULT, + whenEvaluatedParams, tryCatch.load(i)); + realParamsHandle[i] = resultHandle; + } + // Then we need to create an array for the last argument + Type varargsParam = parameterTypes.get(parameterTypes.size() - 1); + ResultHandle componentType = tryCatch + .loadClass(varargsParam.asArrayType().component().name().toString()); + ResultHandle varargsResults = tryCatch.invokeVirtualMethod(Descriptors.EVALUATED_PARAMS_GET_VARARGS_RESULTS, + evaluatedParams, tryCatch.load(parameterTypes.size()), componentType); + // E.g. String, String, String -> String, String[] + realParamsHandle[parameterTypes.size() - 1] = varargsResults; + } + if (Modifier.isStatic(method.flags())) { if (Modifier.isInterface(clazz.flags())) { tryCatch.assign(invokeRet, - tryCatch.invokeStaticInterfaceMethod(MethodDescriptor.of(method), paramsHandle)); + tryCatch.invokeStaticInterfaceMethod(MethodDescriptor.of(method), realParamsHandle)); } else { tryCatch.assign(invokeRet, - tryCatch.invokeStaticMethod(MethodDescriptor.of(method), paramsHandle)); + tryCatch.invokeStaticMethod(MethodDescriptor.of(method), realParamsHandle)); } } else { if (Modifier.isInterface(clazz.flags())) { tryCatch.assign(invokeRet, - tryCatch.invokeInterfaceMethod(MethodDescriptor.of(method), whenBase, paramsHandle)); + tryCatch.invokeInterfaceMethod(MethodDescriptor.of(method), whenBase, realParamsHandle)); } else { tryCatch.assign(invokeRet, - tryCatch.invokeVirtualMethod(MethodDescriptor.of(method), whenBase, paramsHandle)); + tryCatch.invokeVirtualMethod(MethodDescriptor.of(method), whenBase, realParamsHandle)); } }

['extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java', 'independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.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/31436/31406

quarkusio

quarkus

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

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

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

@ServerExceptionMapper doesn't support multiple exception types

fix

### Describe the bug ``` @ServerExceptionMapper(value = {MyExceptionOne.class, MyExceptionTwo.class}) public Uni<Response> mapException(RuntimeException e) { return Uni.createFrom().item(() -> Response.status(Response.Status.CONFLICT) .entity(Map.of(MESSAGE, message)) .build();); } ``` ### Expected behavior multiple exception classes are supported ### Actual behavior ``` java.lang.RuntimeException: java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveScanningProcessor#handleCustomAnnotatedMethods threw an exception: java.lang.RuntimeException: Parameter 'e' of method 'mapException of class '...' is not allowed ``` ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` Darwin RDU-W4HVVTY7VT 21.4.0 Darwin Kernel Version 21.4.0 ### 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) 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) ### Quarkus version or git rev 2.16.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) maven ### Additional information I see that this issue was fixed in https://github.com/quarkusio/quarkus/issues/20202, but it appeared again

4bee348b17430345c927e9c3e8eeec5ed08b5f4e

efa3e58fee290f226978a67e9e9ba8c3ab5eb670

https://github.com/quarkusio/quarkus/compare/4bee348b17430345c927e9c3e8eeec5ed08b5f4e...efa3e58fee290f226978a67e9e9ba8c3ab5eb670

diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java index ee5f1e771f5..d86e45824db 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java @@ -9,7 +9,7 @@ import io.smallrye.mutiny.Uni; public class UniExceptionMapper { @ServerExceptionMapper({ UniException.class, OtherUniException.class }) - Uni<Response> handleUni(Throwable t) { + Uni<Response> handleUni(UniException t) { return Uni.createFrom().deferred(() -> Uni.createFrom().item(Response.status(413).build())); } diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java index 878d38bfada..2782c62bcbe 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java @@ -18,8 +18,8 @@ import static org.jboss.resteasy.reactive.server.processor.util.ResteasyReactive import static org.jboss.resteasy.reactive.server.processor.util.ResteasyReactiveServerDotNames.SIMPLIFIED_RESOURCE_INFO; import java.lang.reflect.Modifier; -import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -123,7 +123,7 @@ public final class ServerExceptionMapperGenerator { Map<String, String> result = new HashMap<>(); boolean handlesMultipleExceptions = handledExceptionTypes.length > 1; - boolean handledContainsThrowable = Arrays.stream(handledExceptionTypes).anyMatch(t -> t.name().equals(THROWABLE)); + Set<String> commonHierarchyOfExceptions = getCommonHierarchyOfExceptions(handledExceptionTypes); for (Type handledExceptionType : handledExceptionTypes) { String generatedClassName = getGeneratedClassName(targetMethod, handledExceptionType); @@ -155,7 +155,7 @@ public final class ServerExceptionMapperGenerator { // RESTEasy Reactive toResponse(...) method generateRRResponse(targetMethod, targetClass, handledExceptionType, cc, rrToResponseDescriptor, - returnType, handlesMultipleExceptions, handledContainsThrowable, + returnType, handlesMultipleExceptions, commonHierarchyOfExceptions, (method, contextHandle) -> { ResultHandle endpointInstanceHandle = method.invokeVirtualMethod( ofMethod(ResteasyReactiveRequestContext.class, "getEndpointInstance", Object.class), @@ -173,7 +173,7 @@ public final class ServerExceptionMapperGenerator { // RESTEasy Reactive asyncResponse(...) method generateRRUniResponse(targetMethod, targetClass, handledExceptionType, cc, rrAsyncResponseDescriptor, - returnType, handlesMultipleExceptions, handledContainsThrowable, + returnType, handlesMultipleExceptions, commonHierarchyOfExceptions, (method, contextHandle) -> { ResultHandle endpointInstanceHandle = method.invokeVirtualMethod( ofMethod(ResteasyReactiveRequestContext.class, "getEndpointInstance", Object.class), @@ -251,7 +251,7 @@ public final class ServerExceptionMapperGenerator { Map<String, String> result = new HashMap<>(); boolean handlesMultipleExceptions = handledExceptionTypes.length > 1; - boolean handledContainsThrowable = Arrays.stream(handledExceptionTypes).anyMatch(t -> t.name().equals(THROWABLE)); + Set<String> commonHierarchyOfExceptions = getCommonHierarchyOfExceptions(handledExceptionTypes); for (Type handledExceptionType : handledExceptionTypes) { String generatedClassName = getGeneratedClassName(targetMethod, handledExceptionType); @@ -311,7 +311,7 @@ public final class ServerExceptionMapperGenerator { // RESTEasy Reactive toResponse(...) method generateRRResponse(targetMethod, targetClass, handledExceptionType, cc, rrToResponseDescriptor, - returnType, handlesMultipleExceptions, handledContainsThrowable, + returnType, handlesMultipleExceptions, commonHierarchyOfExceptions, (method, contextHandle) -> method.readInstanceField(delegateField, method.getThis()), unwrappableTypes); } else if (returnType == ReturnType.UNI_RESPONSE || returnType == ReturnType.UNI_REST_RESPONSE) { @@ -325,7 +325,7 @@ public final class ServerExceptionMapperGenerator { // RESTEasy Reactive asyncResponse(...) method generateRRUniResponse(targetMethod, targetClass, handledExceptionType, cc, rrAsyncResponseDescriptor, - returnType, handlesMultipleExceptions, handledContainsThrowable, + returnType, handlesMultipleExceptions, commonHierarchyOfExceptions, (method, contextHandle) -> method.readInstanceField(delegateField, method.getThis()), unwrappableTypes); } else { @@ -352,20 +352,15 @@ public final class ServerExceptionMapperGenerator { List<Type> methodParameters = targetMethod.parameterTypes(); for (Type methodParameter : methodParameters) { if (methodParameter.kind() == Type.Kind.CLASS) { - try { - Class<?> methodParameterClass = Class.forName(methodParameter.name().toString(), false, - Thread.currentThread().getContextClassLoader()); - if (Throwable.class.isAssignableFrom(methodParameterClass)) { - if (deducedHandledExceptionType != null) { - throw new IllegalArgumentException( - "Multiple method parameters found that extend 'Throwable'. When using '@ServerExceptionMapper', only one parameter can be of type 'Throwable'. Offending method is '" - + targetMethod.name() + "' of class '" - + targetMethod.declaringClass().name().toString() + "'"); - } - deducedHandledExceptionType = methodParameter; + Class<?> methodParameterClass = getClassByName(methodParameter.name().toString()); + if (methodParameterClass != null && Throwable.class.isAssignableFrom(methodParameterClass)) { + if (deducedHandledExceptionType != null) { + throw new IllegalArgumentException( + "Multiple method parameters found that extend 'Throwable'. When using '@ServerExceptionMapper', only one parameter can be of type 'Throwable'. Offending method is '" + + targetMethod.name() + "' of class '" + + targetMethod.declaringClass().name().toString() + "'"); } - } catch (ClassNotFoundException ignored) { - + deducedHandledExceptionType = methodParameter; } } } @@ -377,6 +372,36 @@ public final class ServerExceptionMapperGenerator { return new Type[] { deducedHandledExceptionType }; } + private static Set<String> getCommonHierarchyOfExceptions(Type[] handledExceptions) { + Set<String> commonHierarchy = new HashSet<>(); + boolean first = true; + for (Type handledException : handledExceptions) { + Class<?> handledExceptionClass = getClassByName(handledException.name().toString()); + while (handledExceptionClass != null && !handledExceptionClass.equals(Throwable.class)) { + String handledExceptionClassName = handledExceptionClass.getName(); + if (first) { + commonHierarchy.add(handledExceptionClassName); + } else if (!commonHierarchy.contains(handledExceptionClassName)) { + commonHierarchy.remove(handledExceptionClassName); + } + + handledExceptionClass = handledExceptionClass.getSuperclass(); + } + + first = false; + } + + return commonHierarchy; + } + + private static Class<?> getClassByName(String className) { + try { + return Class.forName(className, false, Thread.currentThread().getContextClassLoader()); + } catch (ClassNotFoundException ignored) { + return null; + } + } + private static MethodDescriptor toResponseDescriptor(Type handledExceptionType, String generatedClassName) { return ofMethod(generatedClassName, "toResponse", Response.class.getName(), @@ -432,7 +457,7 @@ public final class ServerExceptionMapperGenerator { private static void generateRRResponse(MethodInfo targetMethod, ClassInfo targetClass, Type handledExceptionType, ClassCreator cc, MethodDescriptor rrToResponseDescriptor, - ReturnType returnType, boolean handlesMultipleExceptions, boolean handledContainsThrowable, + ReturnType returnType, boolean handlesMultipleExceptions, Set<String> commonHierarchyOfExceptions, BiFunction<MethodCreator, ResultHandle, ResultHandle> targetInstanceHandleCreator, Set<DotName> unwrappableTypes) { MethodCreator mc = cc.getMethodCreator(rrToResponseDescriptor); ResultHandle exceptionHandle = mc.getMethodParam(0); @@ -452,7 +477,7 @@ public final class ServerExceptionMapperGenerator { } else { TargetMethodParamsInfo targetMethodParamsInfo = getTargetMethodParamsInfo(targetMethod, targetClass, handledExceptionType, mc, exceptionHandle, contextHandle, handlesMultipleExceptions, - handledContainsThrowable, unwrappableTypes); + commonHierarchyOfExceptions, unwrappableTypes); ResultHandle resultHandle = mc.invokeVirtualMethod( ofMethod(targetClass.name().toString(), targetMethod.name(), targetMethod.returnType().name().toString(), targetMethodParamsInfo.getTypes()), @@ -479,7 +504,7 @@ public final class ServerExceptionMapperGenerator { private static void generateRRUniResponse(MethodInfo targetMethod, ClassInfo targetClass, Type handledExceptionType, ClassCreator cc, MethodDescriptor rrAsyncResponseDescriptor, - ReturnType returnType, boolean handlesMultipleExceptions, boolean handledContainsThrowable, + ReturnType returnType, boolean handlesMultipleExceptions, Set<String> commonHierarchyOfExceptions, BiFunction<MethodCreator, ResultHandle, ResultHandle> targetInstanceHandleCreator, Set<DotName> unwrappableTypes) { MethodCreator mc = cc.getMethodCreator(rrAsyncResponseDescriptor); ResultHandle exceptionHandle = mc.getMethodParam(0); @@ -498,7 +523,7 @@ public final class ServerExceptionMapperGenerator { } else { TargetMethodParamsInfo targetMethodParamsInfo = getTargetMethodParamsInfo(targetMethod, targetClass, handledExceptionType, mc, exceptionHandle, contextHandle, handlesMultipleExceptions, - handledContainsThrowable, unwrappableTypes); + commonHierarchyOfExceptions, unwrappableTypes); uniHandle = mc.invokeVirtualMethod( ofMethod(targetClass.name().toString(), targetMethod.name(), Uni.class.getName(), targetMethodParamsInfo.getTypes()), @@ -512,7 +537,7 @@ public final class ServerExceptionMapperGenerator { private static TargetMethodParamsInfo getTargetMethodParamsInfo(MethodInfo targetMethod, ClassInfo targetClass, Type handledExceptionType, MethodCreator mc, ResultHandle exceptionHandle, ResultHandle contextHandle, - boolean handlesMultipleExceptions, boolean handledContainsThrowable, Set<DotName> unwrappableTypes) { + boolean handlesMultipleExceptions, Set<String> commonHierarchyOfExceptions, Set<DotName> unwrappableTypes) { List<Type> parameters = targetMethod.parameterTypes(); ResultHandle[] targetMethodParamHandles = new ResultHandle[parameters.size()]; String[] parameterTypes = new String[parameters.size()]; @@ -522,39 +547,19 @@ public final class ServerExceptionMapperGenerator { DotName paramDotName = parameter.name(); parameterTypes[i] = paramDotName.toString(); String parameterName = targetMethod.parameterName(i); - if (paramDotName.equals(handledExceptionType.name())) { - if (handlesMultipleExceptions) { + if (paramDotName.equals(THROWABLE)) { + targetMethodParamHandles[i] = exceptionHandle; + } else if (paramDotName.equals(handledExceptionType.name())) { + if (handlesMultipleExceptions && !commonHierarchyOfExceptions.contains(paramDotName.toString())) { throw new RuntimeException("Parameter '" + parameterName + "' of method '" + targetMethod.name() + " of class '" + targetClass.name() + "' cannot be of type '" + handledExceptionType.name() + "' because the method handles multiple exceptions. You can use '" - + (handledContainsThrowable ? Throwable.class.getName() : Exception.class.getName()) - + "' instead."); + + Throwable.class.getName() + "' instead."); } else { targetMethodParamHandles[i] = exceptionHandle; } - } else if (paramDotName.equals(THROWABLE)) { + } else if (commonHierarchyOfExceptions.contains(paramDotName.toString())) { targetMethodParamHandles[i] = exceptionHandle; - } else if (paramDotName.equals(EXCEPTION)) { - if (handlesMultipleExceptions) { - if (handledContainsThrowable) { - throw new RuntimeException("Parameter '" + parameterName + "' of method '" + targetMethod.name() - + " of class '" + targetClass.name() - + "' cannot be of type '" + handledExceptionType.name() - + "' because the method handles multiple exceptions. You can use '" + Exception.class.getName() - + "' instead."); - } else { - targetMethodParamHandles[i] = exceptionHandle; - } - } else { - if (handledContainsThrowable) { - throw new RuntimeException("Parameter '" + parameterName + "' of method '" + targetMethod.name() - + " of class '" + targetClass.name() - + "' cannot be of type '" + handledExceptionType.name() + "'. You can use '" - + Throwable.class.getName() + "' instead."); - } else { - targetMethodParamHandles[i] = exceptionHandle; - } - } } else if (paramDotName.equals(handledExceptionType.name())) { targetMethodParamHandles[i] = exceptionHandle; } else if (CONTAINER_REQUEST_CONTEXT.equals(paramDotName)

['extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java', 'independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.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/31422/26152

quarkusio

quarkus

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

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

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

Resteasy Reactive: ContextResolver<ObjectMapper> not used

fix

### Describe the bug When creating a RestClient with a `ContextResolver<ObjectMapper>` registered, this ContextResolver is never used and thus the wrong ObjectMapper (via CDI) is used. Other implementation approaches would be fine as well, but nothing seems to get this behaviour working. Multiple different ObjectMappers in the application do not seem to be supported. ### Expected behavior The ObjectMapper returned by a class that implements `ContextResolver<ObjectMapper>` used via `RestClientBuilder#register(Object)` is used in the given RestClient and only there. Multiple RestClients can use multiple different ObjectMappers. ### Actual behavior The ObjectMapper of the registered `ContextResolver` is not used at all. Instead an application scoped ObjectMapper bean is used in all RestClients. ### How to Reproduce? Run the following test class. The test should pass if matching the expected behaviour. ```java @QuarkusTest class MyClientTest { MyClient clientAllowsUnknown; MyClient clientDisallowsUnknown; WireMockServer wireMockServer = getWireMockServer(); @BeforeEach void setUp() throws MalformedURLException { wireMockServer.resetAll(); clientAllowsUnknown = RestClientBuilder.newBuilder() .baseUrl(new URL(wireMockServer.baseUrl())) .register(ClientObjectMapperUnknown.class) .build(MyClient.class); clientDisallowsUnknown = RestClientBuilder.newBuilder() .baseUrl(new URL(wireMockServer.baseUrl())) .register(ClientObjectMapperNoUnknown.class) .build(MyClient.class); } @Test void something_withAdditionalIgnoredProperties() { var json = "{ \"value\": \"someValue\", \"secondValue\": \"toBeIgnored\" }"; wireMockServer.stubFor( WireMock.get(WireMock.urlMatching("/something")) .willReturn(okJson(json))); var result = clientAllowsUnknown.something().await().indefinitely(); // FAIL_ON_UNKNOWN_PROPERTIES disabled assertThatCode(() -> new ClientObjectMapperUnknown().getContext(ObjectMapper.class).readValue(json, Something.class)) .doesNotThrowAnyException(); assertThat(result).isEqualTo(Something.builder().withValue("someValue").build()); // FAIL_ON_UNKNOWN_PROPERTIES enabled assertThatThrownBy(() -> new ClientObjectMapperNoUnknown().getContext(ObjectMapper.class).readValue(json, Something.class)) .isInstanceOf(JsonProcessingException.class); assertThatThrownBy(() -> clientDisallowsUnknown.something().await().indefinitely()) .isInstanceOf(JsonProcessingException.class); } @Path("/something") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public interface MyClient { @GET Uni<Something> something(); } @Value @Builder(toBuilder = true, setterPrefix = "with") @Jacksonized public static class Something { String value; } public static class ClientObjectMapperUnknown implements ContextResolver<ObjectMapper> { @Override public ObjectMapper getContext(Class<?> type) { return new ObjectMapper() .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); } } public static class ClientObjectMapperNoUnknown implements ContextResolver<ObjectMapper> { @Override public ObjectMapper getContext(Class<?> type) { return new ObjectMapper() .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) .enable(SerializationFeature.FAIL_ON_EMPTY_BEANS); } } public static WireMockServer getWireMockServer() { var wireMockServer = new WireMockServer(options().port(getAvailableTcpPort(20000, 22000))); wireMockServer.start(); return wireMockServer; } public static int getAvailableTcpPort(int min, int max) { var ports = IntStream.range(min, max).boxed().collect(Collectors.toList()); Collections.shuffle(ports); // shuffle to get a random order and reduce the probability a port is already in use for (var port : ports) { try (ServerSocket serverSocket = new ServerSocket(port)) { return serverSocket.getLocalPort(); } catch (IOException e) { // try next } } throw new IllegalStateException(MessageFormat.format("Could not find a free TCP port in range {0}:{1}.", min, max)); } } ``` With ```xml <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-rest-client-reactive-jackson</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-resteasy-reactive</artifactId> </dependency> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> <version>1.18.22</version> </dependency> ``` ### Output of `uname -a` or `ver` Darwin M042112251A.local 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64 x86_64 ### Output of `java -version` openjdk version "11.0.14.1" 2022-02-08 OpenJDK Runtime Environment Temurin-11.0.14.1+1 (build 11.0.14.1+1) OpenJDK 64-Bit Server VM Temurin-11.0.14.1+1 (build 11.0.14.1+1, mixed mode) ### GraalVM version (if different from Java) not used ### Quarkus version or git rev 2.8.0.Final, 2.9.2.Final, 2.10.0.CR1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) ### Additional information _No response_

88cfc7d6df4daf9a658fb723ea262a88285996bb

e05af28364c3bea101a8a8ee16e33d3321d2470f

https://github.com/quarkusio/quarkus/compare/88cfc7d6df4daf9a658fb723ea262a88285996bb...e05af28364c3bea101a8a8ee16e33d3321d2470f

diff --git a/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java b/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java index 1ba281fc8c3..98a52d39391 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java @@ -49,7 +49,7 @@ public class ClientJacksonMessageBodyWriter implements MessageBodyWriter<Object> @Override public void handle(RestClientRequestContext requestContext) throws Exception { - this.context = context; + this.context = requestContext; } protected ObjectWriter getEffectiveWriter() { diff --git a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java index b4a80c3a955..f925704718c 100644 --- a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java +++ b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java @@ -1,5 +1,6 @@ package io.quarkus.it.rest.client; +import static com.github.tomakehurst.wiremock.client.WireMock.ok; import static com.github.tomakehurst.wiremock.client.WireMock.okJson; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; import static org.assertj.core.api.Assertions.assertThat; @@ -8,9 +9,11 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.net.MalformedURLException; import java.net.URL; import java.util.Objects; +import java.util.concurrent.atomic.AtomicBoolean; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; @@ -40,6 +43,8 @@ public class ClientWithCustomObjectMapperTest { @BeforeEach public void setUp() throws MalformedURLException { + ClientObjectMapperUnknown.USED.set(false); + ClientObjectMapperNoUnknown.USED.set(false); wireMockServer = new WireMockServer(options().port(20001)); wireMockServer.start(); @@ -60,10 +65,10 @@ public class ClientWithCustomObjectMapperTest { } @Test - void testCustomObjectMappersShouldBeUsed() { + void testCustomObjectMappersShouldBeUsedInReader() { var json = "{ \"value\": \"someValue\", \"secondValue\": \"toBeIgnored\" }"; wireMockServer.stubFor( - WireMock.get(WireMock.urlMatching("/get")) + WireMock.get(WireMock.urlMatching("/client")) .willReturn(okJson(json))); // FAIL_ON_UNKNOWN_PROPERTIES disabled @@ -75,12 +80,25 @@ public class ClientWithCustomObjectMapperTest { .isInstanceOf(ClientWebApplicationException.class); } - @Path("/get") + @Test + void testCustomObjectMappersShouldBeUsedInWriter() { + wireMockServer.stubFor( + WireMock.post(WireMock.urlMatching("/client")) + .willReturn(ok())); + + clientDisallowsUnknown.post(new Request()); + assertThat(ClientObjectMapperNoUnknown.USED.get()).isTrue(); + } + + @Path("/client") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public interface MyClient { @GET Uni<Request> get(); + + @POST + void post(Request request); } public static class Request { @@ -119,8 +137,11 @@ public class ClientWithCustomObjectMapperTest { } public static class ClientObjectMapperUnknown implements ContextResolver<ObjectMapper> { + static final AtomicBoolean USED = new AtomicBoolean(false); + @Override public ObjectMapper getContext(Class<?> type) { + USED.set(true); return new ObjectMapper() .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); @@ -128,8 +149,12 @@ public class ClientWithCustomObjectMapperTest { } public static class ClientObjectMapperNoUnknown implements ContextResolver<ObjectMapper> { + + static final AtomicBoolean USED = new AtomicBoolean(false); + @Override public ObjectMapper getContext(Class<?> type) { + USED.set(true); return new ObjectMapper() .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) .enable(SerializationFeature.FAIL_ON_EMPTY_BEANS);

['integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java', 'extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.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/31394/31393

quarkusio

quarkus

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

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

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

Integration Test AfterEach callbacks are not called

fixes

### Describe the bug When a class implementing `io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback` is created and register with the ServiceRegistry, the `afterEach` callback method should be called after each test invocation. The callbacks are not made for Integration Tests ### Expected behavior The callback should be called, in the example shared I would expect the following to appear in the logs; ``` Test Running: testHelloEndpoint CutomsTestCallback: afterEach ``` ### Actual behavior The `AfterEach` callbacks are skipped and never called ### How to Reproduce? Create an Integration test `MyTestIt` ``` @QuarkusIntegrationTest public class MyTestIt { @Test public void testHelloEndpoint() { System.out.println("Test Running: testHelloEndpoint"); given() .when().get("/hello") .then() .statusCode(200) .body(is("Hello from RESTEasy Reactive")); } } ``` Create a custom test callback ``` public class CutomsTestCallback implements QuarkusTestAfterEachCallback { @Override public void afterEach(QuarkusTestMethodContext context) { System.out.println("CutomsTestCallback: afterEach"); } } ``` Configure the application to enable IntegrationTest callbacks, `application.properties` ``` quarkus.test.enable-callbacks-for-integration-tests=true ``` Register the callback with ServiceLoader in `META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback` ``` org.acme.CutomsTestCallback ``` Run Integration test ### 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_

54afd4cf90e13c425a8f78a4e72d130820df7b7f

8371983bab2947673a113d09531cc9d288601c94

https://github.com/quarkusio/quarkus/compare/54afd4cf90e13c425a8f78a4e72d130820df7b7f...8371983bab2947673a113d09531cc9d288601c94

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractTestWithCallbacksExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractTestWithCallbacksExtension.java index f9b6d75c5c7..2717fe0fa4a 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractTestWithCallbacksExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractTestWithCallbacksExtension.java @@ -80,14 +80,18 @@ public abstract class AbstractTestWithCallbacksExtension { invokeAfterEachCallbacks(QuarkusTestMethodContext.class, testMethodContext); } - protected boolean isAfterAllCallbacksEmpty() { - return afterAllCallbacks == null || afterAllCallbacks.isEmpty(); + protected boolean isAfterEachCallbacksEmpty() { + return afterEachCallbacks == null || afterEachCallbacks.isEmpty(); } protected void invokeAfterEachCallbacks(Class<?> clazz, Object classInstance) throws Exception { invokeCallbacks(afterEachCallbacks, "afterEach", clazz, classInstance); } + protected boolean isAfterAllCallbacksEmpty() { + return afterAllCallbacks == null || afterAllCallbacks.isEmpty(); + } + protected void invokeAfterAllCallbacks(QuarkusTestContext testContext) throws Exception { invokeAfterAllCallbacks(QuarkusTestContext.class, testContext); } diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java index eae6f147152..a9e7a071ddc 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java @@ -82,7 +82,7 @@ public class QuarkusIntegrationTestExtension extends AbstractQuarkusTestWithCont @Override public void afterEach(ExtensionContext context) throws Exception { if (!failedBoot) { - if (!isAfterAllCallbacksEmpty()) { + if (!isAfterEachCallbacksEmpty()) { invokeAfterEachCallbacks(createQuarkusTestMethodContext(context)); }

['test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java', 'test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractTestWithCallbacksExtension.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/31294/31258

quarkusio

quarkus

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

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

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

Synchronize GraalVM upstream's and Quarkus'-only debug info stripping

fixes

### Describe the bug GraalVM 23.0 will gain functionality to [strip debuginfo](https://github.com/oracle/graal/pull/5691). This is turned on by default when debuginfo generation is being turned on. As a result, quarkus applications trying to turn on debuginfo and then trying to use it in a debugger results in a CRC mismatch when loading them with gdb (for example): ``` warning: the debug information found in "/disk/graal/upstream-sources/mandrel-integration-tests/apps/quarkus-full-microprofile/target/quarkus-native-image-source-jar/quarkus-runner.debug" does not match "/disk/graal/upstream-sources/mandrel-integration-tests/apps/quarkus-full-microprofile/target/quarkus-native-image-source-jar/quarkus-runner" (CRC mismatch). ``` This is caused by two `.gnu_debuglink` sections trying to get created. The first one by GraalVM, the second by quarkus's native image build steps. The second attempt will fail and then the debuginfo won't match the CRC. ### Expected behavior Either use upstream's feature or turn it off using `-H:-StripDebugInfo` and keep using quarkus's approach. ### Actual behavior Debuginfo isn't working. See: https://github.com/Karm/mandrel-integration-tests/issues/138 ### How to Reproduce? Build a quarkus up in native with a GraalVM 23.0.0 snapshot build with debuginfo. Try to debug the binary in gdb. Observe the CRC warning and debuginfo not usable for source-file-based break points. ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 17.0.7+1 ### GraalVM version (if different from Java) 23.0.0 ### Quarkus version or git rev main ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

6cced964632d3a6b7710f73808906dbaa4f0f704

ad468ce6fb65b7f540edd7f237902a2ec9ec254e

https://github.com/quarkusio/quarkus/compare/6cced964632d3a6b7710f73808906dbaa4f0f704...ad468ce6fb65b7f540edd7f237902a2ec9ec254e

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java index c5acdbab3a9..a079197e631 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java @@ -47,7 +47,7 @@ public abstract class NativeImageBuildRunner { } public Result build(List<String> args, String nativeImageName, String resultingExecutableName, Path outputDir, - boolean debugSymbolsEnabled, boolean processInheritIODisabled) + GraalVM.Version graalVMVersion, boolean debugSymbolsEnabled, boolean processInheritIODisabled) throws InterruptedException, IOException { preBuild(args); try { @@ -66,21 +66,27 @@ public abstract class NativeImageBuildRunner { int exitCode = process.waitFor(); boolean objcopyExists = objcopyExists(); if (exitCode != 0) { - return new Result(exitCode, objcopyExists); + return new Result(exitCode); } - if (objcopyExists) { - if (debugSymbolsEnabled) { - splitDebugSymbols(nativeImageName, resultingExecutableName); + if (debugSymbolsEnabled && graalVMVersion.compareTo(GraalVM.Version.VERSION_23_0_0) < 0 && objcopyExists) { + // Need to explicitly split debug symbols prior to GraalVM/Mandrel 23.0 + splitDebugSymbols(nativeImageName, resultingExecutableName); + } + if (!(debugSymbolsEnabled && graalVMVersion.compareTo(GraalVM.Version.VERSION_23_0_0) >= 0)) { + // Strip debug symbols even if not generated by GraalVM/Mandrel, because the underlying JDK might + // contain them. Note, however, that starting with GraalVM/Mandrel 23.0 this is done by default when + // generating debug info, so we don't want to do it twice and print twice a warning if objcopy is not + // available. + if (objcopyExists) { + objcopy("--strip-debug", resultingExecutableName); + } else if (SystemUtils.IS_OS_LINUX) { + log.warn( + "objcopy executable not found in PATH. Debug symbols will therefore not be separated from the executable."); + log.warn("That also means that resulting native executable is larger as it embeds the debug symbols."); } - // Strip debug symbols regardless, because the underlying JDK might contain them - objcopy("--strip-debug", resultingExecutableName); - } else if (SystemUtils.IS_OS_LINUX) { - log.warn( - "objcopy executable not found in PATH. Debug symbols will therefore not be separated from the executable."); - log.warn("That also means that resulting native executable is larger as it embeds the debug symbols."); } - return new Result(0, objcopyExists); + return new Result(0); } finally { postBuild(); } @@ -148,19 +154,14 @@ public abstract class NativeImageBuildRunner { static class Result { private final int exitCode; - private final boolean objcopyExists; - public Result(int exitCode, boolean objcopyExists) { + public Result(int exitCode) { this.exitCode = exitCode; - this.objcopyExists = objcopyExists; } public int getExitCode() { return exitCode; } - public boolean isObjcopyExists() { - return objcopyExists; - } } } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java index 8da849d81a4..f1f391783e1 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java @@ -257,7 +257,7 @@ public class NativeImageBuildStep { NativeImageBuildRunner.Result buildNativeResult = buildRunner.build(nativeImageArgs, nativeImageName, resultingExecutableName, outputDir, - nativeConfig.debug.enabled, + graalVMVersion, nativeConfig.debug.enabled, processInheritIODisabled.isPresent() || processInheritIODisabledBuildItem.isPresent()); if (buildNativeResult.getExitCode() != 0) { throw imageGenerationFailed(buildNativeResult.getExitCode(), nativeConfig.isContainerBuild()); @@ -265,9 +265,9 @@ public class NativeImageBuildStep { IoUtils.copy(generatedExecutablePath, finalExecutablePath); Files.delete(generatedExecutablePath); if (nativeConfig.debug.enabled) { - if (buildNativeResult.isObjcopyExists()) { - final String symbolsName = String.format("%s.debug", nativeImageName); - Path generatedSymbols = outputDir.resolve(symbolsName); + final String symbolsName = String.format("%s.debug", nativeImageName); + Path generatedSymbols = outputDir.resolve(symbolsName); + if (generatedSymbols.toFile().exists()) { Path finalSymbolsPath = outputTargetBuildItem.getOutputDirectory().resolve(symbolsName); IoUtils.copy(generatedSymbols, finalSymbolsPath); Files.delete(generatedSymbols);

['core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java', 'core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.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/31260/29427

quarkusio

quarkus

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

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

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

quarkus.oidc.auth-server-url causing weird start-up failure

fixes

### Describe the bug adding this line makes all the difference: `%ecom-dev.quarkus.oidc.auth-server-url=http://ecom-portal-keycloak:8080/realms/quarkus` makes the application crash without much explanation on DEBUG log level: ```posh exec java -Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitialRAMPercentage=50.0 -XX:MaxRAMPercentage=50.0 -Xss256k -Xmx512m -cp . -jar /deployments/quarkus-run.jar Nov 22, 2022 11:04:30 PM org.hibernate.validator.internal.util.Version INFO: HV000001: Hibernate Validator %s Nov 22, 2022 11:04:38 PM io.quarkus.opentelemetry.runtime.tracing.LateBoundSampler WARN: No Sampler delegate specified, no action taken. Nov 22, 2022 11:04:48 PM io.vertx.core.net.impl.ConnectionBase ERROR: Connection reset java.net.SocketException: Connection reset at java.base/sun.nio.ch.SocketChannelImpl.throwConnectionReset(SocketChannelImpl.java:394) at java.base/sun.nio.ch.SocketChannelImpl.read(SocketChannelImpl.java:426) at io.netty.buffer.PooledByteBuf.setBytes(PooledByteBuf.java:258) at io.netty.buffer.AbstractByteBuf.writeBytes(AbstractByteBuf.java:1132) at io.netty.channel.socket.nio.NioSocketChannel.doReadBytes(NioSocketChannel.java:357) at io.netty.channel.nio.AbstractNioByteChannel$NioByteUnsafe.read(AbstractNioByteChannel.java:151) at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:788) 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:831) Nov 22, 2022 11:04:48 PM io.quarkus.runtime.ApplicationLifecycleManager run ERROR: Failed to start application (with profile ecom-dev) java.net.SocketException: Connection reset at java.base/sun.nio.ch.SocketChannelImpl.throwConnectionReset(SocketChannelImpl.java:394) at java.base/sun.nio.ch.SocketChannelImpl.read(SocketChannelImpl.java:426) at io.netty.buffer.PooledByteBuf.setBytes(PooledByteBuf.java:258) at io.netty.buffer.AbstractByteBuf.writeBytes(AbstractByteBuf.java:1132) at io.netty.channel.socket.nio.NioSocketChannel.doReadBytes(NioSocketChannel.java:357) at io.netty.channel.nio.AbstractNioByteChannel$NioByteUnsafe.read(AbstractNioByteChannel.java:151) at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:788) 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:831) ``` The keycloak server 19.0.3 is ready and reachable: ``` / $ curl -kv http://ecom-portal-keycloak:8080/realms/quarkus * Trying 172.20.93.10:8080... * Connected to ecom-portal-keycloak (172.20.93.10) port 8080 (#0) > GET /realms/quarkus HTTP/1.1 > Host: ecom-portal-keycloak:8080 > User-Agent: curl/7.79.1 > Accept: */* > * Mark bundle as not supporting multiuse < HTTP/1.1 200 OK < referrer-policy: no-referrer < x-frame-options: SAMEORIGIN < strict-transport-security: max-age=31536000; includeSubDomains < cache-control: no-cache < x-content-type-options: nosniff < x-xss-protection: 1; mode=block < content-type: application/json < content-length: 655 < x-envoy-upstream-service-time: 92 < date: Tue, 22 Nov 2022 23:08:14 GMT < server: envoy < * Connection #0 to host ecom-portal-keycloak left intact {"realm":"quarkus","public_key":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzNMrtvYNG/QBFl+wH+89/asjb+PFU5I+8c+7y1qVgR88NoG53vGKM6GJMnu22nEf24AxXiRLR6SNgiKXhYISNlONREoDJcz9J5Fupm+5MkujHyMn7wLrBTDlFVWwMyVdCTcbmSddM8CkNqMpc8M49HroxxlJLlyaQZNiUKjQVKIsxVMzP5jXfthUtR2eMLLxSyLb6TOZfVrIRouQcDdSdn4q4Oj5eaEWHUg9EH6Q3nGmbL/JnWcvTlb1wDV/LMd4AvOZYKXEuf2RrOdkmNrZ0yXGT0dCzjjRDr+GvH7xUqAw8yAkw6/LegaN8+MPb0Qd9sEnGbkAh2iNrEg+LYDnnQIDAQAB","token-service":"https://portal.ecom-dev.app.whirlpool.aws.fisv.cloud/realms/quarkus/protocol/openid-connect","account-service":"https://portal.ecom-dev.app.whirlpool.aws.fisv.cloud/realms/quarkus/account","tokens-not-before":0}/ $ ``` Any ideas why such a configuration would make the application not start-up anymore? ### Expected behavior some meaningful error log, or for it to just work. ### Actual behavior quarkus dead, sad developer. ### 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_

82f63512c081eb378a69de8f5564ee7d29827ac1

3b578363ddae786b1e9bb57365258017ad784a3a

https://github.com/quarkusio/quarkus/compare/82f63512c081eb378a69de8f5564ee7d29827ac1...3b578363ddae786b1e9bb57365258017ad784a3a

diff --git a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java index 8c66e1a5a3d..c81938e0794 100644 --- a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java +++ b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java @@ -417,7 +417,7 @@ public class OidcCommonUtils { if (resp.statusCode() == 200) { return resp.bodyAsJsonObject(); } else { - LOG.tracef("Discovery has failed, status code: %d", resp.statusCode()); + LOG.warnf("Discovery has failed, status code: %d", resp.statusCode()); throw new OidcEndpointAccessException(resp.statusCode()); } }).onFailure(oidcEndpointNotAvailable()) 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 1d809ccd5cb..f35e423cba8 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 @@ -109,8 +109,8 @@ public class OidcRecorder { @Override public TenantConfigContext apply(Throwable t) { if (t instanceof OIDCException) { - // OIDC server is not available yet - try to create the connection when the first request arrives - LOG.debugf("Tenant '%s': '%s'." + LOG.warnf("Tenant '%s': '%s'." + + " OIDC server is not available yet, an attempt to connect will be made duiring the first request." + " Access to resources protected by this tenant may fail" + " if OIDC server will not become available", tenantId, t.getMessage()); @@ -257,7 +257,7 @@ public class OidcRecorder { protected static OIDCException toOidcException(Throwable cause, String authServerUrl) { final String message = OidcCommonUtils.formatConnectionErrorMessage(authServerUrl); - LOG.debug(message); + LOG.warn(message); return new OIDCException("OIDC Server is not available", cause); }

['extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java', 'extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.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/31737/26180

quarkusio

quarkus

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

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

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

OpenShift binary build targeting to another namespace failing

fix

### Describe the bug We have Jenkins running in OpenShift project/namespace (jenkins-namespace) and we have also another namespace(s) where Quarkus applications are deployed. Jenkins is running with Service Account "jenkins" which has access to another namespaces but implicitly "jenkins-namespace" is selected for it. When I try: `mvn clean package -Dquarkus.openshift.namespace=target-namespace-name -Dquarkus.kubernetes.deploy=true` then correct namespace is set in openshift.yaml, but OpenshiftProcessor is then trying to start build in user's current namespace (jenkins-namespace): `[INFO] [io.quarkus.container.image.openshift.deployment.OpenshiftProcessor] Starting (in-cluster) container image build for jar using: BINARY on server: https://serverUrl/ in namespace:jenkins-namespace.` This behaviour could be workarounded by calling `oc project target-namespace-name` beforehand. ### Expected behavior Application is deployed in namespace which is defined by `quarkus.openshift.namespace` property ### Actual behavior Build failure ### How to Reproduce? ``` bash oc project jenkins-namespace mvn clean package -Dquarkus.openshift.namespace=target-namespace-name -Dquarkus.kubernetes.deploy=true ``` ### 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_

bbb56f92d755ac529c4df04147639d88ed2dda39

a88471214e99408f12c99b93b4d858cf64ea857f

https://github.com/quarkusio/quarkus/compare/bbb56f92d755ac529c4df04147639d88ed2dda39...a88471214e99408f12c99b93b4d858cf64ea857f

diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java index 3b735804542..f6d78bd7e16 100644 --- a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java +++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java @@ -1,5 +1,6 @@ package io.quarkus.container.image.openshift.deployment; +import static io.quarkus.container.image.openshift.deployment.OpenshiftUtils.getNamespace; import static io.quarkus.container.image.openshift.deployment.OpenshiftUtils.mergeConfig; import static io.quarkus.container.util.PathsUtil.findMainSourcesRoot; import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.DEFAULT_FAST_JAR_DIRECTORY_NAME; @@ -264,7 +265,7 @@ public class OpenshiftProcessor { return; } - try (KubernetesClient kubernetesClient = kubernetesClientBuilder.buildClient()) { + try (KubernetesClient kubernetesClient = buildClient(kubernetesClientBuilder)) { String namespace = Optional.ofNullable(kubernetesClient.getNamespace()).orElse("default"); LOG.info("Starting (in-cluster) container image build for jar using: " + config.buildStrategy + " on server: " + kubernetesClient.getMasterUrl() + " in namespace:" + namespace + "."); @@ -324,7 +325,7 @@ public class OpenshiftProcessor { return; } - try (KubernetesClient kubernetesClient = kubernetesClientBuilder.buildClient()) { + try (KubernetesClient kubernetesClient = buildClient(kubernetesClientBuilder)) { String namespace = Optional.ofNullable(kubernetesClient.getNamespace()).orElse("default"); LOG.info("Starting (in-cluster) container image build for jar using: " + config.buildStrategy + " on server: " @@ -543,6 +544,11 @@ public class OpenshiftProcessor { return new KubernetesClientBuilder().withConfig(configuration).withHttpClientFactory(httpClientFactory); } + private static KubernetesClient buildClient(KubernetesClientBuildItem kubernetesClientBuilder) { + getNamespace().ifPresent(kubernetesClientBuilder.getConfig()::setNamespace); + return kubernetesClientBuilder.buildClient(); + } + // visible for test static String concatUnixPaths(String... elements) { StringBuilder result = new StringBuilder(); diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftUtils.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftUtils.java index 1a3a6c04eac..461c63097c1 100644 --- a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftUtils.java +++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftUtils.java @@ -28,6 +28,9 @@ import io.fabric8.openshift.client.OpenShiftClient; */ public class OpenshiftUtils { + private static final String OPENSHIFT_NAMESPACE = "quarkus.openshift.namespace"; + private static final String KUBERNETES_NAMESPACE = "quarkus.kubernetes.namespace"; + /** * Wait for the references ImageStreamTags to become available. * @@ -142,4 +145,12 @@ public class OpenshiftUtils { return result; } + + /** + * @return the openshift namespace set in the OpenShift extension. + */ + public static Optional<String> getNamespace() { + return ConfigProvider.getConfig().getOptionalValue(OPENSHIFT_NAMESPACE, String.class) + .or(() -> ConfigProvider.getConfig().getOptionalValue(KUBERNETES_NAMESPACE, String.class)); + } }

['extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftUtils.java', 'extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.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/31770/31624

quarkusio

quarkus

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

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

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

native compilation : quarkus-jdbc-oracle with elasticsearch-java strange behaviour

fixes

### Describe the bug Hello, I'm trying to compile in native mode my project using - quay.io/quarkus/ubi-quarkus-graalvmce-builder-image:22.3-java17 as nativeBuilder - quarkus 2.16.3.Final - quarkus-jdbc-oracle - quarkus-elasticsearch-rest-client - elasticsearch-java But it fail. I can't figure out the problem. I've tried to add --initialize-at-run-time args but it doesn't change anything. I'm already using elasticsearch-java in native mode (8.1.2 not 8.6.2) with some initialize-at-run-time and register for reflection it works but the problem seem to come from the jdbc-oracle. ### Expected behavior Compilation without error or at least not the oracle-jdbc one. ### Actual behavior With the actual configuration I get this error : ``` #15 766.0 Error: Classes that should be initialized at run time got initialized during image building: #15 766.0 oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource$BlockReleaser the class was requested to be initialized at run time (from feature io.quarkus.runner.Feature.beforeAnalysis with 'BlockSource$ThreadedCachingBlockSource$BlockReleaser.class'). oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource caused initialization of this class with the following trace: ``` More detail stack on the project readme : https://github.com/xrobert35/quarkus-oracle-jdbc-error-example/blob/master/README.md ### How to Reproduce? I've made a simplified project to reproduce Step 1. ```shell https://github.com/xrobert35/quarkus-oracle-jdbc-error-example docker build -t <name> . --no-cache ``` ### Output of `uname -a` or `ver` docker windows or WSL docker ### Output of `java -version` Java Version 17.0.6+10-jvmci-22.3-b13 ### GraalVM version (if different from Java) 22.3 ### Quarkus version or git rev 2.16.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Docker ### Additional information ### Some strange behaviour - If you remove the use of ElasticsearchClient (including the import) in TestService **the compilation will work**. (So I suppose the real problem could be the creation of the ElasticsearchClient (in the TestOracleJDBCConfig file), but : - If you change quarkus-jdbc-oracle to quarkus-jdbc-postgresql and change to db-king to postgresql and I let the ElasticsearchClient **the compilation will work**

c0fc995631a35fa9e31fe741520078c556525cff

77062838587b25c6c8a18dddda6e26f2995348b7

https://github.com/quarkusio/quarkus/compare/c0fc995631a35fa9e31fe741520078c556525cff...77062838587b25c6c8a18dddda6e26f2995348b7

diff --git a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java index fbabaecceb2..892ef190c53 100644 --- a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java +++ b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java @@ -9,6 +9,7 @@ import io.quarkus.deployment.builditem.nativeimage.ExcludeConfigBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageAllowIncompleteClasspathBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem; import io.quarkus.maven.dependency.ArtifactKey; /** @@ -66,7 +67,8 @@ public final class OracleMetadataOverrides { } @BuildStep - void runtimeInitializeDriver(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitialized) { + void runtimeInitializeDriver(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitialized, + BuildProducer<RuntimeReinitializedClassBuildItem> runtimeReinitialized) { //These re-implement all the "--initialize-at-build-time" arguments found in the native-image.properties : // Override: the original metadata marks the drivers as "runtime initialized" but this makes it incompatible with @@ -93,10 +95,14 @@ public final class OracleMetadataOverrides { runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TcpMultiplexer")); runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TcpMultiplexer")); runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TcpMultiplexer$LazyHolder")); - runtimeInitialized - .produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem( + + // Needs to be REinitialized to avoid problems when also using the Elasticsearch Java client + // See https://github.com/quarkusio/quarkus/issues/31624#issuecomment-1457706253 + runtimeReinitialized.produce(new RuntimeReinitializedClassBuildItem( + "oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource")); + runtimeReinitialized.produce(new RuntimeReinitializedClassBuildItem( "oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource$BlockReleaser")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.xa.client.OracleXADataSource")); runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.replay.OracleXADataSourceImpl")); runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.datasource.OracleXAConnection")); diff --git a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleNativeImage.java b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleNativeImage.java index 8778e677ca1..51053a2fb07 100644 --- a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleNativeImage.java +++ b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleNativeImage.java @@ -3,7 +3,6 @@ package io.quarkus.jdbc.oracle.deployment; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; /** * @author Sanne Grinovero <sanne@hibernate.org> @@ -35,10 +34,4 @@ public final class OracleNativeImage { reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, "com.sun.jndi.rmi.registry.RegistryContextFactory")); } - @BuildStep - void runtimeInitialization(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClass) { - runtimeInitializedClass - .produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource")); - } - }

['extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleNativeImage.java', 'extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.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/23512/23511

quarkusio

quarkus

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

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

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

ClassLoader can't find resource since 2.7.0

fixes

### Describe the bug Hi, After updating from 2.6.3-Final to 2.7.0-FInal, I've been trying to load a certificate file with property: `quarkus.http.ssl.certificate.file=META-INF/certs/server.pem` (I know it's deprecated) but it ended with a "FileNotFoundException". After digging a bit, using this property then calls `Thread.currentThread().getContextClassLoader().getResourceAsStream(path);` in VertxHttpRecorder.java I used this same code in a simple OnStart and observed the same behaviour. I tried to dig further using debgger but only found that getResourceAsStream() from QuarkusClassLoader.java behaviour differs : - 2.6.3 : 'elements' property contains [MemoryClassPathElement, DirectoryClassPathElement] - 2.7.0 : 'elements' property contains [MemoryClassPathElement, PathTreeClassPathElement] ### Expected behavior File's loaded ### Actual behavior File's not found, FileNotFoundException ### How to Reproduce? 1 - Download default zip from https://code.quarkus.io/ 2 - Add class ``` @ApplicationScoped public class AppLifecycleBean { void onStart(@Observes StartupEvent ev) { // Method invoked by VertxHttpRecorder to initialize property "quarkus.http.ssl.certificate.file" // Works in 2.6.3 but null in 2.7.0 var pathValue = "META-INF/certs/server.pem"; var path = Path.of(pathValue); var inputStreamNullResult = Thread.currentThread().getContextClassLoader().getResourceAsStream(path.toString()); // Works with any version using String directly // Maybe something to do with Windows path somewhere ? var inputStreamOkResult = Thread.currentThread().getContextClassLoader().getResourceAsStream(pathValue); /* Note that might help digging: using debugger during getResourceAsStream() in QuarkusClassLoader.java: - 2.6.3 : 'elements' property contains [MemoryClassPathElement, DirectoryClassPathElement] - 2.7.0 : 'elements' property contains [MemoryClassPathElement, PathTreeClassPathElement] */ } } ``` 3 - Add any file in resources directory, "META-INF/certs/server.pem" 4 - Switch from version 2.6.3-Final and 2.7.0-Final to observe that `inputStream` is null in 2.7.0-Final. ### Output of `uname -a` or `ver` Windows 10 ### Output of `java -version` openjdk 11.0.10 2021-01-19 ### 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`) Apache Maven 3.8.4 ### Additional information _No response_

b8ad9658f99026d80a67805b6d4b44d20dbd34c3

3825aeb273fc5cb883711d79c85834ecbb1cc5e3

https://github.com/quarkusio/quarkus/compare/b8ad9658f99026d80a67805b6d4b44d20dbd34c3...3825aeb273fc5cb883711d79c85834ecbb1cc5e3

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/util/ClassPathUtils.java b/core/runtime/src/main/java/io/quarkus/runtime/util/ClassPathUtils.java index 3782c79581b..c8301db988f 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/util/ClassPathUtils.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/util/ClassPathUtils.java @@ -22,6 +22,23 @@ public class ClassPathUtils { private static final String FILE = "file"; private static final String JAR = "jar"; + /** + * Translates a file system-specific path to a Java classpath resource name + * that uses '/' as a separator. + * + * @param path file system path + * @return Java classpath resource name + */ + public static String toResourceName(Path path) { + if (path == null) { + return null; + } + if (path.getFileSystem().getSeparator().equals("/")) { + return path.toString(); + } + return path.toString().replace(path.getFileSystem().getSeparator(), "/"); + } + /** * Invokes {@link #consumeAsStreams(ClassLoader, String, Consumer)} passing in * an instance of the current thread's context classloader as the classloader diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcSslUtils.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcSslUtils.java index 47673ac5e57..a26af11d2f5 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcSslUtils.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcSslUtils.java @@ -13,6 +13,7 @@ import org.jboss.logging.Logger; import io.quarkus.grpc.runtime.config.GrpcServerConfiguration; import io.quarkus.grpc.runtime.config.SslServerConfig; +import io.quarkus.runtime.util.ClassPathUtils; import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpServerOptions; import io.vertx.core.http.HttpVersion; @@ -126,7 +127,7 @@ public class GrpcSslUtils { private static byte[] getFileContent(Path path) throws IOException { byte[] data; final InputStream resource = Thread.currentThread().getContextClassLoader() - .getResourceAsStream(path.toString()); + .getResourceAsStream(ClassPathUtils.toResourceName(path)); if (resource != null) { try (InputStream is = resource) { data = doRead(is); diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java index 4d974f74e17..9704fab557f 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java @@ -42,6 +42,7 @@ import io.quarkus.grpc.runtime.config.GrpcClientConfiguration; import io.quarkus.grpc.runtime.config.GrpcServerConfiguration; import io.quarkus.grpc.runtime.config.SslClientConfig; import io.quarkus.runtime.LaunchMode; +import io.quarkus.runtime.util.ClassPathUtils; import io.smallrye.stork.Stork; @SuppressWarnings({ "OptionalIsPresent", "Convert2Lambda" }) @@ -223,7 +224,7 @@ public class Channels { private static InputStream streamFor(Path path, String resourceName) { final InputStream resource = Thread.currentThread().getContextClassLoader() - .getResourceAsStream(path.toString()); + .getResourceAsStream(ClassPathUtils.toResourceName(path)); if (resource != null) { return resource; } else { diff --git a/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java b/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java index 8c73ab2b1ad..28c847fa573 100644 --- a/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java +++ b/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java @@ -61,7 +61,7 @@ class InfinispanClientProcessor { private static final Log log = LogFactory.getLog(InfinispanClientProcessor.class); private static final String META_INF = "META-INF"; - private static final String HOTROD_CLIENT_PROPERTIES = META_INF + File.separator + "hotrod-client.properties"; + private static final String HOTROD_CLIENT_PROPERTIES = "hotrod-client.properties"; private static final String PROTO_EXTENSION = ".proto"; private static final String SASL_SECURITY_PROVIDER = "com.sun.security.sasl.Provider"; @@ -85,13 +85,14 @@ class InfinispanClientProcessor { feature.produce(new FeatureBuildItem(Feature.INFINISPAN_CLIENT)); additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(InfinispanClientProducer.class)); systemProperties.produce(new SystemPropertyBuildItem("io.netty.noUnsafe", "true")); - hotDeployment.produce(new HotDeploymentWatchedFileBuildItem(HOTROD_CLIENT_PROPERTIES)); + hotDeployment.produce(new HotDeploymentWatchedFileBuildItem(META_INF + File.separator + HOTROD_CLIENT_PROPERTIES)); // Enable SSL support by default sslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.INFINISPAN_CLIENT)); nativeImageSecurityProviders.produce(new NativeImageSecurityProviderBuildItem(SASL_SECURITY_PROVIDER)); - InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(HOTROD_CLIENT_PROPERTIES); + InputStream stream = Thread.currentThread().getContextClassLoader() + .getResourceAsStream(META_INF + "/" + HOTROD_CLIENT_PROPERTIES); Properties properties; if (stream == null) { properties = new Properties(); diff --git a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java index e92b7881ffb..744dcc9e6e1 100644 --- a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java +++ b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java @@ -32,6 +32,7 @@ import io.quarkus.oidc.common.runtime.OidcCommonConfig.Credentials.Secret; import io.quarkus.oidc.common.runtime.OidcCommonConfig.Tls.Verification; import io.quarkus.runtime.TlsConfig; import io.quarkus.runtime.configuration.ConfigurationException; +import io.quarkus.runtime.util.ClassPathUtils; import io.smallrye.jwt.algorithm.SignatureAlgorithm; import io.smallrye.jwt.build.Jwt; import io.smallrye.jwt.build.JwtSignatureBuilder; @@ -401,7 +402,8 @@ public class OidcCommonUtils { private static byte[] getFileContent(Path path) throws IOException { byte[] data; - final InputStream resource = Thread.currentThread().getContextClassLoader().getResourceAsStream(path.toString()); + final InputStream resource = Thread.currentThread().getContextClassLoader() + .getResourceAsStream(ClassPathUtils.toResourceName(path)); if (resource != null) { try (InputStream is = resource) { data = doRead(is); diff --git a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java index e2a6e0bbc44..b719ad95ec6 100644 --- a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java +++ b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java @@ -65,11 +65,11 @@ import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem; import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; import io.quarkus.deployment.logging.LogCleanupFilterBuildItem; import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem; -import io.quarkus.paths.PathUtils; import io.quarkus.resteasy.common.spi.ResteasyDotNames; import io.quarkus.resteasy.server.common.spi.AllowedJaxRsAnnotationPrefixBuildItem; import io.quarkus.resteasy.server.common.spi.ResteasyJaxrsConfigBuildItem; import io.quarkus.runtime.LaunchMode; +import io.quarkus.runtime.util.ClassPathUtils; import io.quarkus.smallrye.openapi.common.deployment.SmallRyeOpenApiConfig; import io.quarkus.smallrye.openapi.deployment.filter.AutoRolesAllowedFilter; import io.quarkus.smallrye.openapi.deployment.filter.AutoTagFilter; @@ -172,7 +172,7 @@ public class SmallRyeOpenApiProcessor { List<Path> additionalStaticDocuments = openApiConfig.additionalDocsDirectory.get(); for (Path path : additionalStaticDocuments) { // Scan all yaml and json files - List<String> filesInDir = getResourceFiles(PathUtils.asString(path, "/"), + List<String> filesInDir = getResourceFiles(ClassPathUtils.toResourceName(path), outputTargetBuildItem.getOutputDirectory()); for (String possibleFile : filesInDir) { watchedFiles.produce(new HotDeploymentWatchedFileBuildItem(possibleFile)); @@ -795,7 +795,7 @@ public class SmallRyeOpenApiProcessor { for (Path path : additionalStaticDocuments) { // Scan all yaml and json files try { - List<String> filesInDir = getResourceFiles(PathUtils.asString(path, "/"), target); + List<String> filesInDir = getResourceFiles(ClassPathUtils.toResourceName(path), target); for (String possibleModelFile : filesInDir) { addStaticModelIfExist(results, possibleModelFile); } diff --git a/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/VertxSpringCloudConfigGateway.java b/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/VertxSpringCloudConfigGateway.java index 081a525469e..5b08792f7ab 100644 --- a/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/VertxSpringCloudConfigGateway.java +++ b/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/VertxSpringCloudConfigGateway.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.TlsConfig; +import io.quarkus.runtime.util.ClassPathUtils; import io.smallrye.mutiny.Uni; import io.vertx.core.net.JksOptions; import io.vertx.core.net.KeyStoreOptionsBase; @@ -130,7 +131,7 @@ public class VertxSpringCloudConfigGateway implements SpringCloudConfigClientGat private static byte[] storeBytes(Path keyStorePath) throws Exception { InputStream classPathResource = Thread.currentThread().getContextClassLoader() - .getResourceAsStream(keyStorePath.toString()); + .getResourceAsStream(ClassPathUtils.toResourceName(keyStorePath)); if (classPathResource != null) { try (InputStream is = classPathResource) { return allBytes(is); diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java index b6385ef98a3..e800959e190 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java @@ -59,6 +59,7 @@ import io.quarkus.runtime.configuration.ConfigInstantiator; import io.quarkus.runtime.configuration.ConfigurationException; import io.quarkus.runtime.configuration.MemorySize; import io.quarkus.runtime.shutdown.ShutdownConfig; +import io.quarkus.runtime.util.ClassPathUtils; import io.quarkus.vertx.core.runtime.VertxCoreRecorder; import io.quarkus.vertx.core.runtime.config.VertxConfiguration; import io.quarkus.vertx.http.runtime.HttpConfiguration.InsecureRequests; @@ -762,7 +763,8 @@ public class VertxHttpRecorder { private static byte[] getFileContent(Path path) throws IOException { byte[] data; - final InputStream resource = Thread.currentThread().getContextClassLoader().getResourceAsStream(path.toString()); + final InputStream resource = Thread.currentThread().getContextClassLoader() + .getResourceAsStream(ClassPathUtils.toResourceName(path)); if (resource != null) { try (InputStream is = resource) { data = doRead(is); diff --git a/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java b/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java index 1e42e7fde2f..f60e9b3ec12 100644 --- a/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java +++ b/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java @@ -23,6 +23,7 @@ import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import io.quarkus.runtime.util.ClassPathUtils; import io.quarkus.test.common.http.TestHTTPResource; import io.quarkus.test.junit.QuarkusTest; import io.vertx.core.Vertx; @@ -130,7 +131,8 @@ public class BouncyCastleFipsJsseTestCase { private static byte[] getFileContent(Path path) throws IOException { byte[] data; - final InputStream resource = Thread.currentThread().getContextClassLoader().getResourceAsStream(path.toString()); + final InputStream resource = Thread.currentThread().getContextClassLoader() + .getResourceAsStream(ClassPathUtils.toResourceName(path)); if (resource != null) { try (InputStream is = resource) { data = doRead(is);

['extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java', 'extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcSslUtils.java', 'extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java', 'extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java', 'integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java', 'extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java', 'extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/VertxSpringCloudConfigGateway.java', 'extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java', 'core/runtime/src/main/java/io/quarkus/runtime/util/ClassPathUtils.java']

{'.java': 9}

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/23542/23517

quarkusio

quarkus

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

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

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

Quarkus' DiagnosticPrinter incompatible with GraalVM / Mandrel 22.1-dev

fix

### Describe the bug A [recent GraalVM refactoring](https://github.com/oracle/graal/commit/56804e7227510acbfac9c658905cb614eec57d73) moved `com.oracle.svm.core.posix.thread.PosixJavaThreads#getPthreadIdentifier` and `com.oracle.svm.core.posix.thread.PosixJavaThreads#hasThreadIdentifier` to a new class `com.oracle.svm.core.posix.thread.PosixPlatformJavaThreads` making the following code to cause native-image failures since GraalVM fails to find the corresponding methods: https://github.com/quarkusio/quarkus/blob/5036e2f94f71f88f3e0a7415c7b2c519861a267c/core/runtime/src/main/java/io/quarkus/runtime/graal/DiagnosticPrinter.java#L18-L26 ### Expected behavior Quarkus should work with the upcoming 22.1 GraalVM release ### Actual behavior Quarkus fails with: ``` Error: Could not find target method: static native com.oracle.svm.core.posix.headers.Pthread$pthread_t io.quarkus.runtime.graal.DiagnosticPrinter$Target_PosixJavaThreads.getPthreadIdentifier(java.lang.Thread) com.oracle.svm.core.util.UserError$UserException: Could not find target method: static native com.oracle.svm.core.posix.headers.Pthread$pthread_t io.quarkus.runtime.graal.DiagnosticPrinter$Target_PosixJavaThreads.getPthreadIdentifier(java.lang.Thread) at com.oracle.svm.core.util.UserError.abort(UserError.java:72) at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.findOriginalMethod(AnnotationSubstitutionProcessor.java:764) at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.handleMethodInAliasClass(AnnotationSubstitutionProcessor.java:381) at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.handleAliasClass(AnnotationSubstitutionProcessor.java:353) at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.handleClass(AnnotationSubstitutionProcessor.java:323) at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.init(AnnotationSubstitutionProcessor.java:279) at com.oracle.svm.hosted.NativeImageGenerator.createAnnotationSubstitutionProcessor(NativeImageGenerator.java:923) at com.oracle.svm.hosted.NativeImageGenerator.setupNativeImage(NativeImageGenerator.java:836) at com.oracle.svm.hosted.NativeImageGenerator.doRun(NativeImageGenerator.java:551) at com.oracle.svm.hosted.NativeImageGenerator.run(NativeImageGenerator.java:511) at com.oracle.svm.hosted.NativeImageGeneratorRunner.buildImage(NativeImageGeneratorRunner.java:423) at com.oracle.svm.hosted.NativeImageGeneratorRunner.build(NativeImageGeneratorRunner.java:598) at com.oracle.svm.hosted.NativeImageGeneratorRunner.main(NativeImageGeneratorRunner.java:128) at com.oracle.svm.hosted.NativeImageGeneratorRunner$JDK9Plus.main(NativeImageGeneratorRunner.java:628) ``` See https://github.com/graalvm/mandrel/runs/5103314555?check_suite_focus=true#step:11:177 ### How to Reproduce? 1. Download latest nightly build of GraalVM from https://github.com/graalvm/graalvm-ce-dev-builds/releases/ 2. Try to create a native Quarkus application or integration test with it ### Output of `uname -a` or `ver` GH runner ### Output of `java -version` 11.0.14 and 17.0.2 ### GraalVM version (if different from Java) 22.1.0-deva0db6e1 ### Quarkus version or git rev 8de379736da497e2b971be853ec2c076509779b0 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d) ### Additional information This issue is related to the discussion in https://github.com/oracle/graal/discussions/4146. `DiagnosticsPrinter` is relying on GraalVM internals, as a result it's expected for such code segments to cause issues from time to time. The question is: Do Quarkus users and devs use the `DiagnosticsPrinter`? Is it worth performing version checks (and complicating things by not using public APIs) to make it work or is it something we could remove? cc @geoand @gsmet @stuartwdouglas

e85b6fece0eb6df0c62a70f0c5d2173b0f7a6460

d928f25a9ccb2ba8956638498ddb234662fd4d3e

https://github.com/quarkusio/quarkus/compare/e85b6fece0eb6df0c62a70f0c5d2173b0f7a6460...d928f25a9ccb2ba8956638498ddb234662fd4d3e

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/graal/DiagnosticPrinter.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/DiagnosticPrinter.java index b925372a100..98f5e5d9dba 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/graal/DiagnosticPrinter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/graal/DiagnosticPrinter.java @@ -4,27 +4,10 @@ import java.io.PrintStream; import java.time.Instant; import java.util.Map; -import org.graalvm.nativeimage.Platform; -import org.graalvm.nativeimage.Platforms; - -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.posix.headers.Pthread; - /** * A signal handler that prints diagnostic thread info to standard output. */ public final class DiagnosticPrinter { - @TargetClass(className = "com.oracle.svm.core.posix.thread.PosixJavaThreads") - @Platforms({ Platform.LINUX.class, Platform.DARWIN.class }) - static final class Target_PosixJavaThreads { - @Alias - static native Pthread.pthread_t getPthreadIdentifier(Thread thread); - - @Alias - static native boolean hasThreadIdentifier(Thread thread); - } - public static void printDiagnostics(PrintStream w) { Map<Thread, StackTraceElement[]> allStackTraces = Thread.getAllStackTraces(); w.println(Instant.now().toString()); @@ -42,15 +25,6 @@ public final class DiagnosticPrinter { w.print("daemon "); w.print("prio="); w.print(thread.getPriority()); - w.print(" tid="); - if ((Platform.includedIn(Platform.LINUX.class) || Platform.includedIn(Platform.DARWIN.class)) - && Target_PosixJavaThreads.hasThreadIdentifier(thread)) { - final long nativeId = Target_PosixJavaThreads.getPthreadIdentifier(thread).rawValue(); - w.print("0x"); - w.println(Long.toHexString(nativeId)); - } else { - w.println("(unknown)"); - } w.print(" java.lang.thread.State: "); w.println(thread.getState()); for (StackTraceElement element : stackTrace) {

['core/runtime/src/main/java/io/quarkus/runtime/graal/DiagnosticPrinter.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/23556/23445

quarkusio

quarkus

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

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

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

Hibernate post-boot schema-validation fails after upgrade to Quarkus 2.6.3

fixes

### Describe the bug After upgrade to 2.6.3.Final, post boot schema validation emits some warnings about missing table(s). Migrations are managed by Flyway and database contains: 1. schema _postboot1_ holds Flyway schema history table 2. schema _postboot_ contains table _product_ Flyway is configured to use _postboot1_ as its own schema and _postboot_ as managed schema. Hibernate is configured to use _postboot_ as default schema. A single PanacheEntity _@Entity_ is mapped as: ``` @Entity @Table(name="product") class Product extends PanacheEntity { // properties } ``` ### Expected behavior No warnings at all (as before the upgrade) ### Actual behavior ``` 2022-02-04 16:26:25,945 ERROR [io.qua.hib.orm.run.sch.SchemaManagementIntegrator] (Hibernate post-boot validation thread for <default>) Failed to validate Schema: Schema-validation: missing table [product] 2022-02-04 16:26:25,992 ERROR [io.qua.hib.orm.run.sch.SchemaManagementIntegrator] (Hibernate post-boot validation thread for <default>) The following SQL may resolve the database issues, as generated by the Hibernate schema migration tool. WARNING: You must manually verify this SQL is correct, this is a best effort guess, do not copy/paste it without verifying that it does what you expect. create table product (id bigint not null, code varchar(255), marketArea varchar(255), primary key (id)); ``` ### How to Reproduce? https://github.com/luca-bassoricci/hibernate-postboot-validator Repo is configured to use version 2.7.0 of Quarkus ### Output of `uname -a` or `ver` Link to repo with sample ### Output of `java -version` Link to repo with sample ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) ### Additional information _No response_

c7c39f6882cf07352cc5bfebd6e46af5714add07

ab7a7e8253d65eb3a8e534d8500c76e29d6a33bc

https://github.com/quarkusio/quarkus/compare/c7c39f6882cf07352cc5bfebd6e46af5714add07...ab7a7e8253d65eb3a8e534d8500c76e29d6a33bc

diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/schema/SchemaManagementIntegrator.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/schema/SchemaManagementIntegrator.java index aed4b79b258..a6c5918dd53 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/schema/SchemaManagementIntegrator.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/schema/SchemaManagementIntegrator.java @@ -3,14 +3,15 @@ package io.quarkus.hibernate.orm.runtime.schema; import java.io.StringWriter; import java.util.Collections; import java.util.EnumSet; -import java.util.HashMap; import java.util.IdentityHashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.hibernate.boot.Metadata; +import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.integrator.spi.Integrator; +import org.hibernate.service.ServiceRegistry; import org.hibernate.service.spi.SessionFactoryServiceRegistry; import org.hibernate.tool.schema.SourceType; import org.hibernate.tool.schema.TargetType; @@ -71,9 +72,9 @@ public class SchemaManagementIntegrator implements Integrator, DatabaseSchemaPro if (name != null) { return name; } - Object prop = sf.getProperties().get("hibernate.ejb.persistenceUnitName"); - if (prop != null) { - return prop.toString(); + Object persistenceUnitName = sf.getProperties().get("hibernate.ejb.persistenceUnitName"); + if (persistenceUnitName != null) { + return persistenceUnitName.toString(); } return DataSourceUtil.DEFAULT_DATASOURCE_NAME; } @@ -91,24 +92,24 @@ public class SchemaManagementIntegrator implements Integrator, DatabaseSchemaPro if (!LaunchMode.current().isDevOrTest()) { throw new IllegalStateException("Can only be used in dev or test mode"); } - Holder val = metadataMap.get(name); + Holder holder = metadataMap.get(name); - Object prop = val.sessionFactory.getProperties().get("javax.persistence.schema-generation.database.action"); - if (prop != null && !(prop.toString().equals("none"))) { + ServiceRegistry serviceRegistry = holder.sessionFactory.getServiceRegistry(); + SimpleExecutionOptions executionOptions = new SimpleExecutionOptions(serviceRegistry); + Object schemaGenerationDatabaseAction = executionOptions.getConfigurationValues() + .get("javax.persistence.schema-generation.database.action"); + if (schemaGenerationDatabaseAction != null && !(schemaGenerationDatabaseAction.toString().equals("none"))) { //if this is none we assume another framework is doing this (e.g. flyway) - SchemaManagementTool schemaManagementTool = val.sessionFactory.getServiceRegistry() + SchemaManagementTool schemaManagementTool = serviceRegistry .getService(SchemaManagementTool.class); - SchemaDropper schemaDropper = schemaManagementTool.getSchemaDropper(new HashMap()); - schemaDropper - .doDrop(val.metadata, new SimpleExecutionOptions(), new SimpleSourceDescriptor(), - new SimpleTargetDescriptor()); - schemaManagementTool.getSchemaCreator(new HashMap()) - .doCreation(val.metadata, new SimpleExecutionOptions(), new SimpleSourceDescriptor(), - new SimpleTargetDescriptor()); + SchemaDropper schemaDropper = schemaManagementTool.getSchemaDropper(executionOptions.getConfigurationValues()); + schemaDropper.doDrop(holder.metadata, executionOptions, new SimpleSourceDescriptor(), new SimpleTargetDescriptor()); + schemaManagementTool.getSchemaCreator(executionOptions.getConfigurationValues()) + .doCreation(holder.metadata, executionOptions, new SimpleSourceDescriptor(), new SimpleTargetDescriptor()); } //we still clear caches though - val.sessionFactory.getCache().evictAll(); - val.sessionFactory.getCache().evictQueries(); + holder.sessionFactory.getCache().evictAll(); + holder.sessionFactory.getCache().evictQueries(); } public static void runPostBootValidation(String name) { @@ -123,17 +124,19 @@ public class SchemaManagementIntegrator implements Integrator, DatabaseSchemaPro } //if this is none we assume another framework is doing this (e.g. flyway) - SchemaManagementTool schemaManagementTool = val.sessionFactory.getServiceRegistry() + ServiceRegistry serviceRegistry = val.sessionFactory.getServiceRegistry(); + SchemaManagementTool schemaManagementTool = serviceRegistry .getService(SchemaManagementTool.class); - SchemaValidator validator = schemaManagementTool.getSchemaValidator(new HashMap()); + SimpleExecutionOptions executionOptions = new SimpleExecutionOptions(serviceRegistry); + SchemaValidator validator = schemaManagementTool.getSchemaValidator(executionOptions.getConfigurationValues()); try { - validator.doValidation(val.metadata, new SimpleExecutionOptions()); + validator.doValidation(val.metadata, executionOptions); } catch (SchemaManagementException e) { log.error("Failed to validate Schema: " + e.getMessage()); - SchemaMigrator migrator = schemaManagementTool.getSchemaMigrator(new HashMap()); + SchemaMigrator migrator = schemaManagementTool.getSchemaMigrator(executionOptions.getConfigurationValues()); StringWriter writer = new StringWriter(); - migrator.doMigration(val.metadata, new SimpleExecutionOptions(), new TargetDescriptor() { + migrator.doMigration(val.metadata, executionOptions, new TargetDescriptor() { @Override public EnumSet<TargetType> getTargetTypes() { return EnumSet.of(TargetType.SCRIPT); @@ -186,9 +189,15 @@ public class SchemaManagementIntegrator implements Integrator, DatabaseSchemaPro } private static class SimpleExecutionOptions implements ExecutionOptions { + private final Map<?, ?> configurationValues; + + public SimpleExecutionOptions(ServiceRegistry serviceRegistry) { + configurationValues = serviceRegistry.getService(ConfigurationService.class).getSettings(); + } + @Override - public Map getConfigurationValues() { - return Collections.emptyMap(); + public Map<?, ?> getConfigurationValues() { + return configurationValues; } @Override

['extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/schema/SchemaManagementIntegrator.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/32208/32193

quarkusio

quarkus

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

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

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

Kubernetes config now requires explicit `view-secrets` authorization to access secrets that is not needed

fix

### Describe the bug I have application that uses the Quarkus Kubernetes config extension access OpenShift secret. When migrating to Quarkus 3.0, deployment fails over missing `view-secrets` authorization. I only access secrets that I created in namespace I also created with the same OpenShift user that I use for deployment, therefore I have sufficient rights to access the secrets. This worked in Quarkus 2.16. ### Expected behavior Steps to reproduce worked with `stream=2.16` (also don't set `999-SNAPSHOT`), I'd like them to work again or have the change in behavior in https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.0#kubernetesopenshift. ### Actual behavior Deployment fails ``` ... Caused by: java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors 18:49:09,959 INFO mvn: [error]: Build step io.quarkus.kubernetes.deployment.KubernetesDeployer#deploy threw an exception: io.fabric8.kubernetes.client.KubernetesClientException: Failure executing: POST at: https://edited/apis/rbac.authorization.k8s.io/v1/namespaces/ts-dgbcvqufsb/rolebindings. Message: roles.rbac.authorization.k8s.io "view-secrets" not found. Received status: Status(apiVersion=v1, code=404, details=StatusDetails(causes=[], group=rbac.authorization.k8s.io, kind=roles, name=view-secrets, retryAfterSeconds=null, uid=null, additionalProperties={}), kind=Status, message=roles.rbac.authorization.k8s.io "view-secrets" not found, metadata=ListMeta(_continue=null, remainingItemCount=null, resourceVersion=null, selfLink=null, additionalProperties={}), reason=NotFound, status=Failure, additionalProperties={}). 18:49:09,959 INFO mvn: at io.fabric8.kubernetes.client.KubernetesClientException.copyAsCause(KubernetesClientException.java:238) 18:49:09,959 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.waitForResult(OperationSupport.java:546) 18:49:09,959 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.handleResponse(OperationSupport.java:566) 18:49:09,960 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.handleCreate(OperationSupport.java:350) 18:49:09,960 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.BaseOperation.handleCreate(BaseOperation.java:707) 18:49:09,960 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.BaseOperation.handleCreate(BaseOperation.java:93) 18:49:09,960 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.CreateOnlyResourceOperation.create(CreateOnlyResourceOperation.java:42) 18:49:09,960 INFO mvn: at io.fabric8.kubernetes.client.utils.internal.CreateOrReplaceHelper.createOrReplace(CreateOrReplaceHelper.java:51) 18:49:09,960 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.BaseOperation.createOrReplace(BaseOperation.java:310) 18:49:09,960 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.BaseOperation.createOrReplace(BaseOperation.java:93) 18:49:09,960 INFO mvn: at io.fabric8.kubernetes.client.extension.ResourceAdapter.createOrReplace(ResourceAdapter.java:124) 18:49:09,960 INFO mvn: at io.quarkus.kubernetes.deployment.KubernetesDeployer.deployResource(KubernetesDeployer.java:259) 18:49:09,960 INFO mvn: at io.quarkus.kubernetes.deployment.KubernetesDeployer.lambda$deploy$4(KubernetesDeployer.java:219) 18:49:09,960 INFO mvn: at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:183) 18:49:09,960 INFO mvn: at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:177) 18:49:09,960 INFO mvn: at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1655) 18:49:09,960 INFO mvn: at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484) 18:49:09,960 INFO mvn: at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474) 18:49:09,960 INFO mvn: at java.base/java.util.stream.ForEachOps$ForEachOp.evaluateSequential(ForEachOps.java:150) 18:49:09,961 INFO mvn: at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(ForEachOps.java:173) 18:49:09,961 INFO mvn: at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) 18:49:09,961 INFO mvn: at java.base/java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:497) 18:49:09,961 INFO mvn: at io.quarkus.kubernetes.deployment.KubernetesDeployer.deploy(KubernetesDeployer.java:218) 18:49:09,961 INFO mvn: at io.quarkus.kubernetes.deployment.KubernetesDeployer.deploy(KubernetesDeployer.java:142) 18:49:09,961 INFO mvn: at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) 18:49:09,961 INFO mvn: at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) 18:49:09,961 INFO mvn: at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) 18:49:09,961 INFO mvn: at java.base/java.lang.reflect.Method.invoke(Method.java:566) 18:49:09,961 INFO mvn: at io.quarkus.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:909) 18:49:09,961 INFO mvn: at io.quarkus.builder.BuildContext.run(BuildContext.java:282) 18:49:09,961 INFO mvn: at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) 18:49:09,961 INFO mvn: at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2513) 18:49:09,961 INFO mvn: at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1538) 18:49:09,962 INFO mvn: at java.base/java.lang.Thread.run(Thread.java:829) 18:49:09,962 INFO mvn: at org.jboss.threads.JBossThread.run(JBossThread.java:501) 18:49:09,962 INFO mvn: Caused by: io.fabric8.kubernetes.client.KubernetesClientException: Failure executing: POST at: https://edited/apis/rbac.authorization.k8s.io/v1/namespaces/ts-dgbcvqufsb/rolebindings. Message: roles.rbac.authorization.k8s.io "view-secrets" not found. Received status: Status(apiVersion=v1, code=404, details=StatusDetails(causes=[], group=rbac.authorization.k8s.io, kind=roles, name=view-secrets, retryAfterSeconds=null, uid=null, additionalProperties={}), kind=Status, message=roles.rbac.authorization.k8s.io "view-secrets" not found, metadata=ListMeta(_continue=null, remainingItemCount=null, resourceVersion=null, selfLink=null, additionalProperties={}), reason=NotFound, status=Failure, additionalProperties={}). 18:49:09,962 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.requestFailure(OperationSupport.java:701) 18:49:09,962 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.requestFailure(OperationSupport.java:681) 18:49:09,962 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.assertResponseCode(OperationSupport.java:630) 18:49:09,962 INFO mvn: at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.lambda$handleResponse$0(OperationSupport.java:591) 18:49:09,962 INFO mvn: at java.base/java.util.concurrent.CompletableFuture$UniApply.tryFire(CompletableFuture.java:642) 18:49:09,962 INFO mvn: at java.base/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:506) 18:49:09,962 INFO mvn: at java.base/java.util.concurrent.CompletableFuture.complete(CompletableFuture.java:2073) 18:49:09,962 INFO mvn: at io.fabric8.kubernetes.client.http.StandardHttpClient.lambda$completeOrCancel$5(StandardHttpClient.java:120) 18:49:09,962 INFO mvn: at java.base/java.util.concurrent.CompletableFuture.uniWhenComplete(CompletableFuture.java:859) 18:49:09,962 INFO mvn: at java.base/java.util.concurrent.CompletableFuture$UniWhenComplete.tryFire(CompletableFuture.java:837) 18:49:09,962 INFO mvn: at java.base/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:506) 18:49:09,962 INFO mvn: at java.base/java.util.concurrent.CompletableFuture.complete(CompletableFuture.java:2073) 18:49:09,962 INFO mvn: at io.fabric8.kubernetes.client.http.ByteArrayBodyHandler.onBodyDone(ByteArrayBodyHandler.java:52) 18:49:09,962 INFO mvn: at java.base/java.util.concurrent.CompletableFuture.uniWhenComplete(CompletableFuture.java:859) 18:49:09,962 INFO mvn: at java.base/java.util.concurrent.CompletableFuture$UniWhenComplete.tryFire(CompletableFuture.java:837) 18:49:09,962 INFO mvn: at java.base/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:506) 18:49:09,963 INFO mvn: at java.base/java.util.concurrent.CompletableFuture.complete(CompletableFuture.java:2073) 18:49:09,963 INFO mvn: at io.fabric8.kubernetes.client.vertx.VertxHttpRequest.lambda$null$1(VertxHttpRequest.java:122) 18:49:09,963 INFO mvn: at io.vertx.core.impl.ContextInternal.dispatch(ContextInternal.java:264) 18:49:09,963 INFO mvn: at io.vertx.core.impl.ContextInternal.dispatch(ContextInternal.java:246) 18:49:09,963 INFO mvn: at io.vertx.core.http.impl.HttpEventHandler.handleEnd(HttpEventHandler.java:76) 18:49:09,963 INFO mvn: at io.vertx.core.http.impl.HttpClientResponseImpl.handleEnd(HttpClientResponseImpl.java:250) 18:49:09,963 INFO mvn: at io.vertx.core.http.impl.Http1xClientConnection$StreamImpl.lambda$new$0(Http1xClientConnection.java:398) 18:49:09,963 INFO mvn: at io.vertx.core.streams.impl.InboundBuffer.handleEvent(InboundBuffer.java:239) 18:49:09,963 INFO mvn: at io.vertx.core.streams.impl.InboundBuffer.write(InboundBuffer.java:129) 18:49:09,963 INFO mvn: at io.vertx.core.http.impl.Http1xClientConnection$StreamImpl.handleEnd(Http1xClientConnection.java:645) 18:49:09,963 INFO mvn: at io.vertx.core.impl.EventLoopContext.execute(EventLoopContext.java:76) 18:49:09,963 INFO mvn: at io.vertx.core.impl.ContextBase.execute(ContextBase.java:232) 18:49:09,963 INFO mvn: at io.vertx.core.http.impl.Http1xClientConnection.handleResponseEnd(Http1xClientConnection.java:879) 18:49:09,963 INFO mvn: at io.vertx.core.http.impl.Http1xClientConnection.handleHttpMessage(Http1xClientConnection.java:751) 18:49:09,963 INFO mvn: at io.vertx.core.http.impl.Http1xClientConnection.handleMessage(Http1xClientConnection.java:715) 18:49:09,963 INFO mvn: at io.vertx.core.net.impl.ConnectionBase.read(ConnectionBase.java:157) 18:49:09,963 INFO mvn: at io.vertx.core.net.impl.VertxHandler.channelRead(VertxHandler.java:153) 18:49:09,963 INFO mvn: at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:442) 18:49:09,963 INFO mvn: at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:420) 18:49:09,963 INFO mvn: at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:412) 18:49:09,963 INFO mvn: at io.netty.channel.CombinedChannelDuplexHandler$DelegatingChannelHandlerContext.fireChannelRead(CombinedChannelDuplexHandler.java:436) 18:49:09,964 INFO mvn: at io.netty.handler.codec.ByteToMessageDecoder.fireChannelRead(ByteToMessageDecoder.java:346) 18:49:09,964 INFO mvn: at io.netty.handler.codec.ByteToMessageDecoder.channelRead(ByteToMessageDecoder.java:318) 18:49:09,964 INFO mvn: at io.netty.channel.CombinedChannelDuplexHandler.channelRead(CombinedChannelDuplexHandler.java:251) 18:49:09,964 INFO mvn: at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:442) 18:49:09,964 INFO mvn: at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:420) 18:49:09,964 INFO mvn: at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:412) 18:49:09,964 INFO mvn: at io.netty.handler.ssl.SslHandler.unwrap(SslHandler.java:1373) 18:49:09,964 INFO mvn: at io.netty.handler.ssl.SslHandler.decodeJdkCompatible(SslHandler.java:1236) 18:49:09,964 INFO mvn: at io.netty.handler.ssl.SslHandler.decode(SslHandler.java:1285) 18:49:09,964 INFO mvn: at io.netty.handler.codec.ByteToMessageDecoder.decodeRemovalReentryProtection(ByteToMessageDecoder.java:529) 18:49:09,964 INFO mvn: at io.netty.handler.codec.ByteToMessageDecoder.callDecode(ByteToMessageDecoder.java:468) 18:49:09,964 INFO mvn: at io.netty.handler.codec.ByteToMessageDecoder.channelRead(ByteToMessageDecoder.java:290) 18:49:09,964 INFO mvn: at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:444) 18:49:09,964 INFO mvn: at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:420) 18:49:09,964 INFO mvn: at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:412) 18:49:09,964 INFO mvn: at io.netty.channel.DefaultChannelPipeline$HeadContext.channelRead(DefaultChannelPipeline.java:1410) 18:49:09,964 INFO mvn: at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:440) 18:49:09,964 INFO mvn: at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:420) 18:49:09,964 INFO mvn: at io.netty.channel.DefaultChannelPipeline.fireChannelRead(DefaultChannelPipeline.java:919) 18:49:09,964 INFO mvn: at io.netty.channel.nio.AbstractNioByteChannel$NioByteUnsafe.read(AbstractNioByteChannel.java:166) 18:49:09,964 INFO mvn: at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:788) 18:49:09,965 INFO mvn: at io.netty.channel.nio.NioEventLoop.processSelectedKeysOptimized(NioEventLoop.java:724) 18:49:09,965 INFO mvn: at io.netty.channel.nio.NioEventLoop.processSelectedKeys(NioEventLoop.java:650) 18:49:09,965 INFO mvn: at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:562) 18:49:09,965 INFO mvn: at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:997) 18:49:09,965 INFO mvn: at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) 18:49:09,965 INFO mvn: at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) 18:49:09,965 INFO mvn: at java.base/java.lang.Thread.run(Thread.java:829) 18:49:09,965 INFO mvn: ... ``` ### How to Reproduce? Steps to reproduce: 1. `oc new-project mvavrik-debug` 2. `quarkus create app secret-reproducer -x openshift,resteasy-reactive,kubernetes-config --stream=3.0` 3. `cd secret-reproducer/` 4. ``` cat <<EOF > ./secret apiVersion: v1 kind: Secret metadata: name: app-config stringData: application.properties: | msg=So Long, and Thanks for All the Fish EOF ``` 5. `oc apply -f secret` 6. `mvn clean verify -Dquarkus.platform.version=999-SNAPSHOT -Dquarkus.platform.group-id=io.quarkus -Dquarkus.kubernetes.deployment-target=openshift -Dquarkus.kubernetes.deploy=true -Dquarkus.kubernetes-client.trust-certs=true -Dquarkus.kubernetes-config.enabled=true -Dquarkus.kubernetes.config.secrets.enabled=true -Dquarkus.kubernetes-config.secrets=app-config -Dquarkus.kubernetes-config.secrets.enabled=true` ### Output of `uname -a` or `ver` Linux ### Output of `java -version` openjdk 17.0.8 ### GraalVM version (if different from Java) OpenJDK Runtime Environment GraalVM CE 22.3 ### Quarkus version or git rev 999-SNAPSHOT ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 ### Additional information Tested with OpenShift 4.12 (Kubernetes version v1.25.4+18eadca) and 4.8.

34da5133fd7dd9997d1cc7d52f80bbf81cd27a17

f3d8aafdb59b34be44552a9342e6b144bdc554b7

https://github.com/quarkusio/quarkus/compare/34da5133fd7dd9997d1cc7d52f80bbf81cd27a17...f3d8aafdb59b34be44552a9342e6b144bdc554b7

diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddClusterRoleResourceDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddClusterRoleResourceDecorator.java index 2074e4fd122..d1309151483 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddClusterRoleResourceDecorator.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddClusterRoleResourceDecorator.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import io.dekorate.kubernetes.decorator.Decorator; import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator; import io.fabric8.kubernetes.api.model.KubernetesListBuilder; import io.fabric8.kubernetes.api.model.ObjectMeta; @@ -45,4 +46,9 @@ class AddClusterRoleResourceDecorator extends ResourceProvidingDecorator<Kuberne .endMetadata() .withRules(rules)); } + + @Override + public Class<? extends Decorator>[] before() { + return new Class[] { AddRoleBindingResourceDecorator.class }; + } } diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddRoleResourceDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddRoleResourceDecorator.java index 752efe7fd2b..632b3bca7bc 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddRoleResourceDecorator.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddRoleResourceDecorator.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import io.dekorate.kubernetes.decorator.Decorator; import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator; import io.fabric8.kubernetes.api.model.KubernetesListBuilder; import io.fabric8.kubernetes.api.model.ObjectMeta; @@ -48,4 +49,9 @@ class AddRoleResourceDecorator extends ResourceProvidingDecorator<KubernetesList .endMetadata() .withRules(rules)); } + + @Override + public Class<? extends Decorator>[] before() { + return new Class[] { AddRoleBindingResourceDecorator.class }; + } } diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddServiceAccountResourceDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddServiceAccountResourceDecorator.java index b8fb1f0eb8d..f6f90801b36 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddServiceAccountResourceDecorator.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddServiceAccountResourceDecorator.java @@ -5,6 +5,7 @@ import static io.quarkus.kubernetes.deployment.Constants.SERVICE_ACCOUNT; import java.util.HashMap; import java.util.Map; +import io.dekorate.kubernetes.decorator.Decorator; import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator; import io.fabric8.kubernetes.api.model.KubernetesListBuilder; import io.fabric8.kubernetes.api.model.ObjectMeta; @@ -43,4 +44,9 @@ public class AddServiceAccountResourceDecorator extends ResourceProvidingDecorat .endMetadata() .endServiceAccountItem(); } + + @Override + public Class<? extends Decorator>[] before() { + return new Class[] { AddRoleBindingResourceDecorator.class }; + } } diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacFullTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacFullTest.java index 80ee1df0689..3ff3de62fb5 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacFullTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacFullTest.java @@ -5,9 +5,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.util.List; import java.util.Optional; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -40,9 +43,16 @@ public class KubernetesWithRbacFullTest { @Test public void assertGeneratedResources() throws IOException { - final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes"); - List<HasMetadata> kubernetesList = DeserializationUtil - .deserializeAsList(kubernetesDir.resolve("kubernetes.yml")); + final Path kubernetesFile = prodModeTestResults.getBuildDir().resolve("kubernetes").resolve("kubernetes.yml"); + + // ensure rbac resources are generated in order: having the RoleBinding resource at the end: + String kubernetesFileContent = Files.readString(kubernetesFile); + int lastIndexOfRoleRefKind = lastIndexOfKind(kubernetesFileContent, "Role", "ClusterRole", "ServiceAccount"); + int firstIndexOfRoleBinding = kubernetesFileContent.indexOf("kind: RoleBinding"); + assertTrue(lastIndexOfRoleRefKind < firstIndexOfRoleBinding, "RoleBinding resource is created before " + + "the Role/ClusterRole/ServiceAccount resource!"); + + List<HasMetadata> kubernetesList = DeserializationUtil.deserializeAsList(kubernetesFile); Deployment deployment = getDeploymentByName(kubernetesList, APP_NAME); assertEquals(APP_NAMESPACE, deployment.getMetadata().getNamespace()); @@ -84,6 +94,21 @@ public class KubernetesWithRbacFullTest { assertEquals("projectc", subject.getNamespace()); } + private int lastIndexOfKind(String content, String... kinds) { + int index = Integer.MIN_VALUE; + for (String kind : kinds) { + Matcher matcher = Pattern.compile("(?m)^kind: " + kind).matcher(content); + if (matcher.find()) { + int lastIndexOfKind = matcher.end(); + if (lastIndexOfKind > index) { + index = lastIndexOfKind; + } + } + } + + return index; + } + private Deployment getDeploymentByName(List<HasMetadata> kubernetesList, String name) { return getResourceByName(kubernetesList, Deployment.class, name); }

['extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddClusterRoleResourceDecorator.java', 'integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacFullTest.java', 'extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddRoleResourceDecorator.java', 'extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddServiceAccountResourceDecorator.java']

{'.java': 4}

Java

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

Apache License 2.0

quarkusio/quarkus/32207/32135

quarkusio

quarkus

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

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

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

Quarkus-openshift fails to properly deploy applications which use management interface

fix

### Describe the bug I have an application, which uses separate management interface[1] and deployed on Openshift via quarkus-openshift extension[2]. Both main and management interfaces are not accessible after deployment. [1] https://github.com/quarkusio/quarkus/pull/30506 [2] https://quarkus.io/guides/deploying-to-openshift ### Expected behavior Quarkus openshift extension should deploy an application is completely working state. ### Actual behavior see below ### How to Reproduce? 1. Clone: `git clone git@github.com:fedinskiy/reproducer.git -b openshift-extension-management` 2. Create new openshift project `oc new-project fvd-test-management` 3. Deploy the app according to manual: `mvn clean install -Dquarkus.kubernetes.deploy=true -Dquarkus.openshift.route.expose=true -Dquarkus.kubernetes-client.trust-certs=true` Log contains something like `[INFO] [io.quarkus.kubernetes.deployment.KubernetesDeployer] The deployed application can be accessed at: http://openshift-quickstart-fvd-test-management.apps.ocp4-12.rest.of.url` 4. Check the app ``` [fedinskiy@localhost reproducer]$ curl -v http://openshift-quickstart-fvd-test-management.apps.ocp4-12 <omitted for brevity> > User-Agent: curl/7.85.0 < HTTP/1.0 503 Service Unavailable ``` For comparison: 1. `oc new-project fvd-test-old` 2. `echo "" > src/main/resources/application.properties` 3. `mvn clean install -Dquarkus.kubernetes.deploy=true -Dquarkus.openshift.route.expose=true -Dquarkus.kubernetes-client.trust-certs=true` 4. The application can be accessed: ` curl http://openshift-quickstart-fvd-test-old.apps.ocp4-12<omitted>` ### Output of `uname -a` or `ver` 6.0.18-300.fc37.x86_64 ### Output of `java -version` 17.0.5, vendor: GraalVM Community ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.0.0.Beta1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 (84538c9988a25aec085021c365c560670ad80f63) ### Additional information ``` $ oc version Client Version: 4.11.0-202208020706.p0.g7075089.assembly.stream-7075089 Kustomize Version: v4.5.4 Kubernetes Version: v1.25.4+18eadca ```

2d2e1cf4d3c15c250fdd960f868371757b5f77fe

7765b20d8c3390f4ba12b17647edfec82a3a4ba7

https://github.com/quarkusio/quarkus/compare/2d2e1cf4d3c15c250fdd960f868371757b5f77fe...7765b20d8c3390f4ba12b17647edfec82a3a4ba7

diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java index 1afe6e7aa81..75c08c859ed 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java @@ -6,8 +6,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import io.dekorate.kubernetes.decorator.AddLivenessProbeDecorator; -import io.dekorate.kubernetes.decorator.AddReadinessProbeDecorator; +import io.dekorate.kubernetes.decorator.AbstractAddProbeDecorator; import io.dekorate.kubernetes.decorator.AddSidecarDecorator; import io.dekorate.kubernetes.decorator.Decorator; import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator; @@ -106,7 +105,6 @@ public class ApplyHttpGetActionPortDecorator extends Decorator<HTTPGetActionFlue @Override public Class<? extends Decorator>[] after() { - return new Class[] { ResourceProvidingDecorator.class, AddSidecarDecorator.class, - AddLivenessProbeDecorator.class, AddReadinessProbeDecorator.class }; + return new Class[] { ResourceProvidingDecorator.class, AddSidecarDecorator.class, AbstractAddProbeDecorator.class }; } } diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java index 47aa05a3db0..101d3a5ff7a 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java @@ -59,6 +59,10 @@ public final class Constants { public static final int MIN_NODE_PORT_VALUE = 30000; public static final int MAX_NODE_PORT_VALUE = 31999; + public static final String LIVENESS_PROBE = "livenessProbe"; + public static final String READINESS_PROBE = "readinessProbe"; + public static final String STARTUP_PROBE = "startupProbe"; + private Constants() { } } diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/DevClusterHelper.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/DevClusterHelper.java index 3e837624d5e..77bc359390b 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/DevClusterHelper.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/DevClusterHelper.java @@ -2,10 +2,13 @@ package io.quarkus.kubernetes.deployment; import static io.quarkus.kubernetes.deployment.Constants.KUBERNETES; +import static io.quarkus.kubernetes.deployment.Constants.LIVENESS_PROBE; import static io.quarkus.kubernetes.deployment.Constants.MAX_NODE_PORT_VALUE; import static io.quarkus.kubernetes.deployment.Constants.MAX_PORT_NUMBER; import static io.quarkus.kubernetes.deployment.Constants.MIN_NODE_PORT_VALUE; import static io.quarkus.kubernetes.deployment.Constants.MIN_PORT_NUMBER; +import static io.quarkus.kubernetes.deployment.Constants.READINESS_PROBE; +import static io.quarkus.kubernetes.deployment.Constants.STARTUP_PROBE; import java.math.BigInteger; import java.nio.charset.StandardCharsets; @@ -128,15 +131,15 @@ public class DevClusterHelper { //Probe port handling result.add( - KubernetesCommonHelper.createProbeHttpPortDecorator(name, clusterKind, "livenessProbe", config.livenessProbe, + KubernetesCommonHelper.createProbeHttpPortDecorator(name, clusterKind, LIVENESS_PROBE, config.livenessProbe, portName, ports)); result.add( - KubernetesCommonHelper.createProbeHttpPortDecorator(name, clusterKind, "readinessProbe", config.readinessProbe, + KubernetesCommonHelper.createProbeHttpPortDecorator(name, clusterKind, READINESS_PROBE, config.readinessProbe, portName, ports)); result.add( - KubernetesCommonHelper.createProbeHttpPortDecorator(name, clusterKind, "startupProbe", config.startupProbe, + KubernetesCommonHelper.createProbeHttpPortDecorator(name, clusterKind, STARTUP_PROBE, config.startupProbe, portName, ports)); diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java index 5bbb03e9828..199b54be052 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java @@ -2,10 +2,13 @@ package io.quarkus.kubernetes.deployment; import static io.quarkus.kubernetes.deployment.Constants.DEFAULT_S2I_IMAGE_NAME; +import static io.quarkus.kubernetes.deployment.Constants.LIVENESS_PROBE; import static io.quarkus.kubernetes.deployment.Constants.OPENSHIFT; import static io.quarkus.kubernetes.deployment.Constants.OPENSHIFT_APP_RUNTIME; import static io.quarkus.kubernetes.deployment.Constants.QUARKUS; +import static io.quarkus.kubernetes.deployment.Constants.READINESS_PROBE; import static io.quarkus.kubernetes.deployment.Constants.ROUTE; +import static io.quarkus.kubernetes.deployment.Constants.STARTUP_PROBE; import static io.quarkus.kubernetes.deployment.OpenshiftConfig.OpenshiftFlavor.v3; import static io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem.DEFAULT_PRIORITY; @@ -310,15 +313,15 @@ public class OpenshiftProcessor { } // Probe port handling - result.add(KubernetesCommonHelper.createProbeHttpPortDecorator(name, OPENSHIFT, "livenssProbe", config.livenessProbe, + result.add(KubernetesCommonHelper.createProbeHttpPortDecorator(name, OPENSHIFT, LIVENESS_PROBE, config.livenessProbe, portName, ports)); result.add( - KubernetesCommonHelper.createProbeHttpPortDecorator(name, OPENSHIFT, "readinessProbe", config.readinessProbe, + KubernetesCommonHelper.createProbeHttpPortDecorator(name, OPENSHIFT, READINESS_PROBE, config.readinessProbe, portName, ports)); result.add( - KubernetesCommonHelper.createProbeHttpPortDecorator(name, OPENSHIFT, "startupProbe", config.startupProbe, + KubernetesCommonHelper.createProbeHttpPortDecorator(name, OPENSHIFT, STARTUP_PROBE, config.startupProbe, portName, ports)); diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/VanillaKubernetesProcessor.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/VanillaKubernetesProcessor.java index 031d4a9e953..ca88fe0eff3 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/VanillaKubernetesProcessor.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/VanillaKubernetesProcessor.java @@ -5,6 +5,9 @@ import static io.quarkus.kubernetes.deployment.Constants.DEPLOYMENT_GROUP; import static io.quarkus.kubernetes.deployment.Constants.DEPLOYMENT_VERSION; import static io.quarkus.kubernetes.deployment.Constants.INGRESS; import static io.quarkus.kubernetes.deployment.Constants.KUBERNETES; +import static io.quarkus.kubernetes.deployment.Constants.LIVENESS_PROBE; +import static io.quarkus.kubernetes.deployment.Constants.READINESS_PROBE; +import static io.quarkus.kubernetes.deployment.Constants.STARTUP_PROBE; import static io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem.VANILLA_KUBERNETES_PRIORITY; import java.util.ArrayList; @@ -252,15 +255,15 @@ public class VanillaKubernetesProcessor { // Probe port handling result.add( - KubernetesCommonHelper.createProbeHttpPortDecorator(name, KUBERNETES, "livenessProbe", config.livenessProbe, + KubernetesCommonHelper.createProbeHttpPortDecorator(name, KUBERNETES, LIVENESS_PROBE, config.livenessProbe, portName, ports)); result.add( - KubernetesCommonHelper.createProbeHttpPortDecorator(name, KUBERNETES, "readinessProbe", config.readinessProbe, + KubernetesCommonHelper.createProbeHttpPortDecorator(name, KUBERNETES, READINESS_PROBE, config.readinessProbe, portName, ports)); result.add( - KubernetesCommonHelper.createProbeHttpPortDecorator(name, KUBERNETES, "startupProbe", config.startupProbe, + KubernetesCommonHelper.createProbeHttpPortDecorator(name, KUBERNETES, STARTUP_PROBE, config.startupProbe, portName, ports));

['extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java', 'extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/DevClusterHelper.java', 'extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java', 'extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/VanillaKubernetesProcessor.java', 'extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.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/32199/32194

quarkusio

quarkus

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

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

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

@RestCookie/@RestHeader (and relative @*Param) applied to Temporal parameter lead to deployment failure

fixes

### Describe the bug ```java @Path("/hello") public class GreetingResource { @Inject ObjectMapper mapper; @Path("{path}") @GET @Produces(MediaType.APPLICATION_JSON) public String hello(@RestQuery("query") Instant query, @RestPath("path") Instant path, @RestHeader("header") Instant header, @RestCookie("cookie") Instant cookie) throws IOException {} } ``` header and cookie extracted as `java.time.temporal.*` produce and invalid build ```posh Build step io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveProcessor#setupEndpoints threw an exception: java.lang.RuntimeException: java.lang.RuntimeException: Failed to process method 'org.acme.GreetingResource#hello' at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.createEndpoints(EndpointIndexer.java:323) at io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveProcessor.setupEndpoints(ResteasyReactiveProcessor.java:633) 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.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:909) at io.quarkus.builder.BuildContext.run(BuildContext.java:[281](https://github.com/luca-bassoricci/code-with-quarkus/actions/runs/4544958243/jobs/8011773735#step:4:282)) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Caused by: java.lang.RuntimeException: Failed to process method 'org.acme.GreetingResource#hello' at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.createResourceMethod(EndpointIndexer.java:765) at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.createEndpoints(EndpointIndexer.java:412) at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.createEndpoints(EndpointIndexer.java:[290](https://github.com/luca-bassoricci/code-with-quarkus/actions/runs/4544958243/jobs/8011773735#step:4:291)) ... 12 more Caused by: java.lang.RuntimeException: Could not create converter for java.time.Instant for method java.lang.String hello(java.time.Instant query, java.time.Instant path, java.time.Instant header, java.time.Instant cookie) throws java.io.IOException on class org.acme.GreetingResource of type HEADER at org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer.handleOtherParam(ServerEndpointIndexer.java:367) at org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer.handleOtherParam(ServerEndpointIndexer.java:96) at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.extractParameterInfo(EndpointIndexer.java:1407) at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.createResourceMethod(EndpointIndexer.java:592) ... 14 more Caused by: java.lang.RuntimeException: Failed to find converter for java.time.Instant at org.jboss.resteasy.reactive.server.processor.generation.converters.GeneratedConverterIndexerExtension.extractConverterImpl(GeneratedConverterIndexerExtension.java:106) at org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer.extractConverter(ServerEndpointIndexer.java:564) at org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer.handleOtherParam(ServerEndpointIndexer.java:363) ... 17 more ``` ### Expected behavior A valid build with data extracted from header/cookie as Temporal value. ### Actual behavior Invalid build ### How to Reproduce? Reproducer at https://github.com/luca-bassoricci/code-with-quarkus; just build to reproduce the error ### Output of `uname -a` or `ver` Windows 11 ### Output of `java -version` temurin 17 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.16.5.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

34da5133fd7dd9997d1cc7d52f80bbf81cd27a17

335e4924d8a01809ba1b0b6bb25ca29805827342

https://github.com/quarkusio/quarkus/compare/34da5133fd7dd9997d1cc7d52f80bbf81cd27a17...335e4924d8a01809ba1b0b6bb25ca29805827342

diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java index 3ab31b32824..05b7f10dc15 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java @@ -1382,7 +1382,8 @@ public abstract class EndpointIndexer<T extends EndpointIndexer<T, PARAM, METHOD handlePathSegmentParam(builder); typeHandled = true; } else if (SUPPORT_TEMPORAL_PARAMS.contains(paramType.name()) - && (type == ParameterType.PATH || type == ParameterType.QUERY || type == ParameterType.FORM)) { + && (type == ParameterType.PATH || type == ParameterType.QUERY || type == ParameterType.FORM + || type == ParameterType.COOKIE || type == ParameterType.HEADER)) { elementType = paramType.name().toString(); handleTemporalParam(builder, paramType.name(), anns, currentMethodInfo); typeHandled = true; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java index 220a56196dd..c6fe44fe32f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java @@ -4,9 +4,14 @@ import java.time.Duration; import java.time.Instant; import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import org.hamcrest.Matchers; +import org.jboss.resteasy.reactive.RestCookie; +import org.jboss.resteasy.reactive.RestForm; +import org.jboss.resteasy.reactive.RestHeader; +import org.jboss.resteasy.reactive.RestPath; import org.jboss.resteasy.reactive.RestQuery; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -24,11 +29,37 @@ public class InstantParamTest { .addClasses(HelloResource.class)); @Test - public void test() { + public void instantAsQueryParam() { RestAssured.get("/hello?instant=1984-08-08T01:02:03Z") .then().statusCode(200).body(Matchers.equalTo("hello#1984-08-09T01:02:03Z")); } + @Test + public void instantAsPathParam() { + RestAssured.get("/hello/1984-08-08T01:02:03Z") + .then().statusCode(200).body(Matchers.equalTo("hello@1984-08-09T01:02:03Z")); + } + + @Test + public void instantAsFormParam() { + RestAssured.given().formParam("instant", "1984-08-08T01:02:03Z").post("/hello") + .then().statusCode(200).body(Matchers.equalTo("hello:1984-08-09T01:02:03Z")); + } + + @Test + public void instantAsHeader() { + RestAssured.with().header("instant", "1984-08-08T01:02:03Z") + .get("/hello/header") + .then().statusCode(200).body(Matchers.equalTo("hello=1984-08-09T01:02:03Z")); + } + + @Test + public void instantAsCookie() { + RestAssured.with().cookie("instant", "1984-08-08T01:02:03Z") + .get("/hello/cookie") + .then().statusCode(200).body(Matchers.equalTo("hello/1984-08-09T01:02:03Z")); + } + @Path("hello") public static class HelloResource { @@ -36,6 +67,29 @@ public class InstantParamTest { public String helloQuery(@RestQuery Instant instant) { return "hello#" + instant.plus(Duration.ofDays(1)).toString(); } + + @GET + @Path("{instant}") + public String helloPath(@RestPath Instant instant) { + return "hello@" + instant.plus(Duration.ofDays(1)).toString(); + } + + @POST + public String helloForm(@RestForm Instant instant) { + return "hello:" + instant.plus(Duration.ofDays(1)).toString(); + } + + @GET + @Path("cookie") + public String helloCookie(@RestCookie Instant instant) { + return "hello/" + instant.plus(Duration.ofDays(1)).toString(); + } + + @GET + @Path("header") + public String helloHeader(@RestHeader Instant instant) { + return "hello=" + instant.plus(Duration.ofDays(1)).toString(); + } } } diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java index f3b59f8d673..c98a886a8e8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java @@ -3,8 +3,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import jakarta.ws.rs.CookieParam; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; @@ -43,6 +45,20 @@ public class LocalDateParamTest { .then().statusCode(200).body(Matchers.equalTo("hello:1995-09-22")); } + @Test + public void localDateAsHeader() { + RestAssured.with().header("date", "08-08-1984") + .get("/hello/header") + .then().statusCode(200).body(Matchers.equalTo("hello=1984-08-08")); + } + + @Test + public void localDateAsCookie() { + RestAssured.with().cookie("date", "08-08-1984") + .get("/hello/cookie") + .then().statusCode(200).body(Matchers.equalTo("hello/1984-08-08")); + } + @Path("hello") public static class HelloResource { @@ -62,6 +78,20 @@ public class LocalDateParamTest { @FormParam("date") @DateFormat(dateTimeFormatterProvider = CustomDateTimeFormatterProvider.class) LocalDate date) { return "hello:" + date; } + + @GET + @Path("cookie") + public String helloCookie( + @CookieParam("date") @DateFormat(pattern = "dd-MM-yyyy") LocalDate date) { + return "hello/" + date; + } + + @GET + @Path("header") + public String helloHeader( + @HeaderParam("date") @DateFormat(pattern = "dd-MM-yyyy") LocalDate date) { + return "hello=" + date; + } } public static class CustomDateTimeFormatterProvider implements DateFormat.DateTimeFormatterProvider { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java index d69a18a11d5..7c4e9cb8e84 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java @@ -11,6 +11,8 @@ import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.DateFormat; +import org.jboss.resteasy.reactive.RestCookie; +import org.jboss.resteasy.reactive.RestHeader; import org.jboss.resteasy.reactive.RestPath; import org.jboss.resteasy.reactive.RestQuery; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; @@ -55,6 +57,20 @@ public class LocalDateTimeParamTest { .then().statusCode(200).body(Matchers.equalTo("hello:22")); } + @Test + public void localDateTimeAsHeader() { + RestAssured.with().header("date", "1984-08-08 01:02:03") + .get("/hello/header") + .then().statusCode(200).body(Matchers.equalTo("hello=1984-08-08T01:02:03")); + } + + @Test + public void localDateTimeAsCookie() { + RestAssured.with().cookie("date", "1984-08-08 01:02:03") + .get("/hello/cookie") + .then().statusCode(200).body(Matchers.equalTo("hello/1984-08-08T01:02:03")); + } + @Path("hello") public static class HelloResource { @@ -80,6 +96,18 @@ public class LocalDateTimeParamTest { @FormParam("date") @DateFormat(dateTimeFormatterProvider = CustomDateTimeFormatterProvider.class) LocalDateTime date) { return "hello:" + date.getDayOfMonth(); } + + @Path("cookie") + @GET + public String helloCookie(@RestCookie @DateFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime date) { + return "hello/" + date; + } + + @Path("header") + @GET + public String helloHeader(@RestHeader @DateFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime date) { + return "hello=" + date; + } } public static class CustomDateTimeFormatterProvider implements DateFormat.DateTimeFormatterProvider {

['independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java', 'independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java', 'independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java', 'independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java']

{'.java': 4}

Java

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

Apache License 2.0

quarkusio/quarkus/32110/32037

quarkusio

quarkus

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

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

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

Set-Cookie Header is Split when using OIDC together with AWS Lambda

fixes

### Describe the bug I think I have a similar problem to #25580. I am trying to use the quarkus-oidc extension together with an AWS Lambda deployment using quarkus-amazon-lambda-http. When I remove the quarkus-amazon-lambda-http dependency from the project, everything works fine. However when it is included in the dependencies so the Mock Lambda Event Server is used in dev mode, the q_auth-Cookie breaks (in two parts). This is part of the headers that Quarkus responds with: ``` < set-cookie: q_auth=6b6a7588-802f-49ea-a276-64e6bac263d1|/auth/authenticateAndRedirect?url=http%3A%2F%2Flocalhost%3A3000%2F; Max-Age=1800; Expires=Wed < set-cookie: 22 Mar 2023 13:44:01 GMT; Path=/; HTTPOnly ``` As you can see, the comma that is used within the expiration value now is interpreted by the AWS Lambda Mock Server (and probably also the real one) as the separating character between two header values. ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? Steps to reproduce: 1. Go to https://code.quarkus.io, select "AWS Lambda HTTP" as well as "OpenID Connect" and download and extract the ZIP 2. Change maven.compiler.release to 11 (probably not necessary, I just did not have the required java version installed) 3. Add the following to the `application.properties`: ``` quarkus.oidc.application-type=web_app # Enforce OIDC usage for all paths quarkus.http.auth.permission.authenticated.paths=/* quarkus.http.auth.permission.authenticated.policy=authenticated ``` 4. Run `./mvnw quarkus:dev` 5. Execute `curl localhost:8080 -v` Now you can see two set-cookie headers, of which at least the second one looks broken ### 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_ (edited to add missing reproduction step)

125f884d2e755d143003381cad2c6b3deebf8d51

736ba35acdebace0bdc6395e9147c42e3bdebbf1

https://github.com/quarkusio/quarkus/compare/125f884d2e755d143003381cad2c6b3deebf8d51...736ba35acdebace0bdc6395e9147c42e3bdebbf1

diff --git a/extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java b/extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java index e7b438422ea..69fe6e67955 100644 --- a/extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java +++ b/extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java @@ -128,6 +128,11 @@ public class MockHttpEventServer extends MockEventServer { } } } + if (res.getCookies() != null) { + for (String cookie : res.getCookies()) { + response.headers().add("set-cookie", cookie); + } + } response.setStatusCode(res.getStatusCode()); String body = res.getBody(); if (body != null) { diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java index c7c9b7f1092..8b5c2654937 100644 --- a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java +++ b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java @@ -108,6 +108,11 @@ public class LambdaHttpHandler implements RequestHandler<APIGatewayV2HTTPEvent, if (allForName == null || allForName.isEmpty()) { continue; } + // Handle cookies separately to preserve commas in the header values + if ("set-cookie".equals(name)) { + responseBuilder.setCookies(allForName); + continue; + } final StringBuilder sb = new StringBuilder(); for (Iterator<String> valueIterator = allForName.iterator(); valueIterator.hasNext();) { sb.append(valueIterator.next());

['extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java', 'extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.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/22681/22662

quarkusio

quarkus

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

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

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

Gauges annotation are not showing up his value, on a resteasy endpoint

fixes

### Describe the bug If a gauge is declared in a Resteasy endpoint through an annotation, the gauge value is not pushed to `/metrics` Example: ``` @Path("/using-microprofile-pingpong") public class UsingMicroProfilePingPongResource { private static final String PING_PONG = "ping pong"; private static final long DEFAULT_GAUGE_VALUE = 100L; // counters works as expected @GET @Counted(name = "simple_counter_mp", absolute = true) @Produces(MediaType.TEXT_PLAIN) @Path("/counter") public String simpleScenario() { return PING_PONG; } //TODO gauges are not promoting their values to /metrics @GET @Gauge(name = "simple_gauge_mp", unit = MetricUnits.NONE) @Produces(MediaType.TEXT_PLAIN) @Path("/gauge") public long highestPrimeNumberSoFar() { return DEFAULT_GAUGE_VALUE; } } ``` But If I move on the gauge to a separate public method, then works as expected: ``` @Path("/using-microprofile-pingpong") public class UsingMicroProfilePingPongResource { private static final String PING_PONG = "ping pong"; private static final long DEFAULT_GAUGE_VALUE = 100L; @GET @Counted(name = "simple_counter_mp", absolute = true) @Produces(MediaType.TEXT_PLAIN) @Path("/counter") public String simpleScenario() { return PING_PONG; } @GET @Produces(MediaType.TEXT_PLAIN) @Path("/gauge") public long highestPrimeNumberSoFar() { return getDefaultGauge(); } @Gauge(name = "simple_gauge_mp", unit = MetricUnits.NONE) public long getDefaultGauge() { return DEFAULT_GAUGE_VALUE; } } ``` Additional when the gauge is not promoted I am getting the following warning message: ``` 2022-01-05 16:48:04,996 WARN [io.mic.cor.ins.int.DefaultGauge] (vert.x-worker-thread-0) Failed to apply the value function for the gauge 'io.quarkus.ts.micrometer.prometheus.UsingMicroProfilePingPongResource.simple_gauge_mp'. Note that subsequent logs will be logged at debug level.: javax.enterprise.context.ContextNotActiveException at io.quarkus.arc.impl.ClientProxies.getDelegate(ClientProxies.java:46) at io.quarkus.vertx.http.runtime.CurrentVertxRequest_ClientProxy.arc$delegate(Unknown Source) ``` From a developer experience point of view, would be great to have the same behavior in all metrics data structures. So, if counter annotations is available in an endpoint declaration then gauges should be also valid. ### 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` openjdk 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 _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

9a40f35af46ddeb20a6426fef10348fe02045788

6c613029edec5fcddea931062ebb9f2ecdde0c01

https://github.com/quarkusio/quarkus/compare/9a40f35af46ddeb20a6426fef10348fe02045788...6c613029edec5fcddea931062ebb9f2ecdde0c01

diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java index 820e93c7411..835b0e6e831 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java @@ -10,7 +10,7 @@ import org.eclipse.microprofile.metrics.annotation.Metric; import io.micrometer.core.instrument.Tags; -class MetricDescriptor { +public class MetricDescriptor { final String name; final Tags tags; ExtendedMetricID metricId = null; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java index 232fa2cc10d..80df6d2aee8 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java @@ -4,6 +4,7 @@ import java.lang.annotation.Annotation; import java.util.Set; import javax.annotation.Priority; +import javax.enterprise.context.ContextNotActiveException; import javax.inject.Inject; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; @@ -12,6 +13,7 @@ import javax.interceptor.InvocationContext; import io.quarkus.arc.ArcInvocationContext; import io.quarkus.vertx.http.runtime.CurrentVertxRequest; import io.vertx.core.http.impl.HttpServerRequestInternal; +import io.vertx.ext.web.RoutingContext; @SuppressWarnings("unused") @QuarkusRestPathTemplate @@ -24,7 +26,13 @@ public class QuarkusRestPathTemplateInterceptor { @AroundInvoke Object restMethodInvoke(InvocationContext context) throws Exception { QuarkusRestPathTemplate annotation = getAnnotation(context); - if ((annotation != null) && (request.getCurrent() != null)) { + RoutingContext routingContext = null; + try { + routingContext = request.getCurrent(); + } catch (ContextNotActiveException ex) { + // just leave routingContext as null + } + if ((annotation != null) && (routingContext != null)) { ((HttpServerRequestInternal) request.getCurrent().request()).context().putLocal("UrlPathTemplate", annotation.value()); } diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java index 8504a49f242..0545b7477f9 100644 --- a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java +++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java @@ -70,6 +70,8 @@ public class PrimeResource { } @Gauge(name = "highestPrimeNumberSoFar", unit = MetricUnits.NONE, description = "Highest prime number so far.") + @GET + @Path("/blabla") // make this a REST method just to verify that a gauge will still work on it public Long highestPrimeNumberSoFar() { return highestPrimeSoFar.get(); }

['integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java', 'extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java', 'extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java']

{'.java': 3}

Java