Skip to content

Commit a0d37ac

Browse files
izeyejhoeller
izeye
authored and
jhoeller
committed
Remove inconsistent spaces
(cherry picked from commit fb898e1)
1 parent a39938d commit a0d37ac

File tree

14 files changed

+40
-40
lines changed

14 files changed

+40
-40
lines changed

‎spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public MethodBeforeAdviceInterceptor(MethodBeforeAdvice advice) {
4848

4949
@Override
5050
public Object invoke(MethodInvocation mi) throws Throwable {
51-
this.advice.before(mi.getMethod(), mi.getArguments(), mi.getThis() );
51+
this.advice.before(mi.getMethod(), mi.getArguments(), mi.getThis());
5252
return mi.proceed();
5353
}
5454

‎spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ public void tearDown() {
7070
@Test
7171
public void testBasicFunctionality() {
7272
SideEffectBean proxied = (SideEffectBean) beanFactory.getBean("swappable");
73-
assertEquals(INITIAL_COUNT, proxied.getCount() );
73+
assertEquals(INITIAL_COUNT, proxied.getCount());
7474
proxied.doWork();
75-
assertEquals(INITIAL_COUNT + 1, proxied.getCount() );
75+
assertEquals(INITIAL_COUNT + 1, proxied.getCount());
7676

7777
proxied = (SideEffectBean) beanFactory.getBean("swappable");
7878
proxied.doWork();
79-
assertEquals(INITIAL_COUNT + 2, proxied.getCount() );
79+
assertEquals(INITIAL_COUNT + 2, proxied.getCount());
8080
}
8181

8282
@Test
@@ -85,9 +85,9 @@ public void testValidSwaps() {
8585
SideEffectBean target2 = (SideEffectBean) beanFactory.getBean("target2");
8686

8787
SideEffectBean proxied = (SideEffectBean) beanFactory.getBean("swappable");
88-
assertEquals(target1.getCount(), proxied.getCount() );
88+
assertEquals(target1.getCount(), proxied.getCount());
8989
proxied.doWork();
90-
assertEquals(INITIAL_COUNT + 1, proxied.getCount() );
90+
assertEquals(INITIAL_COUNT + 1, proxied.getCount());
9191

9292
HotSwappableTargetSource swapper = (HotSwappableTargetSource) beanFactory.getBean("swapper");
9393
Object old = swapper.swap(target2);

‎spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ public void setUp() throws Exception {
5656
@Test
5757
public void testPrototypeAndSingletonBehaveDifferently() {
5858
SideEffectBean singleton = (SideEffectBean) beanFactory.getBean("singleton");
59-
assertEquals(INITIAL_COUNT, singleton.getCount() );
59+
assertEquals(INITIAL_COUNT, singleton.getCount());
6060
singleton.doWork();
61-
assertEquals(INITIAL_COUNT + 1, singleton.getCount() );
61+
assertEquals(INITIAL_COUNT + 1, singleton.getCount());
6262

6363
SideEffectBean prototype = (SideEffectBean) beanFactory.getBean("prototype");
64-
assertEquals(INITIAL_COUNT, prototype.getCount() );
64+
assertEquals(INITIAL_COUNT, prototype.getCount());
6565
prototype.doWork();
66-
assertEquals(INITIAL_COUNT, prototype.getCount() );
66+
assertEquals(INITIAL_COUNT, prototype.getCount());
6767
}
6868

6969

‎spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ protected void tearDown() {
6262
@Test
6363
public void testUseDifferentManagedInstancesInSameThread() {
6464
SideEffectBean apartment = (SideEffectBean) beanFactory.getBean("apartment");
65-
assertEquals(INITIAL_COUNT, apartment.getCount() );
65+
assertEquals(INITIAL_COUNT, apartment.getCount());
6666
apartment.doWork();
67-
assertEquals(INITIAL_COUNT + 1, apartment.getCount() );
67+
assertEquals(INITIAL_COUNT + 1, apartment.getCount());
6868

6969
ITestBean test = (ITestBean) beanFactory.getBean("threadLocal2");
7070
assertEquals("Rod", test.getName());
@@ -74,12 +74,12 @@ public void testUseDifferentManagedInstancesInSameThread() {
7474
@Test
7575
public void testReuseInSameThread() {
7676
SideEffectBean apartment = (SideEffectBean) beanFactory.getBean("apartment");
77-
assertEquals(INITIAL_COUNT, apartment.getCount() );
77+
assertEquals(INITIAL_COUNT, apartment.getCount());
7878
apartment.doWork();
79-
assertEquals(INITIAL_COUNT + 1, apartment.getCount() );
79+
assertEquals(INITIAL_COUNT + 1, apartment.getCount());
8080

8181
apartment = (SideEffectBean) beanFactory.getBean("apartment");
82-
assertEquals(INITIAL_COUNT + 1, apartment.getCount() );
82+
assertEquals(INITIAL_COUNT + 1, apartment.getCount());
8383
}
8484

8585
/**
@@ -106,20 +106,20 @@ public void testCanGetStatsViaMixin() {
106106
@Test
107107
public void testNewThreadHasOwnInstance() throws InterruptedException {
108108
SideEffectBean apartment = (SideEffectBean) beanFactory.getBean("apartment");
109-
assertEquals(INITIAL_COUNT, apartment.getCount() );
109+
assertEquals(INITIAL_COUNT, apartment.getCount());
110110
apartment.doWork();
111111
apartment.doWork();
112112
apartment.doWork();
113-
assertEquals(INITIAL_COUNT + 3, apartment.getCount() );
113+
assertEquals(INITIAL_COUNT + 3, apartment.getCount());
114114

115115
class Runner implements Runnable {
116116
public SideEffectBean mine;
117117
@Override
118118
public void run() {
119119
this.mine = (SideEffectBean) beanFactory.getBean("apartment");
120-
assertEquals(INITIAL_COUNT, mine.getCount() );
120+
assertEquals(INITIAL_COUNT, mine.getCount());
121121
mine.doWork();
122-
assertEquals(INITIAL_COUNT + 1, mine.getCount() );
122+
assertEquals(INITIAL_COUNT + 1, mine.getCount());
123123
}
124124
}
125125
Runner r = new Runner();
@@ -130,11 +130,11 @@ public void run() {
130130
assertNotNull(r);
131131

132132
// Check it didn't affect the other thread's copy
133-
assertEquals(INITIAL_COUNT + 3, apartment.getCount() );
133+
assertEquals(INITIAL_COUNT + 3, apartment.getCount());
134134

135135
// When we use other thread's copy in this thread
136136
// it should behave like ours
137-
assertEquals(INITIAL_COUNT + 3, r.mine.getCount() );
137+
assertEquals(INITIAL_COUNT + 3, r.mine.getCount());
138138

139139
// Bound to two threads
140140
assertEquals(2, ((ThreadLocalTargetSourceStats) apartment).getObjectCount());

‎spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -260,22 +260,22 @@ private Object testPrototypeInstancesAreIndependent(String beanName) {
260260

261261
// Check it works without AOP
262262
SideEffectBean raw = (SideEffectBean) bf.getBean("prototypeTarget");
263-
assertEquals(INITIAL_COUNT, raw.getCount() );
263+
assertEquals(INITIAL_COUNT, raw.getCount());
264264
raw.doWork();
265-
assertEquals(INITIAL_COUNT+1, raw.getCount() );
265+
assertEquals(INITIAL_COUNT+1, raw.getCount());
266266
raw = (SideEffectBean) bf.getBean("prototypeTarget");
267-
assertEquals(INITIAL_COUNT, raw.getCount() );
267+
assertEquals(INITIAL_COUNT, raw.getCount());
268268

269269
// Now try with advised instances
270270
SideEffectBean prototype2FirstInstance = (SideEffectBean) bf.getBean(beanName);
271-
assertEquals(INITIAL_COUNT, prototype2FirstInstance.getCount() );
271+
assertEquals(INITIAL_COUNT, prototype2FirstInstance.getCount());
272272
prototype2FirstInstance.doWork();
273-
assertEquals(INITIAL_COUNT + 1, prototype2FirstInstance.getCount() );
273+
assertEquals(INITIAL_COUNT + 1, prototype2FirstInstance.getCount());
274274

275275
SideEffectBean prototype2SecondInstance = (SideEffectBean) bf.getBean(beanName);
276276
assertFalse("Prototypes are not ==", prototype2FirstInstance == prototype2SecondInstance);
277-
assertEquals(INITIAL_COUNT, prototype2SecondInstance.getCount() );
278-
assertEquals(INITIAL_COUNT + 1, prototype2FirstInstance.getCount() );
277+
assertEquals(INITIAL_COUNT, prototype2SecondInstance.getCount());
278+
assertEquals(INITIAL_COUNT + 1, prototype2FirstInstance.getCount());
279279

280280
return prototype2FirstInstance;
281281
}

‎spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private void testFunctionality(String name) {
8484
// Just check that it works--we can't make assumptions
8585
// about the count
8686
pooled.doWork();
87-
//assertEquals(INITIAL_COUNT + 1, apartment.getCount() );
87+
//assertEquals(INITIAL_COUNT + 1, apartment.getCount());
8888
}
8989

9090
@Test

‎spring-context/src/test/java/org/springframework/cache/AbstractCacheTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private void doTestCacheGetCallable(Object returnValue) {
132132
String key = createRandomKey();
133133

134134
assertNull(cache.get(key));
135-
Object value = cache.get(key, () -> returnValue );
135+
Object value = cache.get(key, () -> returnValue);
136136
assertEquals(returnValue, value);
137137
assertEquals(value, cache.get(key).get());
138138
}

‎spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void testInvokesMethodOnEjbInstance() throws Exception {
8989

9090
LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
9191

92-
ProxyFactory pf = new ProxyFactory(new Class<?>[] { BusinessMethods.class } );
92+
ProxyFactory pf = new ProxyFactory(new Class<?>[] { BusinessMethods.class });
9393
pf.addAdvice(si);
9494
BusinessMethods target = (BusinessMethods) pf.getProxy();
9595

@@ -110,7 +110,7 @@ public void testInvokesMethodOnEjbInstanceWithSeparateBusinessMethods() throws E
110110

111111
LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
112112

113-
ProxyFactory pf = new ProxyFactory(new Class<?>[] { BusinessMethods.class } );
113+
ProxyFactory pf = new ProxyFactory(new Class<?>[] { BusinessMethods.class });
114114
pf.addAdvice(si);
115115
BusinessMethods target = (BusinessMethods) pf.getProxy();
116116

@@ -129,7 +129,7 @@ private void testException(Exception expected) throws Exception {
129129

130130
LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
131131

132-
ProxyFactory pf = new ProxyFactory(new Class<?>[] { LocalInterfaceWithBusinessMethods.class } );
132+
ProxyFactory pf = new ProxyFactory(new Class<?>[] { LocalInterfaceWithBusinessMethods.class });
133133
pf.addAdvice(si);
134134
LocalInterfaceWithBusinessMethods target = (LocalInterfaceWithBusinessMethods) pf.getProxy();
135135

‎spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void test5() throws Exception {
112112
lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test");
113113
verify(creator).setClobAsAsciiStream(eq(preparedStatement), eq(1), inputStreamCaptor.capture(), eq(3));
114114
byte[] bytes = new byte[3];
115-
inputStreamCaptor.getValue().read(bytes );
115+
inputStreamCaptor.getValue().read(bytes);
116116
assertThat(bytes, equalTo(testContent));
117117
}
118118

‎spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected Object resolveArgumentInternal(MethodParameter parameter, Message<?> m
7373
logger.warn("Message headers contain two values for the same header '" + name + "', " +
7474
"one in the top level header map and a second in the nested map with native headers. " +
7575
"Using the value from top level map. " +
76-
"Use 'nativeHeader.myHeader' to resolve to the value from the nested native header map." );
76+
"Use 'nativeHeader.myHeader' to resolve to the value from the nested native header map.");
7777
}
7878
}
7979

0 commit comments

Comments
 (0)