Polishing, primarily to keep Checkstyle happy

pull/4099/head
Andy Wilkinson 9 years ago
parent b7719a131b
commit bc590a8bf4

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2013 the original author or authors. * Copyright 2012-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -50,7 +50,8 @@ class OnResourceCondition extends SpringBootCondition {
Assert.isTrue(locations.size() > 0, Assert.isTrue(locations.size() > 0,
"@ConditionalOnResource annotations must specify at least one resource location"); "@ConditionalOnResource annotations must specify at least one resource location");
for (String location : locations) { for (String location : locations) {
if (!loader.getResource(context.getEnvironment().resolvePlaceholders(location)).exists()) { if (!loader.getResource(
context.getEnvironment().resolvePlaceholders(location)).exists()) {
return ConditionOutcome.noMatch("resource not found: " + location); return ConditionOutcome.noMatch("resource not found: " + location);
} }
} }

@ -16,16 +16,16 @@
package org.springframework.boot.autoconfigure.condition; package org.springframework.boot.autoconfigure.condition;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test; import org.junit.Test;
import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.boot.test.EnvironmentTestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/** /**
* Tests for {@link ConditionalOnResource}. * Tests for {@link ConditionalOnResource}.
* *

Loading…
Cancel
Save