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

Fix checkstyle issues on master

Browse Source 
Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.

See gh-13932
This commit is contained in:
Phillip Webb
2018-07-27 23:58:57 +01:00
parent a6c9c92f2e
commit ce9c053cbf
11 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java
View File

@@ -127,7 +127,7 @@ public class HibernateProperties {
if (ddlAuto != null) {
return ddlAuto;
}
return (this.ddlAuto != null ? this.ddlAuto : defaultDdlAuto.get());
return (this.ddlAuto != null) ? this.ddlAuto : defaultDdlAuto.get();
}
public static class Naming {

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java
View File

@@ -78,8 +78,8 @@ public final class OAuth2ClientPropertiesRegistrationAdapter {
private static Builder getBuilderFromIssuerIfPossible(String registrationId,
String configuredProviderId, Map<String, Provider> providers) {
String providerId = (configuredProviderId != null ? configuredProviderId
: registrationId);
String providerId = (configuredProviderId != null) ? configuredProviderId
: registrationId;
if (providers.containsKey(providerId)) {
Provider provider = providers.get(providerId);
String issuer = provider.getIssuerUri();