Updates ConfigData to use spring.cloud.config.media-type.

See gh-1715

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java

@@ -55,7 +55,6 @@ import org.springframework.web.client.RestTemplate;
 import static org.springframework.cloud.config.client.ConfigClientProperties.AUTHORIZATION;
 import static org.springframework.cloud.config.client.ConfigClientProperties.STATE_HEADER;
 import static org.springframework.cloud.config.client.ConfigClientProperties.TOKEN_HEADER;
-import static org.springframework.cloud.config.environment.EnvironmentMediaType.V2_JSON;
 
 public class ConfigServerConfigDataLoader implements ConfigDataLoader<ConfigServerConfigDataLocation>, Ordered {
 
@@ -226,6 +225,7 @@ public class ConfigServerConfigDataLoader implements ConfigDataLoader<ConfigServ
 			path = path + "/{label}";
 		}
 		ResponseEntity<Environment> response = null;
+		List<MediaType> acceptHeader = Collections.singletonList(MediaType.parseMediaType(properties.getMediaType()));
 
 		for (int i = 0; i < noOfUrls; i++) {
 			ConfigClientProperties.Credentials credentials = properties.getCredentials(i);
@@ -237,7 +237,7 @@ public class ConfigServerConfigDataLoader implements ConfigDataLoader<ConfigServ
 
 			try {
 				HttpHeaders headers = new HttpHeaders();
-				headers.setAccept(Collections.singletonList(MediaType.parseMediaType(V2_JSON)));
+				headers.setAccept(acceptHeader);
 				addAuthorizationToken(properties, headers, username, password);
 				if (StringUtils.hasText(token)) {
 					headers.add(TOKEN_HEADER, token);

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java

@@ -228,6 +228,7 @@ public class ConfigServicePropertySourceLocator implements PropertySourceLocator
 			path = path + "/{label}";
 		}
 		ResponseEntity<Environment> response = null;
+		List<MediaType> acceptHeader = Collections.singletonList(MediaType.parseMediaType(properties.getMediaType()));
 
 		for (int i = 0; i < noOfUrls; i++) {
 			Credentials credentials = properties.getCredentials(i);
@@ -239,7 +240,7 @@ public class ConfigServicePropertySourceLocator implements PropertySourceLocator
 
 			try {
 				HttpHeaders headers = new HttpHeaders();
-				headers.setAccept(Collections.singletonList(MediaType.parseMediaType(properties.getMediaType())));
+				headers.setAccept(acceptHeader);
 				addAuthorizationToken(properties, headers, username, password);
 				if (StringUtils.hasText(token)) {
 					headers.add(TOKEN_HEADER, token);

spring-cloud-config-sample/src/test/java/sample/ConfigDataCustomMediaTypeIntegrationTests.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright 2018-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import java.io.IOException;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
+import org.springframework.boot.origin.Origin;
+import org.springframework.boot.origin.OriginLookup;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.config.server.test.ConfigServerTestUtils;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.SocketUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class,
+		// Normally spring.cloud.config.enabled:true is the default but since we have the
+		// config server on the classpath we need to set it explicitly
+		properties = { "spring.cloud.config.enabled=true", "spring.cloud.config.media-type=application/json",
+				"spring.config.import=configserver:", "management.security.enabled=false",
+				"management.endpoints.web.exposure.include=*" },
+		webEnvironment = RANDOM_PORT)
+public class ConfigDataCustomMediaTypeIntegrationTests {
+
+	private static final String BASE_PATH = new WebEndpointProperties().getBasePath();
+
+	private static int configPort = SocketUtils.findAvailableTcpPort();
+
+	private static ConfigurableApplicationContext server;
+
+	@LocalServerPort
+	private int port;
+
+	@Autowired
+	ConfigurableEnvironment env;
+
+	@BeforeClass
+	public static void startConfigServer() throws IOException {
+		String baseDir = ConfigServerTestUtils.getBaseDirectory("spring-cloud-config-sample");
+		String repo = ConfigServerTestUtils.prepareLocalRepo(baseDir, "target/repos", "config-repo", "target/config");
+		server = SpringApplication.run(org.springframework.cloud.config.server.ConfigServerApplication.class,
+				"--server.port=" + configPort, "--spring.config.name=server",
+				"--spring.cloud.config.server.git.uri=" + repo);
+
+		System.setProperty("spring.cloud.config.uri", "http://localhost:" + configPort);
+	}
+
+	@AfterClass
+	public static void close() {
+		System.clearProperty("spring.cloud.config.uri");
+		if (server != null) {
+			server.close();
+		}
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	public void noOriginWithMediaTypeApplicationJson() {
+		MutablePropertySources sources = env.getPropertySources();
+		sources.stream().filter(propertySource -> propertySource.getName().startsWith("configserver:")).findFirst()
+				.ifPresent(propertySource -> {
+					if (propertySource instanceof OriginLookup) {
+						OriginLookup<String> originLookup = (OriginLookup) propertySource;
+						Origin origin = originLookup.getOrigin("info.foo");
+						// because media-type was set as application/json, no origin
+						assertThat(origin).as("origin was not null").isNull();
+					}
+				});
+		assertThat(env.getProperty("info.foo")).isEqualTo("bar");
+	}
+
+}