root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge pull request #5384 from izeye/polish-20160310 

* pr/5384:
  Polish
This commit is contained in:
Stephane Nicoll 2016-03-10 09:07:51 +01:00
parent b8dc4e74e4 1d02184b44
commit a508864d6f
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalzer.java → spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalyzer.java
View File

@ -28,7 +28,7 @@ import org.springframework.boot.diagnostics.FailureAnalyzer;
* *
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
class ValidationExceptionFailureAnalzer class ValidationExceptionFailureAnalyzer
extends AbstractFailureAnalyzer<ValidationException> { extends AbstractFailureAnalyzer<ValidationException> {
private static final String MISSING_IMPLEMENTATION_MESSAGE = "Unable to create a " private static final String MISSING_IMPLEMENTATION_MESSAGE = "Unable to create a "

2
spring-boot/src/main/java/org/springframework/boot/info/GitProperties.java
View File

@ -51,7 +51,7 @@ public class GitProperties extends InfoProperties {
} }
/** /**
* Return the abbreviated id of the commit oir {@code null}. * Return the abbreviated id of the commit or {@code null}.
* @return the short commit id * @return the short commit id
*/ */
public String getShortCommitId() { public String getShortCommitId() {

6
spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java
View File

@ -61,17 +61,17 @@ public abstract class JsonObjectDeserializer<T>
/** /**
* Deserialize JSON content into the value type this serializer handles. * Deserialize JSON content into the value type this serializer handles.
* @param jasonParser 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 * @param context Context that can be used to access information about this
* deserialization activity * deserialization activity
* @param codec the {@link ObjectCodec} associated with the parser * @param codec the {@link ObjectCodec} associated with the parser
* @param tree deserialized JSON content as tree expressed using set of * @param tree deserialized JSON content as tree expressed using set of
* {@link TreeNode} instances * {@link TreeNode} instances
* @return the dserialized object * @return the deserialized object
* @throws IOException on error * @throws IOException on error
* @see #deserialize(JsonParser, DeserializationContext) * @see #deserialize(JsonParser, DeserializationContext)
*/ */
protected abstract T deserializeObject(JsonParser jasonParser, protected abstract T deserializeObject(JsonParser jsonParser,
DeserializationContext context, ObjectCodec codec, JsonNode tree) DeserializationContext context, ObjectCodec codec, JsonNode tree)
throws IOException; throws IOException;

2
spring-boot/src/test/java/org/springframework/boot/context/embedded/DelegatingFilterProxyRegistrationBeanTests.java
View File

@ -38,7 +38,7 @@ public class DelegatingFilterProxyRegistrationBeanTests
extends AbstractFilterRegistrationBeanTests { extends AbstractFilterRegistrationBeanTests {
private WebApplicationContext applicationContext = new GenericWebApplicationContext( private WebApplicationContext applicationContext = new GenericWebApplicationContext(
new MockServletContext());; new MockServletContext());
@Test @Test
public void targetBeanNameMustNotBeNull() throws Exception { public void targetBeanNameMustNotBeNull() throws Exception {

4
spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalyzerTests.java
View File

@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
/** /**
* Tests for {@link ValidationExceptionFailureAnalzer} * Tests for {@link ValidationExceptionFailureAnalyzer}
* *
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
@ -45,7 +45,7 @@ public class ValidationExceptionFailureAnalyzerTests {
fail("Expected failure did not occur"); fail("Expected failure did not occur");
} }
catch (Exception ex) { catch (Exception ex) {
FailureAnalysis analysis = new ValidationExceptionFailureAnalzer() FailureAnalysis analysis = new ValidationExceptionFailureAnalyzer()
.analyze(ex); .analyze(ex);
assertThat(analysis).isNotNull(); assertThat(analysis).isNotNull();
} }

2
spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java
View File

@ -197,7 +197,7 @@ public class JsonObjectDeserializerTests {
static class TestJsonObjectDeserializer<T> extends JsonObjectDeserializer<T> { static class TestJsonObjectDeserializer<T> extends JsonObjectDeserializer<T> {
@Override @Override
protected T deserializeObject(JsonParser jasonParser, protected T deserializeObject(JsonParser jsonParser,
DeserializationContext context, ObjectCodec codec, JsonNode tree) DeserializationContext context, ObjectCodec codec, JsonNode tree)
throws IOException { throws IOException {
return null; return null;

2
spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java
View File

@ -47,7 +47,7 @@ public class NameAndAgeJsonComponent {
public static class Deserializer extends JsonObjectDeserializer<NameAndAge> { public static class Deserializer extends JsonObjectDeserializer<NameAndAge> {
@Override @Override
protected NameAndAge deserializeObject(JsonParser jasonParser, protected NameAndAge deserializeObject(JsonParser jsonParser,
DeserializationContext context, ObjectCodec codec, JsonNode tree) DeserializationContext context, ObjectCodec codec, JsonNode tree)
throws IOException { throws IOException {
String name = nullSafeValue(tree.get("name"), String.class); String name = nullSafeValue(tree.get("name"), String.class);