From 779deb0fa786d57b67afa91c8b0164364982e679 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 13 Jun 2017 11:38:05 +0200 Subject: [PATCH] Cleanup of duplicate semicolons Issue: SPR-15654 --- .../aop/aspectj/AroundAdviceBindingTests.java | 8 ++++---- .../support/TransactionSynchronizationManager.java | 4 ++-- .../web/context/request/async/WebAsyncManagerTests.java | 2 +- .../web/servlet/view/document/AbstractXlsView.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java index 1e05bb38b5..31615467f6 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,19 +74,19 @@ public class AroundAdviceBindingTests { @Test public void testOneObjectArgBoundToTarget() { testBeanProxy.getAge(); - verify(mockCollaborator).oneObjectArg(this.testBeanTarget);; + verify(mockCollaborator).oneObjectArg(this.testBeanTarget); } @Test public void testOneIntAndOneObjectArgs() { testBeanProxy.setAge(5); - verify(mockCollaborator).oneIntAndOneObject(5, this.testBeanProxy);; + verify(mockCollaborator).oneIntAndOneObject(5, this.testBeanProxy); } @Test public void testJustJoinPoint() { testBeanProxy.getAge(); - verify(mockCollaborator).justJoinPoint("getAge");; + verify(mockCollaborator).justJoinPoint("getAge"); } } diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java index db948e05c4..b705fc00c0 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java @@ -470,8 +470,8 @@ public abstract class TransactionSynchronizationManager { public static void clear() { synchronizations.remove(); currentTransactionName.remove(); - currentTransactionReadOnly.remove();; - currentTransactionIsolationLevel.remove();; + currentTransactionReadOnly.remove(); + currentTransactionIsolationLevel.remove(); actualTransactionActive.remove(); } diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java index 89c5cd2459..0d805d7871 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java @@ -328,7 +328,7 @@ public class WebAsyncManagerTests { Exception exception = new Exception(); DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class); - willThrow(exception).given(interceptor).postProcess(this.asyncWebRequest, deferredResult, 25);; + willThrow(exception).given(interceptor).postProcess(this.asyncWebRequest, deferredResult, 25); setupDefaultAsyncScenario(); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsView.java index f0ab4ea599..a6e1b50c6b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsView.java @@ -70,7 +70,7 @@ public abstract class AbstractXlsView extends AbstractView { response.setContentType(getContentType()); // Flush byte array to servlet output stream. - renderWorkbook(workbook, response);; + renderWorkbook(workbook, response); }