diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java
index c834307ba9..60a4c5be57 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -133,28 +133,27 @@ public class JpaPropertiesTests {
 	@Test
 	public void determineDatabaseWithKnownUrl() {
 		JpaProperties properties = load();
-		Database database = properties.determineDatabase(
-				mockDataSource("jdbc:h2:mem:testdb"));
+		Database database = properties
+				.determineDatabase(mockDataSource("jdbc:h2:mem:testdb"));
 		assertThat(database).isEqualTo(Database.H2);
 	}
 
 	@Test
 	public void determineDatabaseWithKnownUrlAndUserConfig() {
 		JpaProperties properties = load("spring.jpa.database=mysql");
-		Database database = properties.determineDatabase(
-				mockDataSource("jdbc:h2:mem:testdb"));
+		Database database = properties
+				.determineDatabase(mockDataSource("jdbc:h2:mem:testdb"));
 		assertThat(database).isEqualTo(Database.MYSQL);
 	}
 
 	@Test
 	public void determineDatabaseWithUnknownUrl() {
 		JpaProperties properties = load();
-		Database database = properties.determineDatabase(
-				mockDataSource("jdbc:unknown://localhost"));
+		Database database = properties
+				.determineDatabase(mockDataSource("jdbc:unknown://localhost"));
 		assertThat(database).isEqualTo(Database.DEFAULT);
 	}
 
-	@SuppressWarnings("unchecked")
 	private DataSource mockStandaloneDataSource() throws SQLException {
 		DataSource ds = mock(DataSource.class);
 		given(ds.getConnection()).willThrow(SQLException.class);
@@ -171,7 +170,7 @@ public class JpaPropertiesTests {
 			given(ds.getConnection()).willReturn(connection);
 		}
 		catch (SQLException e) {
-			//Do nothing
+			// Do nothing
 		}
 		return ds;
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
index 5d3c5166ba..9adf2721e8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
@@ -304,7 +304,6 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
 		return bean;
 	}
 
-	@SuppressWarnings("deprecation")
 	private void postProcessBeforeInitialization(Object bean, String beanName,
 			ConfigurationProperties annotation) {
 		Object target = bean;