Skip to content

Commit 1a5c4f8

Browse files
author
Dave Syer
committed
Fix compilation error
1 parent 39a9442 commit 1a5c4f8

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.data.jpa.city.City;
2727
import org.springframework.boot.autoconfigure.data.jpa.city.CityRepository;
28-
import org.springframework.boot.autoconfigure.data.mongo.MixedMongoRepositoriesAutoConfigurationTests.BaseConfiguration.Registrar;
2928
import org.springframework.boot.autoconfigure.data.mongo.country.Country;
3029
import org.springframework.boot.autoconfigure.data.mongo.country.CountryRepository;
3130
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -112,28 +111,6 @@ public void testJpaRepositoryConfigurationWithMongoOverlapDisabled() throws Exce
112111
assertNotNull(this.context.getBean(CityRepository.class));
113112
}
114113

115-
@Configuration
116-
@Import(Registrar.class)
117-
protected static class BaseConfiguration {
118-
119-
protected static class Registrar implements ImportSelector {
120-
121-
@Override
122-
public String[] selectImports(AnnotationMetadata importingClassMetadata) {
123-
List<String> names = new ArrayList<String>();
124-
for (Class<?> type : new Class<?>[] { DataSourceAutoConfiguration.class,
125-
HibernateJpaAutoConfiguration.class,
126-
JpaRepositoriesAutoConfiguration.class,
127-
MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
128-
MongoRepositoriesAutoConfiguration.class }) {
129-
names.add(type.getName());
130-
}
131-
return names.toArray(new String[0]);
132-
}
133-
}
134-
135-
}
136-
137114
@Configuration
138115
@TestAutoConfigurationPackage(MongoAutoConfigurationTests.class)
139116
// Not this package or its parent
@@ -167,4 +144,27 @@ protected static class JpaConfiguration {
167144
protected static class OverlapConfiguration {
168145

169146
}
147+
148+
@Configuration
149+
@Import(Registrar.class)
150+
protected static class BaseConfiguration {
151+
152+
}
153+
154+
protected static class Registrar implements ImportSelector {
155+
156+
@Override
157+
public String[] selectImports(AnnotationMetadata importingClassMetadata) {
158+
List<String> names = new ArrayList<String>();
159+
for (Class<?> type : new Class<?>[] { DataSourceAutoConfiguration.class,
160+
HibernateJpaAutoConfiguration.class,
161+
JpaRepositoriesAutoConfiguration.class, MongoAutoConfiguration.class,
162+
MongoDataAutoConfiguration.class,
163+
MongoRepositoriesAutoConfiguration.class }) {
164+
names.add(type.getName());
165+
}
166+
return names.toArray(new String[0]);
167+
}
168+
}
169+
170170
}

0 commit comments

Comments
 (0)