root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #16219 from izeye

Browse Source 
* pr/16219:
  Polish
pull/16247/head
Madhura Bhave 6 years ago
parent b7b2798f13 c5b5f752ed
commit 28175c8635
35 changed files with 73 additions and 89 deletions
Show Stats Download Patch File Download Diff File

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementPortType.java
Unescape Escape View File

@ -45,9 +45,9 @@ public enum ManagementPortType {
* Look at the given environment to determine if the {@link ManagementPortType} is
* {@link #DISABLED}, {@link #SAME} or {@link #DIFFERENT}.
* @param environment the Spring environment
* @return {@link #DISABLED} if `management.server.port` is set to a negative value,
* {@link #SAME} if `management.server.port` is not specified or equal to
* `server.port`and {@link #DIFFERENT} otherwise.
* @return {@link #DISABLED} if {@code management.server.port} is set to a negative
* value, {@link #SAME} if {@code management.server.port} is not specified or equal to
* {@code server.port} and {@link #DIFFERENT} otherwise.
* @since 2.1.4
*/
public static ManagementPortType get(Environment environment) {

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
Unescape Escape View File

@ -1179,7 +1179,7 @@ shown in the following example:
}
----
JAXB is only available out of the box with Java 8. If you're using a more recent java
JAXB is only available out of the box with Java 8. If you're using a more recent Java
generation, add the following dependency to your project:
[source,xml,indent=0,subs="verbatim,quotes,attributes"]

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-main-attach-disabled/verify.groovy
Unescape Escape View File

@ -22,6 +22,3 @@ assertFalse 'repackaged artifact should not have been installed',
file.text.contains ("Installing " + repackaged + " to")
assertFalse 'backup artifact should not have been installed',
file.text.contains ("Installing " + backup + "to")

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-source-attach-disabled/verify.groovy
Unescape Escape View File

@ -3,7 +3,7 @@ import org.springframework.boot.maven.*
import static org.junit.Assert.assertTrue
import static org.junit.Assert.assertFalse
File main = new File(basedir, "target/jar-classifier-source-attach-disabled-0.0.1.BUILD-SNAPSHOT-test.jar");
File main = new File(basedir, "target/jar-classifier-source-attach-disabled-0.0.1.BUILD-SNAPSHOT-test.jar")
File backup = new File(basedir, "target/jar-classifier-source-attach-disabled-0.0.1.BUILD-SNAPSHOT-test.jar.original")
new Verify.JarArchiveVerification(main, Verify.SAMPLE_APP).verify();
@ -18,4 +18,3 @@ assertTrue 'backup artifact should have been installed',
file.text.contains ("Installing " + backup + " to")
assertFalse 'repackaged artifact should not have been installed',
file.text.contains ("Installing " + main + " to")

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-source/verify.groovy
Unescape Escape View File

@ -3,7 +3,7 @@ import org.springframework.boot.maven.*
import static org.junit.Assert.assertFalse
import static org.junit.Assert.assertTrue
File repackaged = new File(basedir, "target/jar-classifier-source-0.0.1.BUILD-SNAPSHOT-test.jar");
File repackaged = new File(basedir, "target/jar-classifier-source-0.0.1.BUILD-SNAPSHOT-test.jar")
File backup = new File(basedir, "target/jar-classifier-source-0.0.1.BUILD-SNAPSHOT-test.jar.original")
new Verify.JarArchiveVerification(repackaged, Verify.SAMPLE_APP).verify();
@ -14,4 +14,3 @@ assertTrue 'repackaged artifact should have been replaced',
file.text.contains("Replacing artifact with classifier test with repackaged archive")
assertFalse 'backup artifact should not have been installed', file.text.contains ("Installing "+backup)
assertTrue 'repackaged artifact should have been installed', file.text.contains ("Installing "+repackaged)

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-create-dir/verify.groovy
Unescape Escape View File

@ -3,5 +3,4 @@ import org.springframework.boot.maven.*;
Verify.verifyJar(
new File(basedir, "target/foo/jar-create-dir-0.0.1.BUILD-SNAPSHOT-foo.jar"), "some.random.Main"
);
)

8
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-dir/verify.groovy
Unescape Escape View File

@ -3,12 +3,8 @@ import org.springframework.boot.maven.*;
Verify.verifyJar(
new File(basedir, "target/foo/jar-custom-dir-0.0.1.BUILD-SNAPSHOT.jar"), "some.random.Main"
);
)
Verify.verifyJar(
new File(localRepositoryPath, "org/springframework/boot/maven/it/jar-custom-dir/0.0.1.BUILD-SNAPSHOT/jar-custom-dir-0.0.1.BUILD-SNAPSHOT.jar"), "some.random.Main"
);
)

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-launcher/verify.groovy
Unescape Escape View File

@ -3,5 +3,4 @@ import org.springframework.boot.maven.*;
Verify.verifyJar(
new File(basedir, "target/jar-0.0.1.BUILD-SNAPSHOT.jar"), "some.random.Main", "Hello world"
);
)

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-artifact/verify.groovy
Unescape Escape View File

@ -1,11 +1,11 @@
import java.io.*;
import org.springframework.boot.maven.*;
File f = new File( basedir, "target/jar-exclude-artifact-0.0.1.BUILD-SNAPSHOT.jar");
File f = new File(basedir, "target/jar-exclude-artifact-0.0.1.BUILD-SNAPSHOT.jar")
new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
@Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
super.verifyZipEntries(verifier)
verifier.assertHasNoEntryNameStartingWith("lib/servlet-api-2.5.jar")
}
}.verify();
}.verify()

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-entry/verify.groovy
Unescape Escape View File

@ -17,11 +17,11 @@
import java.io.*;
import org.springframework.boot.maven.*;
File f = new File( basedir, "target/jar-exclude-entry-0.0.1.BUILD-SNAPSHOT.jar");
File f = new File(basedir, "target/jar-exclude-entry-0.0.1.BUILD-SNAPSHOT.jar")
new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
@Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
super.verifyZipEntries(verifier)
verifier.assertHasNoEntryNameStartingWith("lib/servlet-api-2.5.jar")
}
}.verify();
}.verify()

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/verify.groovy
Unescape Escape View File

@ -17,11 +17,11 @@
import java.io.*;
import org.springframework.boot.maven.*;
File f = new File( basedir, "target/jar-exclude-group-0.0.1.BUILD-SNAPSHOT.jar");
File f = new File(basedir, "target/jar-exclude-group-0.0.1.BUILD-SNAPSHOT.jar")
new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
@Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
super.verifyZipEntries(verifier)
verifier.assertHasNoEntryNameStartingWith("lib/log4j-api-2.4.1.jar")
}
}.verify();
}.verify()

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-executable/verify.groovy
Unescape Escape View File

@ -4,5 +4,4 @@ import org.springframework.boot.maven.*;
Verify.verifyJar(
new File(basedir, "target/jar-executable-0.0.1.BUILD-SNAPSHOT.jar"),
"some.random.Main", "Spring Boot Startup Script", "MyFullyExecutableJarName",
"MyFullyExecutableJarDesc");
"MyFullyExecutableJarDesc")

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-non-executable/verify.groovy
Unescape Escape View File

@ -3,5 +3,4 @@ import org.springframework.boot.maven.*;
Verify.verifyJar(
new File(basedir, "target/jar-0.0.1.BUILD-SNAPSHOT.jar"), "some.random.Main", false
);
)

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope-default/verify.groovy
Unescape Escape View File

@ -17,11 +17,11 @@
import java.io.*;
import org.springframework.boot.maven.*;
File f = new File( basedir, "target/jar-system-scope-default-0.0.1.BUILD-SNAPSHOT.jar");
File f = new File(basedir, "target/jar-system-scope-default-0.0.1.BUILD-SNAPSHOT.jar")
new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
@Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
super.verifyZipEntries(verifier)
verifier.assertHasNoEntryNameStartingWith("BOOT-INF/lib/sample-1.0.0.jar")
}
}.verify();
}.verify()

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope/verify.groovy
Unescape Escape View File

@ -17,11 +17,11 @@
import java.io.*;
import org.springframework.boot.maven.*;
File f = new File( basedir, "target/jar-system-scope-0.0.1.BUILD-SNAPSHOT.jar");
File f = new File(basedir, "target/jar-system-scope-0.0.1.BUILD-SNAPSHOT.jar")
new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
@Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
super.verifyZipEntries(verifier)
verifier.assertHasEntryNameStartingWith("BOOT-INF/lib/sample-1.0.0.jar")
}
}.verify();
}.verify()

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/verify.groovy
Unescape Escape View File

@ -17,11 +17,11 @@
import java.io.*;
import org.springframework.boot.maven.*;
File f = new File( basedir, "target/jar-test-scope-0.0.1.BUILD-SNAPSHOT.jar");
File f = new File(basedir, "target/jar-test-scope-0.0.1.BUILD-SNAPSHOT.jar")
new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
@Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
super.verifyZipEntries(verifier)
verifier.assertHasNoEntryNameStartingWith("lib/log4j-api-2.4.1.jar")
}
}.verify();
}.verify()

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/verify.groovy
Unescape Escape View File

@ -17,7 +17,7 @@
import java.io.*;
import org.springframework.boot.maven.*;
File f = new File( basedir, "target/jar-with-kotlin-module-0.0.1.BUILD-SNAPSHOT.jar");
File f = new File(basedir, "target/jar-with-kotlin-module-0.0.1.BUILD-SNAPSHOT.jar")
new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
@Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
@ -27,4 +27,4 @@ new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
verifier.assertHasNonUnpackEntry("BOOT-INF/lib/kotlin-stdlib-")
verifier.assertHasNonUnpackEntry("BOOT-INF/lib/kotlin-reflect-")
}
}.verify();
}.verify()

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/verify.groovy
Unescape Escape View File

@ -17,7 +17,7 @@
import java.io.*;
import org.springframework.boot.maven.*;
File f = new File( basedir, "target/jar-with-unpack-0.0.1.BUILD-SNAPSHOT.jar");
File f = new File(basedir, "target/jar-with-unpack-0.0.1.BUILD-SNAPSHOT.jar")
new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
@Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
@ -25,4 +25,4 @@ new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
verifier.assertHasUnpackEntry("BOOT-INF/lib/spring-core-")
verifier.assertHasNonUnpackEntry("BOOT-INF/lib/spring-context-")
}
}.verify();
}.verify()

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/verify.groovy
Unescape Escape View File

@ -3,5 +3,4 @@ import org.springframework.boot.maven.*;
Verify.verifyZip(
new File(basedir, "target/jar-0.0.1.BUILD-SNAPSHOT.jar")
);
)

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war/verify.groovy
Unescape Escape View File

@ -3,5 +3,5 @@ import org.springframework.boot.maven.*;
Verify.verifyWar(
new File(basedir, "target/war-0.0.1.BUILD-SNAPSHOT.war")
);
)

3
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
Unescape Escape View File

@ -28,7 +28,6 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.PostConstruct;
import org.assertj.core.api.Assertions;
import org.assertj.core.api.Condition;
import org.junit.After;
import org.junit.Before;
@ -1084,7 +1083,7 @@ public class SpringApplicationTests {
ExampleConfig.class);
application.addListeners(
(ApplicationListener<ApplicationEnvironmentPreparedEvent>) (event) -> {
Assertions.assertThat(event.getEnvironment())
assertThat(event.getEnvironment())
.isInstanceOf(StandardServletEnvironment.class);
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(
event.getEnvironment(), "foo=bar");

4
spring-boot-samples/spring-boot-sample-actuator-custom-security/src/test/java/sample/actuator/customsecurity/ManagementPortAndPathSampleActuatorApplicationTests.java
Unescape Escape View File

@ -43,10 +43,10 @@ import static org.assertj.core.api.Assertions.assertThat;
public class ManagementPortAndPathSampleActuatorApplicationTests {
@LocalServerPort
private int port = 9010;
private int port;
@LocalManagementPort
private int managementPort = 9011;
private int managementPort;
@Test
public void testHome() {

6
spring-boot-samples/spring-boot-sample-actuator-log4j2/src/test/java/sample/actuator/log4j2/SampleActuatorLog4J2ApplicationTests.java
Unescape Escape View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2019 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.
@ -31,7 +31,7 @@ import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import static org.hamcrest.Matchers.containsString;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@ -60,7 +60,7 @@ public class SampleActuatorLog4J2ApplicationTests {
@Test
public void testLogger() {
logger.info("Hello World");
this.output.expect(containsString("Hello World"));
assertThat(this.output.toString()).contains("Hello World");
}
@Test

4
spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java
Unescape Escape View File

@ -43,10 +43,10 @@ import static org.assertj.core.api.Assertions.assertThat;
public class SampleActuatorUiApplicationPortTests {
@LocalServerPort
private int port = 9010;
private int port;
@LocalManagementPort
private int managementPort = 9011;
private int managementPort;
@Test
public void testHome() {

4
spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressActuatorApplicationTests.java
Unescape Escape View File

@ -44,10 +44,10 @@ import static org.assertj.core.api.Assertions.assertThat;
public class ManagementAddressActuatorApplicationTests {
@LocalServerPort
private int port = 9010;
private int port;
@LocalManagementPort
private int managementPort = 9011;
private int managementPort;
@Test
public void testHome() {

4
spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPortAndPathSampleActuatorApplicationTests.java
Unescape Escape View File

@ -46,10 +46,10 @@ import static org.assertj.core.api.Assertions.assertThat;
public class ManagementPortAndPathSampleActuatorApplicationTests {
@LocalServerPort
private int port = 9010;
private int port;
@LocalManagementPort
private int managementPort = 9011;
private int managementPort;
@Autowired
private Environment environment;

4
spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPortSampleActuatorApplicationTests.java
Unescape Escape View File

@ -43,10 +43,10 @@ import static org.assertj.core.api.Assertions.assertThat;
public class ManagementPortSampleActuatorApplicationTests {
@LocalServerPort
private int port = 9010;
private int port;
@LocalManagementPort
private int managementPort = 9011;
private int managementPort;
@Test
public void testHome() {

3
spring-boot-samples/spring-boot-sample-custom-layout/src/it/custom/verify.groovy
Unescape Escape View File

@ -3,5 +3,4 @@ import sample.layout.*;
Verify.verify(
new File(basedir, "target/custom-0.0.1.BUILD-SNAPSHOT.jar"), "custom"
);
)

3
spring-boot-samples/spring-boot-sample-custom-layout/src/it/default/verify.groovy
Unescape Escape View File

@ -3,5 +3,4 @@ import sample.layout.*;
Verify.verify(
new File(basedir, "target/default-0.0.1.BUILD-SNAPSHOT.jar"), "sample"
);
)

4
spring-boot-samples/spring-boot-sample-jersey/src/test/java/sample/jersey/JerseyApplicationPathAndManagementPortTests.java
Unescape Escape View File

@ -41,10 +41,10 @@ import static org.assertj.core.api.Assertions.assertThat;
public class JerseyApplicationPathAndManagementPortTests {
@LocalServerPort
private int port = 9010;
private int port;
@LocalManagementPort
private int managementPort = 9011;
private int managementPort;
@Autowired
private TestRestTemplate testRestTemplate;

9
spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/ManagementPortSampleSecureWebFluxTests.java
Unescape Escape View File

@ -18,7 +18,6 @@ package sample.secure.webflux;
import java.util.Base64;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -37,6 +36,8 @@ import org.springframework.security.web.server.SecurityWebFilterChain;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Integration tests for separate management and main service ports.
*
@ -50,10 +51,10 @@ import org.springframework.test.web.reactive.server.WebTestClient;
public class ManagementPortSampleSecureWebFluxTests {
@LocalServerPort
private int port = 9010;
private int port;
@LocalManagementPort
private int managementPort = 9011;
private int managementPort;
@Autowired
private WebTestClient webClient;
@ -90,7 +91,7 @@ public class ManagementPortSampleSecureWebFluxTests {
String.class)
.exchange().expectStatus().isOk().expectBody(String.class).returnResult()
.getResponseBody();
Assertions.assertThat(responseBody).contains("\"status\":\"UP\"");
assertThat(responseBody).contains("\"status\":\"UP\"");
}
private String getBasicAuth() {

Write Preview
Loading…
Cancel
Save