This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 3f9f9d9913 Remove unnecessary FQCN
3f9f9d9913 is described below
commit 3f9f9d99133dfa987076bb598bd86fa279e58fe7
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Sep 21 22:55:50 2023 +0100
Remove unnecessary FQCN
---
java/javax/ejb/EJB.java | 2 +-
java/javax/el/ELManager.java | 4 +--
java/javax/el/ELProcessor.java | 2 +-
java/javax/el/ImportHandler.java | 8 +++---
java/javax/el/LambdaExpression.java | 2 +-
java/javax/servlet/ReadListener.java | 2 +-
java/javax/servlet/ServletOutputStream.java | 2 +-
java/javax/servlet/WriteListener.java | 2 +-
java/javax/servlet/http/HttpServlet.java | 2 +-
java/javax/servlet/http/HttpServletRequest.java | 2 +-
.../servlet/jsp/el/ImplicitObjectELResolver.java | 2 +-
java/javax/servlet/jsp/tagext/TagLibraryInfo.java | 2 +-
java/javax/websocket/CloseReason.java | 30 +++++++++++-----------
java/javax/xml/ws/WebServiceRef.java | 4 +--
14 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/java/javax/ejb/EJB.java b/java/javax/ejb/EJB.java
index 46b0aa23f6..f577f0d4ff 100644
--- a/java/javax/ejb/EJB.java
+++ b/java/javax/ejb/EJB.java
@@ -30,7 +30,7 @@ public @interface EJB {
String description() default "";
@SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to
match specification
- Class beanInterface() default java.lang.Object.class;
+ Class beanInterface() default Object.class;
String beanName() default "";
diff --git a/java/javax/el/ELManager.java b/java/javax/el/ELManager.java
index 15677c72bf..b0f799a5c2 100644
--- a/java/javax/el/ELManager.java
+++ b/java/javax/el/ELManager.java
@@ -60,11 +60,11 @@ public class ELManager {
getELContext().getVariableMapper().setVariable(variable, expression);
}
- public void importStatic(String staticMemberName) throws
javax.el.ELException {
+ public void importStatic(String staticMemberName) throws ELException {
getELContext().getImportHandler().importStatic(staticMemberName);
}
- public void importClass(String className) throws javax.el.ELException {
+ public void importClass(String className) throws ELException {
getELContext().getImportHandler().importClass(className);
}
diff --git a/java/javax/el/ELProcessor.java b/java/javax/el/ELProcessor.java
index 8133c5026d..74496143ff 100644
--- a/java/javax/el/ELProcessor.java
+++ b/java/javax/el/ELProcessor.java
@@ -171,7 +171,7 @@ public class ELProcessor {
* @throws NullPointerException If any of the arguments are null
* @throws NoSuchMethodException If the method is not static
*/
- public void defineFunction(String prefix, String function, Method method)
throws java.lang.NoSuchMethodException {
+ public void defineFunction(String prefix, String function, Method method)
throws NoSuchMethodException {
if (prefix == null || function == null || method == null) {
throw new NullPointerException(Util.message(context,
"elProcessor.defineFunctionNullParams"));
diff --git a/java/javax/el/ImportHandler.java b/java/javax/el/ImportHandler.java
index ed88b36e76..f26fe7efdb 100644
--- a/java/javax/el/ImportHandler.java
+++ b/java/javax/el/ImportHandler.java
@@ -288,7 +288,7 @@ public class ImportHandler {
}
- public void importStatic(String name) throws javax.el.ELException {
+ public void importStatic(String name) throws ELException {
int lastPeriod = name.lastIndexOf('.');
if (lastPeriod < 0) {
@@ -343,7 +343,7 @@ public class ImportHandler {
}
- public void importClass(String name) throws javax.el.ELException {
+ public void importClass(String name) throws ELException {
int lastPeriodIndex = name.lastIndexOf('.');
if (lastPeriodIndex < 0) {
@@ -374,7 +374,7 @@ public class ImportHandler {
}
- public java.lang.Class<?> resolveClass(String name) {
+ public Class<?> resolveClass(String name) {
if (name == null || name.contains(".")) {
return null;
}
@@ -434,7 +434,7 @@ public class ImportHandler {
}
- public java.lang.Class<?> resolveStatic(String name) {
+ public Class<?> resolveStatic(String name) {
return statics.get(name);
}
diff --git a/java/javax/el/LambdaExpression.java
b/java/javax/el/LambdaExpression.java
index a87d73122b..51baa1c2dd 100644
--- a/java/javax/el/LambdaExpression.java
+++ b/java/javax/el/LambdaExpression.java
@@ -81,7 +81,7 @@ public class LambdaExpression {
}
}
- public java.lang.Object invoke(Object... args) {
+ public Object invoke(Object... args) {
return invoke(context, args);
}
}
diff --git a/java/javax/servlet/ReadListener.java
b/java/javax/servlet/ReadListener.java
index 2bfe552e42..8004bf262e 100644
--- a/java/javax/servlet/ReadListener.java
+++ b/java/javax/servlet/ReadListener.java
@@ -46,5 +46,5 @@ public interface ReadListener extends java.util.EventListener
{
*
* @param throwable The exception that occurred
*/
- void onError(java.lang.Throwable throwable);
+ void onError(Throwable throwable);
}
diff --git a/java/javax/servlet/ServletOutputStream.java
b/java/javax/servlet/ServletOutputStream.java
index 61c3c0f2c3..a61c34b058 100644
--- a/java/javax/servlet/ServletOutputStream.java
+++ b/java/javax/servlet/ServletOutputStream.java
@@ -269,5 +269,5 @@ public abstract class ServletOutputStream extends
OutputStream {
*
* @since Servlet 3.1
*/
- public abstract void setWriteListener(javax.servlet.WriteListener
listener);
+ public abstract void setWriteListener(WriteListener listener);
}
diff --git a/java/javax/servlet/WriteListener.java
b/java/javax/servlet/WriteListener.java
index 44c4c6d285..936cbec4b6 100644
--- a/java/javax/servlet/WriteListener.java
+++ b/java/javax/servlet/WriteListener.java
@@ -39,5 +39,5 @@ public interface WriteListener extends
java.util.EventListener {
*
* @param throwable The throwable that represents the error that occurred
*/
- void onError(java.lang.Throwable throwable);
+ void onError(Throwable throwable);
}
\ No newline at end of file
diff --git a/java/javax/servlet/http/HttpServlet.java
b/java/javax/servlet/http/HttpServlet.java
index 8a6c63871d..17f36246df 100644
--- a/java/javax/servlet/http/HttpServlet.java
+++ b/java/javax/servlet/http/HttpServlet.java
@@ -295,7 +295,7 @@ public abstract class HttpServlet extends GenericServlet {
private static Method[] getAllDeclaredMethods(Class<?> c) {
- if (c.equals(javax.servlet.http.HttpServlet.class)) {
+ if (c.equals(HttpServlet.class)) {
return null;
}
diff --git a/java/javax/servlet/http/HttpServletRequest.java
b/java/javax/servlet/http/HttpServletRequest.java
index 96e39e27c9..e7a3a3af4c 100644
--- a/java/javax/servlet/http/HttpServletRequest.java
+++ b/java/javax/servlet/http/HttpServletRequest.java
@@ -466,5 +466,5 @@ public interface HttpServletRequest extends ServletRequest {
* @since Servlet 3.1
*/
<T extends HttpUpgradeHandler> T upgrade(Class<T> httpUpgradeHandlerClass)
- throws java.io.IOException, ServletException;
+ throws IOException, ServletException;
}
diff --git a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
index 47428a770f..295aafa031 100644
--- a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -617,7 +617,7 @@ public class ImplicitObjectELResolver extends ELResolver {
private static final Map<String,Scope> lookupMap = new HashMap<>();
static {
- for (Scope scope : Scope.values()) {
+ for (Scope scope : values()) {
lookupMap.put(scope.implicitName, scope);
}
}
diff --git a/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
b/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
index d3274c011e..7f0afe539d 100644
--- a/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
@@ -211,7 +211,7 @@ public abstract class TagLibraryInfo {
*
* @since JSP 2.1
*/
- public abstract javax.servlet.jsp.tagext.TagLibraryInfo[]
getTagLibraryInfos();
+ public abstract TagLibraryInfo[] getTagLibraryInfos();
// Protected fields
diff --git a/java/javax/websocket/CloseReason.java
b/java/javax/websocket/CloseReason.java
index ecbf319c2d..12fe61e011 100644
--- a/java/javax/websocket/CloseReason.java
+++ b/java/javax/websocket/CloseReason.java
@@ -78,35 +78,35 @@ public class CloseReason {
}
switch (code) {
case 1000:
- return CloseCodes.NORMAL_CLOSURE;
+ return NORMAL_CLOSURE;
case 1001:
- return CloseCodes.GOING_AWAY;
+ return GOING_AWAY;
case 1002:
- return CloseCodes.PROTOCOL_ERROR;
+ return PROTOCOL_ERROR;
case 1003:
- return CloseCodes.CANNOT_ACCEPT;
+ return CANNOT_ACCEPT;
case 1004:
- return CloseCodes.RESERVED;
+ return RESERVED;
case 1005:
- return CloseCodes.NO_STATUS_CODE;
+ return NO_STATUS_CODE;
case 1006:
- return CloseCodes.CLOSED_ABNORMALLY;
+ return CLOSED_ABNORMALLY;
case 1007:
- return CloseCodes.NOT_CONSISTENT;
+ return NOT_CONSISTENT;
case 1008:
- return CloseCodes.VIOLATED_POLICY;
+ return VIOLATED_POLICY;
case 1009:
- return CloseCodes.TOO_BIG;
+ return TOO_BIG;
case 1010:
- return CloseCodes.NO_EXTENSION;
+ return NO_EXTENSION;
case 1011:
- return CloseCodes.UNEXPECTED_CONDITION;
+ return UNEXPECTED_CONDITION;
case 1012:
- return CloseCodes.SERVICE_RESTART;
+ return SERVICE_RESTART;
case 1013:
- return CloseCodes.TRY_AGAIN_LATER;
+ return TRY_AGAIN_LATER;
case 1015:
- return CloseCodes.TLS_HANDSHAKE_FAILURE;
+ return TLS_HANDSHAKE_FAILURE;
default:
throw new IllegalArgumentException("Invalid close code: ["
+ code + "]");
}
diff --git a/java/javax/xml/ws/WebServiceRef.java
b/java/javax/xml/ws/WebServiceRef.java
index 5edcbe4324..c248a81354 100644
--- a/java/javax/xml/ws/WebServiceRef.java
+++ b/java/javax/xml/ws/WebServiceRef.java
@@ -28,10 +28,10 @@ public @interface WebServiceRef {
String name() default "";
@SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to
match specification
- Class type() default java.lang.Object.class;
+ Class type() default Object.class;
@SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to
match specification
- Class value() default java.lang.Object.class;
+ Class value() default Object.class;
String wsdlLocation() default "";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
