diff --git a/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyJasperInitializer.java b/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyJasperInitializer.java index 096f5f4a2e6..9ab013880f5 100644 --- a/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyJasperInitializer.java +++ b/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyJasperInitializer.java @@ -54,27 +54,18 @@ public class JettyJasperInitializer extends JasperInitializer super(context, namespaceAware, validation, blockExternal); } - /** - * @see org.apache.jasper.servlet.TldScanner#scan() - */ @Override public void scan() throws IOException, SAXException { return; //do nothing } - /** - * @see org.apache.jasper.servlet.TldScanner#getListeners() - */ @Override public List getListeners() { return Collections.emptyList(); } - /** - * @see org.apache.jasper.servlet.TldScanner#scanJars() - */ @Override public void scanJars() { diff --git a/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java b/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java index fd5de945368..1283892c243 100644 --- a/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java +++ b/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java @@ -48,9 +48,6 @@ public class JettyTldPreScanned extends TldPreScanned _jettyPreScannedURLs = preScannedTlds; } - /** - * @see org.apache.jasper.servlet.TldPreScanned#scanJars() - */ @Override public void scanJars() { diff --git a/apache-jsp/src/test/java/org/eclipse/jetty/jsp/TestJettyJspServlet.java b/apache-jsp/src/test/java/org/eclipse/jetty/jsp/TestJettyJspServlet.java index 397aea026f7..e53da63c82c 100644 --- a/apache-jsp/src/test/java/org/eclipse/jetty/jsp/TestJettyJspServlet.java +++ b/apache-jsp/src/test/java/org/eclipse/jetty/jsp/TestJettyJspServlet.java @@ -62,9 +62,6 @@ public class TestJettyJspServlet super(); } - /** - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { diff --git a/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java b/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java index 8abf15abf12..e7c8bf01590 100644 --- a/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java +++ b/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java @@ -28,7 +28,6 @@ import java.util.LinkedList; import java.util.Map; import java.util.Queue; import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -94,10 +93,6 @@ public class SerialRestServlet extends AbstractRestServlet out.close(); } - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse - * response) - */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java index 831a15f6677..199b313fa14 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java @@ -332,9 +332,6 @@ public class AnnotationConfiguration extends AbstractConfiguration _discoverableAnnotationHandlers.add(handler); } - /** - * @see org.eclipse.jetty.webapp.AbstractConfiguration#configure(org.eclipse.jetty.webapp.WebAppContext) - */ @Override public void configure(WebAppContext context) throws Exception { @@ -371,9 +368,6 @@ public class AnnotationConfiguration extends AbstractConfiguration } } - /** - * @see org.eclipse.jetty.webapp.AbstractConfiguration#postConfigure(org.eclipse.jetty.webapp.WebAppContext) - */ @Override public void postConfigure(WebAppContext context) throws Exception { @@ -563,9 +557,6 @@ public class AnnotationConfiguration extends AbstractConfiguration return Integer.getInteger(MAX_SCAN_WAIT, DEFAULT_MAX_SCAN_WAIT).intValue(); } - /** - * @see org.eclipse.jetty.webapp.AbstractConfiguration#cloneConfigure(org.eclipse.jetty.webapp.WebAppContext, org.eclipse.jetty.webapp.WebAppContext) - */ @Override public void cloneConfigure(WebAppContext template, WebAppContext context) throws Exception { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java index be7c373fb3c..46c6cf4b491 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java @@ -43,9 +43,6 @@ public class DeclareRolesAnnotationHandler extends AbstractIntrospectableAnnotat _context = context; } - /** - * @see org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler#doHandle(java.lang.Class) - */ @Override public void doHandle(Class clazz) { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/MultiPartConfigAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/MultiPartConfigAnnotationHandler.java index 58f582c1db9..105e9d760d1 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/MultiPartConfigAnnotationHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/MultiPartConfigAnnotationHandler.java @@ -42,9 +42,6 @@ public class MultiPartConfigAnnotationHandler extends AbstractIntrospectableAnno _context = context; } - /** - * @see org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler#doHandle(java.lang.Class) - */ @Override public void doHandle(Class clazz) { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializersStarter.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializersStarter.java index 805b9ce36c1..e92828673b4 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializersStarter.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializersStarter.java @@ -43,11 +43,6 @@ public class ServletContainerInitializersStarter extends AbstractLifeCycle imple _context = context; } - /** - * Call the doStart method of the ServletContainerInitializers - * - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart() - */ @Override public void doStart() { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java index 34474310832..51340b98c7a 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java @@ -65,9 +65,6 @@ public class ServletSecurityAnnotationHandler extends AbstractIntrospectableAnno _context = wac; } - /** - * @see org.eclipse.jetty.annotations.AnnotationIntrospector.IntrospectableAnnotationHandler#handle(java.lang.Class) - */ @Override public void doHandle(Class clazz) { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotation.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotation.java index f609e026925..07f3919c4f8 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotation.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebFilterAnnotation.java @@ -54,9 +54,6 @@ public class WebFilterAnnotation extends DiscoveredAnnotation super(context, className, resource); } - /** - * @see DiscoveredAnnotation#apply() - */ @Override public void apply() { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotation.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotation.java index 104dfba74da..50613c38870 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotation.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotation.java @@ -54,9 +54,6 @@ public class WebListenerAnnotation extends DiscoveredAnnotation super(context, className, resource); } - /** - * @see DiscoveredAnnotation#apply() - */ @Override public void apply() { diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java index e7a7c7f641f..84986bf6e9f 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java @@ -57,9 +57,6 @@ public class WebServletAnnotation extends DiscoveredAnnotation super(context, className, resource); } - /** - * @see DiscoveredAnnotation#apply() - */ @Override public void apply() { diff --git a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java index ba71267a162..56b200b599c 100644 --- a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java +++ b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java @@ -563,9 +563,6 @@ public class AntWebAppContext extends WebAppContext } } - /** - * - */ @Override public void doStart() { diff --git a/jetty-ant/src/main/java/org/eclipse/jetty/ant/JettyStopTask.java b/jetty-ant/src/main/java/org/eclipse/jetty/ant/JettyStopTask.java index 6ee1cee7500..0a71fc67611 100644 --- a/jetty-ant/src/main/java/org/eclipse/jetty/ant/JettyStopTask.java +++ b/jetty-ant/src/main/java/org/eclipse/jetty/ant/JettyStopTask.java @@ -49,9 +49,6 @@ public class JettyStopTask extends Task TaskLog.setTask(this); } - /** - * @see org.apache.tools.ant.Task#execute() - */ @Override public void execute() throws BuildException { diff --git a/jetty-ant/src/main/java/org/eclipse/jetty/ant/ServerProxyImpl.java b/jetty-ant/src/main/java/org/eclipse/jetty/ant/ServerProxyImpl.java index feb95456da1..16460fe7c18 100644 --- a/jetty-ant/src/main/java/org/eclipse/jetty/ant/ServerProxyImpl.java +++ b/jetty-ant/src/main/java/org/eclipse/jetty/ant/ServerProxyImpl.java @@ -254,9 +254,6 @@ public class ServerProxyImpl implements ServerProxy this.tempDirectory = tempDirectory; } - /** - * @see org.eclipse.jetty.ant.utils.ServerProxy#start() - */ @Override public void start() { @@ -299,9 +296,6 @@ public class ServerProxyImpl implements ServerProxy } } - /** - * @see org.eclipse.jetty.ant.utils.ServerProxy#getProxiedObject() - */ @Override public Object getProxiedObject() { diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java index 78e65014c72..10108dd819f 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java @@ -70,11 +70,6 @@ public interface ConnectionPool extends Closeable */ boolean remove(Connection connection); - /** - * Closes this ConnectionPool. - * - * @see #isClosed() - */ @Override void close(); diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/PropertiesConfigurationManager.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/PropertiesConfigurationManager.java index 317757400ac..14424b416db 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/PropertiesConfigurationManager.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/PropertiesConfigurationManager.java @@ -81,9 +81,6 @@ public class PropertiesConfigurationManager implements ConfigurationManager, Dum _map.put(name, value); } - /** - * @see org.eclipse.jetty.deploy.ConfigurationManager#getProperties() - */ @Override public Map getProperties() { diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreFactory.java b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreFactory.java index 2a6b767302c..10874cb76e8 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreFactory.java +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreFactory.java @@ -78,9 +78,6 @@ public class GCloudSessionDataStoreFactory extends AbstractSessionDataStoreFacto _namespace = namespace; } - /** - * @see org.eclipse.jetty.server.session.SessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception { diff --git a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpsExchange.java b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpsExchange.java index f275db38013..99426f059da 100644 --- a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpsExchange.java +++ b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpsExchange.java @@ -171,9 +171,6 @@ public class JettyHttpsExchange extends HttpsExchange implements JettyExchange return _delegate.toString(); } - /** - * @see com.sun.net.httpserver.HttpsExchange#getSSLSession() - */ @Override public SSLSession getSSLSession() { diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/Http1FieldPreEncoder.java b/jetty-http/src/main/java/org/eclipse/jetty/http/Http1FieldPreEncoder.java index 85600a80c09..9308fd3450d 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/Http1FieldPreEncoder.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/Http1FieldPreEncoder.java @@ -28,18 +28,12 @@ import static java.nio.charset.StandardCharsets.ISO_8859_1; public class Http1FieldPreEncoder implements HttpFieldPreEncoder { - /** - * @see org.eclipse.jetty.http.HttpFieldPreEncoder#getHttpVersion() - */ @Override public HttpVersion getHttpVersion() { return HttpVersion.HTTP_1_0; } - /** - * @see org.eclipse.jetty.http.HttpFieldPreEncoder#getEncodedField(org.eclipse.jetty.http.HttpHeader, java.lang.String, java.lang.String) - */ @Override public byte[] getEncodedField(HttpHeader header, String headerString, String value) { diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/MetaData.java b/jetty-http/src/main/java/org/eclipse/jetty/http/MetaData.java index 3ec17513c96..491cd123b1c 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/MetaData.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/MetaData.java @@ -109,10 +109,6 @@ public class MetaData implements Iterable return _contentLength; } - /** - * @return an iterator over the HTTP fields - * @see #getFields() - */ @Override public Iterator iterator() { diff --git a/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java b/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java index e1c33e1ff73..040c61c221e 100644 --- a/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java +++ b/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java @@ -31,18 +31,12 @@ import org.eclipse.jetty.util.BufferUtil; public class HpackFieldPreEncoder implements HttpFieldPreEncoder { - /** - * @see org.eclipse.jetty.http.HttpFieldPreEncoder#getHttpVersion() - */ @Override public HttpVersion getHttpVersion() { return HttpVersion.HTTP_2; } - /** - * @see org.eclipse.jetty.http.HttpFieldPreEncoder#getEncodedField(org.eclipse.jetty.http.HttpHeader, java.lang.String, java.lang.String) - */ @Override public byte[] getEncodedField(HttpHeader header, String name, String value) { diff --git a/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java b/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java index bd8abf5473f..0598f614bf5 100644 --- a/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java +++ b/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java @@ -82,9 +82,6 @@ public class InfinispanSessionDataStore extends AbstractSessionDataStore _queryManager = queryManager; } - /** - * @see org.eclipse.jetty.server.session.SessionDataStore#load(String) - */ @Override protected void doStart() throws Exception { diff --git a/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStoreFactory.java b/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStoreFactory.java index f2c86b6691d..55c92e42b91 100644 --- a/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStoreFactory.java +++ b/jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStoreFactory.java @@ -49,9 +49,6 @@ public class InfinispanSessionDataStoreFactory extends AbstractSessionDataStoreF _infinispanIdleTimeoutSec = infinispanIdleTimeoutSec; } - /** - * @see org.eclipse.jetty.server.session.SessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception { diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java index 79102ed185c..50cdf335de5 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java @@ -355,9 +355,6 @@ public class ByteArrayEndPoint extends AbstractEndPoint return getOutput().position() > 0; } - /* - * @see org.eclipse.io.EndPoint#fill(org.eclipse.io.Buffer) - */ @Override public int fill(ByteBuffer buffer) throws IOException { @@ -400,9 +397,6 @@ public class ByteArrayEndPoint extends AbstractEndPoint return filled; } - /* - * @see org.eclipse.io.EndPoint#flush(org.eclipse.io.Buffer, org.eclipse.io.Buffer, org.eclipse.io.Buffer) - */ @Override public boolean flush(ByteBuffer... buffers) throws IOException { @@ -450,9 +444,6 @@ public class ByteArrayEndPoint extends AbstractEndPoint return flushed; } - /** - * - */ @Override public void reset() { @@ -465,9 +456,6 @@ public class ByteArrayEndPoint extends AbstractEndPoint super.reset(); } - /* - * @see org.eclipse.io.EndPoint#getConnection() - */ @Override public Object getTransport() { diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractLoginModule.java index 3a99c8427e6..2bbb253b7f3 100644 --- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractLoginModule.java +++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractLoginModule.java @@ -179,10 +179,6 @@ public abstract class AbstractLoginModule implements LoginModule this.commitState = commitState; } - /** - * @throws LoginException if unable to abort - * @see javax.security.auth.spi.LoginModule#abort() - */ @Override public boolean abort() throws LoginException { diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticator.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticator.java index 9f447819deb..9a110eda17f 100644 --- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticator.java +++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticator.java @@ -94,9 +94,6 @@ public class JaspiAuthenticator extends LoginAuthenticator return "JASPI"; } - /** - * @see org.eclipse.jetty.security.authentication.LoginAuthenticator#login(java.lang.String, java.lang.Object, javax.servlet.ServletRequest) - */ @Override public UserIdentity login(String username, Object password, ServletRequest request) { diff --git a/jetty-jaspi/src/test/java/org/eclipse/jetty/security/jaspi/JaspiTest.java b/jetty-jaspi/src/test/java/org/eclipse/jetty/security/jaspi/JaspiTest.java index 32755d01453..d8f34c2ac18 100644 --- a/jetty-jaspi/src/test/java/org/eclipse/jetty/security/jaspi/JaspiTest.java +++ b/jetty-jaspi/src/test/java/org/eclipse/jetty/security/jaspi/JaspiTest.java @@ -69,18 +69,12 @@ public class JaspiTest _roles.put(username, roles); } - /** - * @see org.eclipse.jetty.security.AbstractLoginService#loadRoleInfo(org.eclipse.jetty.security.AbstractLoginService.UserPrincipal) - */ @Override protected String[] loadRoleInfo(UserPrincipal user) { return _roles.get(user.getName()); } - /** - * @see org.eclipse.jetty.security.AbstractLoginService#loadUserInfo(java.lang.String) - */ @Override protected UserPrincipal loadUserInfo(String username) { diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/local/localContextRoot.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/local/localContextRoot.java index 6f774709404..364f3dafc67 100644 --- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/local/localContextRoot.java +++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/local/localContextRoot.java @@ -98,44 +98,29 @@ public class localContextRoot implements Context _env = new Hashtable(env); } - /** - * @see javax.naming.Context#close() - */ @Override public void close() throws NamingException { } - /** - * @see javax.naming.Context#getNameInNamespace() - */ @Override public String getNameInNamespace() throws NamingException { return ""; } - /** - * @see javax.naming.Context#destroySubcontext(javax.naming.Name) - */ @Override public void destroySubcontext(Name name) throws NamingException { __root.destroySubcontext(getSuffix(name)); } - /** - * @see javax.naming.Context#destroySubcontext(java.lang.String) - */ @Override public void destroySubcontext(String name) throws NamingException { destroySubcontext(__root.getNameParser("").parse(getSuffix(name))); } - /** - * @see javax.naming.Context#getEnvironment() - */ @Override public Hashtable getEnvironment() throws NamingException { @@ -186,9 +171,6 @@ public class localContextRoot implements Context return (Context)ctx; } - /** - * @see javax.naming.Context#unbind(javax.naming.Name) - */ @Override public void unbind(Name name) throws NamingException { @@ -219,27 +201,18 @@ public class localContextRoot implements Context } } - /** - * @see javax.naming.Context#unbind(java.lang.String) - */ @Override public void unbind(String name) throws NamingException { unbind(__root.getNameParser("").parse(getSuffix(name))); } - /** - * @see javax.naming.Context#lookupLink(java.lang.String) - */ @Override public Object lookupLink(String name) throws NamingException { return lookupLink(__root.getNameParser("").parse(getSuffix(name))); } - /** - * @see javax.naming.Context#lookupLink(javax.naming.Name) - */ @Override public Object lookupLink(Name name) throws NamingException { @@ -292,18 +265,12 @@ public class localContextRoot implements Context return getContext(cname).lookup(cname.getSuffix(1)); } - /** - * @see javax.naming.Context#removeFromEnvironment(java.lang.String) - */ @Override public Object removeFromEnvironment(String propName) throws NamingException { return _env.remove(propName); } - /** - * @see javax.naming.Context#lookup(javax.naming.Name) - */ @Override public Object lookup(Name name) throws NamingException { @@ -370,27 +337,18 @@ public class localContextRoot implements Context return getContext(cname).lookup(cname.getSuffix(1)); } - /** - * @see javax.naming.Context#lookup(java.lang.String) - */ @Override public Object lookup(String name) throws NamingException { return lookup(__root.getNameParser("").parse(getSuffix(name))); } - /** - * @see javax.naming.Context#bind(java.lang.String, java.lang.Object) - */ @Override public void bind(String name, Object obj) throws NamingException { bind(__root.getNameParser("").parse(getSuffix(name)), obj); } - /** - * @see javax.naming.Context#bind(javax.naming.Name, java.lang.Object) - */ @Override public void bind(Name name, Object obj) throws NamingException { @@ -428,9 +386,6 @@ public class localContextRoot implements Context } } - /** - * @see javax.naming.Context#rebind(javax.naming.Name, java.lang.Object) - */ @Override public void rebind(Name name, Object obj) throws NamingException { @@ -468,36 +423,24 @@ public class localContextRoot implements Context } } - /** - * @see javax.naming.Context#rebind(java.lang.String, java.lang.Object) - */ @Override public void rebind(String name, Object obj) throws NamingException { rebind(__root.getNameParser("").parse(getSuffix(name)), obj); } - /** - * @see javax.naming.Context#rename(javax.naming.Name, javax.naming.Name) - */ @Override public void rename(Name oldName, Name newName) throws NamingException { throw new OperationNotSupportedException(); } - /** - * @see javax.naming.Context#rename(java.lang.String, java.lang.String) - */ @Override public void rename(String oldName, String newName) throws NamingException { throw new OperationNotSupportedException(); } - /** - * @see javax.naming.Context#createSubcontext(java.lang.String) - */ @Override public Context createSubcontext(String name) throws NamingException { @@ -512,9 +455,6 @@ public class localContextRoot implements Context return createSubcontext(__root.getNameParser("").parse(name)); } - /** - * @see javax.naming.Context#createSubcontext(javax.naming.Name) - */ @Override public Context createSubcontext(Name name) throws NamingException { @@ -557,64 +497,42 @@ public class localContextRoot implements Context return getContext(cname).createSubcontext(cname.getSuffix(1)); } - /** - * @see javax.naming.Context#getNameParser(java.lang.String) - */ @Override public NameParser getNameParser(String name) throws NamingException { return __root.getNameParser(name); } - /** - * @see javax.naming.Context#getNameParser(javax.naming.Name) - */ @Override public NameParser getNameParser(Name name) throws NamingException { return __root.getNameParser(name); } - /** - * @see javax.naming.Context#list(java.lang.String) - */ @Override public NamingEnumeration list(String name) throws NamingException { return __root.list(name); } - /** - * @see javax.naming.Context#list(javax.naming.Name) - */ @Override public NamingEnumeration list(Name name) throws NamingException { return __root.list(name); } - /** - * @see javax.naming.Context#listBindings(javax.naming.Name) - */ @Override public NamingEnumeration listBindings(Name name) throws NamingException { return __root.listBindings(name); } - /** - * @see javax.naming.Context#listBindings(java.lang.String) - */ @Override public NamingEnumeration listBindings(String name) throws NamingException { return __root.listBindings(name); } - /** - * @see javax.naming.Context#addToEnvironment(java.lang.String, - * java.lang.Object) - */ @Override public Object addToEnvironment(String propName, Object propVal) throws NamingException @@ -622,9 +540,6 @@ public class localContextRoot implements Context return _env.put(propName, propVal); } - /** - * @see javax.naming.Context#composeName(java.lang.String, java.lang.String) - */ @Override public String composeName(String name, String prefix) throws NamingException @@ -632,10 +547,6 @@ public class localContextRoot implements Context return __root.composeName(name, prefix); } - /** - * @see javax.naming.Context#composeName(javax.naming.Name, - * javax.naming.Name) - */ @Override public Name composeName(Name name, Name prefix) throws NamingException { diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDistroForker.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDistroForker.java index 48178c8450d..641662cc9b4 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDistroForker.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDistroForker.java @@ -165,9 +165,6 @@ public class JettyDistroForker extends AbstractForker this.baseDir = baseDir; } - /** - * @see org.eclipse.jetty.maven.plugin.AbstractForker#createCommand() - */ @Override protected ProcessBuilder createCommand() { @@ -324,9 +321,6 @@ public class JettyDistroForker extends AbstractForker return FileVisitResult.CONTINUE; } - /** - * @see java.nio.file.SimpleFileVisitor#visitFile(java.lang.Object, java.nio.file.attribute.BasicFileAttributes) - */ @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/java/org/eclipse/jetty/memcached/session/MemcachedSessionDataMapFactory.java b/jetty-memcached/jetty-memcached-sessions/src/main/java/org/eclipse/jetty/memcached/session/MemcachedSessionDataMapFactory.java index c41664c8186..e04ca05a327 100644 --- a/jetty-memcached/jetty-memcached-sessions/src/main/java/org/eclipse/jetty/memcached/session/MemcachedSessionDataMapFactory.java +++ b/jetty-memcached/jetty-memcached-sessions/src/main/java/org/eclipse/jetty/memcached/session/MemcachedSessionDataMapFactory.java @@ -83,9 +83,6 @@ public class MemcachedSessionDataMapFactory implements SessionDataMapFactory _heartbeats = heartbeats; } - /** - * @see org.eclipse.jetty.server.session.SessionDataMapFactory#getSessionDataMap() - */ @Override public SessionDataMap getSessionDataMap() { diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java index 8f86d957652..ba4f499fa48 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java @@ -194,9 +194,6 @@ public class AnnotationConfiguration extends org.eclipse.jetty.annotations.Annot parseBundle(context, parser, webbundle, webbundle); } - /** - * @see org.eclipse.jetty.annotations.AnnotationConfiguration#parseWebInfClasses(org.eclipse.jetty.webapp.WebAppContext, org.eclipse.jetty.annotations.AnnotationParser) - */ @Override public void parseWebInfClasses(WebAppContext context, org.eclipse.jetty.annotations.AnnotationParser parser) throws Exception diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java index a6c2b091209..9372f9b58fc 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java @@ -208,9 +208,6 @@ public abstract class AbstractContextProvider extends AbstractLifeCycle implemen return _serverWrapper; } - /** - * @see org.eclipse.jetty.deploy.AppProvider#createContextHandler(org.eclipse.jetty.deploy.App) - */ @Override public ContextHandler createContextHandler(App app) throws Exception { diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java index d3aa1caace4..6f1b71fdbdd 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java @@ -530,9 +530,6 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement return _deploymentManager; } - /** - * @see org.eclipse.jetty.deploy.AppProvider#setDeploymentManager(org.eclipse.jetty.deploy.DeploymentManager) - */ @Override public void setDeploymentManager(DeploymentManager deploymentManager) { diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java index e8252928720..8e5a0ff6268 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java @@ -64,9 +64,6 @@ public class BundleContextProvider extends AbstractContextProvider implements Bu _managedServerName = managedServerName; } - /** - * @see org.osgi.util.tracker.BundleTracker#addingBundle(org.osgi.framework.Bundle, org.osgi.framework.BundleEvent) - */ @Override public Object addingBundle(Bundle bundle, BundleEvent event) { @@ -87,9 +84,6 @@ public class BundleContextProvider extends AbstractContextProvider implements Bu return null; } - /** - * @see org.osgi.util.tracker.BundleTracker#removedBundle(org.osgi.framework.Bundle, org.osgi.framework.BundleEvent, java.lang.Object) - */ @Override public void removedBundle(Bundle bundle, BundleEvent event, Object object) { diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleWebAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleWebAppProvider.java index 9168bcebac7..466b9f9c6a2 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleWebAppProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleWebAppProvider.java @@ -64,9 +64,6 @@ public class BundleWebAppProvider extends AbstractWebAppProvider implements Bund _managedServerName = managedServerName; } - /** - * @see org.osgi.util.tracker.BundleTracker#addingBundle(org.osgi.framework.Bundle, org.osgi.framework.BundleEvent) - */ @Override public Object addingBundle(Bundle bundle, BundleEvent event) { @@ -87,9 +84,6 @@ public class BundleWebAppProvider extends AbstractWebAppProvider implements Bund return null; } - /** - * @see org.osgi.util.tracker.BundleTracker#removedBundle(org.osgi.framework.Bundle, org.osgi.framework.BundleEvent, java.lang.Object) - */ @Override public void removedBundle(Bundle bundle, BundleEvent event, Object object) { @@ -109,9 +103,6 @@ public class BundleWebAppProvider extends AbstractWebAppProvider implements Bund super(wrapper); } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart() - */ @Override protected void doStart() throws Exception { @@ -124,9 +115,6 @@ public class BundleWebAppProvider extends AbstractWebAppProvider implements Bund super.doStart(); } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop() - */ @Override protected void doStop() throws Exception { diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java index 563b0e4dcfb..45b2fe64542 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java @@ -66,9 +66,6 @@ public class ServiceContextProvider extends AbstractContextProvider implements S super(bundleContext, filter, null); } - /** - * @see org.osgi.util.tracker.ServiceTracker#addingService(org.osgi.framework.ServiceReference) - */ @Override public Object addingService(ServiceReference reference) { @@ -77,9 +74,6 @@ public class ServiceContextProvider extends AbstractContextProvider implements S return h; } - /** - * @see org.osgi.util.tracker.ServiceTracker#modifiedService(org.osgi.framework.ServiceReference, java.lang.Object) - */ @Override public void modifiedService(ServiceReference reference, Object service) { @@ -87,9 +81,6 @@ public class ServiceContextProvider extends AbstractContextProvider implements S addingService(reference); } - /** - * @see org.osgi.util.tracker.ServiceTracker#removedService(org.osgi.framework.ServiceReference, java.lang.Object) - */ @Override public void removedService(ServiceReference reference, Object service) { diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java index 94f7da7f12e..3437facef48 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java @@ -72,9 +72,6 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser super(bundleContext, filter, null); } - /** - * @see org.osgi.util.tracker.ServiceTracker#addingService(org.osgi.framework.ServiceReference) - */ @Override public Object addingService(ServiceReference reference) { @@ -83,9 +80,6 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser return wac; } - /** - * @see org.osgi.util.tracker.ServiceTracker#modifiedService(org.osgi.framework.ServiceReference, java.lang.Object) - */ @Override public void modifiedService(ServiceReference reference, Object service) { @@ -93,9 +87,6 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser addingService(reference); } - /** - * @see org.osgi.util.tracker.ServiceTracker#removedService(org.osgi.framework.ServiceReference, java.lang.Object) - */ @Override public void removedService(ServiceReference reference, Object service) { @@ -229,9 +220,6 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser return false; } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart() - */ @Override protected void doStart() throws Exception { @@ -251,9 +239,6 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser super.doStart(); } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop() - */ @Override protected void doStop() throws Exception { diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/JettyServerServiceTracker.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/JettyServerServiceTracker.java index 902c4b8523e..de5a0438596 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/JettyServerServiceTracker.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/JettyServerServiceTracker.java @@ -39,9 +39,6 @@ public class JettyServerServiceTracker implements ServiceTrackerCustomizer { private static Logger LOG = Log.getLogger(JettyServerServiceTracker.class.getName()); - /** - * @see org.osgi.util.tracker.ServiceTrackerCustomizer#addingService(org.osgi.framework.ServiceReference) - */ @Override public Object addingService(ServiceReference sr) { @@ -73,9 +70,6 @@ public class JettyServerServiceTracker implements ServiceTrackerCustomizer } } - /** - * @see org.osgi.util.tracker.ServiceTrackerCustomizer#modifiedService(org.osgi.framework.ServiceReference, java.lang.Object) - */ @Override public void modifiedService(ServiceReference reference, Object service) { @@ -83,9 +77,6 @@ public class JettyServerServiceTracker implements ServiceTrackerCustomizer addingService(reference); } - /** - * @see org.osgi.util.tracker.ServiceTrackerCustomizer#removedService(org.osgi.framework.ServiceReference, java.lang.Object) - */ @Override public void removedService(ServiceReference reference, Object service) { diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/FakeURLClassLoader.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/FakeURLClassLoader.java index 84f5b51f651..1c0938848f4 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/FakeURLClassLoader.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/FakeURLClassLoader.java @@ -52,9 +52,6 @@ public class FakeURLClassLoader extends URLClassLoader return _jars; } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/ServerConnectorListener.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/ServerConnectorListener.java index 5d94979e85e..2edfc3bbeeb 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/ServerConnectorListener.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/ServerConnectorListener.java @@ -38,9 +38,6 @@ public class ServerConnectorListener extends AbstractLifeCycleListener private Path _filePath; private String _sysPropertyName; - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle.AbstractLifeCycleListener#lifeCycleStarted(org.eclipse.jetty.util.component.LifeCycle) - */ @Override public void lifeCycleStarted(LifeCycle event) { diff --git a/jetty-osgi/test-jetty-osgi-server/src/main/java/com/acme/osgi/Activator.java b/jetty-osgi/test-jetty-osgi-server/src/main/java/com/acme/osgi/Activator.java index 62bba903133..ab85f2b9de1 100644 --- a/jetty-osgi/test-jetty-osgi-server/src/main/java/com/acme/osgi/Activator.java +++ b/jetty-osgi/test-jetty-osgi-server/src/main/java/com/acme/osgi/Activator.java @@ -49,9 +49,6 @@ public class Activator implements BundleActivator server.getConnectors()[0].addEventListener(new AbstractLifeCycleListener() { - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle.AbstractLifeCycleListener#lifeCycleStarted(org.eclipse.jetty.util.component.LifeCycle) - */ @Override public void lifeCycleStarted(LifeCycle event) { diff --git a/jetty-osgi/test-jetty-osgi-webapp/src/main/java/com/acme/osgi/Activator.java b/jetty-osgi/test-jetty-osgi-webapp/src/main/java/com/acme/osgi/Activator.java index 258a25bddcb..0184d027048 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/src/main/java/com/acme/osgi/Activator.java +++ b/jetty-osgi/test-jetty-osgi-webapp/src/main/java/com/acme/osgi/Activator.java @@ -45,9 +45,6 @@ public class Activator implements BundleActivator public static class TestServlet extends HttpServlet { - /** - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDescriptorProcessor.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDescriptorProcessor.java index 213f94f7401..0be8e069957 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDescriptorProcessor.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDescriptorProcessor.java @@ -69,9 +69,6 @@ public class PlusDescriptorProcessor extends IterativeDescriptorProcessor } } - /** - * @see org.eclipse.jetty.webapp.IterativeDescriptorProcessor#start(WebAppContext, org.eclipse.jetty.webapp.Descriptor) - */ @Override public void start(WebAppContext context, Descriptor descriptor) { @@ -98,9 +95,6 @@ public class PlusDescriptorProcessor extends IterativeDescriptorProcessor } } - /** - * {@inheritDoc} - */ @Override public void end(WebAppContext context, Descriptor descriptor) { diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java index 4f5a944f382..386c0258187 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java @@ -65,18 +65,12 @@ public class QuickStartDescriptorProcessor extends IterativeDescriptorProcessor } } - /** - * @see org.eclipse.jetty.webapp.IterativeDescriptorProcessor#start(org.eclipse.jetty.webapp.WebAppContext, org.eclipse.jetty.webapp.Descriptor) - */ @Override public void start(WebAppContext context, Descriptor descriptor) { _originAttributeName = context.getInitParameter(QuickStartGeneratorConfiguration.ORIGIN); } - /** - * @see org.eclipse.jetty.webapp.IterativeDescriptorProcessor#end(org.eclipse.jetty.webapp.WebAppContext, org.eclipse.jetty.webapp.Descriptor) - */ @Override public void end(WebAppContext context, Descriptor descriptor) { diff --git a/jetty-quickstart/src/test/java/org/eclipse/jetty/quickstart/FooServlet.java b/jetty-quickstart/src/test/java/org/eclipse/jetty/quickstart/FooServlet.java index b2305b58ce5..36a0bf9ea51 100644 --- a/jetty-quickstart/src/test/java/org/eclipse/jetty/quickstart/FooServlet.java +++ b/jetty-quickstart/src/test/java/org/eclipse/jetty/quickstart/FooServlet.java @@ -27,9 +27,6 @@ import javax.servlet.http.HttpServletResponse; public class FooServlet extends HttpServlet { - /** - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/CookiePatternRule.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/CookiePatternRule.java index 721c3a1ba13..9290dd3811e 100644 --- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/CookiePatternRule.java +++ b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/CookiePatternRule.java @@ -70,10 +70,6 @@ public class CookiePatternRule extends PatternRule _value = value; } - /* - * (non-Javadoc) - * @see org.eclipse.jetty.server.server.handler.rules.RuleBase#apply(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public String apply(String target, HttpServletRequest request, HttpServletResponse response) throws IOException { diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/PatternRule.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/PatternRule.java index e32d6d5c738..11afc47b21d 100644 --- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/PatternRule.java +++ b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/PatternRule.java @@ -57,9 +57,6 @@ public abstract class PatternRule extends Rule _pattern = pattern; } - /* (non-Javadoc) - * @see org.eclipse.jetty.server.server.handler.rules.RuleBase#matchAndApply(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public String matchAndApply(String target, HttpServletRequest request, HttpServletResponse response) throws IOException { diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ResponsePatternRule.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ResponsePatternRule.java index a127afe0507..01d866148c2 100644 --- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ResponsePatternRule.java +++ b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ResponsePatternRule.java @@ -68,10 +68,6 @@ public class ResponsePatternRule extends PatternRule _message = message; } - /* - * (non-Javadoc) - * @see org.eclipse.jetty.server.server.handler.rules.RuleBase#apply(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public String apply(String target, HttpServletRequest request, HttpServletResponse response) throws IOException { diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteHandler.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteHandler.java index 9d87ccc35a0..81db59e9457 100644 --- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteHandler.java +++ b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteHandler.java @@ -293,9 +293,6 @@ public class RewriteHandler extends HandlerWrapper _dispatchTypes = EnumSet.copyOf(Arrays.asList(types)); } - /* (non-Javadoc) - * @see org.eclipse.jetty.server.handler.HandlerWrapper#handle(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) - */ @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRule.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRule.java index a1ead267848..fdfe7587216 100644 --- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRule.java +++ b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRule.java @@ -75,9 +75,6 @@ public class RewriteRegexRule extends RegexRule implements Rule.ApplyURI } } - /* (non-Javadoc) - * @see org.eclipse.jetty.server.handler.rules.RegexRule#apply(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, java.util.regex.Matcher) - */ @Override public String apply(String target, HttpServletRequest request, HttpServletResponse response, Matcher matcher) throws IOException { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java index c163635187b..a0471ea722f 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/AbstractLoginService.java @@ -107,9 +107,6 @@ public abstract class AbstractLoginService extends ContainerLifeCycle implements addBean(_identityService); } - /** - * @see org.eclipse.jetty.security.LoginService#getName() - */ @Override public String getName() { @@ -148,9 +145,6 @@ public abstract class AbstractLoginService extends ContainerLifeCycle implements return String.format("%s@%x[%s]", this.getClass().getSimpleName(), hashCode(), _name); } - /** - * @see org.eclipse.jetty.security.LoginService#login(java.lang.String, java.lang.Object, javax.servlet.ServletRequest) - */ @Override public UserIdentity login(String username, Object credentials, ServletRequest request) { @@ -178,9 +172,6 @@ public abstract class AbstractLoginService extends ContainerLifeCycle implements return null; } - /** - * @see org.eclipse.jetty.security.LoginService#validate(org.eclipse.jetty.server.UserIdentity) - */ @Override public boolean validate(UserIdentity user) { @@ -200,18 +191,12 @@ public abstract class AbstractLoginService extends ContainerLifeCycle implements throw new IllegalStateException("UserPrincipal not KnownUser"); //can't validate } - /** - * @see org.eclipse.jetty.security.LoginService#getIdentityService() - */ @Override public IdentityService getIdentityService() { return _identityService; } - /** - * @see org.eclipse.jetty.security.LoginService#logout(org.eclipse.jetty.server.UserIdentity) - */ @Override public void logout(UserIdentity user) { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java index 764e017d821..68851c767da 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java @@ -352,9 +352,6 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr _roles.addAll(roles); } - /** - * @see org.eclipse.jetty.security.ConstraintAware#addConstraintMapping(org.eclipse.jetty.security.ConstraintMapping) - */ @Override public void addConstraintMapping(ConstraintMapping mapping) { @@ -377,9 +374,6 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr } } - /** - * @see org.eclipse.jetty.security.ConstraintAware#addRole(java.lang.String) - */ @Override public void addRole(String role) { @@ -399,9 +393,6 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr } } - /** - * @see org.eclipse.jetty.security.SecurityHandler#doStart() - */ @Override protected void doStart() throws Exception { @@ -677,9 +668,6 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr return constraintInfo != null && ((RoleInfo)constraintInfo).isChecked(); } - /** - * @see org.eclipse.jetty.security.SecurityHandler#checkWebResourcePermissions(java.lang.String, org.eclipse.jetty.server.Request, org.eclipse.jetty.server.Response, java.lang.Object, org.eclipse.jetty.server.UserIdentity) - */ @Override protected boolean checkWebResourcePermissions(String pathInContext, Request request, Response response, Object constraintInfo, UserIdentity userIdentity) throws IOException @@ -735,9 +723,6 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr DumpableCollection.from("constraints", _constraintMappings)); } - /** - * @see org.eclipse.jetty.security.ConstraintAware#setDenyUncoveredHttpMethods(boolean) - */ @Override public void setDenyUncoveredHttpMethods(boolean deny) { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java index 81062e59df4..0730a9bc324 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java @@ -150,9 +150,6 @@ public class HashLoginService extends AbstractLoginService return null; } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart() - */ @Override protected void doStart() throws Exception { @@ -191,9 +188,6 @@ public class HashLoginService extends AbstractLoginService return _userStoreAutoCreate; } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop() - */ @Override protected void doStop() throws Exception { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java index 9da49113e5f..ec49dc2f716 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java @@ -262,9 +262,6 @@ public class JDBCLoginService extends AbstractLoginService return null; } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop() - */ @Override protected void doStop() throws Exception { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java index b7e112ed98c..e2a907b53ef 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java @@ -444,9 +444,6 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti } } - /** - * @see org.eclipse.jetty.security.Authenticator.AuthConfiguration#isSessionRenewedOnAuthentication() - */ @Override public boolean isSessionRenewedOnAuthentication() { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/BasicAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/BasicAuthenticator.java index 2c586efb7ec..d60dcd09901 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/BasicAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/BasicAuthenticator.java @@ -44,18 +44,12 @@ public class BasicAuthenticator extends LoginAuthenticator { } - /** - * @see org.eclipse.jetty.security.Authenticator#getAuthMethod() - */ @Override public String getAuthMethod() { return Constraint.__BASIC_AUTH; } - /** - * @see org.eclipse.jetty.security.Authenticator#validateRequest(javax.servlet.ServletRequest, javax.servlet.ServletResponse, boolean) - */ @Override public Authentication validateRequest(ServletRequest req, ServletResponse res, boolean mandatory) throws ServerAuthException { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java index e81bab6022f..a83d086912d 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java @@ -55,9 +55,6 @@ public class DeferredAuthentication implements Authentication.Deferred this._authenticator = authenticator; } - /** - * @see org.eclipse.jetty.server.Authentication.Deferred#authenticate(ServletRequest) - */ @Override public Authentication authenticate(ServletRequest request) { @@ -83,9 +80,6 @@ public class DeferredAuthentication implements Authentication.Deferred return this; } - /** - * @see org.eclipse.jetty.server.Authentication.Deferred#authenticate(javax.servlet.ServletRequest, javax.servlet.ServletResponse) - */ @Override public Authentication authenticate(ServletRequest request, ServletResponse response) { @@ -106,9 +100,6 @@ public class DeferredAuthentication implements Authentication.Deferred return this; } - /** - * @see org.eclipse.jetty.server.Authentication.Deferred#login(String, Object, ServletRequest) - */ @Override public Authentication login(String username, Object password, ServletRequest request) { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java index d061079b703..98694577ab2 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java @@ -117,9 +117,6 @@ public class FormAuthenticator extends LoginAuthenticator return _alwaysSaveUri; } - /** - * @see org.eclipse.jetty.security.authentication.LoginAuthenticator#setConfiguration(org.eclipse.jetty.security.Authenticator.AuthConfiguration) - */ @Override public void setConfiguration(AuthConfiguration configuration) { diff --git a/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java b/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java index 7d9312fa7bc..2cb0382f398 100644 --- a/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java +++ b/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java @@ -1747,9 +1747,6 @@ public class ConstraintTest private class RoleRefHandler extends HandlerWrapper { - /** - * @see org.eclipse.jetty.server.handler.HandlerWrapper#handle(java.lang.String, Request, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { diff --git a/jetty-security/src/test/java/org/eclipse/jetty/security/TestLoginService.java b/jetty-security/src/test/java/org/eclipse/jetty/security/TestLoginService.java index ac0b511ef1c..d54b1dd8dc1 100644 --- a/jetty-security/src/test/java/org/eclipse/jetty/security/TestLoginService.java +++ b/jetty-security/src/test/java/org/eclipse/jetty/security/TestLoginService.java @@ -43,9 +43,6 @@ public class TestLoginService extends AbstractLoginService userStore.addUser(username, credential, roles); } - /** - * @see org.eclipse.jetty.security.AbstractLoginService#loadRoleInfo(org.eclipse.jetty.security.AbstractLoginService.UserPrincipal) - */ @Override protected String[] loadRoleInfo(UserPrincipal user) { @@ -63,9 +60,6 @@ public class TestLoginService extends AbstractLoginService return list.toArray(new String[roles.size()]); } - /** - * @see org.eclipse.jetty.security.AbstractLoginService#loadUserInfo(java.lang.String) - */ @Override protected UserPrincipal loadUserInfo(String username) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java index 3efc38195db..e10df803048 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java @@ -630,9 +630,6 @@ public class Request implements HttpServletRequest return (_attributes == null) ? null : _attributes.getAttribute(name); } - /* - * @see javax.servlet.ServletRequest#getAttributeNames() - */ @Override public Enumeration getAttributeNames() { @@ -659,9 +656,6 @@ public class Request implements HttpServletRequest return _authentication; } - /* - * @see javax.servlet.http.HttpServletRequest#getAuthType() - */ @Override public String getAuthType() { @@ -673,9 +667,6 @@ public class Request implements HttpServletRequest return null; } - /* - * @see javax.servlet.ServletRequest#getCharacterEncoding() - */ @Override public String getCharacterEncoding() { @@ -707,9 +698,6 @@ public class Request implements HttpServletRequest return _channel; } - /* - * @see javax.servlet.ServletRequest#getContentLength() - */ @Override public int getContentLength() { @@ -733,9 +721,6 @@ public class Request implements HttpServletRequest return (int)metadata.getFields().getLongField(HttpHeader.CONTENT_LENGTH.asString()); } - /* - * @see javax.servlet.ServletRequest.getContentLengthLong() - */ @Override public long getContentLengthLong() { @@ -752,9 +737,6 @@ public class Request implements HttpServletRequest return _input.getContentConsumed(); } - /* - * @see javax.servlet.ServletRequest#getContentType() - */ @Override public String getContentType() { @@ -790,18 +772,12 @@ public class Request implements HttpServletRequest return _errorContext; } - /* - * @see javax.servlet.http.HttpServletRequest#getContextPath() - */ @Override public String getContextPath() { return _contextPath; } - /* - * @see javax.servlet.http.HttpServletRequest#getCookies() - */ @Override public Cookie[] getCookies() { @@ -833,9 +809,6 @@ public class Request implements HttpServletRequest return _cookies.getCookies(); } - /* - * @see javax.servlet.http.HttpServletRequest#getDateHeader(java.lang.String) - */ @Override public long getDateHeader(String name) { @@ -849,9 +822,6 @@ public class Request implements HttpServletRequest return _dispatcherType; } - /* - * @see javax.servlet.http.HttpServletRequest#getHeader(java.lang.String) - */ @Override public String getHeader(String name) { @@ -859,9 +829,6 @@ public class Request implements HttpServletRequest return metadata == null ? null : metadata.getFields().get(name); } - /* - * @see javax.servlet.http.HttpServletRequest#getHeaderNames() - */ @Override public Enumeration getHeaderNames() { @@ -869,9 +836,6 @@ public class Request implements HttpServletRequest return metadata == null ? Collections.emptyEnumeration() : metadata.getFields().getFieldNames(); } - /* - * @see javax.servlet.http.HttpServletRequest#getHeaders(java.lang.String) - */ @Override public Enumeration getHeaders(String name) { @@ -892,9 +856,6 @@ public class Request implements HttpServletRequest return _inputState; } - /* - * @see javax.servlet.ServletRequest#getInputStream() - */ @Override public ServletInputStream getInputStream() throws IOException { @@ -908,9 +869,6 @@ public class Request implements HttpServletRequest return _input; } - /* - * @see javax.servlet.http.HttpServletRequest#getIntHeader(java.lang.String) - */ @Override public int getIntHeader(String name) { @@ -918,9 +876,6 @@ public class Request implements HttpServletRequest return metadata == null ? -1 : (int)metadata.getFields().getLongField(name); } - /* - * @see javax.servlet.ServletRequest#getLocale() - */ @Override public Locale getLocale() { @@ -946,9 +901,6 @@ public class Request implements HttpServletRequest return new Locale(language, country); } - /* - * @see javax.servlet.ServletRequest#getLocales() - */ @Override public Enumeration getLocales() { @@ -978,9 +930,6 @@ public class Request implements HttpServletRequest return Collections.enumeration(locales); } - /* - * @see javax.servlet.ServletRequest#getLocalAddr() - */ @Override public String getLocalAddr() { @@ -1008,9 +957,6 @@ public class Request implements HttpServletRequest return address.getHostAddress(); } - /* - * @see javax.servlet.ServletRequest#getLocalName() - */ @Override public String getLocalName() { @@ -1035,9 +981,6 @@ public class Request implements HttpServletRequest return null; } - /* - * @see javax.servlet.ServletRequest#getLocalPort() - */ @Override public int getLocalPort() { @@ -1047,9 +990,6 @@ public class Request implements HttpServletRequest return local == null ? 0 : local.getPort(); } - /* - * @see javax.servlet.http.HttpServletRequest#getMethod() - */ @Override public String getMethod() { @@ -1059,36 +999,24 @@ public class Request implements HttpServletRequest return null; } - /* - * @see javax.servlet.ServletRequest#getParameter(java.lang.String) - */ @Override public String getParameter(String name) { return getParameters().getValue(name, 0); } - /* - * @see javax.servlet.ServletRequest#getParameterMap() - */ @Override public Map getParameterMap() { return Collections.unmodifiableMap(getParameters().toStringArrayMap()); } - /* - * @see javax.servlet.ServletRequest#getParameterNames() - */ @Override public Enumeration getParameterNames() { return Collections.enumeration(getParameters().keySet()); } - /* - * @see javax.servlet.ServletRequest#getParameterValues(java.lang.String) - */ @Override public String[] getParameterValues(String name) { @@ -1118,18 +1046,12 @@ public class Request implements HttpServletRequest _parameters = null; } - /* - * @see javax.servlet.http.HttpServletRequest#getPathInfo() - */ @Override public String getPathInfo() { return _pathInfo; } - /* - * @see javax.servlet.http.HttpServletRequest#getPathTranslated() - */ @Override public String getPathTranslated() { @@ -1138,9 +1060,6 @@ public class Request implements HttpServletRequest return _context.getRealPath(_pathInfo); } - /* - * @see javax.servlet.ServletRequest#getProtocol() - */ @Override public String getProtocol() { @@ -1167,9 +1086,6 @@ public class Request implements HttpServletRequest return _queryEncoding; } - /* - * @see javax.servlet.http.HttpServletRequest#getQueryString() - */ @Override public String getQueryString() { @@ -1177,9 +1093,6 @@ public class Request implements HttpServletRequest return metadata == null ? null : metadata.getURI().getQuery(); } - /* - * @see javax.servlet.ServletRequest#getReader() - */ @Override public BufferedReader getReader() throws IOException { @@ -1234,9 +1147,6 @@ public class Request implements HttpServletRequest return remote; } - /* - * @see javax.servlet.ServletRequest#getRemoteAddr() - */ @Override public String getRemoteAddr() { @@ -1254,9 +1164,6 @@ public class Request implements HttpServletRequest return address.getHostAddress(); } - /* - * @see javax.servlet.ServletRequest#getRemoteHost() - */ @Override public String getRemoteHost() { @@ -1266,9 +1173,6 @@ public class Request implements HttpServletRequest return remote == null ? "" : remote.getHostString(); } - /* - * @see javax.servlet.ServletRequest#getRemotePort() - */ @Override public int getRemotePort() { @@ -1278,9 +1182,6 @@ public class Request implements HttpServletRequest return remote == null ? 0 : remote.getPort(); } - /* - * @see javax.servlet.http.HttpServletRequest#getRemoteUser() - */ @Override public String getRemoteUser() { @@ -1290,9 +1191,6 @@ public class Request implements HttpServletRequest return p.getName(); } - /* - * @see javax.servlet.ServletRequest#getRequestDispatcher(java.lang.String) - */ @Override public RequestDispatcher getRequestDispatcher(String path) { @@ -1318,18 +1216,12 @@ public class Request implements HttpServletRequest return _context.getRequestDispatcher(path); } - /* - * @see javax.servlet.http.HttpServletRequest#getRequestedSessionId() - */ @Override public String getRequestedSessionId() { return _requestedSessionId; } - /* - * @see javax.servlet.http.HttpServletRequest#getRequestURI() - */ @Override public String getRequestURI() { @@ -1337,9 +1229,6 @@ public class Request implements HttpServletRequest return metadata == null ? null : metadata.getURI().getPath(); } - /* - * @see javax.servlet.http.HttpServletRequest#getRequestURL() - */ @Override public StringBuffer getRequestURL() { @@ -1371,9 +1260,6 @@ public class Request implements HttpServletRequest return url; } - /* - * @see javax.servlet.ServletRequest#getScheme() - */ @Override public String getScheme() { @@ -1382,9 +1268,6 @@ public class Request implements HttpServletRequest return scheme == null ? HttpScheme.HTTP.asString() : scheme; } - /* - * @see javax.servlet.ServletRequest#getServerName() - */ @Override public String getServerName() { @@ -1417,9 +1300,6 @@ public class Request implements HttpServletRequest return null; } - /* - * @see javax.servlet.ServletRequest#getServerPort() - */ @Override public int getServerPort() { @@ -1461,9 +1341,6 @@ public class Request implements HttpServletRequest return null; } - /* - * @see javax.servlet.http.HttpServletRequest#getServletPath() - */ @Override public String getServletPath() { @@ -1564,18 +1441,12 @@ public class Request implements HttpServletRequest return session; } - /* - * @see javax.servlet.http.HttpServletRequest#getSession() - */ @Override public HttpSession getSession() { return getSession(true); } - /* - * @see javax.servlet.http.HttpServletRequest#getSession(boolean) - */ @Override public HttpSession getSession(boolean create) { @@ -1675,9 +1546,6 @@ public class Request implements HttpServletRequest return _scope; } - /* - * @see javax.servlet.http.HttpServletRequest#getUserPrincipal() - */ @Override public Principal getUserPrincipal() { @@ -1710,18 +1578,12 @@ public class Request implements HttpServletRequest return _asyncNotSupportedSource == null; } - /* - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie() - */ @Override public boolean isRequestedSessionIdFromCookie() { return _requestedSessionId != null && _requestedSessionIdFromCookie; } - /* - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromUrl() - */ @Override @Deprecated(since = "Servlet API 2.1") public boolean isRequestedSessionIdFromUrl() @@ -1729,18 +1591,12 @@ public class Request implements HttpServletRequest return _requestedSessionId != null && !_requestedSessionIdFromCookie; } - /* - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL() - */ @Override public boolean isRequestedSessionIdFromURL() { return _requestedSessionId != null && !_requestedSessionIdFromCookie; } - /* - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid() - */ @Override public boolean isRequestedSessionIdValid() { @@ -1751,9 +1607,6 @@ public class Request implements HttpServletRequest return (session != null && _sessionHandler.getSessionIdManager().getId(_requestedSessionId).equals(_sessionHandler.getId(session))); } - /* - * @see javax.servlet.ServletRequest#isSecure() - */ @Override public boolean isSecure() { @@ -1765,9 +1618,6 @@ public class Request implements HttpServletRequest _secure = secure; } - /* - * @see javax.servlet.http.HttpServletRequest#isUserInRole(java.lang.String) - */ @Override public boolean isUserInRole(String role) { @@ -1907,9 +1757,6 @@ public class Request implements HttpServletRequest _requestAttributeListeners.clear(); } - /* - * @see javax.servlet.ServletRequest#removeAttribute(java.lang.String) - */ @Override public void removeAttribute(String name) { @@ -1938,7 +1785,7 @@ public class Request implements HttpServletRequest _asyncNotSupportedSource = supported ? null : (source == null ? "unknown" : source); } - /* + /** * Set a request attribute. if the attribute name is "org.eclipse.jetty.server.server.Request.queryEncoding" then the value is also passed in a call to * {@link #setQueryEncoding}. * @@ -1988,9 +1835,6 @@ public class Request implements HttpServletRequest _authentication = authentication; } - /* - * @see javax.servlet.ServletRequest#setCharacterEncoding(java.lang.String) - */ @Override public void setCharacterEncoding(String encoding) throws UnsupportedEncodingException { @@ -2491,9 +2335,6 @@ public class Request implements HttpServletRequest } } - /** - * @see javax.servlet.http.HttpServletRequest#upgrade(java.lang.Class) - */ @Override public T upgrade(Class handlerClass) throws IOException, ServletException { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java index bc0063c8e5f..431fe297598 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java @@ -612,45 +612,30 @@ public class Server extends HandlerWrapper implements Attributes _sessionIdManager = sessionIdManager; } - /* - * @see org.eclipse.util.AttributesMap#clearAttributes() - */ @Override public void clearAttributes() { _attributes.clearAttributes(); } - /* - * @see org.eclipse.util.AttributesMap#getAttribute(java.lang.String) - */ @Override public Object getAttribute(String name) { return _attributes.getAttribute(name); } - /* - * @see org.eclipse.util.AttributesMap#getAttributeNames() - */ @Override public Enumeration getAttributeNames() { return _attributes.getAttributeNames(); } - /* - * @see org.eclipse.util.AttributesMap#removeAttribute(java.lang.String) - */ @Override public void removeAttribute(String name) { _attributes.removeAttribute(name); } - /* - * @see org.eclipse.util.AttributesMap#setAttribute(java.lang.String, java.lang.Object) - */ @Override public void setAttribute(String name, Object attribute) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java index e672e62afc2..3d6030c9620 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java @@ -195,54 +195,36 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements return false; } - /** - * @see javax.servlet.http.HttpServletRequest#authenticate(javax.servlet.http.HttpServletResponse) - */ @Override public boolean authenticate(HttpServletResponse response) throws IOException, ServletException { return false; } - /** - * @see javax.servlet.http.HttpServletRequest#getPart(java.lang.String) - */ @Override public Part getPart(String name) throws IOException, ServletException { return null; } - /** - * @see javax.servlet.http.HttpServletRequest#getParts() - */ @Override public Collection getParts() throws IOException, ServletException { return null; } - /** - * @see javax.servlet.http.HttpServletRequest#login(java.lang.String, java.lang.String) - */ @Override public void login(String username, String password) throws ServletException { } - /** - * @see javax.servlet.http.HttpServletRequest#logout() - */ @Override public void logout() throws ServletException { } - /** - * @see javax.servlet.http.HttpServletRequest#changeSessionId() - */ @Override public String changeSessionId() { @@ -250,9 +232,6 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements return null; } - /** - * @see javax.servlet.http.HttpServletRequest#upgrade(java.lang.Class) - */ @Override public T upgrade(Class handlerClass) throws IOException, ServletException { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServletResponseHttpWrapper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServletResponseHttpWrapper.java index 7bfa50290ee..31787ba0fbd 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ServletResponseHttpWrapper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ServletResponseHttpWrapper.java @@ -130,36 +130,24 @@ public class ServletResponseHttpWrapper extends ServletResponseWrapper implement { } - /** - * @see javax.servlet.http.HttpServletResponse#getHeader(java.lang.String) - */ @Override public String getHeader(String name) { return null; } - /** - * @see javax.servlet.http.HttpServletResponse#getHeaderNames() - */ @Override public Collection getHeaderNames() { return null; } - /** - * @see javax.servlet.http.HttpServletResponse#getHeaders(java.lang.String) - */ @Override public Collection getHeaders(String name) { return null; } - /** - * @see javax.servlet.http.HttpServletResponse#getStatus() - */ @Override public int getStatus() { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java index 749dd51230a..f04b6630cba 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java @@ -84,9 +84,6 @@ public abstract class AbstractHandler extends ContainerLifeCycle implements Hand baseRequest.setHandled(true); } - /* - * @see org.eclipse.thread.LifeCycle#start() - */ @Override protected void doStart() throws Exception { @@ -97,9 +94,6 @@ public abstract class AbstractHandler extends ContainerLifeCycle implements Hand super.doStart(); } - /* - * @see org.eclipse.thread.LifeCycle#stop() - */ @Override protected void doStop() throws Exception { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java index 07721ac4627..400d4f6b819 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java @@ -100,9 +100,6 @@ public class BufferedResponseHandler extends HandlerWrapper return _mimeTypes; } - /** - * @see org.eclipse.jetty.server.handler.HandlerWrapper#handle(java.lang.String, org.eclipse.jetty.server.Request, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index 4f3e2050d4e..c98dfbc3d48 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -477,18 +477,12 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu return vhosts; } - /* - * @see javax.servlet.ServletContext#getAttribute(java.lang.String) - */ @Override public Object getAttribute(String name) { return _attributes.getAttribute(name); } - /* - * @see javax.servlet.ServletContext#getAttributeNames() - */ @Override public Enumeration getAttributeNames() { @@ -747,9 +741,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu _logger = logger; } - /* - * @see org.eclipse.thread.AbstractLifeCycle#doStart() - */ @Override protected void doStart() throws Exception { @@ -904,9 +895,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu l.contextDestroyed(e); } - /* - * @see org.eclipse.thread.AbstractLifeCycle#doStop() - */ @Override protected void doStop() throws Exception { @@ -1080,10 +1068,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu return true; } - /** - * @see org.eclipse.jetty.server.handler.ScopedHandler#doScope(java.lang.String, org.eclipse.jetty.server.Request, javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - */ @Override public void doScope(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { @@ -1229,10 +1213,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu } } - /** - * @see org.eclipse.jetty.server.handler.ScopedHandler#doHandle(java.lang.String, org.eclipse.jetty.server.Request, javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - */ @Override public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { @@ -1414,9 +1394,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu return Arrays.copyOf(_protectedTargets, _protectedTargets.length); } - /* - * @see javax.servlet.ServletContext#removeAttribute(java.lang.String) - */ @Override public void removeAttribute(String name) { @@ -1988,9 +1965,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu return ContextHandler.this; } - /* - * @see javax.servlet.ServletContext#getContext(java.lang.String) - */ @Override public ServletContext getContext(String uripath) { @@ -2077,9 +2051,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu return null; } - /* - * @see javax.servlet.ServletContext#getMimeType(java.lang.String) - */ @Override public String getMimeType(String file) { @@ -2088,9 +2059,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu return _mimeTypes.getMimeByExtension(file); } - /* - * @see javax.servlet.ServletContext#getRequestDispatcher(java.lang.String) - */ @Override public RequestDispatcher getRequestDispatcher(String uriInContext) { @@ -2123,9 +2091,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu return null; } - /* - * @see javax.servlet.ServletContext#getRealPath(java.lang.String) - */ @Override public String getRealPath(String path) { @@ -2163,9 +2128,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu return null; } - /* - * @see javax.servlet.ServletContext#getResourceAsStream(java.lang.String) - */ @Override public InputStream getResourceAsStream(String path) { @@ -2187,36 +2149,24 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu } } - /* - * @see javax.servlet.ServletContext#getResourcePaths(java.lang.String) - */ @Override public Set getResourcePaths(String path) { return ContextHandler.this.getResourcePaths(path); } - /* - * @see javax.servlet.ServletContext#log(java.lang.Exception, java.lang.String) - */ @Override public void log(Exception exception, String msg) { _logger.warn(msg, exception); } - /* - * @see javax.servlet.ServletContext#log(java.lang.String) - */ @Override public void log(String msg) { _logger.info(msg); } - /* - * @see javax.servlet.ServletContext#log(java.lang.String, java.lang.Throwable) - */ @Override public void log(String message, Throwable throwable) { @@ -2226,27 +2176,18 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu _logger.warn(message, throwable); } - /* - * @see javax.servlet.ServletContext#getInitParameter(java.lang.String) - */ @Override public String getInitParameter(String name) { return ContextHandler.this.getInitParameter(name); } - /* - * @see javax.servlet.ServletContext#getInitParameterNames() - */ @Override public Enumeration getInitParameterNames() { return ContextHandler.this.getInitParameterNames(); } - /* - * @see javax.servlet.ServletContext#getAttribute(java.lang.String) - */ @Override public synchronized Object getAttribute(String name) { @@ -2256,9 +2197,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu return o; } - /* - * @see javax.servlet.ServletContext#getAttributeNames() - */ @Override public synchronized Enumeration getAttributeNames() { @@ -2277,9 +2215,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu return Collections.enumeration(set); } - /* - * @see javax.servlet.ServletContext#setAttribute(java.lang.String, java.lang.Object) - */ @Override public synchronized void setAttribute(String name, Object value) { @@ -2306,9 +2241,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu } } - /* - * @see javax.servlet.ServletContext#removeAttribute(java.lang.String) - */ @Override public synchronized void removeAttribute(String name) { @@ -2325,9 +2257,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu } } - /* - * @see javax.servlet.ServletContext#getServletContextName() - */ @Override public String getServletContextName() { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java index 5ec6e7419a6..0690f20b628 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java @@ -47,9 +47,6 @@ public class DebugHandler extends HandlerWrapper implements Connection.Listener private OutputStream _out; private PrintStream _print; - /* - * @see org.eclipse.jetty.server.Handler#handle(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) - */ @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException @@ -120,9 +117,6 @@ public class DebugHandler extends HandlerWrapper implements Connection.Listener _print.println(d + (ms > 99 ? "." : (ms > 9 ? ".0" : ".00")) + ms + ":" + name + " " + message); } - /* (non-Javadoc) - * @see org.eclipse.jetty.server.handler.HandlerWrapper#doStart() - */ @Override protected void doStart() throws Exception { @@ -139,9 +133,6 @@ public class DebugHandler extends HandlerWrapper implements Connection.Listener super.doStart(); } - /* (non-Javadoc) - * @see org.eclipse.jetty.server.handler.HandlerWrapper#doStop() - */ @Override protected void doStop() throws Exception { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java index a25f005c8ce..839f25faa62 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java @@ -81,9 +81,6 @@ public class DefaultHandler extends AbstractHandler } } - /* - * @see org.eclipse.jetty.server.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) - */ @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerList.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerList.java index 246ef835f9f..2507ea9322e 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerList.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerList.java @@ -43,9 +43,6 @@ public class HandlerList extends HandlerCollection super(handlers); } - /** - * @see Handler#handle(String, Request, HttpServletRequest, HttpServletResponse) - */ @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java index a8bbfae997d..162d1ce3f89 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HotSwapHandler.java @@ -81,27 +81,18 @@ public class HotSwapHandler extends AbstractHandlerContainer } } - /* - * @see org.eclipse.thread.AbstractLifeCycle#doStart() - */ @Override protected void doStart() throws Exception { super.doStart(); } - /* - * @see org.eclipse.thread.AbstractLifeCycle#doStop() - */ @Override protected void doStop() throws Exception { super.doStop(); } - /* - * @see org.eclipse.jetty.server.server.EventHandler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java index f9f365898e7..5e8bf28eebd 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java @@ -41,9 +41,6 @@ public class RequestLogHandler extends HandlerWrapper { private RequestLog _requestLog; - /* - * @see org.eclipse.jetty.server.server.Handler#handle(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) - */ @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java index 3173ee51a8f..6d99bc10479 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java @@ -214,9 +214,6 @@ public class ResourceHandler extends HandlerWrapper implements ResourceFactory, return _welcomes; } - /* - * @see org.eclipse.jetty.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) - */ @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ScopedHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ScopedHandler.java index 20f06162f1d..92a157d915b 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ScopedHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ScopedHandler.java @@ -105,9 +105,6 @@ public abstract class ScopedHandler extends HandlerWrapper protected ScopedHandler _outerScope; protected ScopedHandler _nextScope; - /** - * @see org.eclipse.jetty.server.handler.HandlerWrapper#doStart() - */ @Override protected void doStart() throws Exception { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java index 78bb7b5349a..db995aefdff 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionCache.java @@ -183,9 +183,6 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements return _handler; } - /** - * @see org.eclipse.jetty.server.session.SessionCache#initialize(org.eclipse.jetty.server.session.SessionContext) - */ @Override public void initialize(SessionContext context) { @@ -194,9 +191,6 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements _context = context; } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart() - */ @Override protected void doStart() throws Exception { @@ -213,9 +207,6 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements super.doStart(); } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop() - */ @Override protected void doStop() throws Exception { @@ -232,9 +223,6 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements return _sessionDataStore; } - /** - * @see org.eclipse.jetty.server.session.SessionCache#setSessionDataStore(org.eclipse.jetty.server.session.SessionDataStore) - */ @Override public void setSessionDataStore(SessionDataStore sessionStore) { @@ -669,9 +657,6 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements return doDelete(id); } - /** - * @see org.eclipse.jetty.server.session.SessionCache#checkExpiration(Set) - */ @Override public Set checkExpiration(Set candidates) { @@ -806,9 +791,6 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements } } - /** - * @see org.eclipse.jetty.server.session.SessionCache#setSaveOnInactiveEviction(boolean) - */ @Override public void setSaveOnInactiveEviction(boolean saveOnEvict) { @@ -828,9 +810,6 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements return _saveOnInactiveEviction; } - /** - * @see org.eclipse.jetty.server.session.SessionCache#newSession(javax.servlet.http.HttpServletRequest, java.lang.String, long, long) - */ @Override public Session newSession(HttpServletRequest request, String id, long time, long maxInactiveMs) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStore.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStore.java index 708d6a29b08..68a235047b6 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStore.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStore.java @@ -83,9 +83,6 @@ public class CachingSessionDataStore extends ContainerLifeCycle implements Sessi return _cache; } - /** - * @see org.eclipse.jetty.server.session.SessionDataStore#load(java.lang.String) - */ @Override public SessionData load(String id) throws Exception { @@ -110,9 +107,6 @@ public class CachingSessionDataStore extends ContainerLifeCycle implements Sessi return d; } - /** - * @see org.eclipse.jetty.server.session.SessionDataStore#delete(java.lang.String) - */ @Override public boolean delete(String id) throws Exception { @@ -124,9 +118,6 @@ public class CachingSessionDataStore extends ContainerLifeCycle implements Sessi return deleted; } - /** - * @see org.eclipse.jetty.server.session.SessionDataStore#getExpired(Set) - */ @Override public Set getExpired(Set candidates) { @@ -134,9 +125,6 @@ public class CachingSessionDataStore extends ContainerLifeCycle implements Sessi return _store.getExpired(candidates); } - /** - * @see org.eclipse.jetty.server.session.SessionDataStore#store(java.lang.String, org.eclipse.jetty.server.session.SessionData) - */ @Override public void store(String id, SessionData data) throws Exception { @@ -162,18 +150,12 @@ public class CachingSessionDataStore extends ContainerLifeCycle implements Sessi super.doStop(); } - /** - * @see org.eclipse.jetty.server.session.SessionDataStore#isPassivating() - */ @Override public boolean isPassivating() { return _store.isPassivating(); } - /** - * @see org.eclipse.jetty.server.session.SessionDataStore#exists(java.lang.String) - */ @Override public boolean exists(String id) throws Exception { @@ -193,9 +175,6 @@ public class CachingSessionDataStore extends ContainerLifeCycle implements Sessi return _store.exists(id); } - /** - * @see org.eclipse.jetty.server.session.SessionDataStore#initialize(org.eclipse.jetty.server.session.SessionContext) - */ @Override public void initialize(SessionContext context) throws Exception { @@ -204,9 +183,6 @@ public class CachingSessionDataStore extends ContainerLifeCycle implements Sessi _cache.initialize(context); } - /** - * @see org.eclipse.jetty.server.session.SessionDataStore#newSessionData(java.lang.String, long, long, long, long) - */ @Override public SessionData newSessionData(String id, long created, long accessed, long lastAccessed, long maxInactiveMs) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStoreFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStoreFactory.java index 9155ebd94b7..0236e5e6fd2 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStoreFactory.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStoreFactory.java @@ -56,9 +56,6 @@ public class CachingSessionDataStoreFactory extends AbstractSessionDataStoreFact _sessionStoreFactory = factory; } - /** - * @see org.eclipse.jetty.server.session.SessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java index b71b424ab4a..a0d68c2dc05 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DatabaseAdaptor.java @@ -305,9 +305,6 @@ public class DatabaseAdaptor return DriverManager.getConnection(_connectionUrl); } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java index f9f7fc6fbe5..1a4dffee910 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java @@ -274,9 +274,6 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi return id; } - /** - * @see org.eclipse.jetty.server.SessionIdManager#isIdInUse(java.lang.String) - */ @Override public boolean isIdInUse(String id) { @@ -312,9 +309,6 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi } } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart() - */ @Override protected void doStart() throws Exception { @@ -344,9 +338,6 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi _houseKeeper.start(); } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop() - */ @Override protected void doStop() throws Exception { @@ -488,9 +479,6 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi return handlers; } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStoreFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStoreFactory.java index a07a4542ff5..2f386528d76 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStoreFactory.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStoreFactory.java @@ -60,9 +60,6 @@ public class FileSessionDataStoreFactory extends AbstractSessionDataStoreFactory _storeDir = storeDir; } - /** - * @see org.eclipse.jetty.server.session.SessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java index b49aa79b16c..23bd6ddf942 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java @@ -78,9 +78,6 @@ public class HouseKeeper extends AbstractLifeCycle _sessionIdManager = sessionIdManager; } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart() - */ @Override protected void doStart() throws Exception { @@ -167,9 +164,6 @@ public class HouseKeeper extends AbstractLifeCycle _runner = null; } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop() - */ @Override protected void doStop() throws Exception { @@ -263,9 +257,6 @@ public class HouseKeeper extends AbstractLifeCycle } } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStoreFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStoreFactory.java index 8d1f375ce59..14a903f0cc1 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStoreFactory.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStoreFactory.java @@ -34,9 +34,6 @@ public class JDBCSessionDataStoreFactory extends AbstractSessionDataStoreFactory */ JDBCSessionDataStore.SessionTableSchema _schema; - /** - * @see org.eclipse.jetty.server.session.SessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionDataStoreFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionDataStoreFactory.java index 642a5bf31c7..a8e083cdf24 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionDataStoreFactory.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionDataStoreFactory.java @@ -24,9 +24,6 @@ package org.eclipse.jetty.server.session; public class NullSessionDataStoreFactory extends AbstractSessionDataStoreFactory { - /** - * @see org.eclipse.jetty.server.session.SessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java index ecfce716f17..0bf1d322369 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java @@ -445,9 +445,6 @@ public class Session implements SessionHandler.SessionIf } } - /** - * @see javax.servlet.http.HttpSession#getId() - */ @Override public String getId() { @@ -472,9 +469,6 @@ public class Session implements SessionHandler.SessionIf return _sessionData.getVhost(); } - /** - * @see javax.servlet.http.HttpSession#getLastAccessedTime() - */ @Override public long getLastAccessedTime() { @@ -488,9 +482,6 @@ public class Session implements SessionHandler.SessionIf } } - /** - * @see javax.servlet.http.HttpSession#getServletContext() - */ @Override public ServletContext getServletContext() { @@ -499,9 +490,6 @@ public class Session implements SessionHandler.SessionIf return _handler._context; } - /** - * @see javax.servlet.http.HttpSession#setMaxInactiveInterval(int) - */ @Override public void setMaxInactiveInterval(int secs) { @@ -596,9 +584,6 @@ public class Session implements SessionHandler.SessionIf return time; } - /** - * @see javax.servlet.http.HttpSession#getMaxInactiveInterval() - */ @Override public int getMaxInactiveInterval() { @@ -609,9 +594,6 @@ public class Session implements SessionHandler.SessionIf } } - /** - * @see javax.servlet.http.HttpSession#getSessionContext() - */ @Override @Deprecated(since = "Servlet API 2.1") public HttpSessionContext getSessionContext() @@ -670,9 +652,6 @@ public class Session implements SessionHandler.SessionIf throw new IllegalStateException("Invalid for read: id=" + _sessionData.getId() + " not resident"); } - /** - * @see javax.servlet.http.HttpSession#getAttribute(java.lang.String) - */ @Override public Object getAttribute(String name) { @@ -683,9 +662,6 @@ public class Session implements SessionHandler.SessionIf } } - /** - * @see javax.servlet.http.HttpSession#getValue(java.lang.String) - */ @Override @Deprecated(since = "Servlet API 2.2") public Object getValue(String name) @@ -697,9 +673,6 @@ public class Session implements SessionHandler.SessionIf } } - /** - * @see javax.servlet.http.HttpSession#getAttributeNames() - */ @Override public Enumeration getAttributeNames() { @@ -758,10 +731,6 @@ public class Session implements SessionHandler.SessionIf } } - /** - * @see javax.servlet.http.HttpSession#setAttribute(java.lang.String, - * java.lang.Object) - */ @Override public void setAttribute(String name, Object value) { @@ -778,10 +747,6 @@ public class Session implements SessionHandler.SessionIf callSessionAttributeListeners(name, value, old); } - /** - * @see javax.servlet.http.HttpSession#putValue(java.lang.String, - * java.lang.Object) - */ @Override @Deprecated(since = "Servlet API 2.2") public void putValue(String name, Object value) @@ -789,18 +754,12 @@ public class Session implements SessionHandler.SessionIf setAttribute(name, value); } - /** - * @see javax.servlet.http.HttpSession#removeAttribute(java.lang.String) - */ @Override public void removeAttribute(String name) { setAttribute(name, null); } - /** - * @see javax.servlet.http.HttpSession#removeValue(java.lang.String) - */ @Override @Deprecated(since = "Servlet API 2.1") public void removeValue(String name) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java index efb3cb72d9e..4477530055c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java @@ -386,9 +386,6 @@ public class SessionHandler extends ScopedHandler } } - /* - * @see org.eclipse.thread.AbstractLifeCycle#doStart() - */ @Override protected void doStart() throws Exception { @@ -489,9 +486,6 @@ public class SessionHandler extends ScopedHandler super.doStart(); } - /* - * @see org.eclipse.thread.AbstractLifeCycle#doStop() - */ @Override protected void doStop() throws Exception { @@ -1476,9 +1470,6 @@ public class SessionHandler extends ScopedHandler } } - /* - * @see org.eclipse.jetty.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) - */ @Override public void doScope(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException @@ -1574,9 +1565,6 @@ public class SessionHandler extends ScopedHandler } } - /* - * @see org.eclipse.jetty.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) - */ @Override public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException @@ -1698,9 +1686,6 @@ public class SessionHandler extends ScopedHandler } } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorCloseTestBase.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorCloseTestBase.java index 60c1bdad48c..a2dc1a77357 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorCloseTestBase.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorCloseTestBase.java @@ -203,9 +203,6 @@ public abstract class ConnectorCloseTestBase extends HttpServerTestFixture return _response; } - /** - * @see java.lang.Runnable#run() - */ @Override public void run() { diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java index 078331af7c6..f725b1f27a9 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java @@ -462,9 +462,6 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory, Welc doGet(request, response); } - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doTrace(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override protected void doTrace(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { @@ -478,9 +475,6 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory, Welc resp.setHeader("Allow", "GET,HEAD,POST,OPTIONS"); } - /* - * @see javax.servlet.Servlet#destroy() - */ @Override public void destroy() { diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/NoJspServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/NoJspServlet.java index 2a13dab5848..153cbff20d3 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/NoJspServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/NoJspServlet.java @@ -28,9 +28,6 @@ public class NoJspServlet extends HttpServlet { private boolean _warned; - /* - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override protected void doGet(HttpServletRequest req, HttpServletResponse response) throws ServletException, IOException { diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java index 7ce95f9709f..b082327e7c5 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java @@ -31,7 +31,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.concurrent.TimeUnit; - import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterRegistration; @@ -42,7 +41,6 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.ServletException; import javax.servlet.ServletRegistration; -import javax.servlet.ServletRegistration.Dynamic; import javax.servlet.ServletSecurityElement; import javax.servlet.SessionCookieConfig; import javax.servlet.SessionTrackingMode; @@ -319,9 +317,6 @@ public class ServletContextHandler extends ContextHandler super.doStart(); } - /** - * @see org.eclipse.jetty.server.handler.ContextHandler#doStop() - */ @Override protected void doStop() throws Exception { @@ -761,9 +756,6 @@ public class ServletContextHandler extends ContextHandler private String _buffer; private String _errorOnUndeclaredNamespace; - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getUrlPatterns() - */ @Override public Collection getUrlPatterns() { @@ -776,9 +768,6 @@ public class ServletContextHandler extends ContextHandler _urlPatterns.add(s); } - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getElIgnored() - */ @Override public String getElIgnored() { @@ -790,9 +779,6 @@ public class ServletContextHandler extends ContextHandler _elIgnored = s; } - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getPageEncoding() - */ @Override public String getPageEncoding() { @@ -839,27 +825,18 @@ public class ServletContextHandler extends ContextHandler _errorOnUndeclaredNamespace = errorOnUndeclaredNamespace; } - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getScriptingInvalid() - */ @Override public String getScriptingInvalid() { return _scriptingInvalid; } - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getIsXml() - */ @Override public String getIsXml() { return _isXml; } - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getIncludePreludes() - */ @Override public Collection getIncludePreludes() { @@ -872,9 +849,6 @@ public class ServletContextHandler extends ContextHandler _includePreludes.add(prelude); } - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getIncludeCodas() - */ @Override public Collection getIncludeCodas() { @@ -887,45 +861,30 @@ public class ServletContextHandler extends ContextHandler _includeCodas.add(coda); } - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getDeferredSyntaxAllowedAsLiteral() - */ @Override public String getDeferredSyntaxAllowedAsLiteral() { return _deferredSyntaxAllowedAsLiteral; } - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getTrimDirectiveWhitespaces() - */ @Override public String getTrimDirectiveWhitespaces() { return _trimDirectiveWhitespaces; } - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getDefaultContentType() - */ @Override public String getDefaultContentType() { return _defaultContentType; } - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getBuffer() - */ @Override public String getBuffer() { return _buffer; } - /** - * @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getErrorOnUndeclaredNamespace() - */ @Override public String getErrorOnUndeclaredNamespace() { @@ -963,9 +922,6 @@ public class ServletContextHandler extends ContextHandler private String _uri; private String _location; - /** - * @see javax.servlet.descriptor.TaglibDescriptor#getTaglibURI() - */ @Override public String getTaglibURI() { @@ -977,9 +933,6 @@ public class ServletContextHandler extends ContextHandler _uri = uri; } - /** - * @see javax.servlet.descriptor.TaglibDescriptor#getTaglibLocation() - */ @Override public String getTaglibLocation() { @@ -1007,9 +960,6 @@ public class ServletContextHandler extends ContextHandler { } - /** - * @see javax.servlet.descriptor.JspConfigDescriptor#getTaglibs() - */ @Override public Collection getTaglibs() { @@ -1021,9 +971,6 @@ public class ServletContextHandler extends ContextHandler _taglibs.add(d); } - /** - * @see javax.servlet.descriptor.JspConfigDescriptor#getJspPropertyGroups() - */ @Override public Collection getJspPropertyGroups() { @@ -1054,9 +1001,6 @@ public class ServletContextHandler extends ContextHandler public class Context extends ContextHandler.Context { - /* - * @see javax.servlet.ServletContext#getNamedDispatcher(java.lang.String) - */ @Override public RequestDispatcher getNamedDispatcher(String name) { diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java index 87c6639a152..21836414996 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java @@ -650,18 +650,12 @@ public class ServletHolder extends Holder implements UserIdentity.Scope return ContextHandler.getContextHandler(_config.getServletContext()); } - /** - * @see org.eclipse.jetty.server.UserIdentity.Scope#getContextPath() - */ @Override public String getContextPath() { return _config.getServletContext().getContextPath(); } - /** - * @see org.eclipse.jetty.server.UserIdentity.Scope#getRoleRefMap() - */ @Override public Map getRoleRefMap() { diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Source.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Source.java index e2419c8b6ed..8d8306004f9 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Source.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Source.java @@ -65,9 +65,6 @@ public class Source return _resource; } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/HostMap.java b/jetty-util/src/main/java/org/eclipse/jetty/util/HostMap.java index 8acd4e41b0b..bedb25cc66a 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/HostMap.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/HostMap.java @@ -47,9 +47,6 @@ public class HostMap extends HashMap super(capacity); } - /** - * @see java.util.HashMap#put(java.lang.Object, java.lang.Object) - */ @Override public TYPE put(String host, TYPE object) throws IllegalArgumentException @@ -57,9 +54,6 @@ public class HostMap extends HashMap return super.put(host, object); } - /** - * @see java.util.HashMap#get(java.lang.Object) - */ @Override public TYPE get(Object key) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java index ebbe7049802..5f6861295c4 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java @@ -78,9 +78,6 @@ public class IO this.write = write; } - /* - * @see java.lang.Runnable#run() - */ @Override public void run() { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java b/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java index f7a0e9016aa..66b6979b0fb 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java @@ -628,9 +628,6 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable config.setPauseUntil(now + getUpdateQuietTimeMillis()); } - /** - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -675,9 +672,6 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable return type; } - /** - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -688,9 +682,6 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable return result; } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -864,9 +855,6 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable s.append("]"); } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart() - */ @Override protected void doStart() throws Exception { @@ -896,9 +884,6 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable super.doStart(); } - /** - * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop() - */ @Override protected void doStop() throws Exception { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java b/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java index f4546badfc6..34dfd80c925 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java @@ -973,9 +973,6 @@ public class UrlEncoded extends MultiMap implements Cloneable return new String(encoded, 0, n, charset); } - /** - * - */ @Override public Object clone() { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/log/JettyAwareLogger.java b/jetty-util/src/main/java/org/eclipse/jetty/util/log/JettyAwareLogger.java index 9271cbc577c..f4021798185 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/JettyAwareLogger.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/JettyAwareLogger.java @@ -44,369 +44,246 @@ class JettyAwareLogger implements org.slf4j.Logger _logger = logger; } - /** - * @see org.slf4j.Logger#debug(java.lang.String) - */ @Override public void debug(String msg) { log(null, DEBUG, msg, null, null); } - /** - * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object) - */ @Override public void debug(String format, Object arg) { log(null, DEBUG, format, new Object[]{arg}, null); } - /** - * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void debug(String format, Object arg1, Object arg2) { log(null, DEBUG, format, new Object[]{arg1, arg2}, null); } - /** - * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object[]) - */ @Override public void debug(String format, Object[] argArray) { log(null, DEBUG, format, argArray, null); } - /** - * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Throwable) - */ @Override public void debug(String msg, Throwable t) { log(null, DEBUG, msg, null, t); } - /** - * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String) - */ @Override public void debug(Marker marker, String msg) { log(marker, DEBUG, msg, null, null); } - /** - * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, java.lang.Object) - */ @Override public void debug(Marker marker, String format, Object arg) { log(marker, DEBUG, format, new Object[]{arg}, null); } - /** - * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void debug(Marker marker, String format, Object arg1, Object arg2) { log(marker, DEBUG, format, new Object[]{arg1, arg2}, null); } - /** - * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, java.lang.Object[]) - */ @Override public void debug(Marker marker, String format, Object[] argArray) { log(marker, DEBUG, format, argArray, null); } - /** - * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, java.lang.Throwable) - */ @Override public void debug(Marker marker, String msg, Throwable t) { log(marker, DEBUG, msg, null, t); } - /** - * @see org.slf4j.Logger#error(java.lang.String) - */ @Override public void error(String msg) { log(null, ERROR, msg, null, null); } - /** - * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object) - */ @Override public void error(String format, Object arg) { log(null, ERROR, format, new Object[]{arg}, null); } - /** - * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void error(String format, Object arg1, Object arg2) { log(null, ERROR, format, new Object[]{arg1, arg2}, null); } - /** - * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object[]) - */ @Override public void error(String format, Object[] argArray) { log(null, ERROR, format, argArray, null); } - /** - * @see org.slf4j.Logger#error(java.lang.String, java.lang.Throwable) - */ @Override public void error(String msg, Throwable t) { log(null, ERROR, msg, null, t); } - /** - * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String) - */ @Override public void error(Marker marker, String msg) { log(marker, ERROR, msg, null, null); } - /** - * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, java.lang.Object) - */ @Override public void error(Marker marker, String format, Object arg) { log(marker, ERROR, format, new Object[]{arg}, null); } - /** - * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void error(Marker marker, String format, Object arg1, Object arg2) { log(marker, ERROR, format, new Object[]{arg1, arg2}, null); } - /** - * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, java.lang.Object[]) - */ @Override public void error(Marker marker, String format, Object[] argArray) { log(marker, ERROR, format, argArray, null); } - /** - * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, java.lang.Throwable) - */ @Override public void error(Marker marker, String msg, Throwable t) { log(marker, ERROR, msg, null, t); } - /** - * @see org.slf4j.Logger#getName() - */ @Override public String getName() { return _logger.getName(); } - /** - * @see org.slf4j.Logger#info(java.lang.String) - */ @Override public void info(String msg) { log(null, INFO, msg, null, null); } - /** - * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object) - */ @Override public void info(String format, Object arg) { log(null, INFO, format, new Object[]{arg}, null); } - /** - * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void info(String format, Object arg1, Object arg2) { log(null, INFO, format, new Object[]{arg1, arg2}, null); } - /** - * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object[]) - */ @Override public void info(String format, Object[] argArray) { log(null, INFO, format, argArray, null); } - /** - * @see org.slf4j.Logger#info(java.lang.String, java.lang.Throwable) - */ @Override public void info(String msg, Throwable t) { log(null, INFO, msg, null, t); } - /** - * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String) - */ @Override public void info(Marker marker, String msg) { log(marker, INFO, msg, null, null); } - /** - * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, java.lang.Object) - */ @Override public void info(Marker marker, String format, Object arg) { log(marker, INFO, format, new Object[]{arg}, null); } - /** - * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void info(Marker marker, String format, Object arg1, Object arg2) { log(marker, INFO, format, new Object[]{arg1, arg2}, null); } - /** - * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, java.lang.Object[]) - */ @Override public void info(Marker marker, String format, Object[] argArray) { log(marker, INFO, format, argArray, null); } - /** - * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, java.lang.Throwable) - */ @Override public void info(Marker marker, String msg, Throwable t) { log(marker, INFO, msg, null, t); } - /** - * @see org.slf4j.Logger#isDebugEnabled() - */ @Override public boolean isDebugEnabled() { return _logger.isDebugEnabled(); } - /** - * @see org.slf4j.Logger#isDebugEnabled(org.slf4j.Marker) - */ @Override public boolean isDebugEnabled(Marker marker) { return _logger.isDebugEnabled(marker); } - /** - * @see org.slf4j.Logger#isErrorEnabled() - */ @Override public boolean isErrorEnabled() { return _logger.isErrorEnabled(); } - /** - * @see org.slf4j.Logger#isErrorEnabled(org.slf4j.Marker) - */ @Override public boolean isErrorEnabled(Marker marker) { return _logger.isErrorEnabled(marker); } - /** - * @see org.slf4j.Logger#isInfoEnabled() - */ @Override public boolean isInfoEnabled() { return _logger.isInfoEnabled(); } - /** - * @see org.slf4j.Logger#isInfoEnabled(org.slf4j.Marker) - */ @Override public boolean isInfoEnabled(Marker marker) { return _logger.isInfoEnabled(marker); } - /** - * @see org.slf4j.Logger#isTraceEnabled() - */ @Override public boolean isTraceEnabled() { return _logger.isTraceEnabled(); } - /** - * @see org.slf4j.Logger#isTraceEnabled(org.slf4j.Marker) - */ @Override public boolean isTraceEnabled(Marker marker) { return _logger.isTraceEnabled(marker); } - /** - * @see org.slf4j.Logger#isWarnEnabled() - */ @Override public boolean isWarnEnabled() { return _logger.isWarnEnabled(); } - /** - * @see org.slf4j.Logger#isWarnEnabled(org.slf4j.Marker) - */ @Override public boolean isWarnEnabled(Marker marker) { @@ -419,180 +296,120 @@ class JettyAwareLogger implements org.slf4j.Logger return _logger.toString(); } - /** - * @see org.slf4j.Logger#trace(java.lang.String) - */ @Override public void trace(String msg) { log(null, TRACE, msg, null, null); } - /** - * @see org.slf4j.Logger#trace(java.lang.String, java.lang.Object) - */ @Override public void trace(String format, Object arg) { log(null, TRACE, format, new Object[]{arg}, null); } - /** - * @see org.slf4j.Logger#trace(java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void trace(String format, Object arg1, Object arg2) { log(null, TRACE, format, new Object[]{arg1, arg2}, null); } - /** - * @see org.slf4j.Logger#trace(java.lang.String, java.lang.Object[]) - */ @Override public void trace(String format, Object[] argArray) { log(null, TRACE, format, argArray, null); } - /** - * @see org.slf4j.Logger#trace(java.lang.String, java.lang.Throwable) - */ @Override public void trace(String msg, Throwable t) { log(null, TRACE, msg, null, t); } - /** - * @see org.slf4j.Logger#trace(org.slf4j.Marker, java.lang.String) - */ @Override public void trace(Marker marker, String msg) { log(marker, TRACE, msg, null, null); } - /** - * @see org.slf4j.Logger#trace(org.slf4j.Marker, java.lang.String, java.lang.Object) - */ @Override public void trace(Marker marker, String format, Object arg) { log(marker, TRACE, format, new Object[]{arg}, null); } - /** - * @see org.slf4j.Logger#trace(org.slf4j.Marker, java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void trace(Marker marker, String format, Object arg1, Object arg2) { log(marker, TRACE, format, new Object[]{arg1, arg2}, null); } - /** - * @see org.slf4j.Logger#trace(org.slf4j.Marker, java.lang.String, java.lang.Object[]) - */ @Override public void trace(Marker marker, String format, Object[] argArray) { log(marker, TRACE, format, argArray, null); } - /** - * @see org.slf4j.Logger#trace(org.slf4j.Marker, java.lang.String, java.lang.Throwable) - */ @Override public void trace(Marker marker, String msg, Throwable t) { log(marker, TRACE, msg, null, t); } - /** - * @see org.slf4j.Logger#warn(java.lang.String) - */ @Override public void warn(String msg) { log(null, WARN, msg, null, null); } - /** - * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object) - */ @Override public void warn(String format, Object arg) { log(null, WARN, format, new Object[]{arg}, null); } - /** - * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object[]) - */ @Override public void warn(String format, Object[] argArray) { log(null, WARN, format, argArray, null); } - /** - * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void warn(String format, Object arg1, Object arg2) { log(null, WARN, format, new Object[]{arg1, arg2}, null); } - /** - * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Throwable) - */ @Override public void warn(String msg, Throwable t) { log(null, WARN, msg, null, t); } - /** - * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String) - */ @Override public void warn(Marker marker, String msg) { log(marker, WARN, msg, null, null); } - /** - * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, java.lang.Object) - */ @Override public void warn(Marker marker, String format, Object arg) { log(marker, WARN, format, new Object[]{arg}, null); } - /** - * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void warn(Marker marker, String format, Object arg1, Object arg2) { log(marker, WARN, format, new Object[]{arg1, arg2}, null); } - /** - * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, java.lang.Object[]) - */ @Override public void warn(Marker marker, String format, Object[] argArray) { log(marker, WARN, format, argArray, null); } - /** - * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, java.lang.Throwable) - */ @Override public void warn(Marker marker, String msg, Throwable t) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java index 15239db9b85..28c34da9250 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java @@ -32,9 +32,6 @@ import java.awt.Toolkit; public class AWTLeakPreventer extends AbstractLeakPreventer { - /** - * @see org.eclipse.jetty.util.preventers.AbstractLeakPreventer#prevent(java.lang.ClassLoader) - */ @Override public void prevent(ClassLoader loader) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DOMLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DOMLeakPreventer.java index 62826fbcf68..f228536328c 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DOMLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DOMLeakPreventer.java @@ -34,9 +34,6 @@ import javax.xml.parsers.DocumentBuilderFactory; public class DOMLeakPreventer extends AbstractLeakPreventer { - /** - * @see org.eclipse.jetty.util.preventers.AbstractLeakPreventer#prevent(java.lang.ClassLoader) - */ @Override public void prevent(ClassLoader loader) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java index 82404e26883..7743d0918da 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java @@ -38,9 +38,6 @@ import java.lang.reflect.Method; public class GCThreadLeakPreventer extends AbstractLeakPreventer { - /** - * @see org.eclipse.jetty.util.preventers.AbstractLeakPreventer#prevent(java.lang.ClassLoader) - */ @Override public void prevent(ClassLoader loader) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/Java2DLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/Java2DLeakPreventer.java index 0a2ea5af26e..073bddf3e59 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/Java2DLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/Java2DLeakPreventer.java @@ -29,9 +29,6 @@ package org.eclipse.jetty.util.preventers; public class Java2DLeakPreventer extends AbstractLeakPreventer { - /** - * @see org.eclipse.jetty.util.preventers.AbstractLeakPreventer#prevent(java.lang.ClassLoader) - */ @Override public void prevent(ClassLoader loader) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LDAPLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LDAPLeakPreventer.java index 7a1abfecbd8..696e603c913 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LDAPLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LDAPLeakPreventer.java @@ -31,9 +31,6 @@ package org.eclipse.jetty.util.preventers; public class LDAPLeakPreventer extends AbstractLeakPreventer { - /** - * @see org.eclipse.jetty.util.preventers.AbstractLeakPreventer#prevent(java.lang.ClassLoader) - */ @Override public void prevent(ClassLoader loader) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LoginConfigurationLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LoginConfigurationLeakPreventer.java index 7d3698ab08e..567a3d55d49 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LoginConfigurationLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/LoginConfigurationLeakPreventer.java @@ -30,9 +30,6 @@ package org.eclipse.jetty.util.preventers; public class LoginConfigurationLeakPreventer extends AbstractLeakPreventer { - /** - * @see org.eclipse.jetty.util.preventers.AbstractLeakPreventer#prevent(java.lang.ClassLoader) - */ @Override public void prevent(ClassLoader loader) { diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/SecurityProviderLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/SecurityProviderLeakPreventer.java index 7be0a6da142..0f3752de27b 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/SecurityProviderLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/SecurityProviderLeakPreventer.java @@ -32,9 +32,6 @@ import java.security.Security; public class SecurityProviderLeakPreventer extends AbstractLeakPreventer { - /** - * @see org.eclipse.jetty.util.preventers.AbstractLeakPreventer#prevent(java.lang.ClassLoader) - */ @Override public void prevent(ClassLoader loader) { diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java index aaa9c8f5600..9e7f78c089f 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java @@ -386,9 +386,6 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL return _resourceAliases.remove(alias); } - /* (non-Javadoc) - * @see org.eclipse.jetty.server.server.handler.ContextHandler#setClassLoader(java.lang.ClassLoader) - */ @Override public void setClassLoader(ClassLoader classLoader) { @@ -527,9 +524,6 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL _configurations.postConfigure(this); } - /* - * @see org.eclipse.thread.AbstractLifeCycle#doStart() - */ @Override protected void doStart() throws Exception { diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java index ed22a9413a0..ad19b2d4d11 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java @@ -99,9 +99,6 @@ public class WebInfConfiguration extends AbstractConfiguration context.setBaseResource(_preUnpackBaseResource); } - /** - * @see org.eclipse.jetty.webapp.AbstractConfiguration#cloneConfigure(org.eclipse.jetty.webapp.WebAppContext, org.eclipse.jetty.webapp.WebAppContext) - */ @Override public void cloneConfigure(WebAppContext template, WebAppContext context) throws Exception { diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java index 276cddeaffa..c3b4c2ca853 100644 --- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java +++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/OrderingTest.java @@ -51,45 +51,30 @@ public class OrderingTest _name = name; } - /** - * @see org.eclipse.jetty.util.resource.Resource#addPath(java.lang.String) - */ @Override public Resource addPath(String path) throws IOException, MalformedURLException { return null; } - /** - * @see org.eclipse.jetty.util.resource.Resource#delete() - */ @Override public boolean delete() throws SecurityException { return false; } - /** - * @see org.eclipse.jetty.util.resource.Resource#exists() - */ @Override public boolean exists() { return false; } - /** - * @see org.eclipse.jetty.util.resource.Resource#getFile() - */ @Override public File getFile() throws IOException { return null; } - /** - * @see org.eclipse.jetty.util.resource.Resource#getInputStream() - */ @Override public InputStream getInputStream() throws IOException { @@ -102,9 +87,6 @@ public class OrderingTest return null; } - /** - * @see org.eclipse.jetty.util.resource.Resource#getName() - */ @Override public String getName() { @@ -117,62 +99,41 @@ public class OrderingTest return null; } - /** - * @see org.eclipse.jetty.util.resource.Resource#isContainedIn(org.eclipse.jetty.util.resource.Resource) - */ @Override public boolean isContainedIn(Resource r) throws MalformedURLException { return false; } - /** - * @see org.eclipse.jetty.util.resource.Resource#isDirectory() - */ @Override public boolean isDirectory() { return false; } - /** - * @see org.eclipse.jetty.util.resource.Resource#lastModified() - */ @Override public long lastModified() { return 0; } - /** - * @see org.eclipse.jetty.util.resource.Resource#length() - */ @Override public long length() { return 0; } - /** - * @see org.eclipse.jetty.util.resource.Resource#list() - */ @Override public String[] list() { return null; } - /** - * @see org.eclipse.jetty.util.resource.Resource#close() - */ @Override public void close() { } - /** - * @see org.eclipse.jetty.util.resource.Resource#renameTo(org.eclipse.jetty.util.resource.Resource) - */ @Override public boolean renameTo(Resource dest) throws SecurityException { diff --git a/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java b/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java index 67f71c45559..1e2ea636175 100644 --- a/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java +++ b/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java @@ -479,9 +479,6 @@ public class DistributionTester consoleStreamers.forEach(ConsoleStreamer::stop); } - /** - * @see #destroy() - */ @Override public void close() { diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/DigestPostTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/DigestPostTest.java index 18f637188b3..930106598b9 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/DigestPostTest.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/DigestPostTest.java @@ -100,18 +100,12 @@ public class DigestPostTest roles.put(username, rolenames); } - /** - * @see org.eclipse.jetty.security.AbstractLoginService#loadRoleInfo(org.eclipse.jetty.security.AbstractLoginService.UserPrincipal) - */ @Override protected String[] loadRoleInfo(UserPrincipal user) { return roles.get(user.getName()); } - /** - * @see org.eclipse.jetty.security.AbstractLoginService#loadUserInfo(java.lang.String) - */ @Override protected UserPrincipal loadUserInfo(String username) { diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/FakeJspServlet.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/FakeJspServlet.java index 7824a54ad0d..e8862320935 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/FakeJspServlet.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/FakeJspServlet.java @@ -29,9 +29,6 @@ import javax.servlet.http.HttpServletResponse; public class FakeJspServlet extends HttpServlet { - /* - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override protected void doGet(HttpServletRequest req, HttpServletResponse response) throws ServletException, IOException { diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java index 3bc59e1cadf..c42e7b71b87 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java @@ -39,9 +39,6 @@ public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessi FileTestHelper.teardown(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/FileSessionDataStoreTest.java b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/FileSessionDataStoreTest.java index 5e9751c61c6..86c2878d566 100644 --- a/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/FileSessionDataStoreTest.java +++ b/tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/FileSessionDataStoreTest.java @@ -74,9 +74,6 @@ public class FileSessionDataStoreTest extends AbstractSessionDataStoreTest } } - /** - * - */ @Override public boolean checkSessionPersisted(SessionData data) throws Exception { diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java index 11769e7edd5..809b82ab1c5 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java @@ -46,9 +46,6 @@ public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessi __testSupport.tearDown(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java index 881d34191e0..ea1e2ed8daa 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java @@ -45,9 +45,6 @@ public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScav __testSupport.tearDown(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java index 29d83f8338f..0023b85ffa5 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java @@ -81,9 +81,6 @@ public class GCloudSessionDataStoreTest extends AbstractSessionDataStoreTest return __testSupport.checkSessionExists(data.getId()); } - /** - * - */ @Override public boolean checkSessionPersisted(SessionData data) throws Exception { diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java index eb2d42a7047..661b57d150b 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java @@ -68,9 +68,6 @@ public class GCloudSessionTestSupport _d = d; } - /** - * @see org.eclipse.jetty.gcloud.session.GCloudSessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception { diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java index c13287467bb..88b47832e4e 100644 --- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java +++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java @@ -45,9 +45,6 @@ public class InvalidationSessionTest extends AbstractClusteredInvalidationSessio __testSupport.tearDown(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java index 15d04fa5559..aac2b34ad52 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java @@ -46,9 +46,6 @@ public class ClusteredOrphanedSessionTest _testHelper.tearDown(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java index dfdcdbd52a5..620a044e8b8 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java @@ -46,9 +46,6 @@ public class ClusteredSessionScavengingTest _testHelper.tearDown(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java index 26f85d65473..26b256a3e21 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java @@ -42,9 +42,6 @@ public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessi __testSupport.teardown(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java index 668c4284587..965962593fd 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java @@ -53,9 +53,6 @@ public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScav super.testClusteredScavenge(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredInvalidationSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredInvalidationSessionTest.java index c1af0830fa9..61ccf05ed5b 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredInvalidationSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredInvalidationSessionTest.java @@ -45,9 +45,6 @@ public class RemoteClusteredInvalidationSessionTest extends AbstractClusteredInv __testSupport.teardown(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredSessionScavengingTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredSessionScavengingTest.java index cb048c1f74b..d7ba530c638 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredSessionScavengingTest.java @@ -45,9 +45,6 @@ public class RemoteClusteredSessionScavengingTest extends AbstractClusteredSessi __testSupport.teardown(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredInvalidationSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredInvalidationSessionTest.java index 69eda55dbc7..d81074084c1 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredInvalidationSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredInvalidationSessionTest.java @@ -32,9 +32,6 @@ public class ClusteredInvalidationSessionTest extends AbstractClusteredInvalidat JdbcTestHelper.shutdown(null); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java index 2fe34944f49..7e0ee188959 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java @@ -25,9 +25,6 @@ import org.junit.jupiter.api.AfterEach; */ public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessionTest { - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java index 0200800bccc..b3b8a0232e4 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java @@ -25,9 +25,6 @@ import org.junit.jupiter.api.AfterEach; */ public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest { - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java index 6a3bbc0e936..3c644ad2abb 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionTableSchemaTest.java @@ -50,9 +50,6 @@ public class SessionTableSchemaTest _da = new DatabaseAdaptor() { - /** - * @see org.eclipse.jetty.server.session.DatabaseAdaptor#isEmptyStringNull() - */ @Override public boolean isEmptyStringNull() { diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java index 276b1984f92..c3a2b12c3d4 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java @@ -28,9 +28,6 @@ import org.junit.jupiter.api.Test; public class WebAppObjectInSessionTest extends AbstractWebAppObjectInSessionTest { - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java b/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java index e9b5c21f6ab..bfe8a905044 100644 --- a/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java +++ b/tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java @@ -122,9 +122,6 @@ public class MemcachedTestHelper public static class MockDataStoreFactory extends AbstractSessionDataStoreFactory { - /** - * @see org.eclipse.jetty.server.session.SessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception { diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredInvalidateSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredInvalidateSessionTest.java index 7d8047da2d8..8b2c0062d9f 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredInvalidateSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredInvalidateSessionTest.java @@ -39,9 +39,6 @@ public class ClusteredInvalidateSessionTest extends AbstractClusteredInvalidatio MongoTestHelper.dropCollection(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredOrphanedSessionTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredOrphanedSessionTest.java index 42b04a53630..fefbdea4ef8 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredOrphanedSessionTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredOrphanedSessionTest.java @@ -43,9 +43,6 @@ public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessi MongoTestHelper.dropCollection(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredSessionScavengingTest.java b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredSessionScavengingTest.java index fac13f9ff68..d841c48e8dc 100644 --- a/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/ClusteredSessionScavengingTest.java @@ -39,9 +39,6 @@ public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScav MongoTestHelper.dropCollection(); } - /** - * @see org.eclipse.jetty.server.session.AbstractTestBase#createSessionDataStoreFactory() - */ @Override public SessionDataStoreFactory createSessionDataStoreFactory() { diff --git a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/TestSessionDataStoreFactory.java b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/TestSessionDataStoreFactory.java index eb2703083c6..30fcb71e995 100644 --- a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/TestSessionDataStoreFactory.java +++ b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/TestSessionDataStoreFactory.java @@ -24,9 +24,6 @@ package org.eclipse.jetty.server.session; public class TestSessionDataStoreFactory extends AbstractSessionDataStoreFactory { - /** - * @see org.eclipse.jetty.server.session.SessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception { diff --git a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DeleteUnloadableSessionTest.java b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DeleteUnloadableSessionTest.java index f0c8b72e2d0..b8aa43e5398 100644 --- a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DeleteUnloadableSessionTest.java +++ b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DeleteUnloadableSessionTest.java @@ -104,9 +104,6 @@ public class DeleteUnloadableSessionTest public static class DelSessionDataStoreFactory extends AbstractSessionDataStoreFactory { - /** - * @see org.eclipse.jetty.server.session.SessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception { diff --git a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DirtyAttributeTest.java b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DirtyAttributeTest.java index 79bd4ebe05a..325cd51786b 100644 --- a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DirtyAttributeTest.java +++ b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/DirtyAttributeTest.java @@ -58,9 +58,6 @@ public class DirtyAttributeTest public class TestPassivatingSessionDataStore extends TestSessionDataStore { - /** - * @see org.eclipse.jetty.server.session.TestSessionDataStore#isPassivating() - */ @Override public boolean isPassivating() { @@ -71,9 +68,6 @@ public class DirtyAttributeTest public class TestPassivatingSessionDataStoreFactory extends AbstractSessionDataStoreFactory { - /** - * @see org.eclipse.jetty.server.session.SessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception { @@ -177,18 +171,12 @@ public class DirtyAttributeTest int binds = 0; int unbinds = 0; - /** - * @see javax.servlet.http.HttpSessionActivationListener#sessionWillPassivate(javax.servlet.http.HttpSessionEvent) - */ @Override public void sessionWillPassivate(HttpSessionEvent se) { ++passivates; } - /** - * @see javax.servlet.http.HttpSessionActivationListener#sessionDidActivate(javax.servlet.http.HttpSessionEvent) - */ @Override public void sessionDidActivate(HttpSessionEvent se) { @@ -215,18 +203,12 @@ public class DirtyAttributeTest assertEquals(expected, unbinds); } - /** - * @see javax.servlet.http.HttpSessionBindingListener#valueBound(javax.servlet.http.HttpSessionBindingEvent) - */ @Override public void valueBound(HttpSessionBindingEvent event) { ++binds; } - /** - * @see javax.servlet.http.HttpSessionBindingListener#valueUnbound(javax.servlet.http.HttpSessionBindingEvent) - */ @Override public void valueUnbound(HttpSessionBindingEvent event) { diff --git a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/SessionEvictionFailureTest.java b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/SessionEvictionFailureTest.java index 480424eb9f5..e602959df49 100644 --- a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/SessionEvictionFailureTest.java +++ b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/SessionEvictionFailureTest.java @@ -112,9 +112,6 @@ public class SessionEvictionFailureTest _nextStoreResults = storeResults; } - /** - * @see org.eclipse.jetty.server.session.SessionDataStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler) - */ @Override public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception { diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestFilter.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestFilter.java index 3d3a9def77c..cb215dbad7d 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestFilter.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestFilter.java @@ -50,9 +50,6 @@ public class TestFilter implements Filter private ServletContext _context; private final Set _allowed = new HashSet(); - /* - * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) - */ @Override public void init(FilterConfig filterConfig) throws ServletException { @@ -65,9 +62,6 @@ public class TestFilter implements Filter LOG.debug("TestFilter#remote=" + _remote); } - /* - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) - */ @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException @@ -113,9 +107,6 @@ public class TestFilter implements Filter } } - /* - * @see javax.servlet.Filter#destroy() - */ @Override public void destroy() { diff --git a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java b/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java index 229a3b16914..9d34984b173 100644 --- a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java +++ b/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java @@ -162,9 +162,6 @@ public class TestServer private static class RestartHandler extends HandlerWrapper { - /** - * @see org.eclipse.jetty.server.handler.HandlerWrapper#handle(java.lang.String, org.eclipse.jetty.server.Request, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { diff --git a/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockDataSource.java b/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockDataSource.java index 8adf63c5444..7d16f9bce5f 100644 --- a/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockDataSource.java +++ b/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockDataSource.java @@ -39,18 +39,12 @@ public class MockDataSource implements DataSource return null; } - /** - * @see javax.sql.DataSource#getConnection() - */ @Override public Connection getConnection() throws SQLException { return null; } - /** - * @see javax.sql.DataSource#getConnection(java.lang.String, java.lang.String) - */ @Override public Connection getConnection(String username, String password) throws SQLException @@ -58,35 +52,23 @@ public class MockDataSource implements DataSource return null; } - /** - * @see javax.sql.DataSource#getLogWriter() - */ @Override public PrintWriter getLogWriter() throws SQLException { return null; } - /** - * @see javax.sql.DataSource#getLoginTimeout() - */ @Override public int getLoginTimeout() throws SQLException { return 0; } - /** - * @see javax.sql.DataSource#setLogWriter(java.io.PrintWriter) - */ @Override public void setLogWriter(PrintWriter out) throws SQLException { } - /** - * @see javax.sql.DataSource#setLoginTimeout(int) - */ @Override public void setLoginTimeout(int seconds) throws SQLException { diff --git a/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockTransport.java b/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockTransport.java index a3a4d0f3707..0b9fd2937d1 100644 --- a/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockTransport.java +++ b/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockTransport.java @@ -38,9 +38,6 @@ public class MockTransport extends Transport super(session, urlname); } - /** - * @see javax.mail.Transport#sendMessage(javax.mail.Message, javax.mail.Address[]) - */ @Override public void sendMessage(Message arg0, Address[] arg1) throws MessagingException { diff --git a/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockUserTransaction.java b/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockUserTransaction.java index d9b37c2afd5..edffcaf2957 100644 --- a/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockUserTransaction.java +++ b/tests/test-webapps/test-mock-resources/src/main/java/com/acme/MockUserTransaction.java @@ -31,17 +31,11 @@ import javax.transaction.UserTransaction; public class MockUserTransaction implements UserTransaction { - /** - * @see javax.transaction.UserTransaction#begin() - */ @Override public void begin() throws NotSupportedException, SystemException { } - /** - * @see javax.transaction.UserTransaction#commit() - */ @Override public void commit() throws HeuristicMixedException, HeuristicRollbackException, IllegalStateException, @@ -49,35 +43,23 @@ public class MockUserTransaction implements UserTransaction { } - /** - * @see javax.transaction.UserTransaction#getStatus() - */ @Override public int getStatus() throws SystemException { return 0; } - /** - * @see javax.transaction.UserTransaction#rollback() - */ @Override public void rollback() throws IllegalStateException, SecurityException, SystemException { } - /** - * @see javax.transaction.UserTransaction#setRollbackOnly() - */ @Override public void setRollbackOnly() throws IllegalStateException, SystemException { } - /** - * @see javax.transaction.UserTransaction#setTransactionTimeout(int) - */ @Override public void setTransactionTimeout(int arg0) throws SystemException { diff --git a/tests/test-webapps/test-servlet-spec/test-container-initializer/src/main/java/com/acme/initializer/FooInitializer.java b/tests/test-webapps/test-servlet-spec/test-container-initializer/src/main/java/com/acme/initializer/FooInitializer.java index 5f19fba7668..ca1751ad108 100644 --- a/tests/test-webapps/test-servlet-spec/test-container-initializer/src/main/java/com/acme/initializer/FooInitializer.java +++ b/tests/test-webapps/test-servlet-spec/test-container-initializer/src/main/java/com/acme/initializer/FooInitializer.java @@ -33,18 +33,12 @@ public class FooInitializer implements ServletContainerInitializer public static class BarListener implements ServletContextListener { - /** - * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent) - */ @Override public void contextInitialized(ServletContextEvent sce) { throw new IllegalStateException("BAR LISTENER CALLED!"); } - /** - * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent) - */ @Override public void contextDestroyed(ServletContextEvent sce) { @@ -55,9 +49,6 @@ public class FooInitializer implements ServletContainerInitializer public static class FooListener implements ServletContextListener { - /** - * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent) - */ @Override public void contextInitialized(ServletContextEvent sce) { @@ -83,9 +74,6 @@ public class FooInitializer implements ServletContainerInitializer } } - /** - * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent) - */ @Override public void contextDestroyed(ServletContextEvent sce) { diff --git a/tests/test-webapps/test-webapp-rfc2616/src/main/java/org/eclipse/jetty/tests/webapp/HttpMethodsServlet.java b/tests/test-webapps/test-webapp-rfc2616/src/main/java/org/eclipse/jetty/tests/webapp/HttpMethodsServlet.java index 98a1b4337a0..d7e1a290b82 100644 --- a/tests/test-webapps/test-webapp-rfc2616/src/main/java/org/eclipse/jetty/tests/webapp/HttpMethodsServlet.java +++ b/tests/test-webapps/test-webapp-rfc2616/src/main/java/org/eclipse/jetty/tests/webapp/HttpMethodsServlet.java @@ -43,56 +43,36 @@ public class HttpMethodsServlet extends HttpServlet super(); } - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse - * response) - */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { /* do nothing */ } - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse - * response) - */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { /* do nothing */ } - /** - * @see HttpServlet#doPut(HttpServletRequest, HttpServletResponse) - */ @Override protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { /* do nothing */ } - /** - * @see HttpServlet#doDelete(HttpServletRequest, HttpServletResponse) - */ @Override protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { /* do nothing */ } - /** - * @see HttpServlet#doHead(HttpServletRequest, HttpServletResponse) - */ @Override protected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { /* do nothing */ } - /** - * @see HttpServlet#doTrace(HttpServletRequest, HttpServletResponse) - */ @Override protected void doTrace(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {