Polish

philwebb · philwebb · commit 6a901199f577 · 2019-01-11T16:42:02.000-08:00
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java
@@ -107,7 +107,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public AtlasConfig customConfig() {
-			return (k) -> null;
+			return (key) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasPropertiesTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasPropertiesTests.java
@@ -31,7 +31,7 @@ public class AtlasPropertiesTests {
 	@Test
 	public void defaultValuesAreConsistent() {
 		AtlasProperties properties = new AtlasProperties();
-		AtlasConfig config = (k) -> null;
+		AtlasConfig config = (key) -> null;
 		assertThat(properties.getStep()).isEqualTo(config.step());
 		assertThat(properties.isEnabled()).isEqualTo(config.enabled());
 		assertThat(properties.getConnectTimeout()).isEqualTo(config.connectTimeout());
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java
@@ -116,8 +116,8 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public DatadogConfig customConfig() {
-			return (k) -> {
-				if ("datadog.apiKey".equals(k)) {
+			return (key) -> {
+				if ("datadog.apiKey".equals(key)) {
 					return "12345";
 				}
 				return null;
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java
@@ -125,14 +125,14 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public DynatraceConfig customConfig() {
-			return (k) -> {
-				if ("dynatrace.uri".equals(k)) {
+			return (key) -> {
+				if ("dynatrace.uri".equals(key)) {
 					return "https://dynatrace.example.com";
 				}
-				if ("dynatrace.apiToken".equals(k)) {
+				if ("dynatrace.apiToken".equals(key)) {
 					return "abcde";
 				}
-				if ("dynatrace.deviceId".equals(k)) {
+				if ("dynatrace.deviceId".equals(key)) {
 					return "test";
 				}
 				return null;
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java
@@ -108,7 +108,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public ElasticConfig customConfig() {
-			return (k) -> null;
+			return (key) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java
@@ -107,7 +107,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public GangliaConfig customConfig() {
-			return (k) -> null;
+			return (key) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java
@@ -124,8 +124,8 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public GraphiteConfig customConfig() {
-			return (k) -> {
-				if ("Graphite.apiKey".equals(k)) {
+			return (key) -> {
+				if ("Graphite.apiKey".equals(key)) {
 					return "12345";
 				}
 				return null;
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java
@@ -109,7 +109,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public HumioConfig customConfig() {
-			return (k) -> null;
+			return (key) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java
@@ -107,7 +107,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public InfluxConfig customConfig() {
-			return (k) -> null;
+			return (key) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java
@@ -129,11 +129,11 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public NewRelicConfig customConfig() {
-			return (k) -> {
-				if ("newrelic.accountId".equals(k)) {
+			return (key) -> {
+				if ("newrelic.accountId".equals(key)) {
 					return "abcde";
 				}
-				if ("newrelic.apiKey".equals(k)) {
+				if ("newrelic.apiKey".equals(key)) {
 					return "12345";
 				}
 				return null;
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java
@@ -157,7 +157,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public PrometheusConfig customConfig() {
-			return (k) -> null;
+			return (key) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java
@@ -124,8 +124,8 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public SignalFxConfig customConfig() {
-			return (k) -> {
-				if ("signalfx.accessToken".equals(k)) {
+			return (key) -> {
+				if ("signalfx.accessToken".equals(key)) {
 					return "abcde";
 				}
 				return null;
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java
@@ -90,7 +90,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public SimpleConfig customConfig() {
-			return (k) -> null;
+			return (key) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchRestHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchRestHealthIndicator.java
@@ -81,7 +81,6 @@ private void doHealthCheck(Health.Builder builder, String json) {
 		else {
 			builder.up();
 		}
-
 		builder.withDetails(response);
 	}
 
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchRestHealthIndicatorTest.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchRestHealthIndicatorTest.java
@@ -33,8 +33,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.BDDMockito.mock;
-import static org.mockito.BDDMockito.when;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link ElasticsearchRestHealthIndicator}.
@@ -54,15 +54,12 @@ public void elasticsearchIsUp() throws IOException {
 		BasicHttpEntity httpEntity = new BasicHttpEntity();
 		httpEntity.setContent(
 				new ByteArrayInputStream(createJsonResult(200, "green").getBytes()));
-
 		Response response = mock(Response.class);
 		StatusLine statusLine = mock(StatusLine.class);
-
-		when(statusLine.getStatusCode()).thenReturn(200);
-		when(response.getStatusLine()).thenReturn(statusLine);
-		when(response.getEntity()).thenReturn(httpEntity);
-		when(this.restClient.performRequest(any(Request.class))).thenReturn(response);
-
+		given(statusLine.getStatusCode()).willReturn(200);
+		given(response.getStatusLine()).willReturn(statusLine);
+		given(response.getEntity()).willReturn(httpEntity);
+		given(this.restClient.performRequest(any(Request.class))).willReturn(response);
 		Health health = this.elasticsearchRestHealthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.UP);
 		assertHealthDetailsWithStatus(health.getDetails(), "green");
@@ -73,25 +70,21 @@ public void elasticsearchWithYellowStatusIsUp() throws IOException {
 		BasicHttpEntity httpEntity = new BasicHttpEntity();
 		httpEntity.setContent(
 				new ByteArrayInputStream(createJsonResult(200, "yellow").getBytes()));
-
 		Response response = mock(Response.class);
 		StatusLine statusLine = mock(StatusLine.class);
-
-		when(statusLine.getStatusCode()).thenReturn(200);
-		when(response.getStatusLine()).thenReturn(statusLine);
-		when(response.getEntity()).thenReturn(httpEntity);
-		when(this.restClient.performRequest(any(Request.class))).thenReturn(response);
-
+		given(statusLine.getStatusCode()).willReturn(200);
+		given(response.getStatusLine()).willReturn(statusLine);
+		given(response.getEntity()).willReturn(httpEntity);
+		given(this.restClient.performRequest(any(Request.class))).willReturn(response);
 		Health health = this.elasticsearchRestHealthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.UP);
 		assertHealthDetailsWithStatus(health.getDetails(), "yellow");
 	}
 
 	@Test
 	public void elasticsearchIsDown() throws IOException {
-		when(this.restClient.performRequest(any(Request.class)))
-				.thenThrow(new IOException("Couldn't connect"));
-
+		given(this.restClient.performRequest(any(Request.class)))
+				.willThrow(new IOException("Couldn't connect"));
 		Health health = this.elasticsearchRestHealthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
 		assertThat(health.getDetails())
@@ -102,12 +95,10 @@ public void elasticsearchIsDown() throws IOException {
 	public void elasticsearchIsDownByResponseCode() throws IOException {
 		Response response = mock(Response.class);
 		StatusLine statusLine = mock(StatusLine.class);
-
-		when(statusLine.getStatusCode()).thenReturn(500);
-		when(statusLine.getReasonPhrase()).thenReturn("Internal server error");
-		when(response.getStatusLine()).thenReturn(statusLine);
-		when(this.restClient.performRequest(any(Request.class))).thenReturn(response);
-
+		given(statusLine.getStatusCode()).willReturn(500);
+		given(statusLine.getReasonPhrase()).willReturn("Internal server error");
+		given(response.getStatusLine()).willReturn(statusLine);
+		given(this.restClient.performRequest(any(Request.class))).willReturn(response);
 		Health health = this.elasticsearchRestHealthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
 		assertThat(health.getDetails()).contains(entry("statusCode", 500),
@@ -119,15 +110,12 @@ public void elasticsearchIsOutOfServiceByStatus() throws IOException {
 		BasicHttpEntity httpEntity = new BasicHttpEntity();
 		httpEntity.setContent(
 				new ByteArrayInputStream(createJsonResult(200, "red").getBytes()));
-
 		Response response = mock(Response.class);
 		StatusLine statusLine = mock(StatusLine.class);
-
-		when(statusLine.getStatusCode()).thenReturn(200);
-		when(response.getStatusLine()).thenReturn(statusLine);
-		when(response.getEntity()).thenReturn(httpEntity);
-		when(this.restClient.performRequest(any(Request.class))).thenReturn(response);
-
+		given(statusLine.getStatusCode()).willReturn(200);
+		given(response.getStatusLine()).willReturn(statusLine);
+		given(response.getEntity()).willReturn(httpEntity);
+		given(this.restClient.performRequest(any(Request.class))).willReturn(response);
 		Health health = this.elasticsearchRestHealthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.OUT_OF_SERVICE);
 		assertHealthDetailsWithStatus(health.getDetails(), "red");
@@ -148,9 +136,8 @@ private void assertHealthDetailsWithStatus(Map<String, Object> details,
 	}
 
 	private String createJsonResult(int responseCode, String status) {
-		String json;
 		if (responseCode == 200) {
-			json = String.format("{\"cluster_name\":\"elasticsearch\","
+			return String.format("{\"cluster_name\":\"elasticsearch\","
 					+ "\"status\":\"%s\",\"timed_out\":false,\"number_of_nodes\":1,"
 					+ "\"number_of_data_nodes\":1,\"active_primary_shards\":0,"
 					+ "\"active_shards\":0,\"relocating_shards\":0,\"initializing_shards\":0,"
@@ -159,12 +146,8 @@ private String createJsonResult(int responseCode, String status) {
 					+ "\"task_max_waiting_in_queue_millis\":0,\"active_shards_percent_as_number\":100.0}",
 					status);
 		}
-		else {
-			json = "{\n" + "  \"error\": \"Server Error\",\n" + "  \"status\": "
-					+ responseCode + "\n" + "}";
-		}
-
-		return json;
+		return "{\n" + "  \"error\": \"Server Error\",\n" + "  \"status\": "
+				+ responseCode + "\n" + "}";
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/NettyWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/NettyWebServerFactoryCustomizer.java
@@ -66,9 +66,8 @@ public void customize(NettyReactiveWebServerFactory factory) {
 				.to((maxHttpRequestHeaderSize) -> customizeMaxHttpHeaderSize(factory,
 						maxHttpRequestHeaderSize));
 		propertyMapper.from(this.serverProperties::getConnectionTimeout).whenNonNull()
-				.asInt(Duration::toMillis)
-				.to((duration) -> customizeConnectionTimeOut(factory, duration));
-
+				.asInt(Duration::toMillis).to((duration) -> factory
+						.addServerCustomizers(getConnectionTimeOutCustomizer(duration)));
 	}
 
 	private boolean getOrDeduceUseForwardHeaders(ServerProperties serverProperties,
@@ -87,11 +86,9 @@ private void customizeMaxHttpHeaderSize(NettyReactiveWebServerFactory factory,
 						.maxHeaderSize(maxHttpHeaderSize)));
 	}
 
-	private void customizeConnectionTimeOut(NettyReactiveWebServerFactory factory,
-			int duration) {
-		factory.addServerCustomizers((NettyServerCustomizer) (httpServer) -> httpServer
-				.tcpConfiguration((tcpServer) -> tcpServer
-						.selectorOption(ChannelOption.CONNECT_TIMEOUT_MILLIS, duration)));
+	private NettyServerCustomizer getConnectionTimeOutCustomizer(int duration) {
+		return (httpServer) -> httpServer.tcpConfiguration((tcpServer) -> tcpServer
+				.selectorOption(ChannelOption.CONNECT_TIMEOUT_MILLIS, duration));
 	}
 
 }
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandler.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandler.java
@@ -70,9 +70,6 @@ public Object onSuccess(ConfigurationPropertyName name, Bindable<?> target,
 	public void onFinish(ConfigurationPropertyName name, Bindable<?> target,
 			BindContext context, Object result) throws Exception {
 		validate(name, target, context, result);
-		if (context.getDepth() == 0 && !this.exceptions.isEmpty()) {
-			throw this.exceptions.pop();
-		}
 		super.onFinish(name, target, context, result);
 	}
 
@@ -81,17 +78,19 @@ public Object onFailure(ConfigurationPropertyName name, Bindable<?> target,
 			BindContext context, Exception error) throws Exception {
 		Object result = super.onFailure(name, target, context, error);
 		validate(name, target, context, null);
-		if (!this.exceptions.isEmpty()) {
-			throw this.exceptions.pop();
-		}
 		return result;
 	}
 
 	private void validate(ConfigurationPropertyName name, Bindable<?> target,
 			BindContext context, Object result) {
 		Object validationTarget = getValidationTarget(target, context, result);
 		Class<?> validationType = target.getBoxedType().resolve();
-		validate(name, validationTarget, validationType);
+		if (validationTarget != null) {
+			validateAndPush(name, validationTarget, validationType);
+		}
+		if (context.getDepth() == 0 && !this.exceptions.isEmpty()) {
+			throw this.exceptions.pop();
+		}
 	}
 
 	private Object getValidationTarget(Bindable<?> target, BindContext context,
@@ -105,14 +104,13 @@ private Object getValidationTarget(Bindable<?> target, BindContext context,
 		return null;
 	}
 
-	private void validate(ConfigurationPropertyName name, Object target, Class<?> type) {
-		if (target != null) {
-			BindingResult errors = new BeanPropertyBindingResult(target, name.toString());
-			Arrays.stream(this.validators).filter((validator) -> validator.supports(type))
-					.forEach((validator) -> validator.validate(target, errors));
-			if (errors.hasErrors()) {
-				this.exceptions.push(getBindValidationException(name, errors));
-			}
+	private void validateAndPush(ConfigurationPropertyName name, Object target,
+			Class<?> type) {
+		BindingResult errors = new BeanPropertyBindingResult(target, name.toString());
+		Arrays.stream(this.validators).filter((validator) -> validator.supports(type))
+				.forEach((validator) -> validator.validate(target, errors));
+		if (errors.hasErrors()) {
+			this.exceptions.push(getBindValidationException(name, errors));
 		}
 	}
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/CompressionConnectorCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/CompressionConnectorCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ static class CustomConfigConfiguration {`
`107`	`107`
`108`	`108`	`@Bean`
`109`	`109`	`public AtlasConfig customConfig() {`
`110`		`- return (k) -> null;`
	`110`	`+ return (key) -> null;`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,14 +125,14 @@ static class CustomConfigConfiguration {`
`125`	`125`
`126`	`126`	`@Bean`
`127`	`127`	`public DynatraceConfig customConfig() {`
`128`		`- return (k) -> {`
`129`		`- if ("dynatrace.uri".equals(k)) {`
	`128`	`+ return (key) -> {`
	`129`	`+ if ("dynatrace.uri".equals(key)) {`
`130`	`130`	`return "https://dynatrace.example.com";`
`131`	`131`	`}`
`132`		`- if ("dynatrace.apiToken".equals(k)) {`
	`132`	`+ if ("dynatrace.apiToken".equals(key)) {`
`133`	`133`	`return "abcde";`
`134`	`134`	`}`
`135`		`- if ("dynatrace.deviceId".equals(k)) {`
	`135`	`+ if ("dynatrace.deviceId".equals(key)) {`
`136`	`136`	`return "test";`
`137`	`137`	`}`
`138`	`138`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ static class CustomConfigConfiguration {`
`108`	`108`
`109`	`109`	`@Bean`
`110`	`110`	`public ElasticConfig customConfig() {`
`111`		`- return (k) -> null;`
	`111`	`+ return (key) -> null;`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ static class CustomConfigConfiguration {`
`109`	`109`
`110`	`110`	`@Bean`
`111`	`111`	`public HumioConfig customConfig() {`
`112`		`- return (k) -> null;`
	`112`	`+ return (key) -> null;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,11 +129,11 @@ static class CustomConfigConfiguration {`
`129`	`129`
`130`	`130`	`@Bean`
`131`	`131`	`public NewRelicConfig customConfig() {`
`132`		`- return (k) -> {`
`133`		`- if ("newrelic.accountId".equals(k)) {`
	`132`	`+ return (key) -> {`
	`133`	`+ if ("newrelic.accountId".equals(key)) {`
`134`	`134`	`return "abcde";`
`135`	`135`	`}`
`136`		`- if ("newrelic.apiKey".equals(k)) {`
	`136`	`+ if ("newrelic.apiKey".equals(key)) {`
`137`	`137`	`return "12345";`
`138`	`138`	`}`
`139`	`139`	`return null;`