Skip to content

Replace deprecated URL constructor in getUrl #1179

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

Merged
merged 3 commits into from
May 8, 2025
Merged

Replace deprecated URL constructor in getUrl #1179

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba824fa
Replace URL with URI in FeignClientsRegistrar to avoid deprecation wa…
HyeongDo-Myeong Mar 31, 2025
7695d1b
Merge branch 'spring-cloud:main' into fix-url-validation
HyeongDo-Myeong May 7, 2025
755557d
chore: update license year and add author tags
HyeongDo-Myeong May 7, 2025
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
6 changes: 2 additions & 4 deletions ...enfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@

package org.springframework.cloud.openfeign;

import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -122,9 +120,9 @@ static String getUrl(String url) {
url = url.substring(0, url.length() - 1);
}
try {
new URL(url);
new URI(url);
}
catch (MalformedURLException e) {
catch (URISyntaxException e) {
throw new IllegalArgumentException(url + " is malformed", e);
}
}
Expand Down
12 changes: 12 additions & 0 deletions ...gn-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,18 @@ private String testGetName(String name) {
return registrar.getName(Collections.singletonMap("name", name));
}

@Test
void goodUrl() {
String url = FeignClientsRegistrar.getUrl("https://good.url");
assertThat(url).as("url was wrong").isEqualTo("https://good.url");
}

@Test
void badUrl() {
assertThatExceptionOfType(IllegalArgumentException.class)
.isThrownBy(() -> FeignClientsRegistrar.getUrl("http://bad url"));
}

@Test
void testRemoveTrailingSlashFromUrl() {
String url = FeignClientsRegistrar.getUrl("http://localhost/");
Expand Down