Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delete trailing whitespace in Java source code

Browse Source
This commit is contained in:
Sam Brannen
2015-06-19 17:09:52 +02:00
parent b36c9f9f23
commit 078d252d1e
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java
View File

@@ -479,7 +479,7 @@ public class AntPathMatcherTests {
// longer is better
assertEquals(1, comparator.compare("/hotels", "/hotels2"));
//SPR-13139
assertEquals(-1, comparator.compare("*", "*/**"));
assertEquals(1, comparator.compare("*/**", "*"));

2
spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
View File

@@ -184,7 +184,7 @@ public class ExpressionState {
public void enterScope() {
ensureVariableScopesInitialized();
this.variableScopes.push(new VariableScope(Collections.<String,Object>emptyMap()));
this.scopeRootObjects.push(getActiveContextObject());
this.scopeRootObjects.push(getActiveContextObject());
}
public void enterScope(String name, Object value) {

10
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
View File

@@ -2999,7 +2999,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
context.setVariable("it", person);
expression.setEvaluationContext(context);
assertTrue(expression.getValue(Boolean.class));
assertTrue(expression.getValue(Boolean.class));
assertTrue(expression.getValue(Boolean.class));
assertCanCompile(expression);
assertTrue(expression.getValue(Boolean.class));
}
@@ -5022,7 +5022,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
for (String[] varg: vargs) {
s+="{";
for (String v: varg) {
s+=v;
s+=v;
}
s+="}";
}
@@ -5038,7 +5038,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
for (int[] varg: vargs) {
s+="{";
for (int v: varg) {
s+=Integer.toString(v);
s+=Integer.toString(v);
}
s+="}";
}
@@ -5150,7 +5150,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
}
output = b.toString();
}
public Obj3(String s, Float f, int... ints) {
StringBuilder b = new StringBuilder();
b.append(s);
@@ -5165,7 +5165,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
}
public static class Obj4 {
public final String output;
public Obj4(int[] params) {

2
spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java
View File

@@ -129,7 +129,7 @@ public class DefaultUserDestinationResolverTests {
@Test
public void handleMessageToOtherUser() {
TestSimpUser otherSimpUser = new TestSimpUser("anna");
otherSimpUser.addSessions(new TestSimpSession("456"));
when(this.registry.getUser("anna")).thenReturn(otherSimpUser);

2
spring-web/src/test/java/org/springframework/http/client/OkHttpAsyncClientHttpRequestFactoryTests.java
View File

@@ -24,7 +24,7 @@ import org.springframework.http.HttpMethod;
* @author Luciano Leggieri
*/
public class OkHttpAsyncClientHttpRequestFactoryTests extends AbstractAsyncHttpRequestFactoryTestCase {
@Override
protected AsyncClientHttpRequestFactory createRequestFactory() {
return new OkHttpClientHttpRequestFactory();

4
spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
View File

@@ -238,11 +238,11 @@ public class Jackson2ObjectMapperBuilderTests {
@Test
public void defaultModules() throws JsonProcessingException, UnsupportedEncodingException {
ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().build();
Long timestamp = 1322903730000L;
DateTime dateTime = new DateTime(timestamp, DateTimeZone.UTC);
assertEquals(timestamp.toString(), new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8"));
Optional<String> optional = Optional.of("test");
assertEquals("\"test\"", new String(objectMapper.writeValueAsBytes(optional), "UTF-8"));
}

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
View File

@@ -701,7 +701,7 @@ public class MvcUriComponentsBuilder {
ControllerMethodInvocationInterceptor(Class<?> controllerType) {
this.controllerType = controllerType;
}
@Override
public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) {
if (getControllerMethod.equals(method)) {

2
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
View File

@@ -407,7 +407,7 @@ public class WebMvcConfigurationSupportExtensionTests {
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/resources/**");
}
}
private class TestPathHelper extends UrlPathHelper {}