From a85122e54adec127bc6e42f79aafb5dff33ec104 Mon Sep 17 00:00:00 2001 From: Lorenzo Dematte Date: Fri, 7 Mar 2025 12:23:22 +0100 Subject: [PATCH 1/2] fix parameter type --- .../elasticsearch/entitlement/bridge/EntitlementChecker.java | 2 +- .../runtime/api/ElasticsearchEntitlementChecker.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java b/libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java index a5a020c69acad..054db7d20f557 100644 --- a/libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java +++ b/libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java @@ -520,7 +520,7 @@ public interface EntitlementChecker { void check$sun_net_www_protocol_https_AbstractDelegateHttpsURLConnection$connect( Class callerClass, - javax.net.ssl.HttpsURLConnection that + java.net.HttpURLConnection that ); void check$sun_net_www_protocol_mailto_MailToURLConnection$connect(Class callerClass, java.net.URLConnection that); diff --git a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/api/ElasticsearchEntitlementChecker.java b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/api/ElasticsearchEntitlementChecker.java index 76d0864ad9c7d..2c8349c4c397c 100644 --- a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/api/ElasticsearchEntitlementChecker.java +++ b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/api/ElasticsearchEntitlementChecker.java @@ -1180,7 +1180,7 @@ private static boolean isFileUrlConnection(java.net.URLConnection urlConnection) @Override public void check$sun_net_www_protocol_https_AbstractDelegateHttpsURLConnection$connect( Class callerClass, - javax.net.ssl.HttpsURLConnection that + java.net.HttpURLConnection that ) { policyManager.checkOutboundNetworkAccess(callerClass); } From 55e8fe7584248c85d01c6550e6c89408994c16cb Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Fri, 7 Mar 2025 11:37:27 +0000 Subject: [PATCH 2/2] [CI] Auto commit changes from spotless --- .../elasticsearch/entitlement/bridge/EntitlementChecker.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java b/libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java index 054db7d20f557..eff84a500bcdd 100644 --- a/libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java +++ b/libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java @@ -518,10 +518,7 @@ public interface EntitlementChecker { Class[] classes ); - void check$sun_net_www_protocol_https_AbstractDelegateHttpsURLConnection$connect( - Class callerClass, - java.net.HttpURLConnection that - ); + void check$sun_net_www_protocol_https_AbstractDelegateHttpsURLConnection$connect(Class callerClass, java.net.HttpURLConnection that); void check$sun_net_www_protocol_mailto_MailToURLConnection$connect(Class callerClass, java.net.URLConnection that);