root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge pull request #4707 from mnhock/Platform-specific-line-separator 

* pr/4707:
  Polish contribution
  Use a platform-specific line separator
This commit is contained in:
Stephane Nicoll 2016-01-25 15:43:28 +01:00
parent bcfd1cc034 cafe1dc4c6
commit 86cb15a29b
11 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java
View File

@ -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()));
}
}

53
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java
View File

@ -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<String, ConditionAndOutcomes> shortOutcomes = orderByName(
report.getConditionAndOutcomesBySource());
for (Map.Entry<String, ConditionAndOutcomes> 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<String, ConditionAndOutcomes> 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"));
}
}

6
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java
View File

@ -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<String> roles = new LinkedHashSet<String>(user.getRole());
withUser(user.getName()).password(user.getPassword())

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java
View File

@ -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.
@ -147,7 +147,7 @@ public class OAuth2AuthorizationServerConfiguration
String prefix = "security.oauth2.client";
boolean defaultSecret = this.credentials.isDefaultSecret();
logger.info(String.format(
"Initialized OAuth2 Client\n\n%s.clientId = %s\n%s.secret = %s\n\n",
"Initialized OAuth2 Client%n%n%s.clientId = %s%n%s.secret = %s%n%n",
prefix, this.credentials.getClientId(), prefix,
defaultSecret ? this.credentials.getClientSecret() : "****"));
}

6
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java
View File

@ -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.
@ -279,14 +279,14 @@ public class CommandRunner implements Iterable<Command> {
if (!isOptionCommand(command) && !isHiddenCommand(command)) {
String usageHelp = command.getUsageHelp();
String description = command.getDescription();
Log.info(String.format("\n %1$s %2$-15s\n %3$s", command.getName(),
Log.info(String.format("%n %1$s %2$-15s%n %3$s", command.getName(),
(usageHelp == null ? "" : usageHelp),
(description == null ? "" : description)));
}
}
Log.info("");
Log.info("Common options:");
Log.info(String.format("\n %1$s %2$-15s\n %3$s", "-d, --debug",
Log.info(String.format("%n %1$s %2$-15s%n %3$s", "-d, --debug",
"Verbose mode",
"Print additional status information for the command you are running"));
Log.info("");

4
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java
View File

@ -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);
}

6
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java
View File

@ -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);
}

4
spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
View File

@ -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<T>
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);

4
spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
View File

@ -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<T>
+ "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);

4
spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java
View File

@ -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));
}
}

6
spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
View File

@ -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));
}
}