[FIXED JENKINS-39114] Compare api, owner and repo case insensitively

jenkinsci · Jan 12, 2017 · 85a9cf3 · 85a9cf3
1 parent 0f11bca
commit 85a9cf3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...main/java/org/jenkinsci/plugins/github_branch_source/GitHubRepositoryEventSubscriber.java b/...main/java/org/jenkinsci/plugins/github_branch_source/GitHubRepositoryEventSubscriber.java
@@ -145,22 +145,22 @@ public NewSCMSourceEvent(GHEventPayload.Repository event, GitHubRepositoryName r
         }
 
         private boolean isApiMatch(String apiUri) {
-            return repoHost.equals(RepositoryUriResolver.hostnameFromApiUri(apiUri));
+            return repoHost.equalsIgnoreCase(RepositoryUriResolver.hostnameFromApiUri(apiUri));
         }
 
         @Override
         public boolean isMatch(@NonNull SCMNavigator navigator) {
             return navigator instanceof GitHubSCMNavigator
                     && isApiMatch(((GitHubSCMNavigator) navigator).getApiUri())
-                    && repoOwner.equals(((GitHubSCMNavigator) navigator).getRepoOwner());
+                    && repoOwner.equalsIgnoreCase(((GitHubSCMNavigator) navigator).getRepoOwner());
         }
 
         @Override
         public boolean isMatch(@NonNull SCMSource source) {
             return source instanceof GitHubSCMSource
                     && isApiMatch(((GitHubSCMSource) source).getApiUri())
-                    && repoOwner.equals(((GitHubSCMSource) source).getRepoOwner())
-                    && repository.equals(((GitHubSCMSource) source).getRepository());
+                    && repoOwner.equalsIgnoreCase(((GitHubSCMSource) source).getRepoOwner())
+                    && repository.equalsIgnoreCase(((GitHubSCMSource) source).getRepository());
         }
 
         @NonNull

diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestGHEventSubscriber.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestGHEventSubscriber.java
@@ -168,13 +168,13 @@ public SCMHeadEventImpl(Type type, GHEventPayload.PullRequest pullRequest, GitHu
         }
 
         private boolean isApiMatch(String apiUri) {
-            return repoHost.equals(RepositoryUriResolver.hostnameFromApiUri(apiUri));
+            return repoHost.equalsIgnoreCase(RepositoryUriResolver.hostnameFromApiUri(apiUri));
         }
 
         @Override
         public boolean isMatch(@NonNull SCMNavigator navigator) {
             return navigator instanceof GitHubSCMNavigator
-                    && repoOwner.equals(((GitHubSCMNavigator) navigator).getRepoOwner());
+                    && repoOwner.equalsIgnoreCase(((GitHubSCMNavigator) navigator).getRepoOwner());
         }
 
         @NonNull
@@ -188,8 +188,8 @@ public String getSourceName() {
         public Map<SCMHead, SCMRevision> heads(@NonNull SCMSource source) {
             if (!(source instanceof GitHubSCMSource
                     && isApiMatch(((GitHubSCMSource) source).getApiUri())
-                    && repoOwner.equals(((GitHubSCMSource) source).getRepoOwner())
-                    && repository.equals(((GitHubSCMSource) source).getRepository()))) {
+                    && repoOwner.equalsIgnoreCase(((GitHubSCMSource) source).getRepoOwner())
+                    && repository.equalsIgnoreCase(((GitHubSCMSource) source).getRepository()))) {
                 return Collections.emptyMap();
             }
             GitHubSCMSource src = (GitHubSCMSource) source;