added javadoc and unit test

This commit is contained in:
Sebastian Sdorra
2018-07-13 11:43:41 +02:00
parent 450f0cd662
commit e371f32bf5
3 changed files with 29 additions and 11 deletions

View File

@@ -59,7 +59,7 @@ import java.util.List;
* @author Sebastian Sdorra * @author Sebastian Sdorra
*/ */
@StaticPermissions( @StaticPermissions(
value = "repository", value = "repository",
permissions = {"read", "write", "modify", "delete", "healthCheck"} permissions = {"read", "write", "modify", "delete", "healthCheck"}
) )
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@@ -356,9 +356,7 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
* @since 1.17 * @since 1.17
*/ */
public String createUrl(String baseUrl) { public String createUrl(String baseUrl) {
String url = HttpUtil.append(baseUrl, type); return HttpUtil.concatenate(baseUrl, type, namespace, name);
return HttpUtil.concatenate(url, namespace, name);
} }
/** /**

View File

@@ -82,9 +82,9 @@ public final class HttpUtil
/** /**
* Name of bearer authentication cookie. * Name of bearer authentication cookie.
* *
* TODO find a better place * TODO find a better place
* *
* @since 2.0.0 * @since 2.0.0
*/ */
public static final String COOKIE_BEARER_AUTHENTICATION = "X-Bearer-Token"; public static final String COOKIE_BEARER_AUTHENTICATION = "X-Bearer-Token";
@@ -97,7 +97,7 @@ public final class HttpUtil
* @since 2.0.0 * @since 2.0.0
*/ */
public static final String HEADER_AUTHORIZATION = "Authorization"; public static final String HEADER_AUTHORIZATION = "Authorization";
/** /**
* content-length header * content-length header
* @since 1.46 * @since 1.46
@@ -248,6 +248,14 @@ public final class HttpUtil
//~--- methods -------------------------------------------------------------- //~--- methods --------------------------------------------------------------
/**
* Joins all path elements together separated by {@code {@link #SEPARATOR_PATH}}.
*
* @param pathElements path elements
*
* @return concatenated path
* @since 2.0.0
*/
public static String concatenate(String... pathElements) { public static String concatenate(String... pathElements) {
return Arrays.stream(pathElements).reduce(HttpUtil::append).orElse(""); return Arrays.stream(pathElements).reduce(HttpUtil::append).orElse("");
} }

View File

@@ -54,6 +54,18 @@ import javax.servlet.http.HttpServletRequest;
public class HttpUtilTest public class HttpUtilTest
{ {
@Test
public void concatenateTest() {
assertEquals(
"/scm/git/hitchhiker/tricia",
HttpUtil.concatenate("/scm", "git", "hitchhiker", "tricia")
);
assertEquals(
"scm/git/hitchhiker/tricia",
HttpUtil.concatenate("scm", "git", "hitchhiker", "tricia")
);
}
/** /**
* Method description * Method description
* *
@@ -63,19 +75,19 @@ public class HttpUtilTest
{ {
//J- //J-
assertEquals( assertEquals(
"http://www.scm-manager/scm/test", "http://www.scm-manager/scm/test",
HttpUtil.append("http://www.scm-manager/scm/", "test") HttpUtil.append("http://www.scm-manager/scm/", "test")
); );
assertEquals( assertEquals(
"http://www.scm-manager/scm/test", "http://www.scm-manager/scm/test",
HttpUtil.append("http://www.scm-manager/scm", "test") HttpUtil.append("http://www.scm-manager/scm", "test")
); );
assertEquals( assertEquals(
"http://www.scm-manager/scm/test", "http://www.scm-manager/scm/test",
HttpUtil.append("http://www.scm-manager/scm", "/test") HttpUtil.append("http://www.scm-manager/scm", "/test")
); );
assertEquals( assertEquals(
"http://www.scm-manager/scm/test", "http://www.scm-manager/scm/test",
HttpUtil.append("http://www.scm-manager/scm/", "/test") HttpUtil.append("http://www.scm-manager/scm/", "/test")
); );
//J+ //J+