Skip to content

Commit 4319465

Browse files
committed
Fix return types of substitutions
Resolves issues with new strict checking introduced with oracle/graal#7340
1 parent 9bfc508 commit 4319465

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

core/runtime/src/main/java/io/quarkus/runtime/graal/AwtImageIO.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.quarkus.runtime.graal;
22

3-
import java.awt.Graphics;
3+
import java.awt.GraphicsEnvironment;
44
import java.awt.Toolkit;
55
import java.util.Iterator;
66
import java.util.function.BooleanSupplier;
@@ -41,7 +41,7 @@ public boolean getAsBoolean() {
4141
@TargetClass(className = "java.awt.GraphicsEnvironment", onlyWith = AwtImageIO.IsAWTAbsent.class)
4242
final class Target_java_awt_GraphicsEnvironment {
4343
@Substitute
44-
public static Graphics getLocalGraphicsEnvironment() {
44+
public static GraphicsEnvironment getLocalGraphicsEnvironment() {
4545
throw new UnsupportedOperationException(AwtImageIO.AWT_EXTENSION_HINT);
4646
}
4747

extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/graal/ClientHttpEngineBuilder43Replacement.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
import javax.net.ssl.SSLContext;
66

7+
import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
8+
import org.jboss.resteasy.client.jaxrs.ClientHttpEngineBuilder;
79
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
810

911
import com.oracle.svm.core.annotate.Alias;
@@ -16,13 +18,13 @@
1618
* {@code SSLContext.getInstance(SSLConnectionSocketFactory.TLS)} which will fail in native when the SSL has been disabled
1719
*/
1820
@TargetClass(className = "org.jboss.resteasy.client.jaxrs.engines.ClientHttpEngineBuilder43")
19-
public final class ClientHttpEngineBuilder43Replacement {
21+
public final class ClientHttpEngineBuilder43Replacement implements ClientHttpEngineBuilder {
2022

2123
@Alias
2224
private ResteasyClientBuilder that;
2325

2426
@Substitute
25-
public ClientHttpEngineBuilder43Replacement resteasyClientBuilder(ResteasyClientBuilder resteasyClientBuilder) {
27+
public ClientHttpEngineBuilder resteasyClientBuilder(ResteasyClientBuilder resteasyClientBuilder) {
2628
that = resteasyClientBuilder;
2729
// make sure we only set a context if there is none or one wouldn't be created implicitly
2830
if ((that.getSSLContext() == null) && (that.getTrustStore() == null) && (that.getKeyStore() == null)) {
@@ -34,4 +36,10 @@ public ClientHttpEngineBuilder43Replacement resteasyClientBuilder(ResteasyClient
3436
}
3537
return this;
3638
}
39+
40+
/**
41+
* Unused alias to implement the {@link ClientHttpEngineBuilder} interface
42+
*/
43+
@Alias
44+
public native ClientHttpEngine build();
3745
}

0 commit comments

Comments
 (0)