Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
636898f9
Commit
636898f9
authored
Feb 09, 2015
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
5922cfa4
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
14 additions
and
14 deletions
+14
-14
GsonHttpMessageConvertersConfiguration.java
...configure/web/GsonHttpMessageConvertersConfiguration.java
+1
-1
ConditionalOnJndiTests.java
.../boot/autoconfigure/condition/ConditionalOnJndiTests.java
+1
-1
JacksonAutoConfigurationTests.java
.../autoconfigure/jackson/JacksonAutoConfigurationTests.java
+2
-2
JndiPropertiesHidingClassLoader.java
...t/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java
+2
-4
TestableInitialContextFactory.java
...oot/autoconfigure/jndi/TestableInitialContextFactory.java
+3
-1
spring-boot-features.adoc
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+0
-1
BootRunResourcesApplication.java
...-resources/src/main/java/BootRunResourcesApplication.java
+2
-2
SampleRedisApplicationTests.java
...t/java/sample/data/redis/SampleRedisApplicationTests.java
+2
-1
BootRunTask.java
...oovy/org/springframework/boot/gradle/run/BootRunTask.java
+1
-1
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java
View file @
636898f9
...
...
@@ -32,7 +32,7 @@ import com.google.gson.Gson;
/**
* Configuration for HTTP Message converters that use Gson
*
* @author
aw
ilkinson
* @author
Andy W
ilkinson
* @since 1.2.2
*/
@Configuration
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java
View file @
636898f9
/*
* Copyright 2012-201
4
the original author or authors.
* Copyright 2012-201
5
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
View file @
636898f9
/*
* Copyright 2012-201
4
the original author or authors.
* Copyright 2012-201
5
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (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
{
this
.
context
.
register
(
JacksonAutoConfiguration
.
class
);
EnvironmentTestUtils
.
addEnvironment
(
this
.
context
,
"spring.jackson.deserialization.fail
_on_unknown_
properties:false"
);
"spring.jackson.deserialization.fail
-on-unknown-
properties:false"
);
this
.
context
.
refresh
();
ObjectMapper
mapper
=
this
.
context
.
getBean
(
ObjectMapper
.
class
);
assertTrue
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
.
enabledByDefault
());
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java
View file @
636898f9
...
...
@@ -38,9 +38,7 @@ public class JndiPropertiesHidingClassLoader extends ClassLoader {
if
(
"jndi.properties"
.
equals
(
name
))
{
return
Collections
.
enumeration
(
Collections
.<
URL
>
emptyList
());
}
else
{
return
super
.
getResources
(
name
);
}
return
super
.
getResources
(
name
);
}
}
\ No newline at end of file
}
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java
View file @
636898f9
...
...
@@ -91,5 +91,7 @@ public class TestableInitialContextFactory implements InitialContextFactory {
public
void
clearAll
()
{
this
.
bindings
.
clear
();
}
}
}
\ No newline at end of file
}
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
636898f9
...
...
@@ -274,7 +274,6 @@ a specific command line switch (e.g. `java -jar app.jar --name="Spring"`).
[[boot-features-external-config-random-values]]
=== Configuring random values
The `RandomValuePropertySource` is useful for injecting random values (e.g. into secrets
or test cases). It can produce integers, longs or strings, e.g.
...
...
spring-boot-integration-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java
View file @
636898f9
...
...
@@ -15,9 +15,9 @@
*/
public
class
BootRunResourcesApplication
{
public
static
void
main
(
String
[]
args
)
{
ClassLoader
classLoader
=
BootRunResourcesApplication
.
class
.
getClassLoader
();
ClassLoader
classLoader
=
BootRunResourcesApplication
.
class
.
getClassLoader
();
System
.
out
.
println
(
classLoader
.
getResource
(
"test.txt"
));
}
...
...
spring-boot-samples/spring-boot-sample-data-redis/src/test/java/sample/data/redis/SampleRedisApplicationTests.java
View file @
636898f9
/*
* Copyright 2012-201
4
the original author or authors.
* Copyright 2012-201
5
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (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
()));
}
}
spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/run/BootRunTask.java
View file @
636898f9
/*
* Copyright 2012-201
4
the original author or authors.
* Copyright 2012-201
5
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment