Commit 636898f9 authored by Phillip Webb's avatar Phillip Webb

Polish

parent 5922cfa4
...@@ -32,7 +32,7 @@ import com.google.gson.Gson; ...@@ -32,7 +32,7 @@ import com.google.gson.Gson;
/** /**
* Configuration for HTTP Message converters that use Gson * Configuration for HTTP Message converters that use Gson
* *
* @author awilkinson * @author Andy Wilkinson
* @since 1.2.2 * @since 1.2.2
*/ */
@Configuration @Configuration
......
/* /*
* Copyright 2012-2014 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.
......
/* /*
* Copyright 2012-2014 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.
...@@ -252,7 +252,7 @@ public class JacksonAutoConfigurationTests { ...@@ -252,7 +252,7 @@ public class JacksonAutoConfigurationTests {
public void disableDeserializationFeature() throws Exception { public void disableDeserializationFeature() throws Exception {
this.context.register(JacksonAutoConfiguration.class); this.context.register(JacksonAutoConfiguration.class);
EnvironmentTestUtils.addEnvironment(this.context, EnvironmentTestUtils.addEnvironment(this.context,
"spring.jackson.deserialization.fail_on_unknown_properties:false"); "spring.jackson.deserialization.fail-on-unknown-properties:false");
this.context.refresh(); this.context.refresh();
ObjectMapper mapper = this.context.getBean(ObjectMapper.class); ObjectMapper mapper = this.context.getBean(ObjectMapper.class);
assertTrue(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES.enabledByDefault()); assertTrue(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES.enabledByDefault());
......
...@@ -38,9 +38,7 @@ public class JndiPropertiesHidingClassLoader extends ClassLoader { ...@@ -38,9 +38,7 @@ public class JndiPropertiesHidingClassLoader extends ClassLoader {
if ("jndi.properties".equals(name)) { if ("jndi.properties".equals(name)) {
return Collections.enumeration(Collections.<URL> emptyList()); return Collections.enumeration(Collections.<URL> emptyList());
} }
else {
return super.getResources(name); return super.getResources(name);
} }
}
} }
...@@ -91,5 +91,7 @@ public class TestableInitialContextFactory implements InitialContextFactory { ...@@ -91,5 +91,7 @@ public class TestableInitialContextFactory implements InitialContextFactory {
public void clearAll() { public void clearAll() {
this.bindings.clear(); this.bindings.clear();
} }
} }
} }
...@@ -274,7 +274,6 @@ a specific command line switch (e.g. `java -jar app.jar --name="Spring"`). ...@@ -274,7 +274,6 @@ a specific command line switch (e.g. `java -jar app.jar --name="Spring"`).
[[boot-features-external-config-random-values]] [[boot-features-external-config-random-values]]
=== Configuring random values === Configuring random values
The `RandomValuePropertySource` is useful for injecting random values (e.g. into secrets The `RandomValuePropertySource` is useful for injecting random values (e.g. into secrets
or test cases). It can produce integers, longs or strings, e.g. or test cases). It can produce integers, longs or strings, e.g.
......
/* /*
* Copyright 2012-2014 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.
...@@ -55,4 +55,5 @@ public class SampleRedisApplicationTests { ...@@ -55,4 +55,5 @@ public class SampleRedisApplicationTests {
} }
return (ex.getCause() == null || redisServerRunning(ex.getCause())); return (ex.getCause() == null || redisServerRunning(ex.getCause()));
} }
} }
/* /*
* Copyright 2012-2014 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.
......
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