Commit f4f668a5 authored by Phillip Webb's avatar Phillip Webb

Polish

parent c5911e86
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId> <artifactId>spring-security-config</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.tomcat.embed</groupId> <groupId>org.apache.tomcat.embed</groupId>
...@@ -79,9 +79,9 @@ ...@@ -79,9 +79,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jolokia</groupId> <groupId>org.jolokia</groupId>
<artifactId>jolokia-core</artifactId> <artifactId>jolokia-core</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!-- Test --> <!-- Test -->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
......
...@@ -374,7 +374,6 @@ public class CrshAutoConfiguration { ...@@ -374,7 +374,6 @@ public class CrshAutoConfiguration {
return plugins; return plugins;
} }
@SuppressWarnings("rawtypes")
protected boolean isEnabled(CRaSHPlugin<?> plugin) { protected boolean isEnabled(CRaSHPlugin<?> plugin) {
Assert.notNull(plugin, "Plugin must not be null"); Assert.notNull(plugin, "Plugin must not be null");
......
...@@ -29,6 +29,8 @@ import org.springframework.util.StringUtils; ...@@ -29,6 +29,8 @@ import org.springframework.util.StringUtils;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
/** /**
* Tests for {@link PropertyPlaceholderAutoConfiguration}.
*
* @author Dave Syer * @author Dave Syer
*/ */
public class PropertyPlaceholderAutoConfigurationTests { public class PropertyPlaceholderAutoConfigurationTests {
......
...@@ -23,6 +23,8 @@ import java.util.List; ...@@ -23,6 +23,8 @@ import java.util.List;
import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration; import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration;
/** /**
* Factory used to create {@link RepositoryConfiguration}s.
*
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Dave Syer * @author Dave Syer
*/ */
......
...@@ -531,10 +531,10 @@ ...@@ -531,10 +531,10 @@
<version>${crashub.version}</version> <version>${crashub.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jolokia</groupId> <groupId>org.jolokia</groupId>
<artifactId>jolokia-core</artifactId> <artifactId>jolokia-core</artifactId>
<version>${jolokia.version}</version> <version>${jolokia.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build> <build>
......
...@@ -40,7 +40,8 @@ public class SampleProfileApplicationTests { ...@@ -40,7 +40,8 @@ public class SampleProfileApplicationTests {
public void after() { public void after() {
if (this.profiles != null) { if (this.profiles != null) {
System.setProperty("spring.profiles.active", this.profiles); System.setProperty("spring.profiles.active", this.profiles);
} else { }
else {
System.clearProperty("spring.profiles.active"); System.clearProperty("spring.profiles.active");
} }
} }
......
...@@ -99,7 +99,6 @@ public class PropertiesConfigurationFactory<T> implements FactoryBean<T>, ...@@ -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 * 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 * their paths). Can be useful to disable this if the name prefix is empty and you
* don't want to ignore unknown fields. * don't want to ignore unknown fields.
*
* @param ignoreNestedProperties the flag to set (default false) * @param ignoreNestedProperties the flag to set (default false)
*/ */
public void setIgnoreNestedProperties(boolean ignoreNestedProperties) { public void setIgnoreNestedProperties(boolean ignoreNestedProperties) {
......
...@@ -75,7 +75,6 @@ public class RelaxedDataBinder extends DataBinder { ...@@ -75,7 +75,6 @@ public class RelaxedDataBinder extends DataBinder {
* Flag to disable binding of nested properties (i.e. those with period separators in * 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 * their paths). Can be useful to disable this if the name prefix is empty and you
* don't want to ignore unknown fields. * don't want to ignore unknown fields.
*
* @param ignoreNestedProperties the flag to set (default false) * @param ignoreNestedProperties the flag to set (default false)
*/ */
public void setIgnoreNestedProperties(boolean ignoreNestedProperties) { public void setIgnoreNestedProperties(boolean ignoreNestedProperties) {
......
...@@ -43,7 +43,7 @@ public final class RelaxedNames implements Iterable<String> { ...@@ -43,7 +43,7 @@ public final class RelaxedNames implements Iterable<String> {
* using dashed notation (e.g. {@literal my-property-name} * using dashed notation (e.g. {@literal my-property-name}
*/ */
public RelaxedNames(String name) { public RelaxedNames(String name) {
this.name = name == null ? "" : name; this.name = (name == null ? "" : name);
initialize(RelaxedNames.this.name, this.values); initialize(RelaxedNames.this.name, this.values);
} }
......
...@@ -97,7 +97,7 @@ public class JettyEmbeddedServletContainerFactory extends ...@@ -97,7 +97,7 @@ public class JettyEmbeddedServletContainerFactory extends
public EmbeddedServletContainer getEmbeddedServletContainer( public EmbeddedServletContainer getEmbeddedServletContainer(
ServletContextInitializer... initializers) { ServletContextInitializer... initializers) {
WebAppContext context = new WebAppContext(); WebAppContext context = new WebAppContext();
int port = getPort() >= 0 ? getPort() : 0; int port = (getPort() >= 0 ? getPort() : 0);
Server server = new Server(new InetSocketAddress(getAddress(), port)); Server server = new Server(new InetSocketAddress(getAddress(), port));
if (this.resourceLoader != null) { if (this.resourceLoader != null) {
......
...@@ -193,7 +193,7 @@ public class TomcatEmbeddedServletContainerFactory extends ...@@ -193,7 +193,7 @@ public class TomcatEmbeddedServletContainerFactory extends
// Needs to be protected so it can be used by subclasses // Needs to be protected so it can be used by subclasses
protected void customizeConnector(Connector connector) { protected void customizeConnector(Connector connector) {
int port = getPort() >= 0 ? getPort() : 0; int port = (getPort() >= 0 ? getPort() : 0);
connector.setPort(port); connector.setPort(port);
if (connector.getProtocolHandler() instanceof AbstractProtocol) { if (connector.getProtocolHandler() instanceof AbstractProtocol) {
if (getAddress() != null) { if (getAddress() != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment