Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GR-32340] Conditional resource configuration. #3774

Merged
merged 4 commits into from
Sep 15, 2021

Conversation

graalvmbot
Copy link
Collaborator

@graalvmbot graalvmbot commented Sep 10, 2021

The first commit refactors the type resolver out and fixes an issue with reflection configuration.
The second commit introduces conditional configuration for resources.

@graalvmbot graalvmbot force-pushed the github/vjovanov/GR-32340-conditional-resources branch 7 times, most recently from ff2c26a to 0f2f511 Compare September 10, 2021 16:00
@graalvmbot graalvmbot force-pushed the github/vjovanov/GR-32340-conditional-resources branch 4 times, most recently from ae2ac39 to 5721b9b Compare September 14, 2021 06:45
import java.util.List;
import java.util.function.Consumer;

public class ProxyRegistry extends ConditionalConfigurationRegistry implements Consumer<ConditionalElement<List<String>>> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be ProxyRegistryImpl to be consistent with the other registries, and perhaps we should introduce a ProxyRegistry interface now instead of using Consumer.

@@ -87,4 +87,9 @@ public int hashCode() {
public int compareTo(ConfigurationCondition o) {
return this.typeName.compareTo(o.typeName);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe objectReachable() should really be named alwaysTrue() for easier comprehension of code that registers types, proxies, etc.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like that, will change.

@graalvmbot graalvmbot force-pushed the github/vjovanov/GR-32340-conditional-resources branch from 5721b9b to 14c6ad3 Compare September 14, 2021 15:45
@graalvmbot graalvmbot merged commit 55ad6f2 into master Sep 15, 2021
zakkak added a commit to zakkak/quarkus that referenced this pull request Sep 17, 2021
oracle/graal#3774 changed the signature of ignoreResources as follows:

```
- public void ignoreResources(String pattern) {
+ public void ignoreResources(ConfigurationCondition condition, String pattern) {
```

This results in Quarkus throwing a `NoSuchMethodError` exception at the
code generated by NativeImageAutoFeatureStep

This patch looks for the right method based on the GraalVM/Mandrel version.

Closes: quarkusio#20226
zakkak added a commit to zakkak/quarkus that referenced this pull request Sep 21, 2021
oracle/graal#3774 changed the signature of ignoreResources as follows:

```
- public void ignoreResources(String pattern) {
+ public void ignoreResources(ConfigurationCondition condition, String pattern) {
```

This results in Quarkus throwing a `NoSuchMethodError` exception at the
code generated by NativeImageAutoFeatureStep

This patch looks for the right method based on the GraalVM/Mandrel version.

Closes: quarkusio#20226
zakkak added a commit to zakkak/quarkus that referenced this pull request Sep 21, 2021
oracle/graal#3774 changed the signature of ignoreResources as follows:

```
- public void ignoreResources(String pattern) {
+ public void ignoreResources(ConfigurationCondition condition, String pattern) {
```

This results in Quarkus throwing a `NoSuchMethodError` exception at the
code generated by NativeImageAutoFeatureStep

This patch looks for the right method based on the GraalVM/Mandrel version.

Closes: quarkusio#20226
geoand pushed a commit to geoand/quarkus that referenced this pull request Sep 28, 2021
oracle/graal#3774 changed the signature of ignoreResources as follows:

```
- public void ignoreResources(String pattern) {
+ public void ignoreResources(ConfigurationCondition condition, String pattern) {
```

This results in Quarkus throwing a `NoSuchMethodError` exception at the
code generated by NativeImageAutoFeatureStep

This patch looks for the right method based on the GraalVM/Mandrel version.

Closes: quarkusio#20226
(cherry picked from commit b5361d8)
gsmet pushed a commit to gsmet/quarkus that referenced this pull request Dec 1, 2021
oracle/graal#3774 changed the signature of ignoreResources as follows:

```
- public void ignoreResources(String pattern) {
+ public void ignoreResources(ConfigurationCondition condition, String pattern) {
```

This results in Quarkus throwing a `NoSuchMethodError` exception at the
code generated by NativeImageAutoFeatureStep

This patch looks for the right method based on the GraalVM/Mandrel version.

Closes: quarkusio#20226
(cherry picked from commit b5361d8)
gsmet pushed a commit to gsmet/quarkus that referenced this pull request Dec 1, 2021
oracle/graal#3774 changed the signature of ignoreResources as follows:

```
- public void ignoreResources(String pattern) {
+ public void ignoreResources(ConfigurationCondition condition, String pattern) {
```

This results in Quarkus throwing a `NoSuchMethodError` exception at the
code generated by NativeImageAutoFeatureStep

This patch looks for the right method based on the GraalVM/Mandrel version.

Closes: quarkusio#20226
(cherry picked from commit b5361d8)
@graalvmbot graalvmbot deleted the github/vjovanov/GR-32340-conditional-resources branch February 8, 2022 01:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants