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

#190 - More simplifications for Spring Boot 1.4 M3.

Browse Source 
Replaced all occurrences of @SpringApplicationConfiguration with @SpringBootTest. Using SpringRunner instead of @SpringJUnit4ClassRunner now.
This commit is contained in:
Oliver Gierke
2016-06-11 11:26:23 +02:00
parent 24ca298de2
commit 6684c8c69b
86 changed files with 411 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
multi-store/src/main/java/example/springdata/multistore/ApplicationConfiguration.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-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.
@@ -15,10 +15,7 @@
*/
package example.springdata.multistore;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import com.mongodb.MongoClient;
@@ -28,9 +25,5 @@ import com.mongodb.MongoClient;
*
* @author Oliver Gierke
*/
@Configuration
@EnableAutoConfiguration
// TODO: Remove explicit activation once Spring Boot has a more lenient repository detection
@EnableJpaRepositories
@EnableMongoRepositories
@SpringBootApplication
public class ApplicationConfiguration {}

16
multi-store/src/test/java/example/springdata/multistore/ApplicationConfigurationTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-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.
@@ -18,26 +18,26 @@ package example.springdata.multistore;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import example.springdata.multistore.customer.Customer;
import example.springdata.multistore.shop.Order;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import org.springframework.data.jpa.repository.support.JpaEntityInformation;
import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
import org.springframework.data.repository.support.Repositories;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import example.springdata.multistore.customer.Customer;
import example.springdata.multistore.shop.Order;
import org.springframework.test.context.junit4.SpringRunner;
/**
* Integration test to check repository interfaces are assigned to the correct store modules.
*
* @author Oliver Gierke
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = ApplicationConfiguration.class)
@RunWith(SpringRunner.class)
@SpringBootTest
public class ApplicationConfigurationTest {
@Autowired ApplicationContext context;