SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If URI has no context path add one ("/")

Browse Source 
Fixes gh-131
This commit is contained in:
Dave Syer
2015-04-29 11:38:00 +02:00
parent 5d1af78f91
commit 98b64aa4cb
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractScmEnvironmentRepository.java
View File

@@ -85,6 +85,11 @@ public abstract class AbstractScmEnvironmentRepository implements EnvironmentRep
while (uri.endsWith("/")) {
uri = uri.substring(0, uri.length() - 1);
}
int index = uri.indexOf("://");
if (index>0 && !uri.substring(index+"://".length()).contains("/")) {
// If there's no context path add one
uri = uri + "/";
}
this.uri = uri;
}

15
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java
View File

@@ -16,8 +16,7 @@
package org.springframework.cloud.config.server;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.*;
import java.io.File;
import java.io.IOException;
@@ -123,5 +122,17 @@ public class JGitEnvironmentRepositoryTests {
assertEquals(repository.getUri() + "/bar.properties", environment
.getPropertySources().get(0).getName());
}
@Test
public void uriWithHostOnly() throws Exception {
repository.setUri("git://localhost");
assertEquals("git://localhost/", repository.getUri());
}
@Test
public void uriWithHostAndPath() throws Exception {
repository.setUri("git://localhost/foo/");
assertEquals("git://localhost/foo", repository.getUri());
}
}