Skip to content

Commit 2cf45ba

Browse files
philwebbcbeams
philwebb
authored and
cbeams
committed
Replace space indentation with tabs
Issue: SPR-10127
1 parent 1762157 commit 2cf45ba

154 files changed

Lines changed: 1572 additions & 1567 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ public Object proceed() throws Throwable {
151151
}
152152

153153
Object interceptorOrInterceptionAdvice =
154-
this.interceptorsAndDynamicMethodMatchers.get(++this.currentInterceptorIndex);
154+
this.interceptorsAndDynamicMethodMatchers.get(++this.currentInterceptorIndex);
155155
if (interceptorOrInterceptionAdvice instanceof InterceptorAndDynamicMethodMatcher) {
156156
// Evaluate dynamic method matcher here: static part will already have
157157
// been evaluated and found to match.
158158
InterceptorAndDynamicMethodMatcher dm =
159-
(InterceptorAndDynamicMethodMatcher) interceptorOrInterceptionAdvice;
159+
(InterceptorAndDynamicMethodMatcher) interceptorOrInterceptionAdvice;
160160
if (dm.methodMatcher.matches(this.method, this.targetClass, this.arguments)) {
161161
return dm.interceptor.invoke(this);
162162
}

‎spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ public Object getTarget() throws BeansException {
7878
Object target = this.targetInThread.get();
7979
if (target == null) {
8080
if (logger.isDebugEnabled()) {
81-
logger.debug("No target for prototype '" + getTargetBeanName() + "' bound to thread: " +
82-
"creating one and binding it to thread '" + Thread.currentThread().getName() + "'");
81+
logger.debug("No target for prototype '" + getTargetBeanName() +
82+
"' bound to thread: " +
83+
"creating one and binding it to thread '" +
84+
Thread.currentThread().getName() + "'");
8385
}
8486
// Associate target with ThreadLocal.
8587
target = newPrototypeInstance();

‎spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ public void testMatchGenericArgument() {
9090
@Test
9191
public void testMatchVarargs() throws SecurityException, NoSuchMethodException {
9292
class MyTemplate {
93-
public int queryForInt(String sql, Object... params) {
94-
return 0;
95-
}
93+
public int queryForInt(String sql, Object... params) {
94+
return 0;
95+
}
9696
}
9797

9898
String expression = "execution(int *.*(String, Object...))";
@@ -101,8 +101,8 @@ public int queryForInt(String sql, Object... params) {
101101

102102
// TODO: the expression above no longer matches Object[]
103103
// assertFalse(jdbcVarArgs.matches(
104-
// JdbcTemplate.class.getMethod("queryForInt", String.class, Object[].class),
105-
// JdbcTemplate.class));
104+
// JdbcTemplate.class.getMethod("queryForInt", String.class, Object[].class),
105+
// JdbcTemplate.class));
106106

107107
assertTrue(jdbcVarArgs.matches(
108108
MyTemplate.class.getMethod("queryForInt", String.class, Object[].class),

‎spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@ public TestException(String string) {
131131
}
132132

133133
public static interface TestService {
134-
public String sayHello();
134+
public String sayHello();
135135
}
136136

137137
@Log
138-
public static class TestServiceImpl implements TestService{
139-
public String sayHello() {
140-
throw new TestException("TestServiceImpl");
141-
}
138+
public static class TestServiceImpl implements TestService {
139+
public String sayHello() {
140+
throw new TestException("TestServiceImpl");
141+
}
142142
}
143143

144144
public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice {
@@ -149,12 +149,12 @@ public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice {
149149

150150
public void before(Method method, Object[] objects, Object o) throws Throwable {
151151
countBefore++;
152-
}
152+
}
153153

154154
public void afterThrowing(Exception e) throws Throwable {
155155
countThrows++;
156-
throw e;
157-
}
156+
throw e;
157+
}
158158

159159
public int getCountBefore() {
160160
return countBefore;

‎spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void testAndOrNotReplacement() {
8080

8181
@Test(expected=IllegalArgumentException.class)
8282
public void testSetTypePatternWithNullArgument() throws Exception {
83-
new TypePatternClassFilter(null);
83+
new TypePatternClassFilter(null);
8484
}
8585

8686
@Test(expected=IllegalStateException.class)

‎spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ public void testIntroductionOnTargetExcludedByTypePattern() {
411411
CannotBeUnlocked.class);
412412
assertFalse("Type pattern must have excluded mixin", proxy instanceof Lockable);
413413
}
414+
414415
/* prereq AspectJ 1.6.7
415416
@Test
416417
public void testIntroductionBasedOnAnnotationMatch_Spr5307() {
@@ -426,8 +427,10 @@ public void testIntroductionBasedOnAnnotationMatch_Spr5307() {
426427
Lockable lockable = (Lockable)proxy;
427428
lockable.locked();
428429
}
429-
*/
430+
*/
431+
430432
// TODO: Why does this test fail? It hasn't been run before, so it maybe never actually passed...
433+
431434
public void XtestIntroductionWithArgumentBinding() {
432435
TestBean target = new TestBean();
433436

@@ -764,8 +767,8 @@ public static class BindingAspectWithSingleArg {
764767
public void setAge(int a) {}
765768

766769
@Around(value="setAge(age)",argNames="age")
767-
// @ArgNames({"age"}) // AMC needs more work here? ignoring pjp arg... ok??
768-
// // argNames should be suported in Around as it is in Pointcut
770+
// @ArgNames({"age"}) // AMC needs more work here? ignoring pjp arg... ok??
771+
// argNames should be suported in Around as it is in Pointcut
769772
public void changeReturnType(ProceedingJoinPoint pjp, int age) throws Throwable {
770773
pjp.proceed(new Object[] {age*2});
771774
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public String toString() {
6868
Method m = Object.class.getMethod("hashCode", (Class[]) null);
6969
Object proxy = new Object();
7070
ReflectiveMethodInvocation invocation =
71-
new ReflectiveMethodInvocation(proxy, target, m, null, null, is);
71+
new ReflectiveMethodInvocation(proxy, target, m, null, null, is);
7272

7373
// If it hits target, the test will fail with the UnsupportedOpException
7474
// in the inner class above.

‎spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ package org.springframework.beans.factory.aspectj;
4141
* @since 3.0.0
4242
*/
4343
public abstract aspect GenericInterfaceDrivenDependencyInjectionAspect<I> extends AbstractInterfaceDrivenDependencyInjectionAspect {
44-
declare parents: I implements ConfigurableObject;
44+
declare parents: I implements ConfigurableObject;
4545

4646
public pointcut inConfigurableBean() : within(I+);
4747

‎spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import org.springframework.dao.DataAccessException;
99
import org.springframework.orm.jpa.EntityManagerFactoryUtils;
1010

1111
public aspect JpaExceptionTranslatorAspect {
12-
pointcut entityManagerCall(): call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) || call(* EntityTransaction.*(..)) || call(* Query.*(..));
12+
pointcut entityManagerCall(): call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) || call(* EntityTransaction.*(..)) || call(* Query.*(..));
1313

14-
after() throwing(RuntimeException re): entityManagerCall() {
15-
DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(re);
16-
if (dex != null) {
17-
throw dex;
18-
} else {
19-
throw re;
20-
}
21-
}
22-
}
14+
after() throwing(RuntimeException re): entityManagerCall() {
15+
DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(re);
16+
if (dex != null) {
17+
throw dex;
18+
} else {
19+
throw re;
20+
}
21+
}
22+
}

‎spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public abstract aspect AbstractTransactionAspect extends TransactionAspectSuppor
6666
@SuppressAjWarnings("adviceDidNotMatch")
6767
after(Object txObject) throwing(Throwable t) : transactionalMethodExecution(txObject) {
6868
try {
69-
completeTransactionAfterThrowing(TransactionAspectSupport.currentTransactionInfo(), t);
69+
completeTransactionAfterThrowing(TransactionAspectSupport.currentTransactionInfo(), t);
7070
}
7171
catch (Throwable t2) {
7272
logger.error("Failed to close transaction after throwing in a transactional method", t2);

0 commit comments

Comments
 (0)