Skip to content

Commit 5c813a3

Browse files
committed
Consistent use of @throws instead of @exception
1 parent 0ac117f commit 5c813a3

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

spring-beans/src/main/java/org/springframework/beans/Mergeable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ public interface Mergeable {
4343
* @param parent the object to merge with
4444
* @return the result of the merge operation
4545
* @throws IllegalArgumentException if the supplied parent is {@code null}
46-
* @exception IllegalStateException if merging is not enabled for this instance
46+
* @throws IllegalStateException if merging is not enabled for this instance
4747
* (i.e. {@code mergeEnabled} equals {@code false}).
4848
*/
4949
Object merge(@Nullable Object parent);

spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -223,7 +223,7 @@ public void setAutodetect(boolean autodetect) {
223223

224224
/**
225225
* Set the autodetection mode to use.
226-
* @exception IllegalArgumentException if the supplied value is not
226+
* @throws IllegalArgumentException if the supplied value is not
227227
* one of the {@code AUTODETECT_} constants
228228
* @see #setAutodetectModeName(String)
229229
* @see #AUTODETECT_ALL
@@ -240,7 +240,7 @@ public void setAutodetectMode(int autodetectMode) {
240240

241241
/**
242242
* Set the autodetection mode to use by name.
243-
* @exception IllegalArgumentException if the supplied value is not resolvable
243+
* @throws IllegalArgumentException if the supplied value is not resolvable
244244
* to one of the {@code AUTODETECT_} constants or is {@code null}
245245
* @see #setAutodetectMode(int)
246246
* @see #AUTODETECT_ALL

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -105,7 +105,7 @@ public boolean supportsParameter(MethodParameter parameter) {
105105

106106
/**
107107
* Iterate over registered {@link HandlerMethodArgumentResolver}s and invoke the one that supports it.
108-
* @exception IllegalStateException if no suitable {@link HandlerMethodArgumentResolver} is found.
108+
* @throws IllegalStateException if no suitable {@link HandlerMethodArgumentResolver} is found.
109109
*/
110110
@Override
111111
@Nullable

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -101,7 +101,7 @@ public void setParameterNameDiscoverer(ParameterNameDiscoverer parameterNameDisc
101101
* @param message the current message being processed
102102
* @param providedArgs "given" arguments matched by type, not resolved
103103
* @return the raw value returned by the invoked method
104-
* @exception Exception raised if no suitable argument resolver can be found,
104+
* @throws Exception raised if no suitable argument resolver can be found,
105105
* or if the method raised an exception
106106
*/
107107
@Nullable

spring-web/src/main/java/org/springframework/web/method/annotation/AbstractWebArgumentResolverAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -88,7 +88,7 @@ public boolean supportsParameter(MethodParameter parameter) {
8888

8989
/**
9090
* Delegate to the {@link WebArgumentResolver} instance.
91-
* @exception IllegalStateException if the resolved value is not assignable
91+
* @throws IllegalStateException if the resolved value is not assignable
9292
* to the method parameter.
9393
*/
9494
@Override

spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -121,7 +121,7 @@ public void setParameterNameDiscoverer(ParameterNameDiscoverer parameterNameDisc
121121
* @param mavContainer the ModelAndViewContainer for this request
122122
* @param providedArgs "given" arguments matched by type, not resolved
123123
* @return the raw value returned by the invoked method
124-
* @exception Exception raised if no suitable argument resolver can be found,
124+
* @throws Exception raised if no suitable argument resolver can be found,
125125
* or if the method raised an exception
126126
*/
127127
@Nullable

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/SockJsServiceConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ public interface SockJsServiceConfig {
6868

6969
/**
7070
* The codec to use for encoding and decoding SockJS messages.
71-
* @exception IllegalStateException if no {@link SockJsMessageCodec} is available
71+
* @throws IllegalStateException if no {@link SockJsMessageCodec} is available
7272
*/
7373
SockJsMessageCodec getMessageCodec();
7474

0 commit comments

Comments
 (0)