Remove unnecessary warning suppressions

pull/8076/head
Andy Wilkinson 8 years ago
parent 42cb053d49
commit 0148276c05

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -133,28 +133,27 @@ public class JpaPropertiesTests {
@Test @Test
public void determineDatabaseWithKnownUrl() { public void determineDatabaseWithKnownUrl() {
JpaProperties properties = load(); JpaProperties properties = load();
Database database = properties.determineDatabase( Database database = properties
mockDataSource("jdbc:h2:mem:testdb")); .determineDatabase(mockDataSource("jdbc:h2:mem:testdb"));
assertThat(database).isEqualTo(Database.H2); assertThat(database).isEqualTo(Database.H2);
} }
@Test @Test
public void determineDatabaseWithKnownUrlAndUserConfig() { public void determineDatabaseWithKnownUrlAndUserConfig() {
JpaProperties properties = load("spring.jpa.database=mysql"); JpaProperties properties = load("spring.jpa.database=mysql");
Database database = properties.determineDatabase( Database database = properties
mockDataSource("jdbc:h2:mem:testdb")); .determineDatabase(mockDataSource("jdbc:h2:mem:testdb"));
assertThat(database).isEqualTo(Database.MYSQL); assertThat(database).isEqualTo(Database.MYSQL);
} }
@Test @Test
public void determineDatabaseWithUnknownUrl() { public void determineDatabaseWithUnknownUrl() {
JpaProperties properties = load(); JpaProperties properties = load();
Database database = properties.determineDatabase( Database database = properties
mockDataSource("jdbc:unknown://localhost")); .determineDatabase(mockDataSource("jdbc:unknown://localhost"));
assertThat(database).isEqualTo(Database.DEFAULT); assertThat(database).isEqualTo(Database.DEFAULT);
} }
@SuppressWarnings("unchecked")
private DataSource mockStandaloneDataSource() throws SQLException { private DataSource mockStandaloneDataSource() throws SQLException {
DataSource ds = mock(DataSource.class); DataSource ds = mock(DataSource.class);
given(ds.getConnection()).willThrow(SQLException.class); given(ds.getConnection()).willThrow(SQLException.class);
@ -171,7 +170,7 @@ public class JpaPropertiesTests {
given(ds.getConnection()).willReturn(connection); given(ds.getConnection()).willReturn(connection);
} }
catch (SQLException e) { catch (SQLException e) {
//Do nothing // Do nothing
} }
return ds; return ds;
} }

@ -304,7 +304,6 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
return bean; return bean;
} }
@SuppressWarnings("deprecation")
private void postProcessBeforeInitialization(Object bean, String beanName, private void postProcessBeforeInitialization(Object bean, String beanName,
ConfigurationProperties annotation) { ConfigurationProperties annotation) {
Object target = bean; Object target = bean;

Loading…
Cancel
Save