SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Prevent SpringBootApplication starting to overlap with user defined Application."

Browse Source 
This reverts commit 66b7d8dbe4.
This commit is contained in:
Oleg Zhurakousky
2018-06-18 13:44:33 -04:00
parent f3a18e6e83
commit 9f3f49eff0
5 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-stream-schema-server/src/main/java/org/springframework/cloud/stream/schema/server/SchemaRegistryServerApplication.java
View File

@@ -16,18 +16,16 @@
package org.springframework.cloud.stream.schema.server;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/**
* @author Vinicius Carvalho
* @author Guilherme Blanco
*/
@EnableAutoConfiguration
@SpringBootApplication
@EnableSchemaRegistryServer
public class SchemaRegistryServerApplication {
public static void main(String[] args) {
new SpringApplicationBuilder(SchemaRegistryServerApplication.class)
.properties("spring.config.name=schemaregistryserver").run(args);
SpringApplication.run(SchemaRegistryServerApplication.class, args);
}
}

0
spring-cloud-stream-schema-server/src/main/resources/schemaregistryserver.yml → spring-cloud-stream-schema-server/src/main/resources/application.yml
View File

6
spring-cloud-stream-schema-server/src/test/java/org/springframework/cloud/stream/schema/server/SchemaRegistryServerAvroTests.java
View File

@@ -44,11 +44,7 @@ import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER
* @author Ilayaperumal Gopinathan
*/
@RunWith(SpringRunner.class)
@SpringBootTest(
classes = SchemaRegistryServerApplication.class,
properties = {"spring.config.name:schemaregistryserver"},
webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT
)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
public class SchemaRegistryServerAvroTests {