This commit is contained in:
Phillip Webb 2015-02-09 11:39:33 -08:00
parent 5922cfa41f
commit 636898f9ad
9 changed files with 14 additions and 14 deletions

View File

@ -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

View File

@ -1,5 +1,5 @@
/* /*
* 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.

View File

@ -1,5 +1,5 @@
/* /*
* 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 {
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());

View File

@ -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);
}
} }
} }

View File

@ -91,5 +91,7 @@ public class TestableInitialContextFactory implements InitialContextFactory {
public void clearAll() { public void clearAll() {
this.bindings.clear(); this.bindings.clear();
} }
} }
}
}

View File

@ -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.

View File

@ -15,9 +15,9 @@
*/ */
public class BootRunResourcesApplication { public class BootRunResourcesApplication {
public static void main(String[] args) { public static void main(String[] args) {
ClassLoader classLoader = BootRunResourcesApplication.class.getClassLoader(); ClassLoader classLoader = BootRunResourcesApplication.class.getClassLoader();
System.out.println(classLoader.getResource("test.txt")); System.out.println(classLoader.getResource("test.txt"));
} }

View File

@ -1,5 +1,5 @@
/* /*
* 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 {
} }
return (ex.getCause() == null || redisServerRunning(ex.getCause())); return (ex.getCause() == null || redisServerRunning(ex.getCause()));
} }
} }

View File

@ -1,5 +1,5 @@
/* /*
* 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.