Skip to content

Commit

Permalink
Revert "Force lowercase urls and origins in GitRemote (#4456)" (#4462)
Browse files Browse the repository at this point in the history 
This reverts commit 758bbd8.
  • Loading branch information
@jkschneider
jkschneider authored Sep 2, 2024
1 parent 03cd38d commit 2b877c6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 18 deletions.
13 changes: 4 additions & 9 deletions rewrite-core/src/main/java/org/openrewrite/GitRemote.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,7 @@ private String repositoryPath(RemoteServerMatch match, URI normalizedUri) {

private static final Pattern PORT_PATTERN = Pattern.compile(":\\d+");

static URI normalize(String original) {
String url = original.toLowerCase(Locale.ENGLISH);
static URI normalize(String url) {
try {
URIish uri = new URIish(url);
String scheme = uri.getScheme();
Expand Down Expand Up @@ -267,7 +266,7 @@ static URI normalize(String original) {
String path = uri.getPath().replaceFirst("/$", "")
.replaceFirst("\\.git$", "")
.replaceFirst("^/", "");
return URI.create((scheme + "://" + host + maybePort + "/" + path).replaceFirst("/$", "").toLowerCase(Locale.ENGLISH));
return URI.create((scheme + "://" + host + maybePort + "/" + path).replaceFirst("/$", ""));
} catch (URISyntaxException e) {
throw new IllegalStateException("Unable to parse origin from: " + url, e);
}
Expand Down Expand Up @@ -306,12 +305,8 @@ public RemoteServer(Service service, String origin, URI... uris) {

public RemoteServer(Service service, String origin, Collection<URI> uris) {
this.service = service;
this.origin = origin.toLowerCase(Locale.ENGLISH);
this.uris.addAll(uris.stream()
.map(URI::toString)
.map(urlString -> urlString.toLowerCase(Locale.ENGLISH))
.map(URI::create)
.collect(Collectors.toList()));
this.origin = origin;
this.uris.addAll(uris);
}

private GitRemote.Parser.@Nullable RemoteServerMatch match(URI normalizedUri) {
Expand Down
15 changes: 6 additions & 9 deletions rewrite-core/src/test/java/org/openrewrite/GitRemoteTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,13 @@ public class GitRemoteTest {
[email protected]:group/subgroup/subergroup/subestgroup/repo.git, gitlab.com, group/subgroup/subergroup/subestgroup/repo, group/subgroup/subergroup/subestgroup, repo
ssh://[email protected]:22/group/subgroup/subergroup/subestgroup/repo.git, gitlab.com, group/subgroup/subergroup/subestgroup/repo, group/subgroup/subergroup/subestgroup, repo
https://bitbucket.org/PRJ/repo, bitbucket.org, prj/repo, prj, repo
[email protected]:PRJ/repo.git, bitbucket.org, prj/repo, prj, repo
ssh://bitbucket.org/PRJ/repo.git, bitbucket.org, prj/repo, prj, repo
https://bitbucket.org/PRJ/repo, bitbucket.org, PRJ/repo, PRJ, repo
[email protected]:PRJ/repo.git, bitbucket.org, PRJ/repo, PRJ, repo
ssh://bitbucket.org/PRJ/repo.git, bitbucket.org, PRJ/repo, PRJ, repo
https://[email protected]/org/project/_git/repo, dev.azure.com, org/project/repo, org/project, repo
https://dev.azure.com/org/project/_git/repo, dev.azure.com, org/project/repo, org/project, repo
[email protected]:v3/org/project/repo, dev.azure.com, org/project/repo, org/project, repo
HTTPS://GITHUB.COM/ORG/REPO.GIT, github.com, org/repo, org, repo
HtTpS://GitHub.CoM/OrG/R3P0.GIT, github.com, org/r3p0, org, r3p0
""")
void parseKnownRemotes(String cloneUrl, String expectedOrigin, String expectedPath, String expectedOrganization, String expectedRepositoryName) {
GitRemote.Parser parser = new GitRemote.Parser();
Expand Down Expand Up @@ -86,9 +83,9 @@ void parseUnknownRemote(String cloneUrl, String expectedOrigin, String expectedP
https://scm.company.com:443/stash/scm/org/repo.git, scm.company.com/stash, Bitbucket, scm.company.com/stash, org/repo, org, repo
https://scm.company.com:1234/stash/scm/org/repo.git, https://scm.company.com:1234/stash, Bitbucket, scm.company.com:1234/stash, org/repo, org, repo
[email protected]:stash/org/repo.git, scm.company.com/stash, Bitbucket, scm.company.com/stash, org/repo, org, repo
ssh://scm.CompanY.com/stash/org/repo, scm.cOMpAnY.com/stash, Bitbucket, scm.company.com/stash, org/repo, org, repo
ssh://scm.company.com/stash/org/repo, scm.company.com/stash, Bitbucket, scm.company.com/stash, org/repo, org, repo
ssh://scm.company.com:22/stash/org/repo, scm.company.com/stash, Bitbucket, scm.company.com/stash, org/repo, org, repo
ssh://scm.company.com:7999/stash/org/repo, ssh://sCm.company.com:7999/stash, Bitbucket, scm.company.com:7999/stash, org/repo, org, repo
ssh://scm.company.com:7999/stash/org/repo, ssh://scm.company.com:7999/stash, Bitbucket, scm.company.com:7999/stash, org/repo, org, repo
https://scm.company.com/very/long/context/path/org/repo.git, scm.company.com/very/long/context/path, Bitbucket, scm.company.com/very/long/context/path, org/repo, org, repo
https://scm.company.com:1234/very/long/context/path/org/repo.git, https://scm.company.com:1234/very/long/context/path, Bitbucket, scm.company.com:1234/very/long/context/path, org/repo, org, repo
Expand All @@ -100,7 +97,7 @@ void parseUnknownRemote(String cloneUrl, String expectedOrigin, String expectedP
[email protected]:group/subgroup/subergroup/subestgroup/repo.git, ssh://scm.company.com, GitLab, scm.company.com, group/subgroup/subergroup/subestgroup/repo, group/subgroup/subergroup/subestgroup, repo
https://scm.company.com:443/group/subgroup/subergroup/subestgroup/repo.git, scm.company.com, GitLab, scm.company.com, group/subgroup/subergroup/subestgroup/repo, group/subgroup/subergroup/subestgroup, repo
ssh://scm.company.com:22/group/subgroup/subergroup/subestgroup/repo.git, ssh://scm.company.com, GitLab, scm.company.com, group/subgroup/subergroup/subestgroup/repo, group/subgroup/subergroup/subestgroup, repo
ssh://SCM.COMPANY.COM:222/group/subgroup/subergroup/subestgroup/repo.git, ssh://SCM.CoMpAnY.cOm:222, GitLab, scm.company.com:222, group/subgroup/subergroup/subestgroup/repo, group/subgroup/subergroup/subestgroup, repo
ssh://scm.company.com:222/group/subgroup/subergroup/subestgroup/repo.git, ssh://scm.company.com:222, GitLab, scm.company.com:222, group/subgroup/subergroup/subestgroup/repo, group/subgroup/subergroup/subestgroup, repo
https://scm.company.com/very/long/context/path/group/subgroup/subergroup/subestgroup/repo, scm.company.com/very/long/context/path, GitLab, scm.company.com/very/long/context/path, group/subgroup/subergroup/subestgroup/repo, group/subgroup/subergroup/subestgroup, repo
""")
Expand Down

0 comments on commit 2b877c6

Please sign in to comment.