Polish contribution

Closes gh-4574

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 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.
@@ -35,6 +35,7 @@ import org.springframework.context.annotation.Configuration;
  * {@link EnableAutoConfiguration Auto-configuration} for SendGrid.
  *
  * @author Maciej Walkowiak
+ * @author Patrick Bray
  * @since 1.3.0
  */
 @Configuration
@@ -49,27 +50,27 @@ public class SendGridAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(SendGrid.class)
 	public SendGrid sendGrid() {
-
+		SendGrid sendGrid = createSendGrid();
-		SendGrid sendGrid;
-
-		if (this.properties.getApikey() != null) {
-			sendGrid = new SendGrid(this.properties.getApikey());
-		}
-		else {
-			sendGrid = new SendGrid(this.properties.getUsername(),
-					this.properties.getPassword());
-		}
-
 		if (this.properties.isProxyConfigured()) {
 			HttpHost proxy = new HttpHost(this.properties.getProxy().getHost(),
 					this.properties.getProxy().getPort());
 			sendGrid.setClient(HttpClientBuilder.create().setProxy(proxy)
 					.setUserAgent("sendgrid/" + sendGrid.getVersion() + ";java").build());
 		}
-
 		return sendGrid;
 	}
 
+	private SendGrid createSendGrid() {
+		if (this.properties.getApiKey() != null) {
+			return new SendGrid(this.properties.getApiKey());
+		}
+		else {
+			return new SendGrid(this.properties.getUsername(),
+					this.properties.getPassword());
+		}
+	}
+
+
 	static class SendGridPropertyCondition extends AnyNestedCondition {
 
 		SendGridPropertyCondition() {
@@ -77,11 +78,11 @@ public class SendGridAutoConfiguration {
 		}
 
 		@ConditionalOnProperty(prefix = "spring.sendgrid", value = "username")
-		private class SendGridUserProperty {
+		static class SendGridUserProperty {
 		}
 
-		@ConditionalOnProperty(prefix = "spring.sendgrid", value = "apikey")
+		@ConditionalOnProperty(prefix = "spring.sendgrid", value = "api-key")
-		private class SendGridApiKeyProperty {
+		static class SendGridApiKeyProperty {
 		}
 	}
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 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.
@@ -28,7 +28,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class SendGridProperties {
 
 	/**
-	 * SendGrid username.
+	 * SendGrid username. Alternative to api key.
 	 */
 	private String username;
 
@@ -38,23 +38,15 @@ public class SendGridProperties {
 	private String password;
 
 	/**
-	 * SendGrid api key.
+	 * SendGrid api key. Alternative to username/password.
 	 */
-	private String apikey;
+	private String apiKey;
 
 	/**
 	 * Proxy configuration.
 	 */
 	private Proxy proxy;
 
-	public String getApikey() {
-		return this.apikey;
-	}
-
-	public void setApikey(final String apikey) {
-		this.apikey = apikey;
-	}
-
 	public String getUsername() {
 		return this.username;
 	}
@@ -71,6 +63,14 @@ public class SendGridProperties {
 		this.password = password;
 	}
 
+	public String getApiKey() {
+		return this.apiKey;
+	}
+
+	public void setApiKey(final String apiKey) {
+		this.apiKey = apiKey;
+	}
+
 	public Proxy getProxy() {
 		return this.proxy;
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 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.
@@ -38,6 +38,7 @@ import static org.junit.Assert.assertThat;
  * Tests for {@link SendGridAutoConfiguration}.
  *
  * @author Maciej Walkowiak
+ * @author Patrick Bray
  */
 public class SendGridAutoConfigurationTests {
 
@@ -51,7 +52,7 @@ public class SendGridAutoConfigurationTests {
 	}
 
 	@Test
-	public void expectedSendGridBeanCreated() {
+	public void expectedSendGridBeanCreatedUsername() {
 		loadContext("spring.sendgrid.username:user", "spring.sendgrid.password:secret");
 		SendGrid sendGrid = this.context.getBean(SendGrid.class);
 		assertEquals("user", ReflectionTestUtils.getField(sendGrid, "username"));
@@ -59,14 +60,10 @@ public class SendGridAutoConfigurationTests {
 	}
 
 	@Test
-	public void expectedSendGridBeanCreated_UsingApiKey() {
+	public void expectedSendGridBeanCreatedApiKey() {
-
+		loadContext("spring.sendgrid.apiKey:SG.SECRET-API-KEY");
-		loadContext("spring.sendgrid.apikey:SG.SECRET-API-KEY");
-
 		SendGrid sendGrid = this.context.getBean(SendGrid.class);
-
+		assertEquals("SG.SECRET-API-KEY", ReflectionTestUtils.getField(sendGrid, "password"));
-		assertEquals("SG.SECRET-API-KEY",
-				ReflectionTestUtils.getField(sendGrid, "password"));
 	}
 
 	@Test(expected = NoSuchBeanDefinitionException.class)

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -120,6 +120,7 @@ content into your application; rather pick only the properties that you need.
 	spring.profiles.include= # Unconditionally activate the specified comma separated profiles.
 
 	# SENDGRID ({sc-spring-boot-autoconfigure}/sendgrid/SendGridAutoConfiguration.{sc-ext}[SendGridAutoConfiguration])
+	spring.sendgrid.api-key= # SendGrid api key (alternative to username/password)
 	spring.sendgrid.username= # SendGrid account username
 	spring.sendgrid.password= # SendGrid account password
 	spring.sendgrid.proxy.host= # SendGrid proxy host