Make sure deprecated dependencies endpoint works with metadata v2.2

Closes gh-1115
spring-io · Aug 12, 2020 · 5d8c853 · 5d8c853
1 parent 6075c08
commit 5d8c853
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/...lizr-web/src/main/java/io/spring/initializr/web/controller/ProjectMetadataController.java b/...lizr-web/src/main/java/io/spring/initializr/web/controller/ProjectMetadataController.java
@@ -94,6 +94,11 @@ public ResponseEntity<String> serviceCapabilitiesV2() {
 		return serviceCapabilitiesFor(InitializrMetadataVersion.V2);
 	}
 
+	@RequestMapping(path = "/dependencies", produces = "application/vnd.initializr.v2.2+json")
+	public ResponseEntity<String> dependenciesV22(@RequestParam(required = false) String bootVersion) {
+		return dependenciesFor(InitializrMetadataVersion.V2_2, bootVersion);
+	}
+
 	@RequestMapping(path = "/dependencies", produces = { "application/vnd.initializr.v2.1+json", "application/json" })
 	public ResponseEntity<String> dependenciesV21(@RequestParam(required = false) String bootVersion) {
 		return dependenciesFor(InitializrMetadataVersion.V2_1, bootVersion);

diff --git a/...ng/initializr/web/controller/ProjectMetadataControllerCustomDefaultsIntegrationTests.java b/...ng/initializr/web/controller/ProjectMetadataControllerCustomDefaultsIntegrationTests.java
@@ -88,10 +88,24 @@ void metadataClientEndpoint() {
 	}
 
 	@Test
-	void noBootVersion() throws JSONException {
-		ResponseEntity<String> response = execute("/dependencies", String.class, null, "application/json");
+	void dependenciesNoAcceptHeaderWithNoBootVersion() throws JSONException {
+		validateDependenciesMetadata("*/*", DEFAULT_METADATA_MEDIA_TYPE);
+	}
+
+	@Test
+	void dependenciesV21WithNoBootVersion() throws JSONException {
+		validateDependenciesMetadata("application/vnd.initializr.v2.1+json", DEFAULT_METADATA_MEDIA_TYPE);
+	}
+
+	@Test
+	void dependenciesV22WithNoBootVersion() throws JSONException {
+		validateDependenciesMetadata("application/vnd.initializr.v2.2+json", CURRENT_METADATA_MEDIA_TYPE);
+	}
+
+	private void validateDependenciesMetadata(String acceptHeader, MediaType expectedMediaType) throws JSONException {
+		ResponseEntity<String> response = execute("/dependencies", String.class, null, acceptHeader);
 		assertThat(response.getHeaders().getFirst(HttpHeaders.ETAG)).isNotNull();
-		validateContentType(response, DEFAULT_METADATA_MEDIA_TYPE);
+		validateContentType(response, expectedMediaType);
 		validateDependenciesOutput("2.1.4", response.getBody());
 	}