Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 16:05:44 +01:00
Code Issues Packages Projects Releases Activity

fix double slash for append and getCompleteUrl of HttpUtil

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-01-07 08:08:32 +01:00
parent 9b850543cd
commit 2e3bd0ef8f
2 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scm-core/src/main/java/sonia/scm/util/HttpUtil.java
View File

@@ -197,7 +197,11 @@ public final class HttpUtil
*/
public static String append(String uri, String suffix)
{
if (!uri.endsWith(SEPARATOR_PATH) &&!suffix.startsWith(SEPARATOR_PATH))
if ( uri.endsWith(SEPARATOR_PATH) && suffix.startsWith(SEPARATOR_PATH) )
{
uri = uri.substring( 0, uri.length() - 1 );
}
else if (!uri.endsWith(SEPARATOR_PATH) &&!suffix.startsWith(SEPARATOR_PATH))
{
uri = uri.concat(SEPARATOR_PATH);
}
@@ -490,18 +494,7 @@ public final class HttpUtil
public static String getCompleteUrl(ScmConfiguration configuration,
String path)
{
String url = configuration.getBaseUrl();
if (url.endsWith(SEPARATOR_PATH) && path.startsWith(SEPARATOR_PATH))
{
url = url.substring(0, url.length());
}
else if (!path.startsWith(SEPARATOR_PATH))
{
path = SEPARATOR_PATH.concat(path);
}
return url.concat(path);
return append(configuration.getBaseUrl(), path);
}
/**

31
scm-core/src/test/java/sonia/scm/util/HttpUtilTest.java
View File

@@ -54,6 +54,33 @@ import javax.servlet.http.HttpServletRequest;
public class HttpUtilTest
{
/**
* Method description
*
*/
@Test
public void appendTest()
{
//J-
assertEquals(
"http://www.scm-manager/scm/test",
HttpUtil.append("http://www.scm-manager/scm/", "test")
);
assertEquals(
"http://www.scm-manager/scm/test",
HttpUtil.append("http://www.scm-manager/scm", "test")
);
assertEquals(
"http://www.scm-manager/scm/test",
HttpUtil.append("http://www.scm-manager/scm", "/test")
);
assertEquals(
"http://www.scm-manager/scm/test",
HttpUtil.append("http://www.scm-manager/scm/", "/test")
);
//J+
}
/**
* Method description
*
@@ -173,6 +200,10 @@ public class HttpUtilTest
HttpUtil.getCompleteUrl(config, "test/path"));
assertEquals("http://www.scm-manager.org/scm/test/path",
HttpUtil.getCompleteUrl(config, "/test/path"));
config.setBaseUrl("http://www.scm-manager.org/scm/");
assertEquals("http://www.scm-manager.org/scm/test/path",
HttpUtil.getCompleteUrl(config, "/test/path"));
}
/**