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
a508864d
Commit
a508864d
authored
Mar 10, 2016
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5384 from izeye/polish-20160310
* pr/5384: Polish
parents
b8dc4e74
1d02184b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
10 deletions
+10
-10
ValidationExceptionFailureAnalyzer.java
...gnostics/analyzer/ValidationExceptionFailureAnalyzer.java
+1
-1
GitProperties.java
...ain/java/org/springframework/boot/info/GitProperties.java
+1
-1
JsonObjectDeserializer.java
.../springframework/boot/jackson/JsonObjectDeserializer.java
+3
-3
DelegatingFilterProxyRegistrationBeanTests.java
.../embedded/DelegatingFilterProxyRegistrationBeanTests.java
+1
-1
ValidationExceptionFailureAnalyzerTests.java
...ics/analyzer/ValidationExceptionFailureAnalyzerTests.java
+2
-2
JsonObjectDeserializerTests.java
...ngframework/boot/jackson/JsonObjectDeserializerTests.java
+1
-1
NameAndAgeJsonComponent.java
...springframework/boot/jackson/NameAndAgeJsonComponent.java
+1
-1
No files found.
spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalzer.java
→
spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnal
y
zer.java
View file @
a508864d
...
...
@@ -28,7 +28,7 @@ import org.springframework.boot.diagnostics.FailureAnalyzer;
*
* @author Andy Wilkinson
*/
class
ValidationExceptionFailureAnalzer
class
ValidationExceptionFailureAnal
y
zer
extends
AbstractFailureAnalyzer
<
ValidationException
>
{
private
static
final
String
MISSING_IMPLEMENTATION_MESSAGE
=
"Unable to create a "
...
...
spring-boot/src/main/java/org/springframework/boot/info/GitProperties.java
View file @
a508864d
...
...
@@ -51,7 +51,7 @@ public class GitProperties extends InfoProperties {
}
/**
* Return the abbreviated id of the commit o
i
r {@code null}.
* Return the abbreviated id of the commit or {@code null}.
* @return the short commit id
*/
public
String
getShortCommitId
()
{
...
...
spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java
View file @
a508864d
...
...
@@ -61,17 +61,17 @@ public abstract class JsonObjectDeserializer<T>
/**
* Deserialize JSON content into the value type this serializer handles.
* @param j
a
sonParser the source parser used for reading JSON content
* @param jsonParser the source parser used for reading JSON content
* @param context Context that can be used to access information about this
* deserialization activity
* @param codec the {@link ObjectCodec} associated with the parser
* @param tree deserialized JSON content as tree expressed using set of
* {@link TreeNode} instances
* @return the dserialized object
* @return the d
e
serialized object
* @throws IOException on error
* @see #deserialize(JsonParser, DeserializationContext)
*/
protected
abstract
T
deserializeObject
(
JsonParser
j
a
sonParser
,
protected
abstract
T
deserializeObject
(
JsonParser
jsonParser
,
DeserializationContext
context
,
ObjectCodec
codec
,
JsonNode
tree
)
throws
IOException
;
...
...
spring-boot/src/test/java/org/springframework/boot/context/embedded/DelegatingFilterProxyRegistrationBeanTests.java
View file @
a508864d
...
...
@@ -38,7 +38,7 @@ public class DelegatingFilterProxyRegistrationBeanTests
extends
AbstractFilterRegistrationBeanTests
{
private
WebApplicationContext
applicationContext
=
new
GenericWebApplicationContext
(
new
MockServletContext
());
;
new
MockServletContext
());
@Test
public
void
targetBeanNameMustNotBeNull
()
throws
Exception
{
...
...
spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalyzerTests.java
View file @
a508864d
...
...
@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import
static
org
.
junit
.
Assert
.
fail
;
/**
* Tests for {@link ValidationExceptionFailureAnalzer}
* Tests for {@link ValidationExceptionFailureAnal
y
zer}
*
* @author Andy Wilkinson
*/
...
...
@@ -45,7 +45,7 @@ public class ValidationExceptionFailureAnalyzerTests {
fail
(
"Expected failure did not occur"
);
}
catch
(
Exception
ex
)
{
FailureAnalysis
analysis
=
new
ValidationExceptionFailureAnalzer
()
FailureAnalysis
analysis
=
new
ValidationExceptionFailureAnal
y
zer
()
.
analyze
(
ex
);
assertThat
(
analysis
).
isNotNull
();
}
...
...
spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java
View file @
a508864d
...
...
@@ -197,7 +197,7 @@ public class JsonObjectDeserializerTests {
static
class
TestJsonObjectDeserializer
<
T
>
extends
JsonObjectDeserializer
<
T
>
{
@Override
protected
T
deserializeObject
(
JsonParser
j
a
sonParser
,
protected
T
deserializeObject
(
JsonParser
jsonParser
,
DeserializationContext
context
,
ObjectCodec
codec
,
JsonNode
tree
)
throws
IOException
{
return
null
;
...
...
spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java
View file @
a508864d
...
...
@@ -47,7 +47,7 @@ public class NameAndAgeJsonComponent {
public
static
class
Deserializer
extends
JsonObjectDeserializer
<
NameAndAge
>
{
@Override
protected
NameAndAge
deserializeObject
(
JsonParser
j
a
sonParser
,
protected
NameAndAge
deserializeObject
(
JsonParser
jsonParser
,
DeserializationContext
context
,
ObjectCodec
codec
,
JsonNode
tree
)
throws
IOException
{
String
name
=
nullSafeValue
(
tree
.
get
(
"name"
),
String
.
class
);
...
...
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