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.

Sign up for GitHub

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

[JENKINS-72028] replace deprecated URL() at core/src/main/java/jenkins/ #8568

Merged
merged 10 commits into from
Oct 11, 2023
Merged

[JENKINS-72028] replace deprecated URL() at core/src/main/java/jenkins/ #8568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f66ba70
missing 'alt' attribute added
abhishekmaity Sep 17, 2023
2afcdeb
missing 'alt' attribute added
abhishekmaity Sep 17, 2023
aeef4c1
replaced 'new URL' to 'new URI' per Java 11 target codebase
abhishekmaity Sep 18, 2023
ddc5115
Revert "replaced 'new URL' to 'new URI' per Java 11 target codebase"
abhishekmaity Sep 18, 2023
398ca85
Merge remote-tracking branch 'origin/master'
abhishekmaity Sep 30, 2023
f0e4508
Merge remote-tracking branch 'origin/master'
abhishekmaity Oct 4, 2023
b911044
Merge remote-tracking branch 'origin/master'
abhishekmaity Oct 5, 2023
52c5bea
replaced deprecated URL() with URI#.toURL()
abhishekmaity Oct 5, 2023
5e0be04
Update core/src/main/java/jenkins/security/ResourceDomainConfiguratio…
abhishekmaity Oct 7, 2023
3371ac4
Merge branch 'master' into url-depreciation-2
NotMyFault Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/main/java/jenkins/install/SetupWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.io.IOException;
import java.net.HttpRetryException;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -561,7 +562,7 @@ public JSONArray getPlatformPluginUpdates() {
suggestedPluginUrl = suggestedPluginUrl + (suggestedPluginUrl.contains("?") ? "&" : "?") + "version=" + version;
}
try {
URLConnection connection = ProxyConfiguration.open(new URL(suggestedPluginUrl));
URLConnection connection = ProxyConfiguration.open(new URI(suggestedPluginUrl).toURL());

try {
String initialPluginJson = IOUtils.toString(connection.getInputStream(), StandardCharsets.UTF_8);
Expand Down
12 changes: 7 additions & 5 deletions core/src/main/java/jenkins/security/ResourceDomainConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -112,14 +114,14 @@

URL resourceRootUrl;
try {
resourceRootUrl = new URL(resourceRootUrlString);
} catch (MalformedURLException ex) {
resourceRootUrl = new URI(resourceRootUrlString).toURL();
} catch (MalformedURLException | URISyntaxException ex) {

Check warning on line 118 in core/src/main/java/jenkins/security/ResourceDomainConfiguration.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 118 is not covered by tests
return FormValidation.error(Messages.ResourceDomainConfiguration_Invalid());
}

String resourceRootUrlHost = resourceRootUrl.getHost();
try {
String jenkinsRootUrlHost = new URL(jenkinsRootUrlString).getHost();
String jenkinsRootUrlHost = new URI(jenkinsRootUrlString).getHost();
if (jenkinsRootUrlHost.equals(resourceRootUrlHost)) {
// We do not allow the same host for Jenkins and resource root URLs even if there's some other difference.
// This is a conservative choice and prohibits same host/different proto/different port/different path:
Expand Down Expand Up @@ -147,7 +149,7 @@

// Send a request to /instance-identity/ at the resource root URL and check whether it is this Jenkins
try {
URLConnection urlConnection = new URL(resourceRootUrlString + "instance-identity/").openConnection();
URLConnection urlConnection = new URI(resourceRootUrlString + "instance-identity/").toURL().openConnection();

Check warning on line 152 in core/src/main/java/jenkins/security/ResourceDomainConfiguration.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 152 is not covered by tests
if (urlConnection instanceof HttpURLConnection) {
HttpURLConnection httpURLConnection = (HttpURLConnection) urlConnection;
int responseCode = httpURLConnection.getResponseCode();
Expand Down Expand Up @@ -179,7 +181,7 @@
return FormValidation.error(Messages.ResourceDomainConfiguration_FailedIdentityCheck(responseCode, responseMessage));
}
return FormValidation.error(Messages.ResourceDomainConfiguration_Invalid()); // unlikely to ever be hit
} catch (MalformedURLException ex) {
} catch (MalformedURLException | URISyntaxException ex) {

Check warning on line 184 in core/src/main/java/jenkins/security/ResourceDomainConfiguration.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 184 is not covered by tests
// Not expected to be hit
LOGGER.log(Level.FINE, "MalformedURLException occurred during instance identity check for " + resourceRootUrlString, ex);
return FormValidation.error(Messages.ResourceDomainConfiguration_Exception(ex.getMessage()));
Expand Down
Loading