diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java index b416204f34a..a6083ab9ac1 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -429,8 +429,9 @@ public class ShellProperties { config.put("crash.auth.simple.username", this.user.getName()); config.put("crash.auth.simple.password", this.user.getPassword()); if (this.user.isDefaultPassword()) { - logger.info("\n\nUsing default password for shell access: " - + this.user.getPassword() + "\n\n"); + logger.info(String.format( + "%n%nUsing default password for shell access: %s%n%n", + this.user.getPassword())); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java index 5cfdb61aced..fcc3d021d9f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -109,9 +109,9 @@ public class AutoConfigurationReportLoggingInitializer if (!this.report.getConditionAndOutcomesBySource().isEmpty()) { if (isCrashReport && this.logger.isInfoEnabled() && !this.logger.isDebugEnabled()) { - this.logger.info("\n\nError starting ApplicationContext. " + this.logger.info(String.format("%n%nError starting ApplicationContext. " + "To display the auto-configuration report enable " - + "debug logging (start with --debug)\n\n"); + + "debug logging (start with --debug)%n%n")); } if (this.logger.isDebugEnabled()) { this.logger.debug(getLogMessage(this.report)); @@ -121,12 +121,12 @@ public class AutoConfigurationReportLoggingInitializer private StringBuilder getLogMessage(ConditionEvaluationReport report) { StringBuilder message = new StringBuilder(); - message.append("\n\n\n"); - message.append("=========================\n"); - message.append("AUTO-CONFIGURATION REPORT\n"); - message.append("=========================\n\n\n"); - message.append("Positive matches:\n"); - message.append("-----------------\n"); + message.append(String.format("%n%n%n")); + message.append(String.format("=========================%n")); + message.append(String.format("AUTO-CONFIGURATION REPORT%n")); + message.append(String.format("=========================%n%n%n")); + message.append(String.format("Positive matches:%n")); + message.append(String.format("-----------------%n")); Map shortOutcomes = orderByName( report.getConditionAndOutcomesBySource()); for (Map.Entry entry : shortOutcomes.entrySet()) { @@ -134,37 +134,37 @@ public class AutoConfigurationReportLoggingInitializer addLogMessage(message, entry.getKey(), entry.getValue()); } } - message.append("\n\n"); - message.append("Negative matches:\n"); - message.append("-----------------\n"); + message.append(String.format("%n%n")); + message.append(String.format("Negative matches:%n")); + message.append(String.format("-----------------%n")); for (Map.Entry entry : shortOutcomes.entrySet()) { if (!entry.getValue().isFullMatch()) { addLogMessage(message, entry.getKey(), entry.getValue()); } } - message.append("\n\n"); - message.append("Exclusions:\n"); - message.append("-----------\n"); + message.append(String.format("%n%n")); + message.append(String.format("Exclusions:%n")); + message.append(String.format("-----------%n")); if (report.getExclusions().isEmpty()) { - message.append("\n None\n"); + message.append(String.format("%n None%n")); } else { for (String exclusion : report.getExclusions()) { - message.append("\n " + exclusion + "\n"); + message.append(String.format("%n %s%n", exclusion)); } } - message.append("\n\n"); - message.append("Unconditional classes:\n"); - message.append("----------------------\n"); + message.append(String.format("%n%n")); + message.append(String.format("Unconditional classes:%n")); + message.append(String.format("----------------------%n")); if (report.getUnconditionalClasses().isEmpty()) { - message.append("\n None\n"); + message.append(String.format("%n None%n")); } else { for (String unconditionalClass : report.getUnconditionalClasses()) { - message.append("\n " + unconditionalClass + "\n"); + message.append(String.format("%n %s%n", unconditionalClass)); } } - message.append("\n\n"); + message.append(String.format("%n%n")); return message; } @@ -187,9 +187,10 @@ public class AutoConfigurationReportLoggingInitializer private void addLogMessage(StringBuilder message, String source, ConditionAndOutcomes conditionAndOutcomes) { - message.append("\n " + source); + message.append(String.format("%n %s", source)); message.append( - conditionAndOutcomes.isFullMatch() ? " matched\n" : " did not match\n"); + conditionAndOutcomes.isFullMatch() ? " matched" : " did not match") + .append(String.format("%n")); for (ConditionAndOutcome conditionAndOutcome : conditionAndOutcomes) { message.append(" - "); if (StringUtils.hasLength(conditionAndOutcome.getOutcome().getMessage())) { @@ -202,7 +203,7 @@ public class AutoConfigurationReportLoggingInitializer message.append(" ("); message.append(ClassUtils .getShortName(conditionAndOutcome.getCondition().getClass())); - message.append(")\n"); + message.append(String.format(")%n")); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java index b11d80c17c6..2677b5843e9 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -167,8 +167,8 @@ public class AuthenticationManagerConfiguration { } User user = this.securityProperties.getUser(); if (user.isDefaultPassword()) { - logger.info("\n\nUsing default security password: " + user.getPassword() - + "\n"); + logger.info(String.format( + "%n%nUsing default security password: %s%n", user.getPassword())); } Set roles = new LinkedHashSet(user.getRole()); withUser(user.getName()).password(user.getPassword()) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java index 0e3accf788b..6ccd57ee88e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java index 58381522bd0..0a52a20dd81 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java index 39d8acaecff..c9f84dbf57e 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2016 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. @@ -181,7 +181,7 @@ public class Shell { if (this.commandRunner.handleSigInt()) { return; } - System.out.println("\nThanks for using Spring Boot"); + System.out.println(String.format("%nThanks for using Spring Boot")); System.exit(1); } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java index fe338ffc785..3f96fe608ac 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -159,8 +159,8 @@ public class DependencyManagementBomTransformation } private void handleMalformedDependency(Expression expression) { - Message message = createSyntaxErrorMessage( - "The string must be of the form \"group:module:version\"\n", expression); + Message message = createSyntaxErrorMessage(String.format( + "The string must be of the form \"group:module:version\"%n"), expression); getSourceUnit().getErrorCollector().addErrorAndContinue(message); } diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java index 37c17f8b214..3caf1c92938 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -231,7 +231,7 @@ public class PropertiesConfigurationFactory try { if (this.logger.isTraceEnabled()) { if (this.properties != null) { - this.logger.trace("Properties:\n" + this.properties); + this.logger.trace(String.format("Properties:%n%s" + this.properties)); } else { this.logger.trace("Property Sources: " + this.propertySources); diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java index d4c65427fe6..3414b90e8d5 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -138,7 +138,7 @@ public class YamlConfigurationFactory + "either set it directly or set the resource to load it from"); try { if (this.logger.isTraceEnabled()) { - this.logger.trace("Yaml document is\n" + this.yaml); + this.logger.trace(String.format("Yaml document is %n%s" + this.yaml)); } Constructor constructor = new YamlJavaBeanPropertyConstructor(this.type, this.propertyAliases); diff --git a/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java index c7acdc0cd89..37122198d64 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -105,7 +105,7 @@ public class ConfigurationWarningsApplicationContextInitializer private void warn(String message) { if (logger.isWarnEnabled()) { - logger.warn("\n\n** WARNING ** : " + message + "\n\n"); + logger.warn(String.format("%n%n** WARNING ** : %s%n%n", message)); } } diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java index 96e95337390..155bbfa1d5a 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java @@ -145,13 +145,13 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem { StringBuilder errors = new StringBuilder(); for (Status status : statuses) { if (status.getLevel() == Status.ERROR) { - errors.append(errors.length() > 0 ? "\n" : ""); + errors.append(errors.length() > 0 ? String.format("%n") : ""); errors.append(status.toString()); } } if (errors.length() > 0) { - throw new IllegalStateException( - "Logback configuration error " + "detected: \n" + errors); + throw new IllegalStateException(String.format( + "Logback configuration error detected: %n%s", errors)); } }