Merge branch '2.0.x'
This commit is contained in:
		
						commit
						734e9e4b74
					
				| 
						 | 
				
			
			@ -40,7 +40,7 @@ class MappingWebEndpointPathMapper implements PathMapper {
 | 
			
		|||
 | 
			
		||||
	@Override
 | 
			
		||||
	public String getRootPath(EndpointId endpointId) {
 | 
			
		||||
		return this.pathMapping.getOrDefault(endpointId, endpointId.toLowerCaseString());
 | 
			
		||||
		return this.pathMapping.getOrDefault(endpointId, endpointId.toString());
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -50,7 +50,7 @@ public class MappingWebEndpointPathMapperTests {
 | 
			
		|||
		MappingWebEndpointPathMapper mapper = new MappingWebEndpointPathMapper(
 | 
			
		||||
				Collections.emptyMap());
 | 
			
		||||
		assertThat(mapper.getRootPath(EndpointId.of("testEndpoint")))
 | 
			
		||||
				.isEqualTo("testendpoint");
 | 
			
		||||
				.isEqualTo("testEndpoint");
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@Test
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,8 +41,7 @@ public interface PathMapper {
 | 
			
		|||
	 * @return an {@link PathMapper} that uses the lowercase endpoint ID as the path
 | 
			
		||||
	 */
 | 
			
		||||
	static PathMapper useEndpointId() {
 | 
			
		||||
		return (id) -> id.toLowerCaseString();
 | 
			
		||||
 | 
			
		||||
		return (id) -> id.toString();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue