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

Upgrade to spring-javaformat 0.0.6

Browse Source
This commit is contained in:
Phillip Webb
2018-08-28 15:22:36 -07:00
parent 17de1571f5
commit 9543fcf44d
290 changed files with 1021 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-samples/pom.xml
View File

@@ -19,7 +19,7 @@
<properties>
<main.basedir>${basedir}/..</main.basedir>
<java.version>1.8</java.version>
<spring-javaformat.version>0.0.2</spring-javaformat.version>
<spring-javaformat.version>0.0.6</spring-javaformat.version>
<disable.checks>false</disable.checks>
</properties>
<modules>

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

@@ -25,7 +25,7 @@ public interface HotelSummary {
Double getAverageRating();
default Integer getAverageRatingRounded() {
return (getAverageRating() != null ? (int) Math.round(getAverageRating()) : null);
return (getAverageRating() != null) ? (int) Math.round(getAverageRating()) : null;
}
}

2
spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java
View File

@@ -91,7 +91,7 @@ class HotelServiceImpl implements HotelService {
@Override
public long getNumberOfReviewsWithRating(Rating rating) {
Long count = this.ratingCount.get(rating);
return (count != null ? count : 0);
return (count != null) ? count : 0;
}
}

2
spring-boot-samples/spring-boot-sample-hibernate4/src/main/java/sample/hibernate4/domain/HotelSummary.java
View File

@@ -25,7 +25,7 @@ public interface HotelSummary {
Double getAverageRating();
default Integer getAverageRatingRounded() {
return (getAverageRating() != null ? (int) Math.round(getAverageRating()) : null);
return (getAverageRating() != null) ? (int) Math.round(getAverageRating()) : null;
}
}

2
spring-boot-samples/spring-boot-sample-hibernate4/src/main/java/sample/hibernate4/service/HotelServiceImpl.java
View File

@@ -91,7 +91,7 @@ class HotelServiceImpl implements HotelService {
@Override
public long getNumberOfReviewsWithRating(Rating rating) {
Long count = this.ratingCount.get(rating);
return (count != null ? count : 0);
return (count != null) ? count : 0;
}
}

2
spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/domain/HotelSummary.java
View File

@@ -25,7 +25,7 @@ public interface HotelSummary {
Double getAverageRating();
default Integer getAverageRatingRounded() {
return (getAverageRating() != null ? (int) Math.round(getAverageRating()) : null);
return (getAverageRating() != null) ? (int) Math.round(getAverageRating()) : null;
}
}

2
spring-boot-samples/spring-boot-sample-hibernate52/src/main/java/sample/hibernate52/service/HotelServiceImpl.java
View File

@@ -91,7 +91,7 @@ class HotelServiceImpl implements HotelService {
@Override
public long getNumberOfReviewsWithRating(Rating rating) {
Long count = this.ratingCount.get(rating);
return (count != null ? count : 0);
return (count != null) ? count : 0;
}
}

12
spring-boot-samples/spring-boot-sample-test/src/main/java/sample/test/domain/VehicleIdentificationNumber.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2018 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.
@@ -33,11 +33,6 @@ public final class VehicleIdentificationNumber {
this.vin = vin;
}
@Override
public int hashCode() {
return this.vin.hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == this) {
@@ -49,6 +44,11 @@ public final class VehicleIdentificationNumber {
return this.vin.equals(((VehicleIdentificationNumber) obj).vin);
}
@Override
public int hashCode() {
return this.vin.hashCode();
}
@Override
public String toString() {
return this.vin;

12
spring-boot-samples/spring-boot-sample-test/src/main/java/sample/test/service/VehicleDetails.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2018 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.
@@ -49,11 +49,6 @@ public class VehicleDetails {
return this.model;
}
@Override
public int hashCode() {
return this.make.hashCode() * 31 + this.model.hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == this) {
@@ -66,4 +61,9 @@ public class VehicleDetails {
return this.make.equals(other.make) && this.model.equals(other.model);
}
@Override
public int hashCode() {
return this.make.hashCode() * 31 + this.model.hashCode();
}
}

2
spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/echo/DefaultEchoService.java
View File

@@ -21,7 +21,7 @@ public class DefaultEchoService implements EchoService {
private final String echoFormat;
public DefaultEchoService(String echoFormat) {
this.echoFormat = (echoFormat != null ? echoFormat : "%s");
this.echoFormat = (echoFormat != null) ? echoFormat : "%s";
}
@Override

2
spring-boot-samples/spring-boot-sample-websocket-jetty93/src/main/java/samples/websocket/jetty93/echo/DefaultEchoService.java
View File

@@ -21,7 +21,7 @@ public class DefaultEchoService implements EchoService {
private final String echoFormat;
public DefaultEchoService(String echoFormat) {
this.echoFormat = (echoFormat != null ? echoFormat : "%s");
this.echoFormat = (echoFormat != null) ? echoFormat : "%s";
}
@Override

2
spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/echo/DefaultEchoService.java
View File

@@ -21,7 +21,7 @@ public class DefaultEchoService implements EchoService {
private final String echoFormat;
public DefaultEchoService(String echoFormat) {
this.echoFormat = (echoFormat != null ? echoFormat : "%s");
this.echoFormat = (echoFormat != null) ? echoFormat : "%s";
}
@Override

2
spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/echo/DefaultEchoService.java
View File

@@ -21,7 +21,7 @@ public class DefaultEchoService implements EchoService {
private final String echoFormat;
public DefaultEchoService(String echoFormat) {
this.echoFormat = (echoFormat != null ? echoFormat : "%s");
this.echoFormat = (echoFormat != null) ? echoFormat : "%s";
}
@Override