root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix class tangle

This commit is contained in:
Phillip Webb 2014-02-03 16:40:49 -08:00
parent 042e512d3d
commit 32f3e353b4
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@ -411,6 +411,10 @@ public class SpringApplication {
}
}
/**
* Setup any active profiles on the environment.
* @param environment the environment to configure
*/
protected void setupProfiles(ConfigurableEnvironment environment) {
for (String profile : this.profiles) {
environment.addActiveProfile(profile);

5
spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListener.java
View File

@ -19,7 +19,8 @@ import org.springframework.util.ClassUtils;
public class LiquibaseServiceLocatorApplicationListener implements
ApplicationListener<ApplicationStartedEvent> {
static final Log logger = LogFactory.getLog(LiquibaseServiceLocatorApplicationListener.class);
static final Log logger = LogFactory
.getLog(LiquibaseServiceLocatorApplicationListener.class);
@Override
public void onApplicationEvent(ApplicationStartedEvent event) {
@ -35,7 +36,7 @@ public class LiquibaseServiceLocatorApplicationListener implements
public void replaceServiceLocator() {
ServiceLocator.setInstance(new CustomResolverServiceLocator(
new SpringPackageScanClassResolver()));
new SpringPackageScanClassResolver(logger)));
}
}

12
spring-boot/src/main/java/org/springframework/boot/liquibase/SpringPackageScanClassResolver.java
View File

@ -23,6 +23,7 @@ import liquibase.servicelocator.DefaultPackageScanClassResolver;
import liquibase.servicelocator.PackageScanClassResolver;
import liquibase.servicelocator.PackageScanFilter;
import org.apache.commons.logging.Log;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
@ -40,6 +41,12 @@ import org.springframework.util.ClassUtils;
*/
public class SpringPackageScanClassResolver extends DefaultPackageScanClassResolver {
private final Log logger;
public SpringPackageScanClassResolver(Log logger) {
this.logger = logger;
}
@Override
protected void find(PackageScanFilter test, String packageName, ClassLoader loader,
Set<Class<?>> classes) {
@ -74,9 +81,8 @@ public class SpringPackageScanClassResolver extends DefaultPackageScanClassResol
return ClassUtils.forName(reader.getClassMetadata().getClassName(), loader);
}
catch (Exception ex) {
if (LiquibaseServiceLocatorApplicationListener.logger.isWarnEnabled()) {
LiquibaseServiceLocatorApplicationListener.logger.warn(
"Ignoring cadidate class resource " + resource, ex);
if (this.logger.isWarnEnabled()) {
this.logger.warn("Ignoring cadidate class resource " + resource, ex);
}
return null;
}

4
spring-boot/src/test/java/org/springframework/boot/liquibase/SpringPackageScanClassResolverTests.java
View File

@ -20,6 +20,7 @@ import java.util.Set;
import liquibase.logging.Logger;
import org.apache.commons.logging.LogFactory;
import org.junit.Test;
import static org.hamcrest.Matchers.greaterThan;
@ -34,7 +35,8 @@ public class SpringPackageScanClassResolverTests {
@Test
public void testScan() {
SpringPackageScanClassResolver resolver = new SpringPackageScanClassResolver();
SpringPackageScanClassResolver resolver = new SpringPackageScanClassResolver(
LogFactory.getLog(getClass()));
resolver.addClassLoader(getClass().getClassLoader());
Set<Class<?>> implementations = resolver.findImplementations(Logger.class,
"liquibase.logging.core");