Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Phillip Webb
2015-10-07 23:34:08 -07:00
parent 47576354f7 6ab376e2e8
commit e473364e4e
507 changed files with 2659 additions and 2478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/HotelSummary.java
View File

@@ -39,10 +39,10 @@ public class HotelSummary implements Serializable {
public HotelSummary(City city, String name, Double averageRating) {
this.city = city;
this.name = name;
this.averageRating = averageRating == null ? null : new BigDecimal(averageRating,
MATH_CONTEXT).doubleValue();
this.averageRatingRounded = averageRating == null ? null : (int) Math
.round(averageRating);
this.averageRating = averageRating == null ? null
: new BigDecimal(averageRating, MATH_CONTEXT).doubleValue();
this.averageRatingRounded = averageRating == null ? null
: (int) Math.round(averageRating);
}
public City getCity() {

3
spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/CityServiceImpl.java
View File

@@ -36,7 +36,8 @@ class CityServiceImpl implements CityService {
private final HotelRepository hotelRepository;
@Autowired
public CityServiceImpl(CityRepository cityRepository, HotelRepository hotelRepository) {
public CityServiceImpl(CityRepository cityRepository,
HotelRepository hotelRepository) {
this.cityRepository = cityRepository;
this.hotelRepository = hotelRepository;
}

9
spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java
View File

@@ -73,12 +73,9 @@ public class SampleDataJpaApplicationTests {
@Test
public void testJmx() throws Exception {
assertEquals(
1,
ManagementFactory
.getPlatformMBeanServer()
.queryMBeans(new ObjectName("jpa.sample:type=ConnectionPool,*"),
null).size());
assertEquals(1, ManagementFactory.getPlatformMBeanServer()
.queryMBeans(new ObjectName("jpa.sample:type=ConnectionPool,*"), null)
.size());
}
}

8
spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java
View File

@@ -59,10 +59,10 @@ public class HotelRepositoryIntegrationTests {
.get(0);
assertThat(city.getName(), is("Atlanta"));
Page<HotelSummary> hotels = this.repository.findByCity(city, new PageRequest(0,
10, Direction.ASC, "name"));
Hotel hotel = this.repository.findByCityAndName(city, hotels.getContent().get(0)
.getName());
Page<HotelSummary> hotels = this.repository.findByCity(city,
new PageRequest(0, 10, Direction.ASC, "name"));
Hotel hotel = this.repository.findByCityAndName(city,
hotels.getContent().get(0).getName());
assertThat(hotel.getName(), is("Doubletree"));
List<RatingCount> counts = this.repository.findRatingCounts(hotel);