JENKINS-22342 ensure URL normalization correct

Previous attempts to fix this stored the normalization flag in the serialized repository browser. Moved to be a function call to avoid the deserializer getting involved
jenkinsci · Apr 11, 2014 · 510337b · 510337b
1 parent 743d715
commit 510337b
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 22 deletions.
diff --git a/src/main/java/hudson/plugins/git/browser/BitbucketWeb.java b/src/main/java/hudson/plugins/git/browser/BitbucketWeb.java
@@ -24,7 +24,6 @@ public class BitbucketWeb extends GitRepositoryBrowser {
     @DataBoundConstructor
     public BitbucketWeb(String repoUrl) {
         super(repoUrl);
-        this.normalizeUrl = true;
     }
 
     @Override

diff --git a/src/main/java/hudson/plugins/git/browser/CGit.java b/src/main/java/hudson/plugins/git/browser/CGit.java
@@ -25,7 +25,6 @@ public class CGit extends GitRepositoryBrowser {
     @DataBoundConstructor
     public CGit(String repoUrl) {
         super(repoUrl);
-        this.normalizeUrl = true;
     }
 
     private QueryBuilder param(URL url) {

diff --git a/src/main/java/hudson/plugins/git/browser/FisheyeGitRepositoryBrowser.java b/src/main/java/hudson/plugins/git/browser/FisheyeGitRepositoryBrowser.java
@@ -27,7 +27,6 @@ public class FisheyeGitRepositoryBrowser extends GitRepositoryBrowser {
 	@DataBoundConstructor
     public FisheyeGitRepositoryBrowser(String repoUrl) {
         super(repoUrl);
-        this.normalizeUrl = true;
     }
 
 	@Override

diff --git a/src/main/java/hudson/plugins/git/browser/GitBlitRepositoryBrowser.java b/src/main/java/hudson/plugins/git/browser/GitBlitRepositoryBrowser.java
@@ -30,7 +30,6 @@ public class GitBlitRepositoryBrowser extends GitRepositoryBrowser {
     public GitBlitRepositoryBrowser(String repoUrl, String projectName) {
         super(repoUrl);
         this.projectName = projectName;
-        this.normalizeUrl = true;
     }
 
     @Override

diff --git a/src/main/java/hudson/plugins/git/browser/GitLab.java b/src/main/java/hudson/plugins/git/browser/GitLab.java
@@ -27,7 +27,6 @@ public class GitLab extends GitRepositoryBrowser {
     public GitLab(String repoUrl, String version) {
         super(repoUrl);
         this.version = Double.valueOf(version);
-        this.normalizeUrl = true;
     }
 
     public double getVersion() {

diff --git a/src/main/java/hudson/plugins/git/browser/GitRepositoryBrowser.java b/src/main/java/hudson/plugins/git/browser/GitRepositoryBrowser.java
@@ -14,11 +14,6 @@
 public abstract class GitRepositoryBrowser extends RepositoryBrowser<GitChangeSet> {
 
     private /* mostly final */ String url;
-    protected boolean normalizeUrl;
-
-    @Deprecated
-    protected GitRepositoryBrowser() {
-    }
 
     protected GitRepositoryBrowser(String repourl) {
         this.url = repourl;
@@ -44,7 +39,7 @@ public final URL getUrl() throws IOException {
             }
         }
 
-        if (normalizeUrl) {
+        if (getNormalizeUrl()) {
             return normalizeToEndWithSlash(new URL(u));
         }
         else {
@@ -74,5 +69,15 @@ public final URL getUrl() throws IOException {
      */
     public abstract URL getFileLink(GitChangeSet.Path path) throws IOException;
 
+    /**
+     * Determines whether a URL should be normalized
+	 * Overridden in the rare case where it shouldn't
+     *
+     * @return True if the URL should be normalized
+     */
+    protected boolean getNormalizeUrl() {
+		return true;
+	}
+
     private static final long serialVersionUID = 1L;
 }
diff --git a/src/main/java/hudson/plugins/git/browser/GitWeb.java b/src/main/java/hudson/plugins/git/browser/GitWeb.java
@@ -25,7 +25,11 @@ public class GitWeb extends GitRepositoryBrowser {
     @DataBoundConstructor
     public GitWeb(String repoUrl) {
         super(repoUrl);
-        this.normalizeUrl = false;
+    }
+
+    @Override
+    protected boolean getNormalizeUrl() {
+		return false;
     }
 
     @Override

diff --git a/src/main/java/hudson/plugins/git/browser/GithubWeb.java b/src/main/java/hudson/plugins/git/browser/GithubWeb.java
@@ -33,7 +33,6 @@ public class GithubWeb extends GitRepositoryBrowser {
     @DataBoundConstructor
     public GithubWeb(String repoUrl) {
         super(repoUrl);
-        this.normalizeUrl = true;
     }
 
     @Override

diff --git a/src/main/java/hudson/plugins/git/browser/GitoriousWeb.java b/src/main/java/hudson/plugins/git/browser/GitoriousWeb.java
@@ -24,7 +24,6 @@ public class GitoriousWeb extends GitRepositoryBrowser {
     @DataBoundConstructor
     public GitoriousWeb(String repoUrl) {
         super(repoUrl);
-        this.normalizeUrl = true;
     }
 
     @Override

diff --git a/src/main/java/hudson/plugins/git/browser/KilnGit.java b/src/main/java/hudson/plugins/git/browser/KilnGit.java
@@ -26,7 +26,6 @@ public class KilnGit extends GitRepositoryBrowser {
     @DataBoundConstructor
     public KilnGit(String repoUrl) {
         super(repoUrl);
-        this.normalizeUrl = true;
     }
 
     private QueryBuilder param(URL url) {

diff --git a/src/main/java/hudson/plugins/git/browser/Phabricator.java b/src/main/java/hudson/plugins/git/browser/Phabricator.java
@@ -27,7 +27,6 @@ public class Phabricator extends GitRepositoryBrowser {
     public Phabricator(String repoUrl, String repo) {
         super(repoUrl);
         this.repo = repo;
-        this.normalizeUrl = true;
     }
 
     public String getRepo() {

diff --git a/src/main/java/hudson/plugins/git/browser/RedmineWeb.java b/src/main/java/hudson/plugins/git/browser/RedmineWeb.java
@@ -26,7 +26,6 @@ public class RedmineWeb extends GitRepositoryBrowser {
     @DataBoundConstructor
     public RedmineWeb(String repoUrl) {
         super(repoUrl);
-        this.normalizeUrl = true;
     }
 
     @Override
@@ -42,8 +41,8 @@ public URL getChangeSetLink(GitChangeSet changeSet) throws IOException {
      *
      * Returns a diff link for {@link EditType#DELETE} and {@link EditType#EDIT}, for {@link EditType#ADD} returns an
      * {@link #getFileLink}.
-     * 
-     * 
+     *
+     *
      * @param path
      *            affected file path
      * @return diff link

diff --git a/src/main/java/hudson/plugins/git/browser/RhodeCode.java b/src/main/java/hudson/plugins/git/browser/RhodeCode.java
@@ -25,7 +25,6 @@ public class RhodeCode extends GitRepositoryBrowser {
     @DataBoundConstructor
     public RhodeCode(String repoUrl) {
         super(repoUrl);
-        this.normalizeUrl = true;
     }
 
     private QueryBuilder param(URL url) {

diff --git a/src/main/java/hudson/plugins/git/browser/Stash.java b/src/main/java/hudson/plugins/git/browser/Stash.java
@@ -25,7 +25,6 @@ public class Stash extends GitRepositoryBrowser {
     @DataBoundConstructor
     public Stash(String repoUrl) {
         super(repoUrl);
-        this.normalizeUrl = true;
     }
 
     private QueryBuilder param(URL url) {

diff --git a/src/main/java/hudson/plugins/git/browser/ViewGitWeb.java b/src/main/java/hudson/plugins/git/browser/ViewGitWeb.java
@@ -31,7 +31,6 @@ public class ViewGitWeb extends GitRepositoryBrowser {
     public ViewGitWeb(String repoUrl, String projectName) {
         super(repoUrl);
         this.projectName = projectName;
-        this.normalizeUrl = true;
     }
 
     @Override