This commit is contained in:
Phillip Webb 2013-11-25 17:12:56 -08:00
parent c5911e8634
commit f4f668a52b
11 changed files with 16 additions and 14 deletions

View File

@ -65,7 +65,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<optional>true</optional>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
@ -79,9 +79,9 @@
</dependency>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-core</artifactId>
<artifactId>jolokia-core</artifactId>
<optional>true</optional>
</dependency>
</dependency>
<!-- Test -->
<dependency>
<groupId>org.springframework</groupId>

View File

@ -374,7 +374,6 @@ public class CrshAutoConfiguration {
return plugins;
}
@SuppressWarnings("rawtypes")
protected boolean isEnabled(CRaSHPlugin<?> plugin) {
Assert.notNull(plugin, "Plugin must not be null");

View File

@ -29,6 +29,8 @@ import org.springframework.util.StringUtils;
import static org.junit.Assert.assertEquals;
/**
* Tests for {@link PropertyPlaceholderAutoConfiguration}.
*
* @author Dave Syer
*/
public class PropertyPlaceholderAutoConfigurationTests {

View File

@ -23,6 +23,8 @@ import java.util.List;
import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration;
/**
* Factory used to create {@link RepositoryConfiguration}s.
*
* @author Andy Wilkinson
* @author Dave Syer
*/

View File

@ -531,10 +531,10 @@
<version>${crashub.version}</version>
</dependency>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-core</artifactId>
<version>${jolokia.version}</version>
</dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-core</artifactId>
<version>${jolokia.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>

View File

@ -40,7 +40,8 @@ public class SampleProfileApplicationTests {
public void after() {
if (this.profiles != null) {
System.setProperty("spring.profiles.active", this.profiles);
} else {
}
else {
System.clearProperty("spring.profiles.active");
}
}

View File

@ -99,7 +99,6 @@ public class PropertiesConfigurationFactory<T> implements FactoryBean<T>,
* Flag to disable binding of nested properties (i.e. those with period separators in
* their paths). Can be useful to disable this if the name prefix is empty and you
* don't want to ignore unknown fields.
*
* @param ignoreNestedProperties the flag to set (default false)
*/
public void setIgnoreNestedProperties(boolean ignoreNestedProperties) {

View File

@ -75,7 +75,6 @@ public class RelaxedDataBinder extends DataBinder {
* Flag to disable binding of nested properties (i.e. those with period separators in
* their paths). Can be useful to disable this if the name prefix is empty and you
* don't want to ignore unknown fields.
*
* @param ignoreNestedProperties the flag to set (default false)
*/
public void setIgnoreNestedProperties(boolean ignoreNestedProperties) {

View File

@ -43,7 +43,7 @@ public final class RelaxedNames implements Iterable<String> {
* using dashed notation (e.g. {@literal my-property-name}
*/
public RelaxedNames(String name) {
this.name = name == null ? "" : name;
this.name = (name == null ? "" : name);
initialize(RelaxedNames.this.name, this.values);
}

View File

@ -97,7 +97,7 @@ public class JettyEmbeddedServletContainerFactory extends
public EmbeddedServletContainer getEmbeddedServletContainer(
ServletContextInitializer... initializers) {
WebAppContext context = new WebAppContext();
int port = getPort() >= 0 ? getPort() : 0;
int port = (getPort() >= 0 ? getPort() : 0);
Server server = new Server(new InetSocketAddress(getAddress(), port));
if (this.resourceLoader != null) {

View File

@ -193,7 +193,7 @@ public class TomcatEmbeddedServletContainerFactory extends
// Needs to be protected so it can be used by subclasses
protected void customizeConnector(Connector connector) {
int port = getPort() >= 0 ? getPort() : 0;
int port = (getPort() >= 0 ? getPort() : 0);
connector.setPort(port);
if (connector.getProtocolHandler() instanceof AbstractProtocol) {
if (getAddress() != null) {