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

Merge previously split strings

Browse Source 
Merge some string lines that were previously split because of the
90 chars wide formatting.
This commit is contained in:
Phillip Webb
2019-07-14 19:39:18 +01:00
parent c3816bfe7b
commit 01933f9b06
173 changed files with 351 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
View File

@@ -424,8 +424,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
}
}
if (mainClass == null) {
throw new MojoExecutionException(
"Unable to find a suitable main class, " + "please add a 'mainClass' property");
throw new MojoExecutionException("Unable to find a suitable main class, please add a 'mainClass' property");
}
return mainClass;
}
@@ -557,7 +556,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
}
catch (NoSuchMethodException ex) {
Exception wrappedEx = new Exception(
"The specified mainClass doesn't contain a " + "main method with appropriate signature.", ex);
"The specified mainClass doesn't contain a main method with appropriate signature.", ex);
thread.getThreadGroup().uncaughtException(thread, wrappedEx);
}
catch (Exception ex) {

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
View File

@@ -360,7 +360,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
@Override
public void handleTimeoutWarning(long duration, String mainMethod) {
getLog().warn("Searching for the main-class is taking some time, "
+ "consider using the mainClass configuration " + "parameter");
+ "consider using the mainClass configuration parameter");
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java
View File

@@ -254,7 +254,7 @@ public class StartMojo extends AbstractRunMojo {
}
}
throw new MojoExecutionException(
"Spring application did not start before the configured " + "timeout (" + (wait * maxAttempts) + "ms");
"Spring application did not start before the configured timeout (" + (wait * maxAttempts) + "ms");
}
private class CreateJmxConnector implements Callable<JMXConnector> {

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java
View File

@@ -80,7 +80,7 @@ class RunArgumentsTests {
@Test
void parseWithNewLinesAndTabs() {
String[] args = parseArgs(" -Dfoo=bar \n" + "\t\t -Dfoo2=bar2 ");
String[] args = parseArgs(" -Dfoo=bar \n\t\t -Dfoo2=bar2 ");
assertThat(args.length).isEqualTo(2);
assertThat(args[0]).isEqualTo("-Dfoo=bar");
assertThat(args[1]).isEqualTo("-Dfoo2=bar2");

8
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
View File

@@ -249,9 +249,9 @@ public final class Verify {
verifier.assertHasEntryNameStartingWith("WEB-INF/lib/spring-context");
verifier.assertHasEntryNameStartingWith("WEB-INF/lib/spring-core");
verifier.assertHasEntryNameStartingWith("WEB-INF/lib-provided/jakarta.servlet-api-4");
assertThat(verifier.hasEntry("org/" + "springframework/boot/loader/JarLauncher.class"))
assertThat(verifier.hasEntry("org/springframework/boot/loader/JarLauncher.class"))
.as("Unpacked launcher classes").isTrue();
assertThat(verifier.hasEntry("WEB-INF/classes/org/" + "test/SampleApplication.class")).as("Own classes")
assertThat(verifier.hasEntry("WEB-INF/classes/org/test/SampleApplication.class")).as("Own classes")
.isTrue();
assertThat(verifier.hasEntry("index.html")).as("Web content").isTrue();
}
@@ -294,9 +294,9 @@ public final class Verify {
verifier.assertHasEntryNameStartingWith("lib/spring-context");
verifier.assertHasEntryNameStartingWith("lib/spring-core");
verifier.assertHasNoEntryNameStartingWith("lib/jakarta.servlet-api");
assertThat(verifier.hasEntry("org/" + "springframework/boot/loader/JarLauncher.class"))
assertThat(verifier.hasEntry("org/springframework/boot/loader/JarLauncher.class"))
.as("Unpacked launcher classes").isFalse();
assertThat(verifier.hasEntry("org/" + "test/SampleModule.class")).as("Own classes").isTrue();
assertThat(verifier.hasEntry("org/test/SampleModule.class")).as("Own classes").isTrue();
}
@Override