Merge branch '1.5.x' into 2.0.x

2018-05-03 12:43:50 -07:00
parent 60e4e51fea 4e96587dc8
commit e125085993
138 changed files with 274 additions and 269 deletions
--- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/HotelSummary.java
+++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/domain/HotelSummary.java
@@ -25,7 +25,7 @@ public interface HotelSummary {
 	Double getAverageRating();

 	default Integer getAverageRatingRounded() {
-		return getAverageRating() == null ? null : (int) Math.round(getAverageRating());
+		return (getAverageRating() != null ? (int) Math.round(getAverageRating()) : null);
 	}

 }