From a639ee9275e672ca21320f56f62f1648d24aa140 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts
Date: Thu, 1 Mar 2018 13:59:25 +1100
Subject: [PATCH] Resolved errorprone MissingOverride warnings #2206
`@Override` was added to methods which were missing the annotation #2206
Signed-off-by: Lachlan Roberts
---
.../asyncrest/AbstractRestServlet.java | 1 +
.../example/asyncrest/SerialRestServlet.java | 2 +
.../eclipse/jetty/embedded/HelloHandler.java | 1 +
.../eclipse/jetty/embedded/ManyHandlers.java | 1 +
.../annotations/AnnotationConfiguration.java | 2 +
.../annotations/AnnotationIntrospector.java | 1 +
.../annotations/ClassInheritanceHandler.java | 1 +
...ContainerInitializerAnnotationHandler.java | 3 +
.../DeclareRolesAnnotationHandler.java | 1 +
.../MultiPartConfigAnnotationHandler.java | 1 +
.../PostConstructAnnotationHandler.java | 1 +
.../PreDestroyAnnotationHandler.java | 1 +
.../ResourceAnnotationHandler.java | 1 +
.../ResourcesAnnotationHandler.java | 1 +
.../annotations/RunAsAnnotationHandler.java | 1 +
.../ServletContainerInitializersStarter.java | 1 +
.../ServletSecurityAnnotationHandler.java | 1 +
.../annotations/WebFilterAnnotation.java | 1 +
.../annotations/WebListenerAnnotation.java | 1 +
.../WebListenerAnnotationHandler.java | 3 +
.../annotations/WebServletAnnotation.java | 1 +
.../org/eclipse/jetty/annotations/ClassB.java | 1 +
.../eclipse/jetty/annotations/FilterC.java | 3 +
.../eclipse/jetty/annotations/ListenerC.java | 2 +
.../eclipse/jetty/annotations/ServletC.java | 1 +
.../TestAnnotationInheritance.java | 3 +
.../annotations/TestAnnotationParser.java | 6 +
.../eclipse/jetty/ant/AntWebAppContext.java | 2 +
.../jetty/ant/AntWebInfConfiguration.java | 2 +
.../org/eclipse/jetty/ant/JettyRunTask.java | 1 +
.../org/eclipse/jetty/ant/JettyStopTask.java | 1 +
.../eclipse/jetty/ant/ServerProxyImpl.java | 4 +
.../java/org/eclipse/jetty/ant/AntBuild.java | 1 +
.../eclipse/jetty/cdi/core/NamedLiteral.java | 1 +
.../cdi/servlet/WeldDeploymentBinding.java | 2 +
.../jetty/client/DuplexConnectionPool.java | 3 +
.../eclipse/jetty/client/HttpDestination.java | 2 +
.../eclipse/jetty/client/HttpResponse.java | 2 +
.../client/http/HttpReceiverOverHTTP.java | 1 +
.../client/util/DeferredContentProvider.java | 1 +
.../jetty/client/ssl/SslBytesTest.java | 1 +
.../continuation/ContinuationFilter.java | 3 +
.../jetty/deploy/bindings/DebugBinding.java | 2 +
.../deploy/bindings/DebugListenerBinding.java | 1 +
.../bindings/GlobalWebappConfigBinding.java | 2 +
.../deploy/bindings/OrderedGroupBinding.java | 2 +
.../deploy/bindings/StandardDeployer.java | 2 +
.../jetty/deploy/graph/GraphOutputDot.java | 1 +
.../deploy/AppLifeCyclePathCollector.java | 2 +
.../eclipse/jetty/deploy/MockAppProvider.java | 2 +
...ScanningAppProviderRuntimeUpdatesTest.java | 1 +
.../session/GCloudSessionDataStore.java | 1 +
.../jetty/http/spi/JettyHttpExchange.java | 1 +
.../jetty/http/spi/JettyHttpsExchange.java | 1 +
.../eclipse/jetty/http/spi/TestSPIServer.java | 2 +
.../org/eclipse/jetty/http/HttpFields.java | 3 +
.../java/org/eclipse/jetty/http/HttpURI.java | 1 +
.../java/org/eclipse/jetty/http/MetaData.java | 2 +
.../eclipse/jetty/http/QuotedQualityCSV.java | 1 +
.../org/eclipse/jetty/http2/HTTP2Session.java | 2 +
.../jetty/http2/hpack/HpackContext.java | 1 +
.../InfinispanSessionDataStore.java | 2 +
.../eclipse/jetty/io/ByteArrayEndPoint.java | 1 +
.../org/eclipse/jetty/io/CyclicTimeout.java | 1 +
.../jetty/io/LeakTrackingByteBufferPool.java | 1 +
.../jetty/io/NetworkTrafficListener.java | 4 +
.../jetty/io/SocketChannelEndPoint.java | 2 +
.../jetty/io/SelectChannelEndPointTest.java | 1 +
.../org/eclipse/jetty/jaas/JAASGroup.java | 10 +
.../eclipse/jetty/jaas/JAASLoginService.java | 7 +
.../org/eclipse/jetty/jaas/JAASPrincipal.java | 4 +
.../java/org/eclipse/jetty/jaas/JAASRole.java | 1 +
.../eclipse/jetty/jaas/JAASUserPrincipal.java | 2 +
.../jetty/jaas/StrictRoleCheckPolicy.java | 1 +
.../callback/AbstractCallbackHandler.java | 1 +
.../jaas/callback/DefaultCallbackHandler.java | 1 +
.../jaas/spi/AbstractDatabaseLoginModule.java | 2 +
.../jetty/jaas/spi/AbstractLoginModule.java | 5 +
.../jetty/jaas/spi/DataSourceLoginModule.java | 2 +
.../jetty/jaas/spi/JDBCLoginModule.java | 2 +
.../jetty/jaas/spi/LdapLoginModule.java | 5 +
.../jaas/spi/PropertyFileLoginModule.java | 2 +
.../security/jaspi/JaspiAuthenticator.java | 4 +
.../jaspi/JaspiAuthenticatorFactory.java | 2 +
.../security/jaspi/JaspiMessageInfo.java | 17 +
.../jaspi/ServletCallbackHandler.java | 1 +
.../security/jaspi/SimpleAuthConfig.java | 6 +
.../jaspi/modules/BaseAuthModule.java | 5 +
.../org/eclipse/jetty/jmx/ObjectMBean.java | 6 +
jetty-jmx/src/test/java/com/acme/Derived.java | 2 +
.../test/java/com/acme/DerivedManaged.java | 2 +
.../jetty/jndi/BindingEnumeration.java | 5 +
.../eclipse/jetty/jndi/ContextFactory.java | 1 +
.../jetty/jndi/InitialContextFactory.java | 2 +
.../eclipse/jetty/jndi/NameEnumeration.java | 5 +
.../org/eclipse/jetty/jndi/NamingContext.java | 35 +-
.../jndi/factories/MailSessionReference.java | 2 +
.../jetty/jndi/java/javaNameParser.java | 1 +
.../jetty/jndi/java/javaRootURLContext.java | 29 +
.../jndi/java/javaURLContextFactory.java | 1 +
.../jetty/jndi/local/localContextRoot.java | 30 +
.../org/eclipse/jetty/jndi/java/TestJNDI.java | 5 +
.../jetty/jndi/java/TestLocalJNDI.java | 3 +
.../eclipse/jetty/jspc/plugin/JspcMojo.java | 2 +
.../jetty/maven/plugin/AbstractJettyMojo.java | 1 +
.../jetty/maven/plugin/ConsoleScanner.java | 1 +
.../maven/plugin/JettyEffectiveWebXml.java | 1 +
.../maven/plugin/JettyRunForkedMojo.java | 3 +
.../jetty/maven/plugin/JettyRunMojo.java | 4 +
.../maven/plugin/JettyRunWarExplodedMojo.java | 5 +
.../jetty/maven/plugin/JettyRunWarMojo.java | 5 +
.../jetty/maven/plugin/JettyStopMojo.java | 1 +
.../maven/plugin/JettyWebAppContext.java | 1 +
.../plugin/MavenWebInfConfiguration.java | 1 +
.../eclipse/jetty/maven/plugin/Overlay.java | 1 +
.../jetty/maven/plugin/OverlayConfig.java | 1 +
.../nosql/mongodb/MongoSessionDataStore.java | 1 +
.../jasper/ContainerTldBundleDiscoverer.java | 1 +
.../boot/jasper/JSTLBundleDiscoverer.java | 1 +
.../osgi/boot/jsp/FragmentActivator.java | 2 +
.../osgi/boot/warurl/WarUrlActivator.java | 2 +
.../warurl/internal/WarURLConnection.java | 40 +
.../annotations/AnnotationConfiguration.java | 1 +
.../osgi/annotations/AnnotationParser.java | 1 +
.../osgi/boot/AbstractContextProvider.java | 2 +
.../osgi/boot/AbstractWebAppProvider.java | 3 +
.../osgi/boot/BundleContextProvider.java | 2 +
.../jetty/osgi/boot/BundleWebAppProvider.java | 3 +
.../osgi/boot/JettyBootstrapActivator.java | 2 +
.../eclipse/jetty/osgi/boot/OSGiDeployer.java | 1 +
.../jetty/osgi/boot/OSGiUndeployer.java | 1 +
.../osgi/boot/ServiceContextProvider.java | 2 +
.../osgi/boot/ServiceWebAppProvider.java | 3 +
.../webapp/OSGiWebappClassLoader.java | 1 +
.../osgi/boot/utils/FakeURLClassLoader.java | 1 +
.../osgi/boot/utils/OSGiClassLoader.java | 1 +
.../DefaultBundleClassLoaderHelper.java | 1 +
.../internal/DefaultFileLocatorHelper.java | 6 +
.../internal/PackageAdminServiceTracker.java | 1 +
.../main/java/com/acme/osgi/Activator.java | 2 +
.../main/java/com/acme/osgi/Activator.java | 2 +
.../main/java/com/acme/osgi/Activator.java | 2 +
.../plus/annotation/ContainerInitializer.java | 1 +
.../plus/annotation/LifeCycleCallback.java | 1 +
.../annotation/PostConstructCallback.java | 3 +
.../plus/annotation/PreDestroyCallback.java | 3 +
.../org/eclipse/jetty/plus/jndi/Link.java | 1 +
.../eclipse/jetty/plus/jndi/NamingEntry.java | 1 +
.../eclipse/jetty/plus/jndi/Transaction.java | 2 +
.../plus/security/DataSourceLoginService.java | 2 +
.../jetty/plus/webapp/EnvConfiguration.java | 2 +
.../jetty/plus/webapp/PlusDecorator.java | 2 +
.../plus/webapp/PlusDescriptorProcessor.java | 2 +
.../jetty/plus/jndi/TestNamingEntries.java | 4 +
.../jetty/plus/jndi/TestNamingEntryUtil.java | 1 +
.../jetty/proxy/ConnectHandlerSSLTest.java | 1 +
.../jetty/proxy/ConnectHandlerTest.java | 1 +
.../proxy/ForwardProxyTLSServerTest.java | 1 +
.../jetty/rewrite/handler/ValidUrlRule.java | 1 +
.../jetty/rewrite/handler/RegexRuleTest.java | 1 +
.../jetty/security/AbstractLoginService.java | 3 +
.../security/DefaultAuthenticatorFactory.java | 1 +
.../security/DefaultIdentityService.java | 7 +
.../jetty/security/DefaultUserIdentity.java | 3 +
.../jetty/security/JDBCLoginService.java | 2 +
.../jetty/security/PropertyUserStore.java | 2 +
.../jetty/security/RoleRunAsToken.java | 1 +
.../jetty/security/SpnegoUserIdentity.java | 3 +
.../jetty/security/SpnegoUserPrincipal.java | 1 +
.../jetty/security/UserAuthentication.java | 1 +
.../DeferredAuthentication.java | 1 +
.../authentication/LoginCallbackImpl.java | 10 +
.../authentication/SessionAuthentication.java | 1 +
.../jetty/security/PropertyUserStoreTest.java | 2 +
.../server/AbstractNetworkConnector.java | 1 +
.../jetty/server/CachedContentFactory.java | 1 +
.../org/eclipse/jetty/server/Handler.java | 1 +
.../org/eclipse/jetty/server/HttpChannel.java | 1 +
.../jetty/server/HttpChannelOverHttp.java | 1 +
.../org/eclipse/jetty/server/HttpInput.java | 2 +
.../eclipse/jetty/server/LocalConnector.java | 1 +
.../jetty/server/ProxyConnectionFactory.java | 20 +
.../server/ServletResponseHttpWrapper.java | 21 +
.../eclipse/jetty/server/UserIdentity.java | 3 +
.../server/handler/MovedContextHandler.java | 1 +
.../gzip/GzipHttpOutputInterceptor.java | 1 +
.../server/session/AbstractSessionCache.java | 9 +
.../session/AbstractSessionDataStore.java | 1 +
.../session/DefaultSessionIdManager.java | 4 +
.../server/session/FileSessionDataStore.java | 1 +
.../server/session/JDBCSessionDataStore.java | 1 +
.../jetty/server/session/SessionContext.java | 1 +
.../jetty/server/session/SessionData.java | 1 +
.../jetty/server/ConnectorCloseTestBase.java | 1 +
.../jetty/server/ConnectorTimeoutTest.java | 1 +
.../jetty/server/HttpServerTestFixture.java | 1 +
.../server/handler/DebugHandlerTest.java | 1 +
.../jetty/server/ssl/SSLEngineTest.java | 1 +
.../eclipse/jetty/servlet/FilterHolder.java | 5 +
.../eclipse/jetty/servlet/FilterMapping.java | 3 +
.../org/eclipse/jetty/servlet/Holder.java | 9 +
.../org/eclipse/jetty/servlet/Invoker.java | 5 +
.../eclipse/jetty/servlet/NoJspServlet.java | 1 +
.../jetty/servlet/ServletContextHandler.java | 20 +
.../eclipse/jetty/servlet/ServletHolder.java | 4 +
.../eclipse/jetty/servlet/ServletMapping.java | 1 +
.../jetty/servlet/StatisticsServlet.java | 3 +
.../jetty/servlet/jmx/FilterMappingMBean.java | 1 +
.../jetty/servlet/jmx/HolderMBean.java | 1 +
.../servlet/jmx/ServletMappingMBean.java | 1 +
.../servlet/listener/ELContextCleaner.java | 2 +
.../servlet/listener/IntrospectorCleaner.java | 2 +
.../jetty/servlet/AsyncContextTest.java | 1 +
.../eclipse/jetty/servlet/DispatcherTest.java | 11 +
.../eclipse/jetty/servlet/ErrorPageTest.java | 3 +
.../eclipse/jetty/servlet/InvokerTest.java | 1 +
.../jetty/servlet/PostServletTest.java | 1 +
.../jetty/servlets/CrossOriginFilter.java | 3 +
.../org/eclipse/jetty/servlets/DoSFilter.java | 7 +
.../jetty/servlets/MultiPartFilter.java | 3 +
.../org/eclipse/jetty/servlets/PutFilter.java | 3 +
.../org/eclipse/jetty/servlets/QoSFilter.java | 3 +
.../eclipse/jetty/servlets/WelcomeFilter.java | 3 +
.../gzip/AsyncScheduledDispatchWrite.java | 1 +
.../servlets/EventSourceServletTest.java | 10 +
.../SpringConfigurationProcessorFactory.java | 1 +
.../org/eclipse/jetty/util/ajax/JSON.java | 17 +
.../util/ajax/JSONCollectionConvertor.java | 2 +
.../jetty/util/ajax/JSONDateConvertor.java | 2 +
.../jetty/util/ajax/JSONEnumConvertor.java | 2 +
.../jetty/util/ajax/JSONObjectConvertor.java | 2 +
.../jetty/util/ajax/JSONPojoConvertor.java | 7 +
.../util/ajax/JSONPojoConvertorFactory.java | 2 +
.../org/eclipse/jetty/util/ajax/JSONTest.java | 3 +
.../eclipse/jetty/util/ArrayTernaryTrie.java | 18 +
.../main/java/org/eclipse/jetty/util/IO.java | 1 +
.../eclipse/jetty/util/InetAddressSet.java | 4 +
.../org/eclipse/jetty/util/JavaVersion.java | 1 +
.../util/MultiPartInputStreamParser.java | 9 +
.../org/eclipse/jetty/util/PathWatcher.java | 1 +
.../jetty/util/RolloverFileOutputStream.java | 2 +
.../util/component/ContainerLifeCycle.java | 1 +
.../FileNoticeLifeCycleListener.java | 5 +
.../jetty/util/log/AbstractLogger.java | 1 +
.../eclipse/jetty/util/log/JavaUtilLog.java | 16 +
.../jetty/util/log/JettyAwareLogger.java | 61 +
.../java/org/eclipse/jetty/util/log/Log.java | 1 +
.../org/eclipse/jetty/util/log/LoggerLog.java | 15 +
.../org/eclipse/jetty/util/log/Slf4jLog.java | 15 +
.../org/eclipse/jetty/util/log/StdErrLog.java | 13 +
.../jetty/util/ssl/SslContextFactory.java | 3 +
.../jetty/util/thread/ExecutorThreadPool.java | 4 +
.../util/thread/ReservedThreadExecutor.java | 1 +
.../jetty/util/thread/TryExecutor.java | 1 +
.../util/thread/strategy/EatWhatYouKill.java | 1 +
.../strategy/ExecuteProduceConsume.java | 1 +
.../jetty/util/FutureCallbackTest.java | 3 +
.../org/eclipse/jetty/util/ScannerTest.java | 4 +
.../eclipse/jetty/util/log/StdErrCapture.java | 1 +
.../util/thread/QueuedThreadPoolTest.java | 11 +-
.../jetty/webapp/AbstractConfiguration.java | 6 +
.../org/eclipse/jetty/webapp/Descriptor.java | 1 +
.../jetty/webapp/FragmentDescriptor.java | 1 +
.../webapp/IterativeDescriptorProcessor.java | 1 +
.../org/eclipse/jetty/webapp/JarScanner.java | 1 +
.../org/eclipse/jetty/webapp/MetaData.java | 1 +
.../webapp/StandardDescriptorProcessor.java | 2 +
.../eclipse/jetty/webapp/WebDescriptor.java | 2 +
.../jetty/webapp/WebAppClassLoaderTest.java | 3 +
.../WebAppClassLoaderUrlStreamTest.java | 1 +
.../samples/AbstractStringEndpoint.java | 2 +
.../AnnotatedServerEndpointMetadata.java | 2 +
.../websocket/client/WebSocketClient.java | 5 +
.../common/WebSocketRemoteEndpoint.java | 1 +
.../websocket/common/WebSocketSession.java | 1 +
.../common/extensions/AbstractExtension.java | 1 +
.../websocket/common/frames/BinaryFrame.java | 1 +
.../common/frames/ContinuationFrame.java | 1 +
.../websocket/common/frames/ControlFrame.java | 2 +
.../websocket/common/frames/TextFrame.java | 1 +
.../common/test/BlockheadClient.java | 5 +
.../test/BlockheadServerConnection.java | 20 +
.../common/test/IBlockheadClient.java | 1 +
.../server/NativeWebSocketConfiguration.java | 1 +
.../server/WebSocketServerFactory.java | 1 +
.../websocket/server/ab/AbstractABCase.java | 1 +
.../servlet/ServletUpgradeRequest.java | 1 +
.../eclipse/jetty/xml/XmlConfiguration.java | 3 +
.../java/org/eclipse/jetty/xml/XmlParser.java | 17 +
output.sav | 14061 ++++++++++++++++
.../jetty/http/client/AsyncIOServletTest.java | 1 +
.../eclipse/jetty/test/DigestPostTest.java | 1 +
.../jetty/test/HttpInputIntegrationTest.java | 1 +
.../jetty/test/jsp/FakeJspServlet.java | 1 +
.../jetty/test/rfcs/RFC2616NIOHttpsTest.java | 1 +
.../jetty/test/support/EchoHandler.java | 1 +
.../jetty/test/support/JettyDistro.java | 2 +
.../test/support/rawhttp/HttpSocketImpl.java | 1 +
.../test/support/rawhttp/HttpsSocketImpl.java | 2 +
.../jetty/DatabaseLoginServiceTestServer.java | 1 +
.../session/ClusteredOrphanedSessionTest.java | 1 +
.../session/ProxySerializationTest.java | 1 +
.../SessionInvalidateCreateScavengeTest.java | 1 +
.../NonClusteredSessionScavengingTest.java | 1 +
.../SessionInvalidateCreateScavengeTest.java | 1 +
.../ClusteredInvalidationSessionTest.java | 1 +
.../session/ClusteredLastAccessTimeTest.java | 1 +
.../session/ClusteredOrphanedSessionTest.java | 1 +
.../ClusteredSessionMigrationTest.java | 1 +
.../ClusteredSessionScavengingTest.java | 3 +
.../session/ProxySerializationTest.java | 1 +
.../server/session/SessionExpiryTest.java | 3 +
.../SessionInvalidateCreateScavengeTest.java | 1 +
.../session/WebAppObjectInSessionTest.java | 1 +
.../mongodb/ClusteredLastAccessTimeTest.java | 1 +
.../mongodb/ClusteredOrphanedSessionTest.java | 1 +
.../ClusteredSessionMigrationTest.java | 1 +
.../nosql/mongodb/SessionExpiryTest.java | 3 +
.../SessionInvalidateCreateScavengeTest.java | 1 +
.../session/AbstractSessionExpiryTest.java | 2 +
...ctSessionInvalidateCreateScavengeTest.java | 4 +
.../server/session/DirtyAttributeTest.java | 4 +
.../server/session/RemoveSessionTest.java | 3 +
.../server/session/SameNodeLoadTest.java | 1 +
.../server/session/SessionListenerTest.java | 2 +
.../src/main/java/com/acme/ChatServlet.java | 1 +
.../src/main/java/com/acme/Date2Tag.java | 1 +
.../src/main/java/com/acme/DateTag.java | 9 +
.../src/main/java/com/acme/TagListener.java | 17 +
.../src/main/java/com/acme/JNDITest.java | 4 +
.../main/java/com/acme/MockDataSource.java | 9 +
.../java/com/acme/MockUserTransaction.java | 6 +
.../com/acme/initializer/FooInitializer.java | 1 +
.../java/com/acme/test/AnnotatedListener.java | 17 +
.../java/com/acme/test/AnnotationTest.java | 3 +
.../com/acme/test/AsyncListenerServlet.java | 1 +
.../java/com/acme/test/MultiPartTest.java | 3 +
.../com/acme/test/RoleAnnotationTest.java | 3 +
.../java/com/acme/test/SecuredServlet.java | 1 +
.../main/java/com/acme/test/TestListener.java | 17 +
.../com/acme/fragment/FragmentServlet.java | 3 +
.../tests/webapp/HttpMethodsServlet.java | 6 +
342 files changed, 15215 insertions(+), 5 deletions(-)
create mode 100644 output.sav
diff --git a/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java b/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java
index 58ff22ed5ca..7198dd6e4df 100644
--- a/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java
+++ b/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java
@@ -121,6 +121,7 @@ public class AbstractRestServlet extends HttpServlet
return w;
}
+ @Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
doGet(request, response);
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 158b2f24758..c9093c1e8de 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
@@ -40,6 +40,7 @@ import org.eclipse.jetty.util.ajax.JSON;
*/
public class SerialRestServlet extends AbstractRestServlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
long start = System.nanoTime();
@@ -98,6 +99,7 @@ public class SerialRestServlet extends AbstractRestServlet
* @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
* response)
*/
+ @Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
doGet(request, response);
diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloHandler.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloHandler.java
index 0c785691dea..ec7fd04ecc0 100644
--- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloHandler.java
+++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloHandler.java
@@ -49,6 +49,7 @@ public class HelloHandler extends AbstractHandler
this.body = body;
}
+ @Override
public void handle( String target,
Request baseRequest,
HttpServletRequest request,
diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java
index d9bfc61d57f..337f760af86 100644
--- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java
+++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java
@@ -72,6 +72,7 @@ public class ManyHandlers
*/
public static class ParamHandler extends AbstractHandler
{
+ @Override
public void handle( String target,
Request baseRequest,
HttpServletRequest request,
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 5cb07aa8002..960e9515896 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
@@ -153,6 +153,7 @@ public class AnnotationConfiguration extends AbstractConfiguration
_stat = stat;
}
+ @Override
public Void call() throws Exception
{
if (_stat != null)
@@ -261,6 +262,7 @@ public class AnnotationConfiguration extends AbstractConfiguration
return _indexMap.size();
}
+ @Override
public String toString()
{
if (_ordering == null)
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationIntrospector.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationIntrospector.java
index 4a381e6e8ff..7a24a989fc5 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationIntrospector.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationIntrospector.java
@@ -61,6 +61,7 @@ public class AnnotationIntrospector
_introspectAncestors = introspectAncestors;
}
+ @Override
public void handle(Class> clazz)
{
Class> c = clazz;
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java
index cceb8511a9b..b1096cf7952 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java
@@ -44,6 +44,7 @@ public class ClassInheritanceHandler extends AbstractHandler
_inheritanceMap = map;
}
+ @Override
public void handle(ClassInfo classInfo)
{
try
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ContainerInitializerAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ContainerInitializerAnnotationHandler.java
index fedcb65a2a1..5fd74b4b579 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ContainerInitializerAnnotationHandler.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ContainerInitializerAnnotationHandler.java
@@ -49,6 +49,7 @@ public class ContainerInitializerAnnotationHandler extends AbstractHandler
*
* @see org.eclipse.jetty.annotations.AnnotationParser.Handler#handle(org.eclipse.jetty.annotations.AnnotationParser.ClassInfo, String)
*/
+ @Override
public void handle(ClassInfo info, String annotationName)
{
if (annotationName == null || !_annotation.getName().equals(annotationName))
@@ -62,6 +63,7 @@ public class ContainerInitializerAnnotationHandler extends AbstractHandler
*
* @see org.eclipse.jetty.annotations.AnnotationParser.Handler#handle(org.eclipse.jetty.annotations.AnnotationParser.FieldInfo, String)
*/
+ @Override
public void handle(FieldInfo info, String annotationName)
{
if (annotationName == null || !_annotation.getName().equals(annotationName))
@@ -74,6 +76,7 @@ public class ContainerInitializerAnnotationHandler extends AbstractHandler
*
* @see org.eclipse.jetty.annotations.AnnotationParser.Handler#handle(org.eclipse.jetty.annotations.AnnotationParser.MethodInfo, String)
*/
+ @Override
public void handle(MethodInfo info, String annotationName)
{
if (annotationName == null || !_annotation.getName().equals(annotationName))
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 96eaab6fc5e..daba6494b12 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
@@ -48,6 +48,7 @@ public class DeclareRolesAnnotationHandler extends AbstractIntrospectableAnnotat
/**
* @see org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler#doHandle(java.lang.Class)
*/
+ @Override
public void doHandle(Class clazz)
{
if (!Servlet.class.isAssignableFrom(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 3334050bf5e..72d171eed0a 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
@@ -46,6 +46,7 @@ public class MultiPartConfigAnnotationHandler extends AbstractIntrospectableAnno
/**
* @see org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler#doHandle(java.lang.Class)
*/
+ @Override
public void doHandle(Class clazz)
{
if (!Servlet.class.isAssignableFrom(clazz))
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/PostConstructAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/PostConstructAnnotationHandler.java
index df69dae5b49..4c1ac135f1c 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/PostConstructAnnotationHandler.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/PostConstructAnnotationHandler.java
@@ -41,6 +41,7 @@ public class PostConstructAnnotationHandler extends AbstractIntrospectableAnnota
}
+ @Override
public void doHandle(Class clazz)
{
//Check that the PostConstruct is on a class that we're interested in
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/PreDestroyAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/PreDestroyAnnotationHandler.java
index bb5c3777397..09fa4c922c2 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/PreDestroyAnnotationHandler.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/PreDestroyAnnotationHandler.java
@@ -40,6 +40,7 @@ public class PreDestroyAnnotationHandler extends AbstractIntrospectableAnnotatio
_context = wac;
}
+ @Override
public void doHandle(Class clazz)
{
//Check that the PreDestroy is on a class that we're interested in
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
index 6bf58140628..445f5d943e8 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
@@ -61,6 +61,7 @@ public class ResourceAnnotationHandler extends AbstractIntrospectableAnnotationH
* environment that will be looked up at runtime. They do
* not specify an injection.
*/
+ @Override
public void doHandle(Class> clazz)
{
if (supportsResourceInjection(clazz))
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourcesAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourcesAnnotationHandler.java
index 9865e81b600..9132a337f82 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourcesAnnotationHandler.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourcesAnnotationHandler.java
@@ -40,6 +40,7 @@ public class ResourcesAnnotationHandler extends AbstractIntrospectableAnnotation
_wac = wac;
}
+ @Override
public void doHandle (Class> clazz)
{
Resources resources = (Resources)clazz.getAnnotation(Resources.class);
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java
index 871a4bd3969..43ed86d213c 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java
@@ -44,6 +44,7 @@ public class RunAsAnnotationHandler extends AbstractIntrospectableAnnotationHand
_context = wac;
}
+ @Override
public void doHandle (Class clazz)
{
if (!Servlet.class.isAssignableFrom(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 5b98abc1fe3..13dd0348568 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
@@ -48,6 +48,7 @@ public class ServletContainerInitializersStarter extends AbstractLifeCycle imple
* Call the doStart method of the ServletContainerInitializers
* @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart()
*/
+ @Override
public void doStart()
{
List initializers = (List)_context.getAttribute(AnnotationConfiguration.CONTAINER_INITIALIZERS);
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 d5ffb24b339..a4395036faf 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
@@ -69,6 +69,7 @@ public class ServletSecurityAnnotationHandler extends AbstractIntrospectableAnno
/**
* @see org.eclipse.jetty.annotations.AnnotationIntrospector.IntrospectableAnnotationHandler#handle(java.lang.Class)
*/
+ @Override
public void doHandle(Class clazz)
{
if (!(_context.getSecurityHandler() instanceof ConstraintAware))
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 0fb430295b2..c7de61c8263 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
@@ -58,6 +58,7 @@ public class WebFilterAnnotation extends DiscoveredAnnotation
/**
* @see DiscoveredAnnotation#apply()
*/
+ @Override
public void apply()
{
// TODO verify against rules for annotation v descriptor
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 3591234cfd8..55dd55bdf42 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
@@ -58,6 +58,7 @@ public class WebListenerAnnotation extends DiscoveredAnnotation
/**
* @see DiscoveredAnnotation#apply()
*/
+ @Override
public void apply()
{
Class extends java.util.EventListener> clazz = (Class extends EventListener>)getTargetClass();
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotationHandler.java
index 72b1c14ca84..441d1441627 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotationHandler.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebListenerAnnotationHandler.java
@@ -34,6 +34,7 @@ public class WebListenerAnnotationHandler extends AbstractDiscoverableAnnotation
super(context);
}
+ @Override
public void handle(ClassInfo info, String annotationName)
{
if (annotationName == null || !"javax.servlet.annotation.WebListener".equals(annotationName))
@@ -43,6 +44,7 @@ public class WebListenerAnnotationHandler extends AbstractDiscoverableAnnotation
addAnnotation(wlAnnotation);
}
+ @Override
public void handle(FieldInfo info, String annotationName)
{
if (annotationName == null || !"javax.servlet.annotation.WebListener".equals(annotationName))
@@ -50,6 +52,7 @@ public class WebListenerAnnotationHandler extends AbstractDiscoverableAnnotation
LOG.warn ("@WebListener is not applicable to fields: "+info.getClassInfo().getClassName()+"."+info.getFieldName());
}
+ @Override
public void handle(MethodInfo info, String annotationName)
{
if (annotationName == null || !"javax.servlet.annotation.WebListener".equals(annotationName))
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 1077fa3a951..940adba4f07 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
@@ -65,6 +65,7 @@ public class WebServletAnnotation extends DiscoveredAnnotation
/**
* @see DiscoveredAnnotation#apply()
*/
+ @Override
public void apply()
{
//TODO check this algorithm with new rules for applying descriptors and annotations in order
diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ClassB.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ClassB.java
index 80b3eab4ab9..b83a56ec793 100644
--- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ClassB.java
+++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ClassB.java
@@ -45,6 +45,7 @@ public class ClassB extends ClassA implements InterfaceD
System.err.println("ClassB.package");
}
+ @Override
public void l()
{
System.err.println("Overridden method l has no annotation");
diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/FilterC.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/FilterC.java
index df6e39df196..2f61d74d6b4 100644
--- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/FilterC.java
+++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/FilterC.java
@@ -57,6 +57,7 @@ public class FilterC implements Filter
}
+ @Override
public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2)
throws IOException, ServletException
{
@@ -69,10 +70,12 @@ public class FilterC implements Filter
arg2.doFilter(request, response);
}
+ @Override
public void destroy()
{
}
+ @Override
public void init(FilterConfig arg0) throws ServletException
{
}
diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ListenerC.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ListenerC.java
index 6dcbe572ac3..7f33ae760b0 100644
--- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ListenerC.java
+++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ListenerC.java
@@ -26,11 +26,13 @@ import javax.servlet.annotation.WebListener;
public class ListenerC implements ServletContextListener
{
+ @Override
public void contextDestroyed(ServletContextEvent arg0)
{
}
+ @Override
public void contextInitialized(ServletContextEvent arg0)
{
diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ServletC.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ServletC.java
index 0e23a66ebb1..25124475ea5 100644
--- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ServletC.java
+++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/ServletC.java
@@ -58,6 +58,7 @@ public class ServletC extends HttpServlet
}
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
response.setContentType("text/html");
diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationInheritance.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationInheritance.java
index 8489c32d94e..f67c8254396 100644
--- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationInheritance.java
+++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationInheritance.java
@@ -54,6 +54,7 @@ public class TestAnnotationInheritance
public final List annotatedMethods = new ArrayList();
public final List annotatedFields = new ArrayList();
+ @Override
public void handle(ClassInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
@@ -62,6 +63,7 @@ public class TestAnnotationInheritance
annotatedClassNames.add(info.getClassName());
}
+ @Override
public void handle(FieldInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
@@ -69,6 +71,7 @@ public class TestAnnotationInheritance
annotatedFields.add(info.getClassInfo().getClassName()+"."+info.getFieldName());
}
+ @Override
public void handle(MethodInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
index 7bcc8a16b44..6d16ee34095 100644
--- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
+++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
@@ -116,6 +116,7 @@ public class TestAnnotationParser
{
private List methods = Arrays.asList("a","b","c","d","l");
+ @Override
public void handle(ClassInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
@@ -124,6 +125,7 @@ public class TestAnnotationParser
assertEquals("org.eclipse.jetty.annotations.ClassA",info.getClassName());
}
+ @Override
public void handle(FieldInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
@@ -132,6 +134,7 @@ public class TestAnnotationParser
assertEquals(org.objectweb.asm.Type.OBJECT,org.objectweb.asm.Type.getType(info.getFieldType()).getSort());
}
+ @Override
public void handle(MethodInfo info, String annotation)
{
if (annotation == null || !"org.eclipse.jetty.annotations.Sample".equals(annotation))
@@ -158,6 +161,7 @@ public class TestAnnotationParser
class MultiAnnotationHandler extends AnnotationParser.AbstractHandler
{
+ @Override
public void handle(ClassInfo info, String annotation)
{
if (annotation == null || ! "org.eclipse.jetty.annotations.Multi".equals(annotation))
@@ -165,6 +169,7 @@ public class TestAnnotationParser
assertTrue("org.eclipse.jetty.annotations.ClassB".equals(info.getClassName()));
}
+ @Override
public void handle(FieldInfo info, String annotation)
{
if (annotation == null || ! "org.eclipse.jetty.annotations.Multi".equals(annotation))
@@ -173,6 +178,7 @@ public class TestAnnotationParser
fail();
}
+ @Override
public void handle(MethodInfo info, String annotation)
{
if (annotation == null || ! "org.eclipse.jetty.annotations.Multi".equals(annotation))
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 7b647c9c844..64f039fb2b9 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
@@ -627,6 +627,7 @@ public class AntWebAppContext extends WebAppContext
/**
*
*/
+ @Override
public void doStart()
{
try
@@ -662,6 +663,7 @@ public class AntWebAppContext extends WebAppContext
}
}
+ @Override
public void doStop()
{
try
diff --git a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebInfConfiguration.java b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebInfConfiguration.java
index 86bd8cb1b7c..6ae07abc984 100644
--- a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebInfConfiguration.java
+++ b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebInfConfiguration.java
@@ -59,6 +59,7 @@ public class AntWebInfConfiguration extends WebInfConfiguration
//match any of the container jars
PatternMatcher containerJarNameMatcher = new PatternMatcher ()
{
+ @Override
public void matched(URI uri) throws Exception
{
context.getMetaData().addContainerResource(Resource.newResource(uri));
@@ -149,6 +150,7 @@ public class AntWebInfConfiguration extends WebInfConfiguration
*
* @see WebXmlConfiguration#configure(WebAppContext)
*/
+ @Override
public void configure(WebAppContext context) throws Exception
{
if (context instanceof AntWebAppContext)
diff --git a/jetty-ant/src/main/java/org/eclipse/jetty/ant/JettyRunTask.java b/jetty-ant/src/main/java/org/eclipse/jetty/ant/JettyRunTask.java
index cc2cb49fcd1..9e9eab1f038 100644
--- a/jetty-ant/src/main/java/org/eclipse/jetty/ant/JettyRunTask.java
+++ b/jetty-ant/src/main/java/org/eclipse/jetty/ant/JettyRunTask.java
@@ -189,6 +189,7 @@ public class JettyRunTask extends Task
*
* @throws BuildException if unable to build
*/
+ @Override
public void execute() throws BuildException
{
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 3dfc109e16a..167864df17e 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
@@ -56,6 +56,7 @@ public class JettyStopTask extends Task
/**
* @see org.apache.tools.ant.Task#execute()
*/
+ @Override
public void execute() throws BuildException
{
try
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 0e03150c5ef..2dd2fdb9ee0 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
@@ -115,6 +115,7 @@ public class ServerProxyImpl implements ServerProxy
this.awc = awc;
}
+ @Override
public void filesChanged(List changedFileNames)
{
boolean isScanned = false;
@@ -151,6 +152,7 @@ public class ServerProxyImpl implements ServerProxy
}
+ @Override
public void addWebApplication(AntWebAppContext webApp)
{
webApplications.add(webApp);
@@ -242,6 +244,7 @@ public class ServerProxyImpl implements ServerProxy
/**
* @see org.eclipse.jetty.ant.utils.ServerProxy#start()
*/
+ @Override
public void start()
{
try
@@ -289,6 +292,7 @@ public class ServerProxyImpl implements ServerProxy
/**
* @see org.eclipse.jetty.ant.utils.ServerProxy#getProxiedObject()
*/
+ @Override
public Object getProxiedObject()
{
return server;
diff --git a/jetty-ant/src/test/java/org/eclipse/jetty/ant/AntBuild.java b/jetty-ant/src/test/java/org/eclipse/jetty/ant/AntBuild.java
index 02928f4dc8d..919b6323fb4 100644
--- a/jetty-ant/src/test/java/org/eclipse/jetty/ant/AntBuild.java
+++ b/jetty-ant/src/test/java/org/eclipse/jetty/ant/AntBuild.java
@@ -265,6 +265,7 @@ public class AntBuild
this.parser = connector;
}
+ @Override
public void run()
{
String line;
diff --git a/jetty-cdi/cdi-core/src/main/java/org/eclipse/jetty/cdi/core/NamedLiteral.java b/jetty-cdi/cdi-core/src/main/java/org/eclipse/jetty/cdi/core/NamedLiteral.java
index 3a679139764..63ea17e2288 100644
--- a/jetty-cdi/cdi-core/src/main/java/org/eclipse/jetty/cdi/core/NamedLiteral.java
+++ b/jetty-cdi/cdi-core/src/main/java/org/eclipse/jetty/cdi/core/NamedLiteral.java
@@ -26,6 +26,7 @@ public class NamedLiteral extends AnnotationLiteral implements Named
{
private final String value;
+ @Override
public String value()
{
return value;
diff --git a/jetty-cdi/cdi-servlet/src/main/java/org/eclipse/jetty/cdi/servlet/WeldDeploymentBinding.java b/jetty-cdi/cdi-servlet/src/main/java/org/eclipse/jetty/cdi/servlet/WeldDeploymentBinding.java
index 3c0345050e7..77eafe4481f 100644
--- a/jetty-cdi/cdi-servlet/src/main/java/org/eclipse/jetty/cdi/servlet/WeldDeploymentBinding.java
+++ b/jetty-cdi/cdi-servlet/src/main/java/org/eclipse/jetty/cdi/servlet/WeldDeploymentBinding.java
@@ -30,11 +30,13 @@ import org.eclipse.jetty.webapp.WebAppContext;
@Deprecated
public class WeldDeploymentBinding implements AppLifeCycle.Binding
{
+ @Override
public String[] getBindingTargets()
{
return new String[] { "deploying" };
}
+ @Override
public void processBinding(Node node, App app) throws Exception
{
ContextHandler handler = app.getContextHandler();
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java
index 62a4c2d112a..5261751a62f 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java
@@ -155,6 +155,7 @@ public class DuplexConnectionPool extends AbstractConnectionPool implements Swee
return active(connection);
}
+ @Override
public boolean release(Connection connection)
{
boolean closed = isClosed();
@@ -184,6 +185,7 @@ public class DuplexConnectionPool extends AbstractConnectionPool implements Swee
return idleConnections.offerFirst(connection);
}
+ @Override
public boolean remove(Connection connection)
{
return remove(connection, false);
@@ -212,6 +214,7 @@ public class DuplexConnectionPool extends AbstractConnectionPool implements Swee
return removed;
}
+ @Override
public void close()
{
super.close();
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java
index c0c6e85c42f..1a2a798b224 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java
@@ -361,6 +361,7 @@ public abstract class HttpDestination extends ContainerLifeCycle implements Dest
protected abstract SendFailure send(Connection connection, HttpExchange exchange);
+ @Override
public void newConnection(Promise promise)
{
createConnection(promise);
@@ -376,6 +377,7 @@ public abstract class HttpDestination extends ContainerLifeCycle implements Dest
return exchanges.remove(exchange);
}
+ @Override
public void close()
{
abort(new AsynchronousCloseException());
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponse.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponse.java
index 87017e6c3c2..e37e2758225 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponse.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponse.java
@@ -49,6 +49,7 @@ public class HttpResponse implements Response
return request;
}
+ @Override
public HttpVersion getVersion()
{
return version;
@@ -72,6 +73,7 @@ public class HttpResponse implements Response
return this;
}
+ @Override
public String getReason()
{
return reason;
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java
index 4dbd7acec00..b211ed32574 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java
@@ -263,6 +263,7 @@ public class HttpReceiverOverHTTP extends HttpReceiver implements HttpParser.Res
process();
}
+ @Override
public void abort(Throwable x)
{
failAndClose(x);
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/DeferredContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/DeferredContentProvider.java
index c7df58be068..335c2eb0b98 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/DeferredContentProvider.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/DeferredContentProvider.java
@@ -207,6 +207,7 @@ public class DeferredContentProvider implements AsyncContentProvider, Callback,
* No more content will be added to this content provider
* and notifies the listener that no more content is available.
*/
+ @Override
public void close()
{
if (closed.compareAndSet(false, true))
diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java
index 6c0c912ed7d..e66edf43887 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesTest.java
@@ -140,6 +140,7 @@ public abstract class SslBytesTest
serverSocket.close();
}
+ @Override
public void run()
{
try
diff --git a/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/ContinuationFilter.java b/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/ContinuationFilter.java
index 46c0fdd96ef..7c450225d28 100644
--- a/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/ContinuationFilter.java
+++ b/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/ContinuationFilter.java
@@ -60,6 +60,7 @@ public class ContinuationFilter implements Filter
ServletContext _context;
private boolean _debug;
+ @Override
public void init(FilterConfig filterConfig) throws ServletException
{
filterConfig.getServletContext().log("WARNING: " + this.getClass().getName() + " is now DEPRECATED, use Servlet 3.0 AsyncContext instead.");
@@ -88,6 +89,7 @@ public class ContinuationFilter implements Filter
_initialized=true;
}
+ @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
{
if (_filtered)
@@ -155,6 +157,7 @@ public class ContinuationFilter implements Filter
}
}
+ @Override
public void destroy()
{
}
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugBinding.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugBinding.java
index e96ffaae5f6..a3db7dba23e 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugBinding.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugBinding.java
@@ -40,11 +40,13 @@ public class DebugBinding implements AppLifeCycle.Binding
_targets=targets;
}
+ @Override
public String[] getBindingTargets()
{
return _targets;
}
+ @Override
public void processBinding(Node node, App app) throws Exception
{
LOG.info("processBinding {} {}",node,app.getContextHandler());
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugListenerBinding.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugListenerBinding.java
index de2ea705de7..cef0ad3ec66 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugListenerBinding.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/DebugListenerBinding.java
@@ -45,6 +45,7 @@ public class DebugListenerBinding extends DebugBinding
return _debugListener;
}
+ @Override
public void processBinding(Node node, App app) throws Exception
{
app.getContextHandler().addEventListener(_debugListener);
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java
index d0b71f429bc..f5832d8dd24 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java
@@ -61,11 +61,13 @@ public class GlobalWebappConfigBinding implements AppLifeCycle.Binding
this._jettyXml = jettyXml;
}
+ @Override
public String[] getBindingTargets()
{
return new String[] { "deploying" };
}
+ @Override
public void processBinding(Node node, App app) throws Exception
{
ContextHandler handler = app.getContextHandler();
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/OrderedGroupBinding.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/OrderedGroupBinding.java
index d06bb9a7ea7..68f42b6df8e 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/OrderedGroupBinding.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/OrderedGroupBinding.java
@@ -63,11 +63,13 @@ public class OrderedGroupBinding implements AppLifeCycle.Binding
}
}
+ @Override
public String[] getBindingTargets()
{
return _bindingTargets;
}
+ @Override
public void processBinding(Node node, App app) throws Exception
{
for ( AppLifeCycle.Binding binding : _orderedBindings )
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardDeployer.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardDeployer.java
index cdf254e046a..f98cadeac85 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardDeployer.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardDeployer.java
@@ -25,12 +25,14 @@ import org.eclipse.jetty.server.handler.ContextHandler;
public class StandardDeployer implements AppLifeCycle.Binding
{
+ @Override
public String[] getBindingTargets()
{
return new String[]
{ "deploying" };
}
+ @Override
public void processBinding(Node node, App app) throws Exception
{
ContextHandler handler = app.getContextHandler();
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/graph/GraphOutputDot.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/graph/GraphOutputDot.java
index d2ea987c8f9..90753a792f9 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/graph/GraphOutputDot.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/graph/GraphOutputDot.java
@@ -50,6 +50,7 @@ public class GraphOutputDot
{
private Collator collator = Collator.getInstance();
+ @Override
public int compare(Node o1, Node o2)
{
if (o1.getName().equals(TOPNODE))
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCyclePathCollector.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCyclePathCollector.java
index 43fadea8eaf..0555561a29c 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCyclePathCollector.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCyclePathCollector.java
@@ -41,12 +41,14 @@ public class AppLifeCyclePathCollector implements AppLifeCycle.Binding
return actualOrder;
}
+ @Override
public String[] getBindingTargets()
{
return new String[]
{ "*" };
}
+ @Override
public void processBinding(Node node, App app) throws Exception
{
actualOrder.add(node);
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/MockAppProvider.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/MockAppProvider.java
index 74bc5991418..30e0fe72609 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/MockAppProvider.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/MockAppProvider.java
@@ -33,6 +33,7 @@ public class MockAppProvider extends AbstractLifeCycle implements AppProvider
private DeploymentManager deployMan;
private File webappsDir;
+ @Override
public void setDeploymentManager(DeploymentManager deploymentManager)
{
this.deployMan = deploymentManager;
@@ -50,6 +51,7 @@ public class MockAppProvider extends AbstractLifeCycle implements AppProvider
this.deployMan.addApp(app);
}
+ @Override
public ContextHandler createContextHandler(App app) throws Exception
{
WebAppContext context = new WebAppContext();
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
index 8d1e8762509..c18f9a8243d 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
@@ -80,6 +80,7 @@ public class ScanningAppProviderRuntimeUpdatesTest
_providers++;
((ScanningAppProvider)provider).addScannerListener(new Scanner.ScanListener()
{
+ @Override
public void scan()
{
_scans.incrementAndGet();
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java
index d8e6c6915fa..178b73079d0 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java
@@ -916,6 +916,7 @@ public class GCloudSessionDataStore extends AbstractSessionDataStore
final AtomicReference exception = new AtomicReference();
Runnable load = new Runnable()
{
+ @Override
public void run ()
{
try
diff --git a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchange.java b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchange.java
index 567365852d4..802b8b3f604 100644
--- a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchange.java
+++ b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchange.java
@@ -176,6 +176,7 @@ public class JettyHttpExchange extends HttpExchange implements JettyExchange
}
/* ------------------------------------------------------------ */
+ @Override
public void setPrincipal(HttpPrincipal principal)
{
_delegate.setPrincipal(principal);
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 c91d5f81f41..b96dee48d05 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
@@ -160,6 +160,7 @@ public class JettyHttpsExchange extends HttpsExchange implements JettyExchange
return _delegate.getPrincipal();
}
+ @Override
public void setPrincipal(HttpPrincipal principal)
{
_delegate.setPrincipal(principal);
diff --git a/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestSPIServer.java b/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestSPIServer.java
index 7e4d14e151b..fb27dfe0f2c 100644
--- a/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestSPIServer.java
+++ b/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestSPIServer.java
@@ -74,6 +74,7 @@ public class TestSPIServer
new HttpHandler()
{
+ @Override
public void handle(HttpExchange exchange) throws IOException
{
Headers responseHeaders = exchange.getResponseHeaders();
@@ -163,6 +164,7 @@ public class TestSPIServer
new HttpHandler()
{
+ @Override
public void handle(HttpExchange exchange) throws IOException
{
Headers responseHeaders = exchange.getResponseHeaders();
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
index 511ccfc7046..19b77a84883 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
@@ -1075,11 +1075,13 @@ public class HttpFields implements Iterable
int _cursor; // index of next element to return
int _last=-1;
+ @Override
public boolean hasNext()
{
return _cursor != _size;
}
+ @Override
public HttpField next()
{
int i = _cursor;
@@ -1089,6 +1091,7 @@ public class HttpFields implements Iterable
return _fields[_last=i];
}
+ @Override
public void remove()
{
if (_last<0)
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
index 1e4633d5ec8..b09accbb18e 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
@@ -695,6 +695,7 @@ public class HttpURI
}
/* ------------------------------------------------------------ */
+ @Override
public boolean equals(Object o)
{
if (o==this)
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 3ea3905dc43..75551f76ede 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
@@ -123,6 +123,7 @@ public class MetaData implements Iterable
* @return an iterator over the HTTP fields
* @see #getFields()
*/
+ @Override
public Iterator iterator()
{
HttpFields fields = getFields();
@@ -180,6 +181,7 @@ public class MetaData implements Iterable
this(request.getMethod(),new HttpURI(request.getURI()), request.getHttpVersion(), new HttpFields(request.getFields()), request.getContentLength());
}
+ @Override
public void recycle()
{
super.recycle();
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java b/jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java
index 6f2adfb85e3..4f9ff72ed6c 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java
@@ -135,6 +135,7 @@ public class QuotedQualityCSV extends QuotedCSV implements Iterable
}
}
+ @Override
public List getValues()
{
if (!_sorted)
diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
index 02671ca3fee..4dd88c5f35e 100644
--- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
+++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
@@ -1158,6 +1158,7 @@ public abstract class HTTP2Session extends ContainerLifeCycle implements ISessio
frameBytes -= bytesFlushed;
}
+ @Override
protected boolean generate(ByteBufferPool.Lease lease)
{
bytes = frameBytes = generator.control(lease, frame);
@@ -1299,6 +1300,7 @@ public abstract class HTTP2Session extends ContainerLifeCycle implements ISessio
return dataBytes;
}
+ @Override
protected boolean generate(ByteBufferPool.Lease lease)
{
int dataBytes = getDataBytesRemaining();
diff --git a/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java b/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java
index ddcfc8f67ba..516dbcb9234 100644
--- a/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java
+++ b/jetty-http2/http2-hpack/src/main/java/org/eclipse/jetty/http2/hpack/HpackContext.java
@@ -430,6 +430,7 @@ public class HpackContext
return null;
}
+ @Override
public String toString()
{
return String.format("{%s,%d,%s,%x}",isStatic()?"S":"D",_slot,_field,hashCode());
diff --git a/jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java b/jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java
index bf11861aa2e..a752e781c22 100644
--- a/jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java
+++ b/jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java
@@ -89,6 +89,7 @@ public class InfinispanSessionDataStore extends AbstractSessionDataStore
Runnable load = new Runnable()
{
+ @Override
public void run ()
{
try
@@ -269,6 +270,7 @@ public class InfinispanSessionDataStore extends AbstractSessionDataStore
Runnable load = new Runnable()
{
+ @Override
public void run ()
{
try
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 ce1c9c2a047..409da35e8e4 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
@@ -494,6 +494,7 @@ public class ByteArrayEndPoint extends AbstractEndPoint
/**
*
*/
+ @Override
public void reset()
{
try(Locker.Lock lock = _locker.lock())
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java b/jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java
index 9df3d823e80..7eca7e18722 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/CyclicTimeout.java
@@ -137,6 +137,7 @@ public abstract class CyclicTimeout implements Destroyable
* Destroys this CyclicTimeout.
* After being destroyed, this CyclicTimeout is not used anymore.
*/
+ @Override
public void destroy()
{
Timeout timeout = _timeout.getAndSet(NOT_SET);
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/LeakTrackingByteBufferPool.java b/jetty-io/src/main/java/org/eclipse/jetty/io/LeakTrackingByteBufferPool.java
index 1abfbd33124..1d8f150d0e2 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/LeakTrackingByteBufferPool.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/LeakTrackingByteBufferPool.java
@@ -33,6 +33,7 @@ public class LeakTrackingByteBufferPool extends ContainerLifeCycle implements By
private final LeakDetector leakDetector = new LeakDetector()
{
+ @Override
public String id(ByteBuffer resource)
{
return BufferUtil.toIDString(resource);
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/NetworkTrafficListener.java b/jetty-io/src/main/java/org/eclipse/jetty/io/NetworkTrafficListener.java
index 651f1aeceed..be902761551 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/NetworkTrafficListener.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/NetworkTrafficListener.java
@@ -81,18 +81,22 @@ public interface NetworkTrafficListener
*/
public static class Adapter implements NetworkTrafficListener
{
+ @Override
public void opened(Socket socket)
{
}
+ @Override
public void incoming(Socket socket, ByteBuffer bytes)
{
}
+ @Override
public void outgoing(Socket socket, ByteBuffer bytes)
{
}
+ @Override
public void closed(Socket socket)
{
}
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java
index 61da9dd09c8..cc8d9fa7351 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SocketChannelEndPoint.java
@@ -55,11 +55,13 @@ public class SocketChannelEndPoint extends ChannelEndPoint
return _socket;
}
+ @Override
public InetSocketAddress getLocalAddress()
{
return _local;
}
+ @Override
public InetSocketAddress getRemoteAddress()
{
return _remote;
diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointTest.java
index a7380c61152..2cb44f0b03e 100644
--- a/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointTest.java
+++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointTest.java
@@ -745,6 +745,7 @@ public class SelectChannelEndPointTest
{
new Thread()
{
+ @Override
public void run()
{
try(Socket client = newClient();)
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASGroup.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASGroup.java
index 495e87f9d74..e83dac76ea5 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASGroup.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASGroup.java
@@ -38,21 +38,25 @@ public class JAASGroup implements Group
}
/* ------------------------------------------------------------ */
+ @Override
public synchronized boolean addMember(Principal principal)
{
return _members.add(principal);
}
+ @Override
public synchronized boolean removeMember(Principal principal)
{
return _members.remove(principal);
}
+ @Override
public boolean isMember(Principal principal)
{
return _members.contains(principal);
}
+ @Override
public Enumeration extends Principal> members()
{
@@ -65,12 +69,14 @@ public class JAASGroup implements Group
this.itor = itor;
}
+ @Override
public boolean hasMoreElements ()
{
return this.itor.hasNext();
}
+ @Override
public Principal nextElement ()
{
return this.itor.next();
@@ -81,11 +87,13 @@ public class JAASGroup implements Group
return new MembersEnumeration (_members.iterator());
}
+ @Override
public int hashCode()
{
return getName().hashCode();
}
+ @Override
public boolean equals(Object object)
{
if (! (object instanceof JAASGroup))
@@ -94,11 +102,13 @@ public class JAASGroup implements Group
return ((JAASGroup)object).getName().equals(getName());
}
+ @Override
public String toString()
{
return getName();
}
+ @Override
public String getName()
{
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java
index 92256d251d7..292b541dfd2 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java
@@ -96,6 +96,7 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService
*
* @return name or null if not set.
*/
+ @Override
public String getName()
{
return _realmName;
@@ -117,6 +118,7 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService
/** Get the identityService.
* @return the identityService
*/
+ @Override
public IdentityService getIdentityService()
{
return _identityService;
@@ -126,6 +128,7 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService
/** Set the identityService.
* @param identityService the identityService to set
*/
+ @Override
public void setIdentityService(IdentityService identityService)
{
_identityService = identityService;
@@ -172,6 +175,7 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService
/**
* @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart()
*/
+ @Override
protected void doStart() throws Exception
{
if (_identityService==null)
@@ -192,6 +196,7 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService
{
callbackHandler = new CallbackHandler()
{
+ @Override
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
for (Callback callback: callbacks)
@@ -266,6 +271,7 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService
}
/* ------------------------------------------------------------ */
+ @Override
public boolean validate(UserIdentity user)
{
// TODO optionally check user is still valid
@@ -281,6 +287,7 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService
}
/* ------------------------------------------------------------ */
+ @Override
public void logout(UserIdentity user)
{
Set userPrincipals = user.getSubject().getPrincipals(JAASUserPrincipal.class);
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASPrincipal.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASPrincipal.java
index 77da45879c7..2cbe8b0165e 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASPrincipal.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASPrincipal.java
@@ -37,6 +37,7 @@ public class JAASPrincipal implements Principal, Serializable
this._name = userName;
}
+ @Override
public boolean equals (Object p)
{
if (! (p instanceof JAASPrincipal))
@@ -45,16 +46,19 @@ public class JAASPrincipal implements Principal, Serializable
return getName().equals(((JAASPrincipal)p).getName());
}
+ @Override
public int hashCode ()
{
return getName().hashCode();
}
+ @Override
public String getName ()
{
return this._name;
}
+ @Override
public String toString ()
{
return getName();
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASRole.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASRole.java
index 6f9b42a8228..312d4bff6ab 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASRole.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASRole.java
@@ -27,6 +27,7 @@ public class JAASRole extends JAASPrincipal
super (name);
}
+ @Override
public boolean equals (Object o)
{
if (! (o instanceof JAASRole))
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASUserPrincipal.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASUserPrincipal.java
index 49f976e6d4e..63616bc97db 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASUserPrincipal.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASUserPrincipal.java
@@ -46,6 +46,7 @@ public class JAASUserPrincipal implements Principal
/* ------------------------------------------------ */
/** Get the name identifying the user
*/
+ @Override
public String getName ()
{
return _name;
@@ -66,6 +67,7 @@ public class JAASUserPrincipal implements Principal
return this._loginContext;
}
+ @Override
public String toString()
{
return getName();
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/StrictRoleCheckPolicy.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/StrictRoleCheckPolicy.java
index 26f33f5724a..4684f282bc0 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/StrictRoleCheckPolicy.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/StrictRoleCheckPolicy.java
@@ -35,6 +35,7 @@ import java.util.Enumeration;
public class StrictRoleCheckPolicy implements RoleCheckPolicy
{
+ @Override
public boolean checkRole (String roleName, Principal runAsRole, Group roles)
{
//check if this user has had any temporary role pushed onto
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/callback/AbstractCallbackHandler.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/callback/AbstractCallbackHandler.java
index 911edd85c05..0880b52a0a6 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/callback/AbstractCallbackHandler.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/callback/AbstractCallbackHandler.java
@@ -51,6 +51,7 @@ public abstract class AbstractCallbackHandler implements CallbackHandler
return _credential;
}
+ @Override
public void handle (Callback[] callbacks)
throws IOException, UnsupportedCallbackException
{
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/callback/DefaultCallbackHandler.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/callback/DefaultCallbackHandler.java
index 0659d4fd592..c6b0ef50bfe 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/callback/DefaultCallbackHandler.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/callback/DefaultCallbackHandler.java
@@ -41,6 +41,7 @@ public class DefaultCallbackHandler extends AbstractCallbackHandler
this._request = request;
}
+ @Override
public void handle (Callback[] callbacks)
throws IOException, UnsupportedCallbackException
{
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractDatabaseLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractDatabaseLoginModule.java
index fdb58826b57..1c11e4beaa3 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractDatabaseLoginModule.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractDatabaseLoginModule.java
@@ -84,6 +84,7 @@ public abstract class AbstractDatabaseLoginModule extends AbstractLoginModule
* @param userName user info to load
* @exception Exception if unable to get the user info
*/
+ @Override
public UserInfo getUserInfo (String userName)
throws Exception
{
@@ -146,6 +147,7 @@ public abstract class AbstractDatabaseLoginModule extends AbstractLoginModule
+ @Override
public void initialize(Subject subject,
CallbackHandler callbackHandler,
Map sharedState,
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 80b9dd33a59..9fff42f77ad 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
@@ -168,6 +168,7 @@ public abstract class AbstractLoginModule implements LoginModule
* @see javax.security.auth.spi.LoginModule#abort()
* @throws LoginException if unable to abort
*/
+ @Override
public boolean abort() throws LoginException
{
this.currentUser = null;
@@ -179,6 +180,7 @@ public abstract class AbstractLoginModule implements LoginModule
* @return true if committed, false if not (likely not authenticated)
* @throws LoginException if unable to commit
*/
+ @Override
public boolean commit() throws LoginException
{
if (!isAuthenticated())
@@ -220,6 +222,7 @@ public abstract class AbstractLoginModule implements LoginModule
* @return true if is authenticated, false otherwise
* @throws LoginException if unable to login
*/
+ @Override
public boolean login() throws LoginException
{
try
@@ -286,6 +289,7 @@ public abstract class AbstractLoginModule implements LoginModule
* @return true always
* @throws LoginException if unable to logout
*/
+ @Override
public boolean logout() throws LoginException
{
this.currentUser.unsetJAASInfo(this.subject);
@@ -300,6 +304,7 @@ public abstract class AbstractLoginModule implements LoginModule
* @param sharedState the shared state map
* @param options the option map
*/
+ @Override
public void initialize(Subject subject, CallbackHandler callbackHandler,
Map sharedState, Map options)
{
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/DataSourceLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/DataSourceLoginModule.java
index 45299e4deca..850f3451a2e 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/DataSourceLoginModule.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/DataSourceLoginModule.java
@@ -52,6 +52,7 @@ public class DataSourceLoginModule extends AbstractDatabaseLoginModule
* @param sharedState the shared state map
* @param options the option map
*/
+ @Override
public void initialize(Subject subject,
CallbackHandler callbackHandler,
Map sharedState,
@@ -79,6 +80,7 @@ public class DataSourceLoginModule extends AbstractDatabaseLoginModule
* @return the connection for the datasource
* @throws Exception if unable to get the connection
*/
+ @Override
public Connection getConnection ()
throws Exception
{
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/JDBCLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/JDBCLoginModule.java
index 74da47b40d2..e98a5824895 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/JDBCLoginModule.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/JDBCLoginModule.java
@@ -53,6 +53,7 @@ public class JDBCLoginModule extends AbstractDatabaseLoginModule
* @return the connection for this datasource
* @throws Exception if unable to get the connection
*/
+ @Override
public Connection getConnection ()
throws Exception
{
@@ -81,6 +82,7 @@ public class JDBCLoginModule extends AbstractDatabaseLoginModule
* @param sharedState the shared state map
* @param options the options map
*/
+ @Override
public void initialize(Subject subject,
CallbackHandler callbackHandler,
Map sharedState,
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java
index ed8bab3138f..bb6b5da68d2 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java
@@ -215,6 +215,7 @@ public class LdapLoginModule extends AbstractLoginModule
* @return the userinfo for the username
* @throws Exception if unable to get the user info
*/
+ @Override
public UserInfo getUserInfo(String username) throws Exception
{
Attributes attributes = getUserAttributes(username);
@@ -397,6 +398,7 @@ public class LdapLoginModule extends AbstractLoginModule
* @return true if authenticated, false otherwise
* @throws LoginException if unable to login
*/
+ @Override
public boolean login() throws LoginException
{
try
@@ -568,6 +570,7 @@ public class LdapLoginModule extends AbstractLoginModule
* @param sharedState the shared state map
* @param options the option map
*/
+ @Override
public void initialize(Subject subject,
CallbackHandler callbackHandler,
Map sharedState,
@@ -615,6 +618,7 @@ public class LdapLoginModule extends AbstractLoginModule
}
}
+ @Override
public boolean commit() throws LoginException
{
try
@@ -629,6 +633,7 @@ public class LdapLoginModule extends AbstractLoginModule
return super.commit();
}
+ @Override
public boolean abort() throws LoginException
{
try
diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java
index 4e16abdc6b6..7d0b7cbbc9b 100644
--- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java
+++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java
@@ -61,6 +61,7 @@ public class PropertyFileLoginModule extends AbstractLoginModule
* @param sharedState the shared state map
* @param options the options map
*/
+ @Override
public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options)
{
super.initialize(subject,callbackHandler,sharedState,options);
@@ -107,6 +108,7 @@ public class PropertyFileLoginModule extends AbstractLoginModule
* @param userName the user name
* @throws Exception if unable to get the user information
*/
+ @Override
public UserInfo getUserInfo(String userName) throws Exception
{
PropertyUserStore propertyUserStore = _propertyUserStores.get(_filename);
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 6c2c17549de..ec01d9ebe78 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
@@ -83,16 +83,19 @@ public class JaspiAuthenticator extends LoginAuthenticator
this._identityService = identityService;
}
+ @Override
public void setConfiguration(AuthConfiguration configuration)
{
super.setConfiguration(configuration);
}
+ @Override
public String getAuthMethod()
{
return "JASPI";
}
+ @Override
public Authentication validateRequest(ServletRequest request, ServletResponse response, boolean mandatory) throws ServerAuthException
{
JaspiMessageInfo info = new JaspiMessageInfo(request, response, mandatory);
@@ -107,6 +110,7 @@ public class JaspiAuthenticator extends LoginAuthenticator
}
// most likely validatedUser is not needed here.
+ @Override
public boolean secureResponse(ServletRequest req, ServletResponse res, boolean mandatory, User validatedUser) throws ServerAuthException
{
JaspiMessageInfo info = (JaspiMessageInfo) req.getAttribute("org.eclipse.jetty.security.jaspi.info");
diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticatorFactory.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticatorFactory.java
index 12888be2e1e..e4ac8629aea 100644
--- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticatorFactory.java
+++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiAuthenticatorFactory.java
@@ -88,6 +88,7 @@ public class JaspiAuthenticatorFactory extends DefaultAuthenticatorFactory
}
/* ------------------------------------------------------------ */
+ @Override
public Authenticator getAuthenticator(Server server, ServletContext context, AuthConfiguration configuration, IdentityService identityService, LoginService loginService)
{
Authenticator authenticator=null;
@@ -96,6 +97,7 @@ public class JaspiAuthenticatorFactory extends DefaultAuthenticatorFactory
AuthConfigFactory authConfigFactory = AuthConfigFactory.getFactory();
RegistrationListener listener = new RegistrationListener()
{
+ @Override
public void notify(String layer, String appContext)
{}
};
diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiMessageInfo.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiMessageInfo.java
index 6cc45bdceac..8c755809cf5 100644
--- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiMessageInfo.java
+++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/JaspiMessageInfo.java
@@ -46,26 +46,31 @@ public class JaspiMessageInfo implements MessageInfo
map = new MIMap(isAuthMandatory);
}
+ @Override
public Map getMap()
{
return map;
}
+ @Override
public Object getRequestMessage()
{
return request;
}
+ @Override
public Object getResponseMessage()
{
return response;
}
+ @Override
public void setRequestMessage(Object request)
{
this.request = (ServletRequest)request;
}
+ @Override
public void setResponseMessage(Object response)
{
this.response = (ServletResponse)response;
@@ -93,6 +98,7 @@ public class JaspiMessageInfo implements MessageInfo
isMandatory = mandatory;
}
+ @Override
public int size()
{
return (isMandatory? 1:0) +
@@ -100,11 +106,13 @@ public class JaspiMessageInfo implements MessageInfo
(delegate == null? 0: delegate.size());
}
+ @Override
public boolean isEmpty()
{
return !isMandatory && authMethod == null && (delegate == null || delegate.isEmpty());
}
+ @Override
public boolean containsKey(Object key)
{
if (MANDATORY_KEY.equals(key)) return isMandatory;
@@ -112,6 +120,7 @@ public class JaspiMessageInfo implements MessageInfo
return delegate != null && delegate.containsKey(key);
}
+ @Override
public boolean containsValue(Object value)
{
if (isMandatory && "true".equals(value)) return true;
@@ -119,6 +128,7 @@ public class JaspiMessageInfo implements MessageInfo
return delegate != null && delegate.containsValue(value);
}
+ @Override
public Object get(Object key)
{
if (MANDATORY_KEY.equals(key)) return isMandatory? "true": null;
@@ -127,6 +137,7 @@ public class JaspiMessageInfo implements MessageInfo
return delegate.get(key);
}
+ @Override
public Object put(Object key, Object value)
{
if (MANDATORY_KEY.equals(key))
@@ -144,6 +155,7 @@ public class JaspiMessageInfo implements MessageInfo
return getDelegate(true).put(key, value);
}
+ @Override
public Object remove(Object key)
{
if (MANDATORY_KEY.equals(key))
@@ -161,6 +173,7 @@ public class JaspiMessageInfo implements MessageInfo
return delegate.remove(key);
}
+ @Override
public void putAll(Map map)
{
if (map != null)
@@ -173,22 +186,26 @@ public class JaspiMessageInfo implements MessageInfo
}
}
+ @Override
public void clear()
{
authMethod = null;
delegate = null;
}
+ @Override
public Set keySet()
{
return getDelegate(true).keySet();
}
+ @Override
public Collection values()
{
return getDelegate(true).values();
}
+ @Override
public Set entrySet()
{
return getDelegate(true).entrySet();
diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/ServletCallbackHandler.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/ServletCallbackHandler.java
index b990a48499f..d81cdcfd74c 100644
--- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/ServletCallbackHandler.java
+++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/ServletCallbackHandler.java
@@ -53,6 +53,7 @@ public class ServletCallbackHandler implements CallbackHandler
_loginService = loginService;
}
+ @Override
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
for (Callback callback : callbacks)
diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/SimpleAuthConfig.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/SimpleAuthConfig.java
index cf37303aa56..59144cf4697 100644
--- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/SimpleAuthConfig.java
+++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/SimpleAuthConfig.java
@@ -40,33 +40,39 @@ public class SimpleAuthConfig implements ServerAuthConfig
this._serverAuthContext = serverAuthContext;
}
+ @Override
public ServerAuthContext getAuthContext(String authContextID, Subject serviceSubject, Map properties) throws AuthException
{
return _serverAuthContext;
}
// supposed to be of form host-namecontext-path
+ @Override
public String getAppContext()
{
return _appContext;
}
// not used yet
+ @Override
public String getAuthContextID(MessageInfo messageInfo) throws IllegalArgumentException
{
return null;
}
+ @Override
public String getMessageLayer()
{
return HTTP_SERVLET;
}
+ @Override
public boolean isProtected()
{
return true;
}
+ @Override
public void refresh()
{
}
diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/BaseAuthModule.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/BaseAuthModule.java
index ef4b33e0149..40bb60bb440 100644
--- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/BaseAuthModule.java
+++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/BaseAuthModule.java
@@ -53,6 +53,7 @@ public class BaseAuthModule implements ServerAuthModule, ServerAuthContext
protected CallbackHandler callbackHandler;
+ @Override
public Class[] getSupportedMessageTypes()
{
return SUPPORTED_MESSAGE_TYPES;
@@ -67,11 +68,13 @@ public class BaseAuthModule implements ServerAuthModule, ServerAuthContext
this.callbackHandler = callbackHandler;
}
+ @Override
public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, Map options) throws AuthException
{
this.callbackHandler = handler;
}
+ @Override
public void cleanSubject(MessageInfo messageInfo, Subject subject) throws AuthException
{
// TODO apparently we either get the LoginCallback or the LoginService
@@ -88,12 +91,14 @@ public class BaseAuthModule implements ServerAuthModule, ServerAuthContext
// }
}
+ @Override
public AuthStatus secureResponse(MessageInfo messageInfo, Subject serviceSubject) throws AuthException
{
// servlets do not need secured responses
return AuthStatus.SEND_SUCCESS;
}
+ @Override
public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) throws AuthException
{
return AuthStatus.SEND_FAILURE;
diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
index 57feedb66a5..7eb773d06aa 100644
--- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
+++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
@@ -257,6 +257,7 @@ public class ObjectMBean implements DynamicMBean
return this._mbeanContainer;
}
+ @Override
public MBeanInfo getMBeanInfo()
{
try
@@ -348,6 +349,7 @@ public class ObjectMBean implements DynamicMBean
return _info;
}
+ @Override
public Object getAttribute(String name) throws AttributeNotFoundException, ReflectionException
{
Method getter = _getters.get(name);
@@ -429,6 +431,7 @@ public class ObjectMBean implements DynamicMBean
}
}
+ @Override
public AttributeList getAttributes(String[] names)
{
AttributeList results = new AttributeList(names.length);
@@ -446,6 +449,7 @@ public class ObjectMBean implements DynamicMBean
return results;
}
+ @Override
public void setAttribute(Attribute attr) throws AttributeNotFoundException, ReflectionException
{
if (attr == null)
@@ -496,6 +500,7 @@ public class ObjectMBean implements DynamicMBean
}
}
+ @Override
public AttributeList setAttributes(AttributeList attrs)
{
if (LOG.isDebugEnabled())
@@ -518,6 +523,7 @@ public class ObjectMBean implements DynamicMBean
return results;
}
+ @Override
public Object invoke(String name, Object[] params, String[] signature) throws MBeanException, ReflectionException
{
if (LOG.isDebugEnabled())
diff --git a/jetty-jmx/src/test/java/com/acme/Derived.java b/jetty-jmx/src/test/java/com/acme/Derived.java
index b3fa78212dd..eba0baac1f6 100644
--- a/jetty-jmx/src/test/java/com/acme/Derived.java
+++ b/jetty-jmx/src/test/java/com/acme/Derived.java
@@ -33,6 +33,7 @@ public class Derived extends Base implements Signature
SuperManaged superManagedInstance = new SuperManaged();
@ManagedAttribute(value = "The full name of something", name = "fname", setter = "setFullName")
+ @Override
public String getFullName()
{
return fname;
@@ -44,6 +45,7 @@ public class Derived extends Base implements Signature
}
@ManagedOperation("publish something")
+ @Override
public void publish()
{
System.err.println("publish");
diff --git a/jetty-jmx/src/test/java/com/acme/DerivedManaged.java b/jetty-jmx/src/test/java/com/acme/DerivedManaged.java
index 994ef528412..0ce4c30920b 100644
--- a/jetty-jmx/src/test/java/com/acme/DerivedManaged.java
+++ b/jetty-jmx/src/test/java/com/acme/DerivedManaged.java
@@ -79,6 +79,7 @@ public class DerivedManaged extends Base implements Signature
}
@ManagedAttribute(value = "The full name of something", name = "fname", setter = "setFullName")
+ @Override
public String getFullName()
{
return fname;
@@ -90,6 +91,7 @@ public class DerivedManaged extends Base implements Signature
}
@ManagedOperation("publish something")
+ @Override
public void publish()
{
System.err.println("publish");
diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/BindingEnumeration.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/BindingEnumeration.java
index ca7bcd967df..6e1c874a453 100644
--- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/BindingEnumeration.java
+++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/BindingEnumeration.java
@@ -37,17 +37,20 @@ public class BindingEnumeration implements NamingEnumeration
_delegate = e;
}
+ @Override
public void close()
throws NamingException
{
}
+ @Override
public boolean hasMore ()
throws NamingException
{
return _delegate.hasNext();
}
+ @Override
public Binding next()
throws NamingException
{
@@ -55,11 +58,13 @@ public class BindingEnumeration implements NamingEnumeration
return new Binding (b.getName(), b.getClassName(), b.getObject(), true);
}
+ @Override
public boolean hasMoreElements()
{
return _delegate.hasNext();
}
+ @Override
public Binding nextElement()
{
Binding b = (Binding)_delegate.next();
diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
index a6a59a82613..afe82262265 100644
--- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
+++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
@@ -95,6 +95,7 @@ public class ContextFactory implements ObjectFactory
* return null.
* @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object, javax.naming.Name, javax.naming.Context, java.util.Hashtable)
*/
+ @Override
public Object getObjectInstance (Object obj,
Name name,
Context nameCtx,
diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/InitialContextFactory.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/InitialContextFactory.java
index 9123e6f2618..d9b5a67ea45 100644
--- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/InitialContextFactory.java
+++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/InitialContextFactory.java
@@ -55,6 +55,7 @@ public class InitialContextFactory implements javax.naming.spi.InitialContextFac
syntax.put("jndi.syntax.separator", "/");
syntax.put("jndi.syntax.ignorecase", "false");
}
+ @Override
public Name parse (String name)
throws NamingException
{
@@ -74,6 +75,7 @@ public class InitialContextFactory implements javax.naming.spi.InitialContextFac
* @param env a Hashtable
value
* @return a Context
value
*/
+ @Override
public Context getInitialContext(Hashtable env)
{
__log.debug("InitialContextFactory.getInitialContext()");
diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NameEnumeration.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NameEnumeration.java
index f86721671eb..7ecdc50bca6 100644
--- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NameEnumeration.java
+++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NameEnumeration.java
@@ -37,17 +37,20 @@ public class NameEnumeration implements NamingEnumeration
_delegate = e;
}
+ @Override
public void close()
throws NamingException
{
}
+ @Override
public boolean hasMore ()
throws NamingException
{
return _delegate.hasNext();
}
+ @Override
public NameClassPair next()
throws NamingException
{
@@ -55,11 +58,13 @@ public class NameEnumeration implements NamingEnumeration
return new NameClassPair(b.getName(),b.getClassName(),true);
}
+ @Override
public boolean hasMoreElements()
{
return _delegate.hasNext();
}
+ @Override
public NameClassPair nextElement()
{
Binding b = _delegate.next();
diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingContext.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingContext.java
index df4c2ad21e0..009e271c00a 100644
--- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingContext.java
+++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/NamingContext.java
@@ -144,6 +144,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return copy of this NamingContext
* @exception CloneNotSupportedException if an error occurs
*/
+ @Override
public Object clone ()
throws CloneNotSupportedException
{
@@ -211,6 +212,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param obj object to bind
* @exception NamingException if an error occurs
*/
+ @Override
public void bind(Name name, Object obj)
throws NamingException
{
@@ -311,6 +313,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param obj an Object
value
* @exception NamingException if an error occurs
*/
+ @Override
public void bind(String name, Object obj)
throws NamingException
{
@@ -326,6 +329,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return a Context
value
* @exception NamingException if an error occurs
*/
+ @Override
public Context createSubcontext (Name name)
throws NamingException
{
@@ -409,6 +413,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return a Context
value
* @exception NamingException if an error occurs
*/
+ @Override
public Context createSubcontext (String name)
throws NamingException
{
@@ -424,6 +429,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param name name of subcontext to remove
* @exception NamingException if an error occurs
*/
+ @Override
public void destroySubcontext (String name)
throws NamingException
{
@@ -439,6 +445,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param name name of subcontext to remove
* @exception NamingException if an error occurs
*/
+ @Override
public void destroySubcontext (Name name)
throws NamingException
{
@@ -452,6 +459,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param name name of bound object
* @exception NamingException if an error occurs
*/
+ @Override
public Object lookup(Name name)
throws NamingException
{
@@ -572,6 +580,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return object bound to name
* @exception NamingException if an error occurs
*/
+ @Override
public Object lookup (String name)
throws NamingException
{
@@ -588,6 +597,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return LinkRef or plain object bound at name
* @exception NamingException if an error occurs
*/
+ @Override
public Object lookupLink (Name name)
throws NamingException
{
@@ -685,6 +695,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return LinkRef or plain object bound at name
* @exception NamingException if an error occurs
*/
+ @Override
public Object lookupLink (String name)
throws NamingException
{
@@ -700,6 +711,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return a NamingEnumeration
value
* @exception NamingException if an error occurs
*/
+ @Override
public NamingEnumeration list(Name name)
throws NamingException
{
@@ -770,6 +782,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return a NamingEnumeration
value
* @exception NamingException if an error occurs
*/
+ @Override
public NamingEnumeration list(String name)
throws NamingException
{
@@ -786,6 +799,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return a NamingEnumeration
value
* @exception NamingException if an error occurs
*/
+ @Override
public NamingEnumeration listBindings(Name name)
throws NamingException
{
@@ -855,6 +869,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return a NamingEnumeration
value
* @exception NamingException if an error occurs
*/
+ @Override
public NamingEnumeration listBindings(String name)
throws NamingException
{
@@ -870,6 +885,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param obj an Object
value
* @exception NamingException if an error occurs
*/
+ @Override
public void rebind(Name name,
Object obj)
throws NamingException
@@ -956,6 +972,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param obj an Object
value
* @exception NamingException if an error occurs
*/
+ @Override
public void rebind (String name,
Object obj)
throws NamingException
@@ -970,6 +987,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param name a String
value
* @exception NamingException if an error occurs
*/
+ @Override
public void unbind (String name)
throws NamingException
{
@@ -983,6 +1001,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param name a String
value
* @exception NamingException if an error occurs
*/
+ @Override
public void unbind (Name name)
throws NamingException
{
@@ -1062,6 +1081,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param newName a Name
value
* @exception NamingException if an error occurs
*/
+ @Override
public void rename(Name oldName,
Name newName)
throws NamingException
@@ -1077,7 +1097,9 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param oldName a Name
value
* @param newName a Name
value
* @exception NamingException if an error occurs
- */ public void rename(String oldName,
+ */
+ @Override
+ public void rename(String oldName,
String newName)
throws NamingException
{
@@ -1095,6 +1117,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return a Name
value
* @exception NamingException if an error occurs
*/
+ @Override
public Name composeName(Name name,
Name prefix)
throws NamingException
@@ -1120,6 +1143,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return a Name
value
* @exception NamingException if an error occurs
*/
+ @Override
public String composeName (String name,
String prefix)
throws NamingException
@@ -1141,6 +1165,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
*
* @exception NamingException if an error occurs
*/
+ @Override
public void close ()
throws NamingException
{
@@ -1154,6 +1179,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param name a Name
value
* @return a NameParser
value
*/
+ @Override
public NameParser getNameParser (Name name)
{
return _parser;
@@ -1166,6 +1192,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @param name a Name
value
* @return a NameParser
value
*/
+ @Override
public NameParser getNameParser (String name)
{
return _parser;
@@ -1183,6 +1210,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return the full name of this Context
* @exception NamingException if an error occurs
*/
+ @Override
public String getNameInNamespace ()
throws NamingException
{
@@ -1209,6 +1237,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return propVal or previous value of the property
* @exception NamingException if an error occurs
*/
+ @Override
public Object addToEnvironment(String propName,
Object propVal)
throws NamingException
@@ -1228,6 +1257,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
* @return value of property or null if it didn't exist
* @exception NamingException if an error occurs
*/
+ @Override
public Object removeFromEnvironment(String propName)
throws NamingException
{
@@ -1244,6 +1274,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
*
* @return a copy of the environment of this Context.
*/
+ @Override
public Hashtable getEnvironment ()
{
return (Hashtable)_env.clone();
@@ -1372,6 +1403,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
/* ------------------------------------------------------------ */
+ @Override
public String dump()
{
StringBuilder buf = new StringBuilder();
@@ -1388,6 +1420,7 @@ public class NamingContext implements Context, Cloneable, Dumpable
/* ------------------------------------------------------------ */
+ @Override
public void dump(Appendable out,String indent) throws IOException
{
out.append(this.getClass().getSimpleName()).append("@").append(Long.toHexString(this.hashCode())).append("\n");
diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/factories/MailSessionReference.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/factories/MailSessionReference.java
index ce24312b748..3cc355a254e 100644
--- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/factories/MailSessionReference.java
+++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/factories/MailSessionReference.java
@@ -69,6 +69,7 @@ public class MailSessionReference extends Reference implements ObjectFactory
passwordAuthentication = new PasswordAuthentication (user, (password.startsWith(Password.__OBFUSCATE)?Password.deobfuscate(password):password));
}
+ @Override
public PasswordAuthentication getPasswordAuthentication()
{
return passwordAuthentication;
@@ -110,6 +111,7 @@ public class MailSessionReference extends Reference implements ObjectFactory
* @return the object found
* @throws Exception if unable to get object instance
*/
+ @Override
public Object getObjectInstance(Object ref, Name arg1, Context arg2, Hashtable arg3) throws Exception
{
if (ref == null)
diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaNameParser.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaNameParser.java
index c0371871a8a..317ca5d086a 100644
--- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaNameParser.java
+++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaNameParser.java
@@ -49,6 +49,7 @@ public class javaNameParser implements NameParser
* of this parser.
* @exception NamingException If a naming exception was encountered.
*/
+ @Override
public Name parse(String name) throws NamingException
{
return new CompoundName(name, syntax);
diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaRootURLContext.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaRootURLContext.java
index 8d19bb60837..58cb52a3957 100644
--- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaRootURLContext.java
+++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaRootURLContext.java
@@ -93,6 +93,7 @@ public class javaRootURLContext implements Context
_env = env;
}
+ @Override
public Object lookup(Name name)
throws NamingException
{
@@ -100,54 +101,63 @@ public class javaRootURLContext implements Context
}
+ @Override
public Object lookup(String name)
throws NamingException
{
return getRoot().lookup(stripProtocol(name));
}
+ @Override
public void bind(Name name, Object obj)
throws NamingException
{
getRoot().bind(stripProtocol(name), obj);
}
+ @Override
public void bind(String name, Object obj)
throws NamingException
{
getRoot().bind(stripProtocol(name), obj);
}
+ @Override
public void unbind (String name)
throws NamingException
{
getRoot().unbind(stripProtocol(name));
}
+ @Override
public void unbind (Name name)
throws NamingException
{
getRoot().unbind(stripProtocol(name));
}
+ @Override
public void rename (String oldStr, String newStr)
throws NamingException
{
getRoot().rename (stripProtocol(oldStr), stripProtocol(newStr));
}
+ @Override
public void rename (Name oldName, Name newName)
throws NamingException
{
getRoot().rename (stripProtocol(oldName), stripProtocol(newName));
}
+ @Override
public void rebind (Name name, Object obj)
throws NamingException
{
getRoot().rebind(stripProtocol(name), obj);
}
+ @Override
public void rebind (String name, Object obj)
throws NamingException
{
@@ -155,12 +165,14 @@ public class javaRootURLContext implements Context
}
+ @Override
public Object lookupLink (Name name)
throws NamingException
{
return getRoot().lookupLink(stripProtocol(name));
}
+ @Override
public Object lookupLink (String name)
throws NamingException
{
@@ -168,12 +180,14 @@ public class javaRootURLContext implements Context
}
+ @Override
public Context createSubcontext (Name name)
throws NamingException
{
return getRoot().createSubcontext(stripProtocol(name));
}
+ @Override
public Context createSubcontext (String name)
throws NamingException
{
@@ -181,12 +195,14 @@ public class javaRootURLContext implements Context
}
+ @Override
public void destroySubcontext (Name name)
throws NamingException
{
getRoot().destroySubcontext(stripProtocol(name));
}
+ @Override
public void destroySubcontext (String name)
throws NamingException
{
@@ -194,6 +210,7 @@ public class javaRootURLContext implements Context
}
+ @Override
public NamingEnumeration list(Name name)
throws NamingException
{
@@ -201,18 +218,21 @@ public class javaRootURLContext implements Context
}
+ @Override
public NamingEnumeration list(String name)
throws NamingException
{
return getRoot().list(stripProtocol(name));
}
+ @Override
public NamingEnumeration listBindings(Name name)
throws NamingException
{
return getRoot().listBindings(stripProtocol(name));
}
+ @Override
public NamingEnumeration listBindings(String name)
throws NamingException
{
@@ -220,6 +240,7 @@ public class javaRootURLContext implements Context
}
+ @Override
public Name composeName (Name name,
Name prefix)
throws NamingException
@@ -227,6 +248,7 @@ public class javaRootURLContext implements Context
return getRoot().composeName(name, prefix);
}
+ @Override
public String composeName (String name,
String prefix)
throws NamingException
@@ -235,23 +257,27 @@ public class javaRootURLContext implements Context
}
+ @Override
public void close ()
throws NamingException
{
}
+ @Override
public String getNameInNamespace ()
throws NamingException
{
return URL_PREFIX;
}
+ @Override
public NameParser getNameParser (Name name)
throws NamingException
{
return __javaNameParser;
}
+ @Override
public NameParser getNameParser (String name)
throws NamingException
{
@@ -259,6 +285,7 @@ public class javaRootURLContext implements Context
}
+ @Override
public Object addToEnvironment(String propName,
Object propVal)
throws NamingException
@@ -266,12 +293,14 @@ public class javaRootURLContext implements Context
return _env.put (propName,propVal);
}
+ @Override
public Object removeFromEnvironment(String propName)
throws NamingException
{
return _env.remove (propName);
}
+ @Override
public Hashtable getEnvironment ()
{
return _env;
diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaURLContextFactory.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaURLContextFactory.java
index 45376706b23..d17a2a12507 100644
--- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaURLContextFactory.java
+++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/java/javaURLContextFactory.java
@@ -48,6 +48,7 @@ public class javaURLContextFactory implements ObjectFactory
* @return a new context or the resolved object for the url
* @exception Exception if an error occurs
*/
+ @Override
public Object getObjectInstance(Object url, Name name, Context ctx, Hashtable env)
throws Exception
{
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 3d033eb2970..4881a9cbea7 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
@@ -84,6 +84,7 @@ public class localContextRoot implements Context
syntax.put("jndi.syntax.ignorecase", "false");
}
+ @Override
public Name parse(String name) throws NamingException
{
return new CompoundName(name, syntax);
@@ -118,6 +119,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#close()
*/
+ @Override
public void close() throws NamingException
{
@@ -128,6 +130,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#getNameInNamespace()
*/
+ @Override
public String getNameInNamespace() throws NamingException
{
return "";
@@ -139,6 +142,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#destroySubcontext(javax.naming.Name)
*/
+ @Override
public void destroySubcontext(Name name) throws NamingException
{
synchronized (__root)
@@ -153,6 +157,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#destroySubcontext(java.lang.String)
*/
+ @Override
public void destroySubcontext(String name) throws NamingException
{
synchronized (__root)
@@ -168,6 +173,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#getEnvironment()
*/
+ @Override
public Hashtable getEnvironment() throws NamingException
{
return _env;
@@ -180,6 +186,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#unbind(javax.naming.Name)
*/
+ @Override
public void unbind(Name name) throws NamingException
{
synchronized (__root)
@@ -263,6 +270,7 @@ 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)));
@@ -275,6 +283,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#lookupLink(java.lang.String)
*/
+ @Override
public Object lookupLink(String name) throws NamingException
{
synchronized (__root)
@@ -288,6 +297,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#lookupLink(javax.naming.Name)
*/
+ @Override
public Object lookupLink(Name name) throws NamingException
{
synchronized (__root)
@@ -391,6 +401,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#removeFromEnvironment(java.lang.String)
*/
+ @Override
public Object removeFromEnvironment(String propName) throws NamingException
{
return _env.remove(propName);
@@ -402,6 +413,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#lookup(javax.naming.Name)
*/
+ @Override
public Object lookup(Name name) throws NamingException
{
synchronized (__root)
@@ -526,6 +538,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#lookup(java.lang.String)
*/
+ @Override
public Object lookup(String name) throws NamingException
{
synchronized (__root)
@@ -540,6 +553,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#bind(java.lang.String, java.lang.Object)
*/
+ @Override
public void bind(String name, Object obj) throws NamingException
{
synchronized (__root)
@@ -555,6 +569,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#bind(javax.naming.Name, java.lang.Object)
*/
+ @Override
public void bind(Name name, Object obj) throws NamingException
{
synchronized (__root)
@@ -644,6 +659,7 @@ 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
{
synchronized (__root)
@@ -730,6 +746,7 @@ 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
{
synchronized (__root)
@@ -742,6 +759,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#rename(javax.naming.Name, javax.naming.Name)
*/
+ @Override
public void rename(Name oldName, Name newName) throws NamingException
{
synchronized (__root)
@@ -755,6 +773,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#rename(java.lang.String, java.lang.String)
*/
+ @Override
public void rename(String oldName, String newName) throws NamingException
{
synchronized (__root)
@@ -768,6 +787,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#createSubcontext(java.lang.String)
*/
+ @Override
public Context createSubcontext(String name) throws NamingException
{
synchronized (__root)
@@ -789,6 +809,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#createSubcontext(javax.naming.Name)
*/
+ @Override
public Context createSubcontext(Name name) throws NamingException
{
synchronized (__root)
@@ -883,6 +904,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#getNameParser(java.lang.String)
*/
+ @Override
public NameParser getNameParser(String name) throws NamingException
{
return __root.getNameParser(name);
@@ -893,6 +915,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#getNameParser(javax.naming.Name)
*/
+ @Override
public NameParser getNameParser(Name name) throws NamingException
{
return __root.getNameParser(name);
@@ -903,6 +926,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#list(java.lang.String)
*/
+ @Override
public NamingEnumeration list(String name) throws NamingException
{
synchronized (__root)
@@ -917,6 +941,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#list(javax.naming.Name)
*/
+ @Override
public NamingEnumeration list(Name name) throws NamingException
{
synchronized (__root)
@@ -987,6 +1012,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#listBindings(javax.naming.Name)
*/
+ @Override
public NamingEnumeration listBindings(Name name) throws NamingException
{
synchronized (__root)
@@ -1058,6 +1084,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#listBindings(java.lang.String)
*/
+ @Override
public NamingEnumeration listBindings(String name) throws NamingException
{
synchronized (__root)
@@ -1073,6 +1100,7 @@ public class localContextRoot implements Context
* @see javax.naming.Context#addToEnvironment(java.lang.String,
* java.lang.Object)
*/
+ @Override
public Object addToEnvironment(String propName, Object propVal)
throws NamingException
{
@@ -1084,6 +1112,7 @@ public class localContextRoot implements Context
*
* @see javax.naming.Context#composeName(java.lang.String, java.lang.String)
*/
+ @Override
public String composeName(String name, String prefix)
throws NamingException
{
@@ -1096,6 +1125,7 @@ public class localContextRoot implements Context
* @see javax.naming.Context#composeName(javax.naming.Name,
* javax.naming.Name)
*/
+ @Override
public Name composeName(Name name, Name prefix) throws NamingException
{
return __root.composeName(name, prefix);
diff --git a/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java b/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
index 24fbf1d4c46..ba553ae0851 100644
--- a/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
+++ b/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
@@ -66,6 +66,7 @@ public class TestJNDI
{
public static String myString = "xxx";
+ @Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception
{
return myString;
@@ -105,6 +106,7 @@ public class TestJNDI
private Context comp;
private Object testObj = new Object();
+ @Override
public void contextInitialized(ServletContextEvent sce)
{
try
@@ -124,6 +126,7 @@ public class TestJNDI
}
}
+ @Override
public void contextDestroyed(ServletContextEvent sce)
{
try
@@ -148,6 +151,7 @@ public class TestJNDI
private Context comp;
private Object testObj = new Object();
+ @Override
public void contextInitialized(ServletContextEvent sce)
{
try
@@ -174,6 +178,7 @@ public class TestJNDI
}
}
+ @Override
public void contextDestroyed(ServletContextEvent sce)
{
try
diff --git a/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestLocalJNDI.java b/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestLocalJNDI.java
index 89193c974de..938c3319a88 100644
--- a/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestLocalJNDI.java
+++ b/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestLocalJNDI.java
@@ -51,6 +51,7 @@ public class TestLocalJNDI
{
}
+ @Override
public Object getObjectInstance(Object obj, Name name, Context ctx, Hashtable env) throws Exception
{
@@ -83,6 +84,7 @@ public class TestLocalJNDI
fruit = f;
}
+ @Override
public Reference getReference() throws NamingException
{
return new Reference(
@@ -92,6 +94,7 @@ public class TestLocalJNDI
null); // Factory location
}
+ @Override
public String toString()
{
return fruit;
diff --git a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
index ba262c3d832..4e5937c11f5 100644
--- a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
+++ b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
@@ -282,6 +282,7 @@ public class JspcMojo extends AbstractMojo
private boolean scanAllDirectories;
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException
{
if (getLog().isDebugEnabled())
@@ -414,6 +415,7 @@ public class JspcMojo extends AbstractMojo
{
delete(generatedClassesDir, new FileFilter()
{
+ @Override
public boolean accept(File f)
{
return f.isDirectory() || f.getName().endsWith(".java");
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
index aabaec2bb4c..ee525ebbe42 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
@@ -306,6 +306,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo
/**
* @see org.apache.maven.plugin.Mojo#execute()
*/
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException
{
getLog().info("Configuring Jetty for project: " + this.project.getName());
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ConsoleScanner.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ConsoleScanner.java
index 4cf965e2ebb..d784099e944 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ConsoleScanner.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ConsoleScanner.java
@@ -36,6 +36,7 @@ public class ConsoleScanner extends Thread
setDaemon(true);
}
+ @Override
public void run()
{
try
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java
index 773ad30fc7c..e00aa76cd29 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java
@@ -68,6 +68,7 @@ public class JettyEffectiveWebXml extends JettyRunMojo
/**
* @see org.apache.maven.plugin.Mojo#execute()
*/
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException
{
super.execute();
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
index c72d1ac8dba..8ac761be0a6 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
@@ -174,6 +174,7 @@ public class JettyRunForkedMojo extends JettyRunMojo
super("RunForkedShutdown");
}
+ @Override
public void run ()
{
if (forkedProcess != null && waitForChild)
@@ -190,6 +191,7 @@ public class JettyRunForkedMojo extends JettyRunMojo
/**
* @see org.apache.maven.plugin.Mojo#execute()
*/
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException
{
Runtime.getRuntime().addShutdownHook(new ShutdownThread());
@@ -430,6 +432,7 @@ public class JettyRunForkedMojo extends JettyRunMojo
+ @Override
public boolean isPluginArtifact(Artifact artifact)
{
if (pluginArtifacts == null || pluginArtifacts.isEmpty())
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java
index 9124c5c4181..a2eda37158f 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java
@@ -199,6 +199,7 @@ public class JettyRunMojo extends AbstractJettyMojo
*
* @see AbstractJettyMojo#checkPomConfiguration()
*/
+ @Override
public void checkPomConfiguration () throws MojoExecutionException
{
// check the location of the static content/jsps etc
@@ -274,6 +275,7 @@ public class JettyRunMojo extends AbstractJettyMojo
/**
* @see org.eclipse.jetty.maven.plugin.AbstractJettyMojo#configureWebApplication()
*/
+ @Override
public void configureWebApplication() throws Exception
{
super.configureWebApplication();
@@ -366,6 +368,7 @@ public class JettyRunMojo extends AbstractJettyMojo
/**
* @see org.eclipse.jetty.maven.plugin.AbstractJettyMojo#configureScanner()
*/
+ @Override
public void configureScanner ()
throws MojoExecutionException
{
@@ -523,6 +526,7 @@ public class JettyRunMojo extends AbstractJettyMojo
/**
* @see org.eclipse.jetty.maven.plugin.AbstractJettyMojo#restartWebApp(boolean)
*/
+ @Override
public void restartWebApp(boolean reconfigureScanner) throws Exception
{
getLog().info("restarting "+webApp);
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarExplodedMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarExplodedMojo.java
index 77626f43624..8892d4f505b 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarExplodedMojo.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarExplodedMojo.java
@@ -64,6 +64,7 @@ public class JettyRunWarExplodedMojo extends AbstractJettyMojo
/**
* @see org.eclipse.jetty.maven.plugin.AbstractJettyMojo#execute()
*/
+ @Override
public void execute () throws MojoExecutionException, MojoFailureException
{
super.execute();
@@ -94,6 +95,7 @@ public class JettyRunWarExplodedMojo extends AbstractJettyMojo
*
* @see AbstractJettyMojo#checkPomConfiguration()
*/
+ @Override
public void checkPomConfiguration() throws MojoExecutionException
{
return;
@@ -105,6 +107,7 @@ public class JettyRunWarExplodedMojo extends AbstractJettyMojo
/**
* @see AbstractJettyMojo#configureScanner()
*/
+ @Override
public void configureScanner() throws MojoExecutionException
{
scanner.watch(project.getFile().toPath());
@@ -168,6 +171,7 @@ public class JettyRunWarExplodedMojo extends AbstractJettyMojo
/**
* @see org.eclipse.jetty.maven.plugin.AbstractJettyMojo#restartWebApp(boolean)
*/
+ @Override
public void restartWebApp(boolean reconfigureScanner) throws Exception
{
getLog().info("Restarting webapp");
@@ -199,6 +203,7 @@ public class JettyRunWarExplodedMojo extends AbstractJettyMojo
/**
* @see org.eclipse.jetty.maven.plugin.AbstractJettyMojo#configureWebApplication()
*/
+ @Override
public void configureWebApplication () throws Exception
{
super.configureWebApplication();
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java
index 16cfbc8d808..83a4f1017a6 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java
@@ -59,6 +59,7 @@ public class JettyRunWarMojo extends AbstractJettyMojo
/**
* @see org.apache.maven.plugin.Mojo#execute()
*/
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException
{
super.execute();
@@ -74,6 +75,7 @@ public class JettyRunWarMojo extends AbstractJettyMojo
+ @Override
public void configureWebApplication () throws Exception
{
super.configureWebApplication();
@@ -87,6 +89,7 @@ public class JettyRunWarMojo extends AbstractJettyMojo
/**
* @see AbstractJettyMojo#checkPomConfiguration()
*/
+ @Override
public void checkPomConfiguration() throws MojoExecutionException
{
return;
@@ -109,6 +112,7 @@ public class JettyRunWarMojo extends AbstractJettyMojo
/**
* @see AbstractJettyMojo#configureScanner()
*/
+ @Override
public void configureScanner() throws MojoExecutionException
{
scanner.watch(project.getFile().toPath());
@@ -147,6 +151,7 @@ public class JettyRunWarMojo extends AbstractJettyMojo
/**
* @see org.eclipse.jetty.maven.plugin.AbstractJettyMojo#restartWebApp(boolean)
*/
+ @Override
public void restartWebApp(boolean reconfigureScanner) throws Exception
{
getLog().info("Restarting webapp ...");
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java
index 2b45325cd4b..68027601464 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java
@@ -66,6 +66,7 @@ public class JettyStopMojo extends AbstractMojo
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException
{
if (stopPort <= 0)
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
index 34f0bad24ad..1ee4ca4d5a8 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
@@ -444,6 +444,7 @@ public class JettyWebAppContext extends WebAppContext
/* ------------------------------------------------------------ */
+ @Override
public void doStop () throws Exception
{
if (_classpathFiles != null)
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenWebInfConfiguration.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenWebInfConfiguration.java
index 4c69f9f5e35..70b45244488 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenWebInfConfiguration.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenWebInfConfiguration.java
@@ -46,6 +46,7 @@ public class MavenWebInfConfiguration extends WebInfConfiguration
/**
* @see org.eclipse.jetty.webapp.WebInfConfiguration#configure(org.eclipse.jetty.webapp.WebAppContext)
*/
+ @Override
public void configure(WebAppContext context) throws Exception
{
JettyWebAppContext jwac = (JettyWebAppContext)context;
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Overlay.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Overlay.java
index cffa9729cc2..eefe8289b89 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Overlay.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Overlay.java
@@ -58,6 +58,7 @@ public class Overlay
return _config;
}
+ @Override
public String toString()
{
StringBuffer strbuff = new StringBuffer();
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java
index a8eca3721e5..d3426f47b8c 100644
--- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java
+++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/OverlayConfig.java
@@ -297,6 +297,7 @@ public class OverlayConfig
return false;
}
+ @Override
public String toString()
{
StringBuffer strbuff = new StringBuffer();
diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java
index ef1b9a8bad9..1b078f61cb4 100644
--- a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java
+++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java
@@ -192,6 +192,7 @@ public class MongoSessionDataStore extends NoSqlSessionDataStore
final AtomicReference exception = new AtomicReference();
Runnable r = new Runnable()
{
+ @Override
public void run ()
{
try
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java
index e7c6681a13b..4c8ed392b91 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java
+++ b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/ContainerTldBundleDiscoverer.java
@@ -89,6 +89,7 @@ public class ContainerTldBundleDiscoverer implements TldBundleDiscoverer
*
* @return The location of the jars that contain tld files as URLs.
*/
+ @Override
public URL[] getUrlsForBundlesWithTlds(DeploymentManager deploymentManager, BundleFileLocatorHelper locatorHelper) throws Exception
{
if (!isJspAvailable())
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/JSTLBundleDiscoverer.java b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/JSTLBundleDiscoverer.java
index d2f274dfbc5..7da3ca590f3 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/JSTLBundleDiscoverer.java
+++ b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/JSTLBundleDiscoverer.java
@@ -122,6 +122,7 @@ public class JSTLBundleDiscoverer implements TldBundleDiscoverer
* @return array of URLs
* @throws Exception In case of errors during resolving TLDs files
*/
+ @Override
public URL[] getUrlsForBundlesWithTlds(DeploymentManager deployer, BundleFileLocatorHelper locatorHelper) throws Exception
{
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
index c737f452bc9..385b2c6a7cf 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
+++ b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
@@ -45,6 +45,7 @@ public class FragmentActivator implements BundleActivator
/**
*
*/
+ @Override
public void start(BundleContext context) throws Exception
{
//set up some classes that will look for bundles with tlds that must be converted
@@ -56,6 +57,7 @@ public class FragmentActivator implements BundleActivator
/**
*
*/
+ @Override
public void stop(BundleContext context) throws Exception
{
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/src/main/java/org/eclipse/jetty/osgi/boot/warurl/WarUrlActivator.java b/jetty-osgi/jetty-osgi-boot-warurl/src/main/java/org/eclipse/jetty/osgi/boot/warurl/WarUrlActivator.java
index da73c3c4c77..27c7269b7bf 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/src/main/java/org/eclipse/jetty/osgi/boot/warurl/WarUrlActivator.java
+++ b/jetty-osgi/jetty-osgi-boot-warurl/src/main/java/org/eclipse/jetty/osgi/boot/warurl/WarUrlActivator.java
@@ -42,6 +42,7 @@ public class WarUrlActivator implements BundleActivator
* @param context the {@link BundleContext} to use
*/
@SuppressWarnings("unchecked")
+ @Override
public void start(BundleContext context) throws Exception
{
Dictionary props = new Hashtable();
@@ -55,6 +56,7 @@ public class WarUrlActivator implements BundleActivator
* as osgi might shutdown every registered service
* by default: need test)
*/
+ @Override
public void stop(BundleContext context) throws Exception
{
try
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/src/main/java/org/eclipse/jetty/osgi/boot/warurl/internal/WarURLConnection.java b/jetty-osgi/jetty-osgi-boot-warurl/src/main/java/org/eclipse/jetty/osgi/boot/warurl/internal/WarURLConnection.java
index 3741f623de5..c675bcab340 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/src/main/java/org/eclipse/jetty/osgi/boot/warurl/internal/WarURLConnection.java
+++ b/jetty-osgi/jetty-osgi-boot-warurl/src/main/java/org/eclipse/jetty/osgi/boot/warurl/internal/WarURLConnection.java
@@ -62,6 +62,7 @@ public class WarURLConnection extends URLConnection
PipedInputStream pIn = new PipedInputStream(pOut);
Runnable run = new Runnable()
{
+ @Override
public void run()
{
JarInputStream jin = null;
@@ -124,196 +125,235 @@ public class WarURLConnection extends URLConnection
}
+ @Override
public InputStream getInputStream() throws IOException
{
return substitueManifest(_mf, _conn.getInputStream());
}
+ @Override
public void addRequestProperty(String key, String value)
{
_conn.addRequestProperty(key,value);
}
+ @Override
public boolean equals(Object obj)
{
return _conn.equals(obj);
}
+ @Override
public boolean getAllowUserInteraction()
{
return _conn.getAllowUserInteraction();
}
+ @Override
public int getConnectTimeout()
{
return _conn.getConnectTimeout();
}
+ @Override
public Object getContent() throws IOException
{
return _conn.getContent();
}
+ @Override
public Object getContent(Class[] classes) throws IOException
{
return _conn.getContent(classes);
}
+ @Override
public String getContentEncoding()
{
return _conn.getContentEncoding();
}
+ @Override
public int getContentLength()
{
return _conn.getContentLength();
}
+ @Override
public String getContentType()
{
return _conn.getContentType();
}
+ @Override
public long getDate()
{
return _conn.getDate();
}
+ @Override
public boolean getDefaultUseCaches()
{
return _conn.getDefaultUseCaches();
}
+ @Override
public boolean getDoInput()
{
return _conn.getDoInput();
}
+ @Override
public boolean getDoOutput()
{
return _conn.getDoOutput();
}
+ @Override
public long getExpiration()
{
return _conn.getExpiration();
}
+ @Override
public String getHeaderField(int n)
{
return _conn.getHeaderField(n);
}
+ @Override
public String getHeaderField(String name)
{
return _conn.getHeaderField(name);
}
+ @Override
public long getHeaderFieldDate(String name, long Default)
{
return _conn.getHeaderFieldDate(name,Default);
}
+ @Override
public int getHeaderFieldInt(String name, int Default)
{
return _conn.getHeaderFieldInt(name,Default);
}
+ @Override
public String getHeaderFieldKey(int n)
{
return _conn.getHeaderFieldKey(n);
}
+ @Override
public Map> getHeaderFields()
{
return _conn.getHeaderFields();
}
+ @Override
public long getIfModifiedSince()
{
return _conn.getIfModifiedSince();
}
+ @Override
public long getLastModified()
{
return _conn.getLastModified();
}
+ @Override
public OutputStream getOutputStream() throws IOException
{
return _conn.getOutputStream();
}
+ @Override
public Permission getPermission() throws IOException
{
return _conn.getPermission();
}
+ @Override
public int getReadTimeout()
{
return _conn.getReadTimeout();
}
+ @Override
public Map> getRequestProperties()
{
return _conn.getRequestProperties();
}
+ @Override
public String getRequestProperty(String key)
{
return _conn.getRequestProperty(key);
}
+ @Override
public URL getURL()
{
return _conn.getURL();
}
+ @Override
public boolean getUseCaches()
{
return _conn.getUseCaches();
}
+ @Override
public void setAllowUserInteraction(boolean allowuserinteraction)
{
_conn.setAllowUserInteraction(allowuserinteraction);
}
+ @Override
public void setConnectTimeout(int timeout)
{
_conn.setConnectTimeout(timeout);
}
+ @Override
public void setDefaultUseCaches(boolean defaultusecaches)
{
_conn.setDefaultUseCaches(defaultusecaches);
}
+ @Override
public void setDoInput(boolean doinput)
{
_conn.setDoInput(doinput);
}
+ @Override
public void setDoOutput(boolean dooutput)
{
_conn.setDoOutput(dooutput);
}
+ @Override
public void setIfModifiedSince(long ifmodifiedsince)
{
_conn.setIfModifiedSince(ifmodifiedsince);
}
+ @Override
public void setReadTimeout(int timeout)
{
_conn.setReadTimeout(timeout);
}
+ @Override
public void setRequestProperty(String key, String value)
{
_conn.setRequestProperty(key,value);
}
+ @Override
public void setUseCaches(boolean usecaches)
{
_conn.setUseCaches(usecaches);
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 e2eaaaa2c6b..1c33a4d5f38 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
@@ -55,6 +55,7 @@ public class AnnotationConfiguration extends org.eclipse.jetty.annotations.Annot
super(parser, handlers, resource);
}
+ @Override
public Void call() throws Exception
{
if (_parser != null)
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
index e52dd8e26e5..c885393aff3 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
@@ -129,6 +129,7 @@ public class AnnotationParser extends org.eclipse.jetty.annotations.AnnotationPa
TreeSet paths = new TreeSet(
new Comparator()
{
+ @Override
public int compare(String o1, String o2)
{
int paths1 = new StringTokenizer(o1,"/",false).countTokens();
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 a86026d9200..ef045288ff1 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
@@ -233,6 +233,7 @@ public abstract class AbstractContextProvider extends AbstractLifeCycle implemen
/**
* @see org.eclipse.jetty.deploy.AppProvider#createContextHandler(org.eclipse.jetty.deploy.App)
*/
+ @Override
public ContextHandler createContextHandler(App app) throws Exception
{
if (app == null)
@@ -246,6 +247,7 @@ public abstract class AbstractContextProvider extends AbstractLifeCycle implemen
}
/* ------------------------------------------------------------ */
+ @Override
public void setDeploymentManager(DeploymentManager deploymentManager)
{
_deploymentManager = deploymentManager;
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 7d264598bc0..1aa83a46841 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
@@ -146,6 +146,7 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
_webApp = webApp;
}
+ @Override
public String getContextPath()
{
return _contextPath;
@@ -624,6 +625,7 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
/**
* @see org.eclipse.jetty.deploy.AppProvider#setDeploymentManager(org.eclipse.jetty.deploy.DeploymentManager)
*/
+ @Override
public void setDeploymentManager(DeploymentManager deploymentManager)
{
_deploymentManager = deploymentManager;
@@ -631,6 +633,7 @@ public abstract class AbstractWebAppProvider extends AbstractLifeCycle implement
/* ------------------------------------------------------------ */
+ @Override
public ContextHandler createContextHandler(App app) throws Exception
{
if (app == null)
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 9447abdba8b..f35c8e237aa 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
@@ -154,6 +154,7 @@ public class BundleContextProvider extends AbstractContextProvider implements Bu
/* ------------------------------------------------------------ */
+ @Override
public boolean bundleAdded (Bundle bundle) throws Exception
{
if (bundle == null)
@@ -206,6 +207,7 @@ public class BundleContextProvider extends AbstractContextProvider implements Bu
* @param bundle the bundle
* @return true if this was a context we had deployed, false otherwise
*/
+ @Override
public boolean bundleRemoved (Bundle bundle) throws Exception
{
List apps = _bundleMap.remove(bundle);
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 2f7af241c0d..21ee0a12751 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
@@ -119,6 +119,7 @@ public class BundleWebAppProvider extends AbstractWebAppProvider implements Bund
/**
* @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart()
*/
+ @Override
protected void doStart() throws Exception
{
_webappTracker = new WebAppTracker(FrameworkUtil.getBundle(this.getClass()).getBundleContext(), getServerInstanceWrapper().getManagedServerName());
@@ -165,6 +166,7 @@ public class BundleWebAppProvider extends AbstractWebAppProvider implements Bund
* A bundle has been added that could be a webapp
* @param bundle the bundle
*/
+ @Override
public boolean bundleAdded (Bundle bundle) throws Exception
{
if (bundle == null)
@@ -249,6 +251,7 @@ public class BundleWebAppProvider extends AbstractWebAppProvider implements Bund
* @param bundle the bundle
* @return true if this was a webapp we had deployed, false otherwise
*/
+ @Override
public boolean bundleRemoved (Bundle bundle) throws Exception
{
App app = _bundleMap.remove(bundle);
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/JettyBootstrapActivator.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/JettyBootstrapActivator.java
index 5c4acbcc6ad..667792850cb 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/JettyBootstrapActivator.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/JettyBootstrapActivator.java
@@ -66,6 +66,7 @@ public class JettyBootstrapActivator implements BundleActivator
*
* @param context the bundle context
*/
+ @Override
public void start(final BundleContext context) throws Exception
{
INSTANCE = this;
@@ -91,6 +92,7 @@ public class JettyBootstrapActivator implements BundleActivator
* @see
* org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception
{
try
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
index 9fe4af96108..06f636ec675 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
@@ -45,6 +45,7 @@ public class OSGiDeployer extends StandardDeployer
/* ------------------------------------------------------------ */
+ @Override
public void processBinding(Node node, App app) throws Exception
{
//TODO how to NOT send this event if its not a webapp:
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiUndeployer.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiUndeployer.java
index bd3c15bd319..364a25d0a23 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiUndeployer.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiUndeployer.java
@@ -47,6 +47,7 @@ public class OSGiUndeployer extends StandardUndeployer
/* ------------------------------------------------------------ */
+ @Override
public void processBinding(Node node, App app) throws Exception
{
EventSender.getInstance().send(EventSender.UNDEPLOYING_EVENT, ((AbstractOSGiApp)app).getBundle(), app.getContextPath());
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 ab8d060fd04..8c7a780ea3f 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
@@ -146,6 +146,7 @@ public class ServiceContextProvider extends AbstractContextProvider implements S
/* ------------------------------------------------------------ */
+ @Override
public boolean serviceAdded (ServiceReference serviceRef, ContextHandler context)
{
if (context == null || serviceRef == null)
@@ -190,6 +191,7 @@ public class ServiceContextProvider extends AbstractContextProvider implements S
/* ------------------------------------------------------------ */
+ @Override
public boolean serviceRemoved (ServiceReference serviceRef, ContextHandler context)
{
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 6a6d6d0a4cf..bcb8f38a98b 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
@@ -156,6 +156,7 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser
*
* @param context the webapp
*/
+ @Override
public boolean serviceAdded (ServiceReference serviceRef, ContextHandler context)
{
if (context == null || !(context instanceof WebAppContext))
@@ -239,6 +240,7 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser
/**
* @param context the webapp
*/
+ @Override
public boolean serviceRemoved (ServiceReference serviceRef, ContextHandler context)
{
if (context == null || !(context instanceof WebAppContext))
@@ -262,6 +264,7 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser
/**
* @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart()
*/
+ @Override
protected void doStart() throws Exception
{
BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java
index 517bb109685..85d22e43e15 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java
@@ -123,6 +123,7 @@ public class OSGiWebappClassLoader extends WebAppClassLoader implements BundleRe
* @return The Bundle
object associated with this
* BundleReference
.
*/
+ @Override
public Bundle getBundle()
{
return _contributor;
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 16aec20b277..9fffcd97fbf 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
@@ -59,6 +59,7 @@ public class FakeURLClassLoader extends URLClassLoader
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
StringBuilder builder = new StringBuilder();
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/OSGiClassLoader.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/OSGiClassLoader.java
index 53353aff2e7..f59c340892a 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/OSGiClassLoader.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/OSGiClassLoader.java
@@ -62,6 +62,7 @@ public class OSGiClassLoader extends URLClassLoader
*
* Copied from WebAppClassLoader
*/
+ @Override
public URL getResource(String name)
{
URL url= null;
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultBundleClassLoaderHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultBundleClassLoaderHelper.java
index afaa2a97b84..5e7bb6170c5 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultBundleClassLoaderHelper.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultBundleClassLoaderHelper.java
@@ -135,6 +135,7 @@ public class DefaultBundleClassLoaderHelper implements BundleClassLoaderHelper
* @param bundle the bundle
* @return classloader object
*/
+ @Override
public ClassLoader getBundleClassLoader(Bundle bundle)
{
String bundleActivator = (String) bundle.getHeaders().get("Bundle-Activator");
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
index c44725b220d..238a706c448 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
@@ -88,6 +88,7 @@ public class DefaultFileLocatorHelper implements BundleFileLocatorHelper
* @return Its installation location as a file.
* @throws Exception if unable to get the bundle install location
*/
+ @Override
public File getBundleInstallLocation(Bundle bundle) throws Exception
{
// String installedBundles = System.getProperty("osgi.bundles");
@@ -214,6 +215,7 @@ public class DefaultFileLocatorHelper implements BundleFileLocatorHelper
* @return file object
* @throws Exception if unable to get the file in the bundle
*/
+ @Override
public File getFileInBundle(Bundle bundle, String path) throws Exception
{
if (path != null && path.length() > 0 && path.charAt(0) == '/')
@@ -240,6 +242,7 @@ public class DefaultFileLocatorHelper implements BundleFileLocatorHelper
* @param entryPath the entry path
* @return null or all the entries found for that path.
*/
+ @Override
public Enumeration findEntries(Bundle bundle, String entryPath)
{
int last = entryPath.lastIndexOf('/');
@@ -267,6 +270,7 @@ public class DefaultFileLocatorHelper implements BundleFileLocatorHelper
* @return The jar(s) file that is either the bundle itself, either the jars
* embedded inside it.
*/
+ @Override
public File[] locateJarsInsideBundle(Bundle bundle) throws Exception
{
File jasperLocation = getBundleInstallLocation(bundle);
@@ -317,6 +321,7 @@ public class DefaultFileLocatorHelper implements BundleFileLocatorHelper
*
* @return a URL to the bundle entry that uses a common protocol
*/
+ @Override
public URL getLocalURL(URL url)
throws Exception
{
@@ -348,6 +353,7 @@ public class DefaultFileLocatorHelper implements BundleFileLocatorHelper
*
* @throws Exception if unable to get the file url
*/
+ @Override
public URL getFileURL(URL url) throws Exception
{
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/PackageAdminServiceTracker.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/PackageAdminServiceTracker.java
index 47cba90371f..a4bc711f359 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/PackageAdminServiceTracker.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/PackageAdminServiceTracker.java
@@ -110,6 +110,7 @@ public class PackageAdminServiceTracker implements ServiceListener
*
* @param event The ServiceEvent
object.
*/
+ @Override
public void serviceChanged(ServiceEvent event)
{
if (event.getType() == ServiceEvent.REGISTERED)
diff --git a/jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java b/jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
index a8ff3497d12..3abe2a26536 100644
--- a/jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
+++ b/jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
@@ -42,6 +42,7 @@ public class Activator implements BundleActivator
*
* @param context
*/
+ @Override
public void start(final BundleContext context) throws Exception
{
ContextHandler ch = new ContextHandler();
@@ -72,6 +73,7 @@ public class Activator implements BundleActivator
* @see
* org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception
{
_sr.unregister();
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 a5ee135cc09..a45f567d57d 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
@@ -44,6 +44,7 @@ public class Activator implements BundleActivator
*
* @param context
*/
+ @Override
public void start(BundleContext context) throws Exception
{
//For test purposes, use a random port
@@ -81,6 +82,7 @@ public class Activator implements BundleActivator
* @see
* org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception
{
_sr.unregister();
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 368e2f956aa..c73ce4945bf 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
@@ -71,6 +71,7 @@ public class Activator implements BundleActivator
*
* @param context
*/
+ @Override
public void start(BundleContext context) throws Exception
{
//Create webappA as a Service and target it at the default server
@@ -98,6 +99,7 @@ public class Activator implements BundleActivator
* @see
* org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception
{
_srA.unregister();
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java
index a647d08ed57..553f003b4f6 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java
@@ -147,6 +147,7 @@ public class ContainerInitializer
}
}
+ @Override
public String toString()
{
List interested = Collections.emptyList();
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java
index 2681c8f1a4b..ee6d41fa8ca 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java
@@ -155,6 +155,7 @@ public abstract class LifeCycleCallback
}
}
+ @Override
public boolean equals (Object o)
{
if (o==null)
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PostConstructCallback.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PostConstructCallback.java
index b9018a09185..d025c9c0cf7 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PostConstructCallback.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PostConstructCallback.java
@@ -38,6 +38,7 @@ public class PostConstructCallback extends LifeCycleCallback
* - cannot be static
* @see org.eclipse.jetty.plus.annotation.LifeCycleCallback#validate(java.lang.Class, java.lang.reflect.Method)
*/
+ @Override
public void validate(Class> clazz, Method method)
{
if (method.getExceptionTypes().length > 0)
@@ -51,12 +52,14 @@ public class PostConstructCallback extends LifeCycleCallback
}
+ @Override
public void callback (Object instance)
throws SecurityException, IllegalArgumentException, NoSuchMethodException, ClassNotFoundException, IllegalAccessException, InvocationTargetException
{
super.callback(instance);
}
+ @Override
public boolean equals (Object o)
{
if (super.equals(o) && (o instanceof PostConstructCallback))
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PreDestroyCallback.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PreDestroyCallback.java
index 51d4f2eb513..7fa9eab0e22 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PreDestroyCallback.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/PreDestroyCallback.java
@@ -42,6 +42,7 @@ public class PreDestroyCallback extends LifeCycleCallback
* - not static
* @see org.eclipse.jetty.plus.annotation.LifeCycleCallback#validate(java.lang.Class, java.lang.reflect.Method)
*/
+ @Override
public void validate(Class> clazz, Method method)
{
@@ -57,6 +58,7 @@ public class PreDestroyCallback extends LifeCycleCallback
}
+ @Override
public void callback(Object instance)
{
try
@@ -69,6 +71,7 @@ public class PreDestroyCallback extends LifeCycleCallback
}
}
+ @Override
public boolean equals(Object o)
{
if (super.equals(o) && (o instanceof PreDestroyCallback))
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Link.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Link.java
index 2184e65141a..6e2703c0fab 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Link.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Link.java
@@ -42,6 +42,7 @@ public class Link extends NamingEntry
_link=link;
}
+ @Override
public void bindToENC(String localName) throws NamingException
{
throw new UnsupportedOperationException("Method not supported for Link objects");
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntry.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntry.java
index 1a0bbd2cebf..df4f90b1b5f 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntry.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/NamingEntry.java
@@ -49,6 +49,7 @@ public abstract class NamingEntry
protected String _objectNameString; //the name of the object relative to the context it is stored in
+ @Override
public String toString()
{
return _jndiName;
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Transaction.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Transaction.java
index 9f91d22782b..f8053021a16 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Transaction.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/jndi/Transaction.java
@@ -68,6 +68,7 @@ public class Transaction extends NamingEntry
* These should be in ADDITION to java:comp/UserTransaction
* @see NamingEntry#bindToENC(java.lang.String)
*/
+ @Override
public void bindToENC (String localName)
throws NamingException
{
@@ -94,6 +95,7 @@ public class Transaction extends NamingEntry
/**
* Unbind this Transaction from a java:comp
*/
+ @Override
public void unbindENC ()
{
try
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
index c7b4770776d..f807044e194 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
@@ -285,6 +285,7 @@ public class DataSourceLoginService extends AbstractLoginService
/* ------------------------------------------------------------ */
+ @Override
public UserPrincipal loadUserInfo (String username)
{
try
@@ -318,6 +319,7 @@ public class DataSourceLoginService extends AbstractLoginService
/* ------------------------------------------------------------ */
+ @Override
public String[] loadRoleInfo (UserPrincipal user)
{
DBUserPrincipal dbuser = (DBUserPrincipal)user;
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java
index 1b108199125..48215f44d18 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java
@@ -98,10 +98,12 @@ public class EnvConfiguration extends AbstractConfiguration
final List bindings = new ArrayList();
NamingContext.Listener listener = new NamingContext.Listener()
{
+ @Override
public void unbind(NamingContext ctx, Binding binding)
{
}
+ @Override
public Binding bind(NamingContext ctx, Binding binding)
{
bindings.add(new Bound(ctx,binding.getName()));
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDecorator.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDecorator.java
index 1967914c071..c00c9a02d2a 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDecorator.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/PlusDecorator.java
@@ -42,6 +42,7 @@ public class PlusDecorator implements Decorator
_context = context;
}
+ @Override
public Object decorate (Object o)
{
@@ -68,6 +69,7 @@ public class PlusDecorator implements Decorator
return o;
}
+ @Override
public void destroy (Object o)
{
LifeCycleCallbackCollection callbacks = (LifeCycleCallbackCollection)_context.getAttribute(LifeCycleCallbackCollection.LIFECYCLE_CALLBACK_COLLECTION);
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 462d7ea3476..fe898053122 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
@@ -73,6 +73,7 @@ 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)
{
@@ -102,6 +103,7 @@ public class PlusDescriptorProcessor extends IterativeDescriptorProcessor
/**
* {@inheritDoc}
*/
+ @Override
public void end(WebAppContext context,Descriptor descriptor)
{
}
diff --git a/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java b/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java
index af0430d2e9d..8030e7f079d 100644
--- a/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java
+++ b/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java
@@ -49,6 +49,7 @@ public class TestNamingEntries
{
public class ScopeA
{
+ @Override
public String toString()
{
return this.getClass().getName()+"@"+super.hashCode();
@@ -77,6 +78,7 @@ public class TestNamingEntries
{
}
+ @Override
public Object getObjectInstance(Object arg0, Name arg1, Context arg2, Hashtable arg3) throws Exception
{
Reference ref = (Reference)arg0;
@@ -99,6 +101,7 @@ public class TestNamingEntries
super(Integer.parseInt(value.trim()));
}
+ @Override
public Reference getReference() throws NamingException
{
RefAddr refAddr = new StringRefAddr("val", String.valueOf(getValue()));
@@ -112,6 +115,7 @@ public class TestNamingEntries
{
}
+ @Override
public Object getObjectInstance(Object arg0, Name arg1, Context arg2, Hashtable arg3) throws Exception
{
Reference ref = (Reference)arg0;
diff --git a/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntryUtil.java b/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntryUtil.java
index dd4ca531ed5..354dbda96af 100644
--- a/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntryUtil.java
+++ b/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntryUtil.java
@@ -48,6 +48,7 @@ public class TestNamingEntryUtil
public class ScopeA
{
+ @Override
public String toString()
{
return this.getClass().getName()+"@"+Long.toHexString(super.hashCode());
diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerSSLTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerSSLTest.java
index 7c17a6f9e40..084f2083045 100644
--- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerSSLTest.java
+++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerSSLTest.java
@@ -158,6 +158,7 @@ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest
private static class ServerHandler extends AbstractHandler
{
+ @Override
public void handle(String target, Request request, HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws IOException, ServletException
{
request.setHandled(true);
diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
index 2f69fe3f1e1..55655364b2b 100644
--- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
+++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
@@ -807,6 +807,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
private static class ServerHandler extends AbstractHandler
{
+ @Override
public void handle(String target, Request request, HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws IOException, ServletException
{
request.setHandled(true);
diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ForwardProxyTLSServerTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ForwardProxyTLSServerTest.java
index 8923829b463..7302f2826f9 100644
--- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ForwardProxyTLSServerTest.java
+++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ForwardProxyTLSServerTest.java
@@ -630,6 +630,7 @@ public class ForwardProxyTLSServerTest
private static class ServerHandler extends AbstractHandler
{
+ @Override
public void handle(String target, Request request, HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws IOException, ServletException
{
request.setHandled(true);
diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java
index 45d6ba438ce..b4c9f92e68e 100644
--- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java
+++ b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java
@@ -118,6 +118,7 @@ public class ValidUrlRule extends Rule
return (!Character.isISOControl(codepoint)) && block != null && block != Character.UnicodeBlock.SPECIALS;
}
+ @Override
public String toString()
{
return super.toString() + "[" + _code + ":" + _reason + "]";
diff --git a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RegexRuleTest.java b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RegexRuleTest.java
index ccd63aca9e6..80edde697d8 100644
--- a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RegexRuleTest.java
+++ b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RegexRuleTest.java
@@ -112,6 +112,7 @@ public class RegexRuleTest
private class TestRegexRule extends RegexRule
{
+ @Override
public String apply(String target,HttpServletRequest request,HttpServletResponse response, Matcher matcher) throws IOException
{
return target;
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 11a68528c12..7e8ea64a9e0 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
@@ -55,6 +55,7 @@ public abstract class AbstractLoginService extends AbstractLifeCycle implements
{
_roleName=name;
}
+ @Override
public String getName()
{
return _roleName;
@@ -93,6 +94,7 @@ public abstract class AbstractLoginService extends AbstractLifeCycle implements
}
/* ------------------------------------------------------------ */
+ @Override
public String getName()
{
return _name;
@@ -128,6 +130,7 @@ public abstract class AbstractLoginService extends AbstractLifeCycle implements
/** Set the identityService.
* @param identityService the identityService to set
*/
+ @Override
public void setIdentityService(IdentityService identityService)
{
if (isRunning())
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultAuthenticatorFactory.java b/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultAuthenticatorFactory.java
index 65800e93537..588464545f1 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultAuthenticatorFactory.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultAuthenticatorFactory.java
@@ -54,6 +54,7 @@ public class DefaultAuthenticatorFactory implements Authenticator.Factory
{
LoginService _loginService;
+ @Override
public Authenticator getAuthenticator(Server server, ServletContext context, AuthConfiguration configuration, IdentityService identityService, LoginService loginService)
{
String auth=configuration.getAuthMethod();
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultIdentityService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultIdentityService.java
index 33a39289e53..fc608ac2fc9 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultIdentityService.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultIdentityService.java
@@ -48,40 +48,47 @@ public class DefaultIdentityService implements IdentityService
* If there are roles refs present in the scope, then wrap the UserIdentity
* with one that uses the role references in the {@link UserIdentity#isUserInRole(String, org.eclipse.jetty.server.UserIdentity.Scope)}
*/
+ @Override
public Object associate(UserIdentity user)
{
return null;
}
/* ------------------------------------------------------------ */
+ @Override
public void disassociate(Object previous)
{
}
/* ------------------------------------------------------------ */
+ @Override
public Object setRunAs(UserIdentity user, RunAsToken token)
{
return token;
}
/* ------------------------------------------------------------ */
+ @Override
public void unsetRunAs(Object lastToken)
{
}
/* ------------------------------------------------------------ */
+ @Override
public RunAsToken newRunAsToken(String runAsName)
{
return new RoleRunAsToken(runAsName);
}
/* ------------------------------------------------------------ */
+ @Override
public UserIdentity getSystemUserIdentity()
{
return null;
}
/* ------------------------------------------------------------ */
+ @Override
public UserIdentity newUserIdentity(final Subject subject, final Principal userPrincipal, final String[] roles)
{
return new DefaultUserIdentity(subject,userPrincipal,roles);
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultUserIdentity.java b/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultUserIdentity.java
index e73bb2b64ee..4c2644985fb 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultUserIdentity.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultUserIdentity.java
@@ -43,16 +43,19 @@ public class DefaultUserIdentity implements UserIdentity
_roles=roles;
}
+ @Override
public Subject getSubject()
{
return _subject;
}
+ @Override
public Principal getUserPrincipal()
{
return _userPrincipal;
}
+ @Override
public boolean isUserInRole(String role, Scope scope)
{
//Servlet Spec 3.1, pg 125
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 b6aa5b53db8..8f08a6f1d72 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
@@ -219,6 +219,7 @@ public class JDBCLoginService extends AbstractLoginService
/* ------------------------------------------------------------ */
+ @Override
public UserPrincipal loadUserInfo (String username)
{
try
@@ -255,6 +256,7 @@ public class JDBCLoginService extends AbstractLoginService
/* ------------------------------------------------------------ */
+ @Override
public String[] loadRoleInfo (UserPrincipal user)
{
JDBCUserPrincipal jdbcUser = (JDBCUserPrincipal)user;
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java b/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
index 0f19c69c717..ee4925a3df0 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
@@ -321,6 +321,7 @@ public class PropertyUserStore extends UserStore implements PathWatcher.Listener
*
* @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart()
*/
+ @Override
protected void doStart() throws Exception
{
super.doStart();
@@ -358,6 +359,7 @@ public class PropertyUserStore extends UserStore implements PathWatcher.Listener
/**
* @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop()
*/
+ @Override
protected void doStop() throws Exception
{
super.doStop();
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/RoleRunAsToken.java b/jetty-security/src/main/java/org/eclipse/jetty/security/RoleRunAsToken.java
index 5e87a700d40..ee4278ecc74 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/RoleRunAsToken.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/RoleRunAsToken.java
@@ -37,6 +37,7 @@ public class RoleRunAsToken implements RunAsToken
return _runAsRole;
}
+ @Override
public String toString()
{
return "RoleRunAsToken("+_runAsRole+")";
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoUserIdentity.java b/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoUserIdentity.java
index 4a7387210eb..d787d98c5bf 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoUserIdentity.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoUserIdentity.java
@@ -39,16 +39,19 @@ public class SpnegoUserIdentity implements UserIdentity
}
+ @Override
public Subject getSubject()
{
return _subject;
}
+ @Override
public Principal getUserPrincipal()
{
return _principal;
}
+ @Override
public boolean isUserInRole(String role, Scope scope)
{
return _roles.contains(role);
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoUserPrincipal.java b/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoUserPrincipal.java
index 4a4cc3e048e..b503cf6d2be 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoUserPrincipal.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoUserPrincipal.java
@@ -40,6 +40,7 @@ public class SpnegoUserPrincipal implements Principal
_token = token;
}
+ @Override
public String getName()
{
return _name;
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/UserAuthentication.java b/jetty-security/src/main/java/org/eclipse/jetty/security/UserAuthentication.java
index a7cfcc7628f..cfbbdcb1560 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/UserAuthentication.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/UserAuthentication.java
@@ -39,6 +39,7 @@ public class UserAuthentication extends AbstractUserAuthentication
return "{User,"+getAuthMethod()+","+_userIdentity+"}";
}
+ @Override
public void logout()
{
SecurityHandler security=SecurityHandler.getCurrentSecurityHandler();
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 09a4588a615..6c26254171c 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
@@ -315,6 +315,7 @@ public class DeferredAuthentication implements Authentication.Deferred
{
}
+ @Override
public void setContentLengthLong(long len)
{
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginCallbackImpl.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginCallbackImpl.java
index 39f366272ac..16cd018449e 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginCallbackImpl.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginCallbackImpl.java
@@ -53,51 +53,61 @@ public class LoginCallbackImpl implements LoginCallback
this.credential = credential;
}
+ @Override
public Subject getSubject()
{
return subject;
}
+ @Override
public String getUserName()
{
return userName;
}
+ @Override
public Object getCredential()
{
return credential;
}
+ @Override
public boolean isSuccess()
{
return success;
}
+ @Override
public void setSuccess(boolean success)
{
this.success = success;
}
+ @Override
public Principal getUserPrincipal()
{
return userPrincipal;
}
+ @Override
public void setUserPrincipal(Principal userPrincipal)
{
this.userPrincipal = userPrincipal;
}
+ @Override
public String[] getRoles()
{
return roles;
}
+ @Override
public void setRoles(String[] groups)
{
this.roles = groups;
}
+ @Override
public void clearPassword()
{
if (credential != null)
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java
index 9e989eb6517..016564c578f 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java
@@ -75,6 +75,7 @@ public class SessionAuthentication extends AbstractUserAuthentication implements
LOG.debug("Deserialized and relogged in {}",this);
}
+ @Override
public void logout()
{
if (_session!=null && _session.getAttribute(__J_AUTHENTICATED)!=null)
diff --git a/jetty-security/src/test/java/org/eclipse/jetty/security/PropertyUserStoreTest.java b/jetty-security/src/test/java/org/eclipse/jetty/security/PropertyUserStoreTest.java
index 31e1de8cc9e..0d710123c11 100644
--- a/jetty-security/src/test/java/org/eclipse/jetty/security/PropertyUserStoreTest.java
+++ b/jetty-security/src/test/java/org/eclipse/jetty/security/PropertyUserStoreTest.java
@@ -62,6 +62,7 @@ public class PropertyUserStoreTest
{
}
+ @Override
public void update(String username, Credential credential, String[] roleArray)
{
if (!users.contains(username))
@@ -71,6 +72,7 @@ public class PropertyUserStoreTest
}
}
+ @Override
public void remove(String username)
{
users.remove(username);
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java
index 47910b88b68..4a79b9eada4 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNetworkConnector.java
@@ -106,6 +106,7 @@ public abstract class AbstractNetworkConnector extends AbstractConnector impleme
return super.shutdown();
}
+ @Override
protected boolean handleAcceptFailure(Throwable ex)
{
if (isOpen())
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java
index 912a4605abf..b942f8ff962 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java
@@ -332,6 +332,7 @@ public class CachedContentFactory implements HttpContent.ContentFactory
SortedSet sorted= new TreeSet(
new Comparator()
{
+ @Override
public int compare(CachedHttpContent c1, CachedHttpContent c2)
{
if (c1._lastAccessed getHeaderNames()
{
return null;
@@ -132,6 +151,7 @@ public class ServletResponseHttpWrapper extends ServletResponseWrapper implement
/**
* @see javax.servlet.http.HttpServletResponse#getHeaders(java.lang.String)
*/
+ @Override
public Collection getHeaders(String name)
{
return null;
@@ -140,6 +160,7 @@ public class ServletResponseHttpWrapper extends ServletResponseWrapper implement
/**
* @see javax.servlet.http.HttpServletResponse#getStatus()
*/
+ @Override
public int getStatus()
{
return 0;
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/UserIdentity.java b/jetty-server/src/main/java/org/eclipse/jetty/server/UserIdentity.java
index 808934dcb5c..1f63407bec5 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/UserIdentity.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/UserIdentity.java
@@ -92,16 +92,19 @@ public interface UserIdentity
/* ------------------------------------------------------------ */
public static final UserIdentity UNAUTHENTICATED_IDENTITY = new UnauthenticatedUserIdentity()
{
+ @Override
public Subject getSubject()
{
return null;
}
+ @Override
public Principal getUserPrincipal()
{
return null;
}
+ @Override
public boolean isUserInRole(String role, Scope scope)
{
return false;
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/MovedContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/MovedContextHandler.java
index eee0f245059..c0622078303 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/MovedContextHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/MovedContextHandler.java
@@ -101,6 +101,7 @@ public class MovedContextHandler extends ContextHandler
private class Redirector extends AbstractHandler
{
+ @Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
if (_newContextURL==null)
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
index 030d31619df..99ea4115d73 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
@@ -84,6 +84,7 @@ public class GzipHttpOutputInterceptor implements HttpOutput.Interceptor
_syncFlush=syncFlush;
}
+ @Override
public HttpOutput.Interceptor getNextInterceptor()
{
return _interceptor;
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 9901af3286b..0c6fc1b2731 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
@@ -105,6 +105,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
* @param data the session data
* @return a new Session object
*/
+ @Override
public abstract Session newSession (SessionData data);
@@ -188,6 +189,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
/**
* @return the SessionManger
*/
+ @Override
public SessionHandler getSessionHandler()
{
return _handler;
@@ -197,6 +199,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
/**
* @see org.eclipse.jetty.server.session.SessionCache#initialize(org.eclipse.jetty.server.session.SessionContext)
*/
+ @Override
public void initialize (SessionContext context)
{
if (isStarted())
@@ -236,6 +239,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
/**
* @return the SessionDataStore or null if there isn't one
*/
+ @Override
public SessionDataStore getSessionDataStore()
{
return _sessionDataStore;
@@ -244,6 +248,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
/**
* @see org.eclipse.jetty.server.session.SessionCache#setSessionDataStore(org.eclipse.jetty.server.session.SessionDataStore)
*/
+ @Override
public void setSessionDataStore(SessionDataStore sessionStore)
{
updateBean(_sessionDataStore, sessionStore);
@@ -259,6 +264,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
* @see org.eclipse.jetty.server.session.SessionCache#getEvictionPolicy()
*/
@ManagedAttribute(value="session eviction policy", readonly=true)
+ @Override
public int getEvictionPolicy()
{
return _evictionPolicy;
@@ -272,6 +278,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
*
* @see org.eclipse.jetty.server.session.SessionCache#setEvictionPolicy(int)
*/
+ @Override
public void setEvictionPolicy(int evictionTimeout)
{
_evictionPolicy = evictionTimeout;
@@ -689,6 +696,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
*
* @param session session to check
*/
+ @Override
public void checkInactiveSession (Session session)
{
if (session == null)
@@ -735,6 +743,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements
/**
* @see org.eclipse.jetty.server.session.SessionCache#renewSessionId(java.lang.String, java.lang.String)
*/
+ @Override
public Session renewSessionId (String oldId, String newId)
throws Exception
{
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionDataStore.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionDataStore.java
index 097d952a108..05163a334aa 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionDataStore.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionDataStore.java
@@ -69,6 +69,7 @@ public abstract class AbstractSessionDataStore extends ContainerLifeCycle implem
/**
* @see org.eclipse.jetty.server.session.SessionDataStore#initialize(org.eclipse.jetty.server.session.SessionContext)
*/
+ @Override
public void initialize (SessionContext context) throws Exception
{
if (isStarted())
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 56c7327fa8e..7056dac5100 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
@@ -115,6 +115,7 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi
/**
* @param houseKeeper the housekeeper
*/
+ @Override
public void setSessionHouseKeeper (HouseKeeper houseKeeper)
{
updateBean(_houseKeeper, houseKeeper);
@@ -126,6 +127,7 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi
/**
* @return the housekeeper
*/
+ @Override
public HouseKeeper getSessionHouseKeeper()
{
return _houseKeeper;
@@ -475,6 +477,7 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi
}
/* ------------------------------------------------------------ */
+ @Override
public void invalidateAll (String id)
{
//tell all contexts that may have a session object with this id to
@@ -516,6 +519,7 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi
*
* @return all session managers
*/
+ @Override
public Set getSessionHandlers()
{
Set handlers = new HashSet<>();
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStore.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStore.java
index 87afebbccb1..0ceb94a6674 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStore.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionDataStore.java
@@ -284,6 +284,7 @@ public class FileSessionDataStore extends AbstractSessionDataStore
final AtomicReference exception = new AtomicReference();
Runnable r = new Runnable()
{
+ @Override
public void run ()
{
//load session info from its file
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java
index de2e185744a..53d36272c5c 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionDataStore.java
@@ -632,6 +632,7 @@ public class JDBCSessionDataStore extends AbstractSessionDataStore
Runnable r = new Runnable()
{
+ @Override
public void run ()
{
try (Connection connection = _dbAdaptor.getConnection();
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionContext.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionContext.java
index cda6a7e7c55..d982a469638 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionContext.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionContext.java
@@ -78,6 +78,7 @@ public class SessionContext
return _vhost;
}
+ @Override
public String toString ()
{
return _workerName+"_"+_canonicalContextPath +"_"+_vhost;
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java
index 630e670ff81..b86d3c2ac8b 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java
@@ -375,6 +375,7 @@ public class SessionData implements Serializable
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
StringBuilder builder = new StringBuilder();
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 b9713da2854..3cf455ec8ab 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
@@ -226,6 +226,7 @@ public abstract class ConnectorCloseTestBase extends HttpServerTestFixture
/**
* @see java.lang.Runnable#run()
*/
+ @Override
public void run()
{
try
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java
index 008ea09cc53..e11bc76dc7c 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java
@@ -69,6 +69,7 @@ public abstract class ConnectorTimeoutTest extends HttpServerTestFixture
}
@Before
+ @Override
public void before()
{
super.before();
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
index b81eb9ec574..9027bfefbf7 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
@@ -271,6 +271,7 @@ public class HttpServerTestFixture
public final static HostnameVerifier __hostnameverifier = new HostnameVerifier()
{
+ @Override
public boolean verify(String hostname, SSLSession session)
{
return true;
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java
index ef950ea1aff..2cf85e1db72 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java
@@ -60,6 +60,7 @@ public class DebugHandlerTest
{
public final static HostnameVerifier __hostnameverifier = new HostnameVerifier()
{
+ @Override
public boolean verify(String hostname, SSLSession session)
{
return true;
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java
index 804539e70ad..5c982e205fd 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java
@@ -389,6 +389,7 @@ public class SSLEngineTest
{
private int bytes=0;
+ @Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
response.setContentType("text/plain");
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java
index 06d2aa08dd8..9fb7462628a 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java
@@ -225,6 +225,7 @@ public class FilterHolder extends Holder
/* ------------------------------------------------------------ */
protected class Registration extends HolderRegistration implements FilterRegistration.Dynamic
{
+ @Override
public void addMappingForServletNames(EnumSet dispatcherTypes, boolean isMatchAfter, String... servletNames)
{
illegalStateIfContextStarted();
@@ -238,6 +239,7 @@ public class FilterHolder extends Holder
_servletHandler.prependFilterMapping(mapping);
}
+ @Override
public void addMappingForUrlPatterns(EnumSet dispatcherTypes, boolean isMatchAfter, String... urlPatterns)
{
illegalStateIfContextStarted();
@@ -251,6 +253,7 @@ public class FilterHolder extends Holder
_servletHandler.prependFilterMapping(mapping);
}
+ @Override
public Collection getServletNameMappings()
{
FilterMapping[] mappings =_servletHandler.getFilterMappings();
@@ -266,6 +269,7 @@ public class FilterHolder extends Holder
return names;
}
+ @Override
public Collection getUrlPatternMappings()
{
FilterMapping[] mappings =_servletHandler.getFilterMappings();
@@ -287,6 +291,7 @@ public class FilterHolder extends Holder
class Config extends HolderConfig implements FilterConfig
{
/* ------------------------------------------------------------ */
+ @Override
public String getFilterName()
{
return _name;
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java
index e9404a7f024..e37eef01166 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterMapping.java
@@ -291,6 +291,7 @@ public class FilterMapping implements Dumpable
}
/* ------------------------------------------------------------ */
+ @Override
public String toString()
{
return
@@ -301,12 +302,14 @@ public class FilterMapping implements Dumpable
}
/* ------------------------------------------------------------ */
+ @Override
public void dump(Appendable out, String indent) throws IOException
{
out.append(String.valueOf(this)).append("\n");
}
/* ------------------------------------------------------------ */
+ @Override
public String dump()
{
return ContainerLifeCycle.dump(this);
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java
index e7d0299a491..a2e9924207d 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java
@@ -121,6 +121,7 @@ public class Holder extends BaseHolder
/**
* @param className The className to set.
*/
+ @Override
public void setClassName(String className)
{
super.setClassName(className);
@@ -132,6 +133,7 @@ public class Holder extends BaseHolder
/**
* @param held The class to hold
*/
+ @Override
public void setHeldClass(Class extends T> held)
{
super.setHeldClass(held);
@@ -239,6 +241,7 @@ public class Holder extends BaseHolder
/* -------------------------------------------------------- */
protected class HolderRegistration implements Registration.Dynamic
{
+ @Override
public void setAsyncSupported(boolean isAsyncSupported)
{
illegalStateIfContextStarted();
@@ -251,26 +254,31 @@ public class Holder extends BaseHolder
LOG.debug(this+" is "+description);
}
+ @Override
public String getClassName()
{
return Holder.this.getClassName();
}
+ @Override
public String getInitParameter(String name)
{
return Holder.this.getInitParameter(name);
}
+ @Override
public Map getInitParameters()
{
return Holder.this.getInitParameters();
}
+ @Override
public String getName()
{
return Holder.this.getName();
}
+ @Override
public boolean setInitParameter(String name, String value)
{
illegalStateIfContextStarted();
@@ -286,6 +294,7 @@ public class Holder extends BaseHolder
return true;
}
+ @Override
public Set setInitParameters(Map initParameters)
{
illegalStateIfContextStarted();
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java
index afd50d3c9bc..f827c192da8 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java
@@ -79,6 +79,7 @@ public class Invoker extends HttpServlet
private boolean _verbose;
/* ------------------------------------------------------------ */
+ @Override
public void init()
{
ServletContext config=getServletContext();
@@ -112,6 +113,7 @@ public class Invoker extends HttpServlet
}
/* ------------------------------------------------------------ */
+ @Override
protected void service(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException
{
@@ -265,6 +267,7 @@ public class Invoker extends HttpServlet
}
/* ------------------------------------------------------------ */
+ @Override
public String getServletPath()
{
if (_included)
@@ -273,6 +276,7 @@ public class Invoker extends HttpServlet
}
/* ------------------------------------------------------------ */
+ @Override
public String getPathInfo()
{
if (_included)
@@ -281,6 +285,7 @@ public class Invoker extends HttpServlet
}
/* ------------------------------------------------------------ */
+ @Override
public Object getAttribute(String name)
{
if (_included)
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 9ba691f4d82..cefa625d8c2 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
@@ -33,6 +33,7 @@ public class NoJspServlet 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
{
if (!_warned)
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 672d0025681..31edea23d58 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
@@ -686,6 +686,7 @@ public class ServletContextHandler extends ContextHandler
* Insert a HandlerWrapper before the first Session,Security or ServletHandler
* but after any other HandlerWrappers.
*/
+ @Override
public void insertHandler(HandlerWrapper handler)
{
if (handler instanceof SessionHandler)
@@ -805,6 +806,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getUrlPatterns()
*/
+ @Override
public Collection getUrlPatterns()
{
return new ArrayList(_urlPatterns); // spec says must be a copy
@@ -819,6 +821,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getElIgnored()
*/
+ @Override
public String getElIgnored()
{
return _elIgnored;
@@ -832,6 +835,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getPageEncoding()
*/
+ @Override
public String getPageEncoding()
{
return _pageEncoding;
@@ -880,6 +884,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getScriptingInvalid()
*/
+ @Override
public String getScriptingInvalid()
{
return _scriptingInvalid;
@@ -888,6 +893,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getIsXml()
*/
+ @Override
public String getIsXml()
{
return _isXml;
@@ -896,6 +902,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getIncludePreludes()
*/
+ @Override
public Collection getIncludePreludes()
{
return new ArrayList(_includePreludes); //must be a copy
@@ -910,6 +917,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getIncludeCodas()
*/
+ @Override
public Collection getIncludeCodas()
{
return new ArrayList(_includeCodas); //must be a copy
@@ -924,6 +932,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getDeferredSyntaxAllowedAsLiteral()
*/
+ @Override
public String getDeferredSyntaxAllowedAsLiteral()
{
return _deferredSyntaxAllowedAsLiteral;
@@ -932,6 +941,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getTrimDirectiveWhitespaces()
*/
+ @Override
public String getTrimDirectiveWhitespaces()
{
return _trimDirectiveWhitespaces;
@@ -940,6 +950,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getDefaultContentType()
*/
+ @Override
public String getDefaultContentType()
{
return _defaultContentType;
@@ -948,6 +959,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getBuffer()
*/
+ @Override
public String getBuffer()
{
return _buffer;
@@ -956,11 +968,13 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspPropertyGroupDescriptor#getErrorOnUndeclaredNamespace()
*/
+ @Override
public String getErrorOnUndeclaredNamespace()
{
return _errorOnUndeclaredNamespace;
}
+ @Override
public String toString ()
{
StringBuffer sb = new StringBuffer();
@@ -991,6 +1005,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.TaglibDescriptor#getTaglibURI()
*/
+ @Override
public String getTaglibURI()
{
return _uri;
@@ -1004,6 +1019,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.TaglibDescriptor#getTaglibLocation()
*/
+ @Override
public String getTaglibLocation()
{
return _location;
@@ -1014,6 +1030,7 @@ public class ServletContextHandler extends ContextHandler
_location = location;
}
+ @Override
public String toString()
{
return ("TagLibDescriptor: taglib-uri="+_uri+" location="+_location);
@@ -1032,6 +1049,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspConfigDescriptor#getTaglibs()
*/
+ @Override
public Collection getTaglibs()
{
return new ArrayList(_taglibs);
@@ -1045,6 +1063,7 @@ public class ServletContextHandler extends ContextHandler
/**
* @see javax.servlet.descriptor.JspConfigDescriptor#getJspPropertyGroups()
*/
+ @Override
public Collection getJspPropertyGroups()
{
return new ArrayList(_jspPropertyGroups);
@@ -1055,6 +1074,7 @@ public class ServletContextHandler extends ContextHandler
_jspPropertyGroups.add(g);
}
+ @Override
public String toString()
{
StringBuffer sb = new StringBuffer();
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 08890281553..a2aaf7fe9c5 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
@@ -233,12 +233,14 @@ public class ServletHolder extends Holder implements UserIdentity.Scope
}
/* ------------------------------------------------------------ */
+ @Override
public boolean equals(Object o)
{
return o instanceof ServletHolder && compareTo((ServletHolder)o)==0;
}
/* ------------------------------------------------------------ */
+ @Override
public int hashCode()
{
return _name==null?System.identityHashCode(this):_name.hashCode();
@@ -304,6 +306,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope
/* ------------------------------------------------------------ */
+ @Override
public void doStart()
throws Exception
{
@@ -436,6 +439,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope
/* ------------------------------------------------------------ */
+ @Override
public void doStop()
throws Exception
{
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletMapping.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletMapping.java
index 464b8ea680c..a01c543fadf 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletMapping.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletMapping.java
@@ -133,6 +133,7 @@ public class ServletMapping
}
/* ------------------------------------------------------------ */
+ @Override
public String toString()
{
return (_pathSpecs==null?"[]":Arrays.asList(_pathSpecs).toString())+"=>"+_servletName;
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java
index f4661379c26..5a57c89755d 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java
@@ -52,6 +52,7 @@ public class StatisticsServlet extends HttpServlet
private MemoryMXBean _memoryBean;
private Connector[] _connectors;
+ @Override
public void init() throws ServletException
{
ServletContext context = getServletContext();
@@ -79,11 +80,13 @@ public class StatisticsServlet extends HttpServlet
}
}
+ @Override
public void doPost(HttpServletRequest sreq, HttpServletResponse sres) throws ServletException, IOException
{
doGet(sreq, sres);
}
+ @Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
if (_statsHandler == null)
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/FilterMappingMBean.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/FilterMappingMBean.java
index 55ef4e9d525..d544c1db502 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/FilterMappingMBean.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/FilterMappingMBean.java
@@ -29,6 +29,7 @@ public class FilterMappingMBean extends ObjectMBean
super(managedObject);
}
+ @Override
public String getObjectNameBasis()
{
if (_managed != null && _managed instanceof FilterMapping)
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/HolderMBean.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/HolderMBean.java
index 3f687aa4d5e..50eca6477e1 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/HolderMBean.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/HolderMBean.java
@@ -29,6 +29,7 @@ public class HolderMBean extends ObjectMBean
}
/* ------------------------------------------------------------ */
+ @Override
public String getObjectNameBasis()
{
if (_managed!=null && _managed instanceof Holder)
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/ServletMappingMBean.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/ServletMappingMBean.java
index 9000cd5274b..19e7c828fdd 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/ServletMappingMBean.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/ServletMappingMBean.java
@@ -29,6 +29,7 @@ public class ServletMappingMBean extends ObjectMBean
super(managedObject);
}
+ @Override
public String getObjectNameBasis()
{
if (_managed != null && _managed instanceof ServletMapping)
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
index 6b2ba2c7086..278a0d3d08f 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
@@ -44,10 +44,12 @@ public class ELContextCleaner implements ServletContextListener
private static final Logger LOG = Log.getLogger(ELContextCleaner.class);
+ @Override
public void contextInitialized(ServletContextEvent sce)
{
}
+ @Override
public void contextDestroyed(ServletContextEvent sce)
{
try
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/IntrospectorCleaner.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/IntrospectorCleaner.java
index d31c2c399e3..dfbd7c465cf 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/IntrospectorCleaner.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/IntrospectorCleaner.java
@@ -32,11 +32,13 @@ import javax.servlet.ServletContextListener;
public class IntrospectorCleaner implements ServletContextListener
{
+ @Override
public void contextInitialized(ServletContextEvent sce)
{
}
+ @Override
public void contextDestroyed(ServletContextEvent sce)
{
java.beans.Introspector.flushCaches();
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
index 9869f0553b7..4f2604c6223 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
@@ -494,6 +494,7 @@ public class AsyncContextTest
this.wrapped = wrapped;
}
+ @Override
public void run()
{
if (wrapped)
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
index cdedb9285f3..3e4e4f5c93e 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
@@ -340,6 +340,7 @@ public class DispatcherTest
public static class ForwardServlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
RequestDispatcher dispatcher = null;
@@ -361,6 +362,7 @@ public class DispatcherTest
public static class ForwardNonUTF8Servlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
RequestDispatcher dispatcher = null;
@@ -382,11 +384,13 @@ public class DispatcherTest
{
ServletContext servletContext;
+ @Override
public void init(FilterConfig filterConfig) throws ServletException
{
servletContext = filterConfig.getServletContext().getContext("/context");
}
+ @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
{
@@ -416,6 +420,7 @@ public class DispatcherTest
}
}
+ @Override
public void destroy()
{
@@ -554,6 +559,7 @@ public class DispatcherTest
public static class EchoURIServlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
response.setContentType("text/plain");
@@ -567,6 +573,7 @@ public class DispatcherTest
public static class AssertForwardServlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
assertEquals( "/context/ForwardServlet", request.getAttribute(Dispatcher.FORWARD_REQUEST_URI));
@@ -596,6 +603,7 @@ public class DispatcherTest
public static class AssertNonUTF8ForwardServlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
byte[] cp1251_bytes = TypeUtil.fromHexString("d2e5ecefe5f0e0f2f3f0e0");
@@ -644,6 +652,7 @@ public class DispatcherTest
public static class AssertIncludeServlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
assertEquals( "/context/AssertIncludeServlet", request.getAttribute(Dispatcher.INCLUDE_REQUEST_URI));
@@ -671,6 +680,7 @@ public class DispatcherTest
public static class AssertForwardIncludeServlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
// include doesn't hide forward
@@ -707,6 +717,7 @@ public class DispatcherTest
public static class AssertIncludeForwardServlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
// forward hides include
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
index 1759904b107..b65dded9b7e 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
@@ -159,6 +159,7 @@ public class ErrorPageTest
public static class FailServlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
String code=request.getParameter("code");
@@ -171,6 +172,7 @@ public class ErrorPageTest
public static class FailClosedServlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
response.sendError(599);
@@ -188,6 +190,7 @@ public class ErrorPageTest
public static class ErrorServlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
PrintWriter writer = response.getWriter();
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/InvokerTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/InvokerTest.java
index 2538be12ab1..413f3f861d3 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/InvokerTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/InvokerTest.java
@@ -88,6 +88,7 @@ public class InvokerTest
public static class TestServlet extends HttpServlet implements Servlet
{
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
response.getWriter().append("Invoked TestServlet!");
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/PostServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/PostServletTest.java
index 4bbdd64332a..e8e9dba8b5c 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/PostServletTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/PostServletTest.java
@@ -55,6 +55,7 @@ public class PostServletTest
public static class BasicReadPostServlet extends HttpServlet
{
+ @Override
protected void doPost(HttpServletRequest request, HttpServletResponse response)
{
posted.set(true);
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java
index 16a3379ecdb..70545d2c0a8 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java
@@ -166,6 +166,7 @@ public class CrossOriginFilter implements Filter
private boolean allowCredentials;
private boolean chainPreflight;
+ @Override
public void init(FilterConfig config) throws ServletException
{
String allowedOriginsConfig = config.getInitParameter(ALLOWED_ORIGINS_PARAM);
@@ -257,6 +258,7 @@ public class CrossOriginFilter implements Filter
return false;
}
+ @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
{
handle((HttpServletRequest)request, (HttpServletResponse)response, chain);
@@ -501,6 +503,7 @@ public class CrossOriginFilter implements Filter
return builder.toString();
}
+ @Override
public void destroy()
{
anyOriginAllowed = false;
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java
index 684b9677ce5..27ee84f5ca4 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java
@@ -191,6 +191,7 @@ public class DoSFilter implements Filter
private Scheduler _scheduler;
private ServletContext _context;
+ @Override
public void init(FilterConfig filterConfig) throws ServletException
{
_queues = new Queue[getMaxPriority() + 1];
@@ -290,6 +291,7 @@ public class DoSFilter implements Filter
}
}
+ @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException
{
doFilter((HttpServletRequest)request, (HttpServletResponse)response, filterChain);
@@ -764,6 +766,7 @@ public class DoSFilter implements Filter
return result;
}
+ @Override
public void destroy()
{
LOG.debug("Destroy {}",this);
@@ -1200,6 +1203,7 @@ public class DoSFilter implements Filter
return _type;
}
+ @Override
public void valueBound(HttpSessionBindingEvent event)
{
if (LOG.isDebugEnabled())
@@ -1207,6 +1211,7 @@ public class DoSFilter implements Filter
_context = event.getSession().getServletContext();
}
+ @Override
public void valueUnbound(HttpSessionBindingEvent event)
{
//take the tracker out of the list of trackers
@@ -1215,6 +1220,7 @@ public class DoSFilter implements Filter
_context = null;
}
+ @Override
public void sessionWillPassivate(HttpSessionEvent se)
{
//take the tracker of the list of trackers (if its still there)
@@ -1223,6 +1229,7 @@ public class DoSFilter implements Filter
_context = null;
}
+ @Override
public void sessionDidActivate(HttpSessionEvent se)
{
RateTracker tracker = (RateTracker)se.getSession().getAttribute(__TRACKER);
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
index 32fdb488552..b1f01913507 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
@@ -113,6 +113,7 @@ public class MultiPartFilter implements Filter
/**
* @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
*/
+ @Override
public void init(FilterConfig filterConfig) throws ServletException
{
tempdir=(File)filterConfig.getServletContext().getAttribute("javax.servlet.context.tempdir");
@@ -139,6 +140,7 @@ public class MultiPartFilter implements Filter
* @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
{
@@ -235,6 +237,7 @@ public class MultiPartFilter implements Filter
/**
* @see javax.servlet.Filter#destroy()
*/
+ @Override
public void destroy()
{
}
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PutFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PutFilter.java
index 14a4b69d769..8d0e9280930 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PutFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PutFilter.java
@@ -78,6 +78,7 @@ public class PutFilter implements Filter
/* ------------------------------------------------------------ */
+ @Override
public void init(FilterConfig config) throws ServletException
{
_context=config.getServletContext();
@@ -118,6 +119,7 @@ public class PutFilter implements Filter
}
/* ------------------------------------------------------------ */
+ @Override
public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException
{
HttpServletRequest request=(HttpServletRequest)req;
@@ -179,6 +181,7 @@ public class PutFilter implements Filter
}
/* ------------------------------------------------------------ */
+ @Override
public void destroy()
{
}
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java
index bf6a80f749c..2d4b0febd95 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java
@@ -101,6 +101,7 @@ public class QoSFilter implements Filter
private Queue[] _queues;
private AsyncListener[] _listeners;
+ @Override
public void init(FilterConfig filterConfig)
{
int max_priority = __DEFAULT_MAX_PRIORITY;
@@ -135,6 +136,7 @@ public class QoSFilter implements Filter
context.setAttribute(filterConfig.getFilterName(), this);
}
+ @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
{
boolean accepted = false;
@@ -266,6 +268,7 @@ public class QoSFilter implements Filter
}
}
+ @Override
public void destroy()
{
}
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java
index d4681df09c8..a30efa06331 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java
@@ -46,6 +46,7 @@ public class WelcomeFilter implements Filter
{
private String welcome;
+ @Override
public void init(FilterConfig filterConfig)
{
welcome=filterConfig.getInitParameter("welcome");
@@ -54,6 +55,7 @@ public class WelcomeFilter implements Filter
}
/* ------------------------------------------------------------ */
+ @Override
public void doFilter(ServletRequest request,
ServletResponse response,
FilterChain chain)
@@ -66,6 +68,7 @@ public class WelcomeFilter implements Filter
chain.doFilter(request, response);
}
+ @Override
public void destroy() {}
}
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncScheduledDispatchWrite.java b/jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncScheduledDispatchWrite.java
index f8ff1a6635e..ed190efcbd0 100644
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncScheduledDispatchWrite.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncScheduledDispatchWrite.java
@@ -73,6 +73,7 @@ public abstract class AsyncScheduledDispatchWrite extends TestDirContentServlet
this.originalReqResp = originalReqResp;
}
+ @Override
public void init(ServletConfig config) throws ServletException
{
super.init(config);
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/EventSourceServletTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/EventSourceServletTest.java
index 83cc164544c..3cea6f5486d 100644
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/EventSourceServletTest.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/EventSourceServletTest.java
@@ -77,12 +77,14 @@ public class EventSourceServletTest
{
return new EventSource()
{
+ @Override
public void onOpen(Emitter emitter) throws IOException
{
emitterRef.set(emitter);
emitterLatch.countDown();
}
+ @Override
public void onClose()
{
closeLatch.countDown();
@@ -136,12 +138,14 @@ public class EventSourceServletTest
{
return new EventSource()
{
+ @Override
public void onOpen(Emitter emitter) throws IOException
{
emitterRef.set(emitter);
emitterLatch.countDown();
}
+ @Override
public void onClose()
{
}
@@ -195,11 +199,13 @@ public class EventSourceServletTest
{
return new EventSource()
{
+ @Override
public void onOpen(Emitter emitter) throws IOException
{
emitter.data(data);
}
+ @Override
public void onClose()
{
}
@@ -244,11 +250,13 @@ public class EventSourceServletTest
{
return new EventSource()
{
+ @Override
public void onOpen(Emitter emitter) throws IOException
{
emitter.data(data);
}
+ @Override
public void onClose()
{
}
@@ -289,11 +297,13 @@ public class EventSourceServletTest
{
return new EventSource()
{
+ @Override
public void onOpen(Emitter emitter) throws IOException
{
emitter.event(name, data);
}
+ @Override
public void onClose()
{
}
diff --git a/jetty-spring/src/main/java/org/eclipse/jetty/spring/SpringConfigurationProcessorFactory.java b/jetty-spring/src/main/java/org/eclipse/jetty/spring/SpringConfigurationProcessorFactory.java
index 4faea8584a4..ec03e076518 100644
--- a/jetty-spring/src/main/java/org/eclipse/jetty/spring/SpringConfigurationProcessorFactory.java
+++ b/jetty-spring/src/main/java/org/eclipse/jetty/spring/SpringConfigurationProcessorFactory.java
@@ -33,6 +33,7 @@ import org.eclipse.jetty.xml.XmlConfiguration;
*/
public class SpringConfigurationProcessorFactory implements ConfigurationProcessorFactory
{
+ @Override
public ConfigurationProcessor getConfigurationProcessor(String dtd, String tag)
{
if ("beans".equals(tag))
diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java
index e42ba9d70e8..24295d1ee69 100644
--- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java
+++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java
@@ -370,10 +370,12 @@ public class JSON
{
appendJSON(buffer,new Convertible()
{
+ @Override
public void fromJSON(Map object)
{
}
+ @Override
public void toJSON(Output out)
{
convertor.toJSON(object,out);
@@ -1316,6 +1318,7 @@ public class JSON
}
}
+ @Override
public void add(Object obj)
{
if (c == 0)
@@ -1324,6 +1327,7 @@ public class JSON
c = 0;
}
+ @Override
public void addClass(Class type)
{
try
@@ -1341,6 +1345,7 @@ public class JSON
}
}
+ @Override
public void add(String name, Object value)
{
try
@@ -1359,6 +1364,7 @@ public class JSON
}
}
+ @Override
public void add(String name, double value)
{
try
@@ -1377,6 +1383,7 @@ public class JSON
}
}
+ @Override
public void add(String name, long value)
{
try
@@ -1395,6 +1402,7 @@ public class JSON
}
}
+ @Override
public void add(String name, boolean value)
{
try
@@ -1436,6 +1444,7 @@ public class JSON
string = s;
}
+ @Override
public boolean hasNext()
{
if (index < string.length())
@@ -1444,11 +1453,13 @@ public class JSON
return false;
}
+ @Override
public char next()
{
return string.charAt(index++);
}
+ @Override
public char peek()
{
return string.charAt(index);
@@ -1460,6 +1471,7 @@ public class JSON
return string.substring(0,index) + "|||" + string.substring(index);
}
+ @Override
public char[] scratchBuffer()
{
if (scratch == null)
@@ -1485,6 +1497,7 @@ public class JSON
_next = -1;
}
+ @Override
public boolean hasNext()
{
getNext();
@@ -1496,6 +1509,7 @@ public class JSON
return true;
}
+ @Override
public char next()
{
getNext();
@@ -1504,6 +1518,7 @@ public class JSON
return c;
}
+ @Override
public char peek()
{
getNext();
@@ -1525,6 +1540,7 @@ public class JSON
}
}
+ @Override
public char[] scratchBuffer()
{
if (scratch == null)
@@ -1629,6 +1645,7 @@ public class JSON
return _json;
}
+ @Override
public void addJSON(Appendable buffer)
{
try
diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONCollectionConvertor.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONCollectionConvertor.java
index 504343bf987..a92b3202261 100644
--- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONCollectionConvertor.java
+++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONCollectionConvertor.java
@@ -26,12 +26,14 @@ import org.eclipse.jetty.util.Loader;
public class JSONCollectionConvertor implements JSON.Convertor
{
+ @Override
public void toJSON(Object obj, JSON.Output out)
{
out.addClass(obj.getClass());
out.add("list", ((Collection)obj).toArray());
}
+ @Override
public Object fromJSON(Map object)
{
try
diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONDateConvertor.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONDateConvertor.java
index 617d4d7bbe3..ea4360a1236 100644
--- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONDateConvertor.java
+++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONDateConvertor.java
@@ -71,6 +71,7 @@ public class JSONDateConvertor implements JSON.Convertor
_format.setTimeZone(zone);
}
+ @Override
public Object fromJSON(Map map)
{
if (!_fromJSON)
@@ -89,6 +90,7 @@ public class JSONDateConvertor implements JSON.Convertor
return null;
}
+ @Override
public void toJSON(Object obj, Output out)
{
String date = _dateCache.format((Date)obj);
diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONEnumConvertor.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONEnumConvertor.java
index d02724e3b5b..8ce9286cc96 100644
--- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONEnumConvertor.java
+++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONEnumConvertor.java
@@ -62,6 +62,7 @@ public class JSONEnumConvertor implements JSON.Convertor
_fromJSON=fromJSON;
}
+ @Override
public Object fromJSON(Map map)
{
if (!_fromJSON)
@@ -78,6 +79,7 @@ public class JSONEnumConvertor implements JSON.Convertor
return null;
}
+ @Override
public void toJSON(Object obj, Output out)
{
if (_fromJSON)
diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONObjectConvertor.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONObjectConvertor.java
index 332351ef1f8..dc72f89bae0 100644
--- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONObjectConvertor.java
+++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONObjectConvertor.java
@@ -58,6 +58,7 @@ public class JSONObjectConvertor implements JSON.Convertor
_excluded=new HashSet(Arrays.asList(excluded));
}
+ @Override
public Object fromJSON(Map map)
{
if (_fromJSON)
@@ -65,6 +66,7 @@ public class JSONObjectConvertor implements JSON.Convertor
return map;
}
+ @Override
public void toJSON(Object obj, Output out)
{
try
diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java
index 031505257a8..a715b1451fb 100644
--- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java
+++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java
@@ -176,6 +176,7 @@ public class JSONPojoConvertor implements JSON.Convertor
}
/* ------------------------------------------------------------ */
+ @Override
public Object fromJSON(Map object)
{
Object obj = null;
@@ -221,6 +222,7 @@ public class JSONPojoConvertor implements JSON.Convertor
}
/* ------------------------------------------------------------ */
+ @Override
public void toJSON(Object obj, Output out)
{
if(_fromJSON)
@@ -377,6 +379,7 @@ public class JSONPojoConvertor implements JSON.Convertor
public static final NumberType SHORT = new NumberType()
{
+ @Override
public Object getActualValue(Number number)
{
return new Short(number.shortValue());
@@ -385,6 +388,7 @@ public class JSONPojoConvertor implements JSON.Convertor
public static final NumberType INTEGER = new NumberType()
{
+ @Override
public Object getActualValue(Number number)
{
return new Integer(number.intValue());
@@ -393,6 +397,7 @@ public class JSONPojoConvertor implements JSON.Convertor
public static final NumberType FLOAT = new NumberType()
{
+ @Override
public Object getActualValue(Number number)
{
return new Float(number.floatValue());
@@ -401,6 +406,7 @@ public class JSONPojoConvertor implements JSON.Convertor
public static final NumberType LONG = new NumberType()
{
+ @Override
public Object getActualValue(Number number)
{
return number instanceof Long ? number : new Long(number.longValue());
@@ -409,6 +415,7 @@ public class JSONPojoConvertor implements JSON.Convertor
public static final NumberType DOUBLE = new NumberType()
{
+ @Override
public Object getActualValue(Number number)
{
return number instanceof Double ? number : new Double(number.doubleValue());
diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertorFactory.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertorFactory.java
index db55072518b..dba596562fc 100644
--- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertorFactory.java
+++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertorFactory.java
@@ -57,6 +57,7 @@ public class JSONPojoConvertorFactory implements JSON.Convertor
}
/* ------------------------------------------------------------ */
+ @Override
public void toJSON(Object obj, Output out)
{
String clsName=obj.getClass().getName();
@@ -80,6 +81,7 @@ public class JSONPojoConvertorFactory implements JSON.Convertor
}
}
+ @Override
public Object fromJSON(Map object)
{
Map map=object;
diff --git a/jetty-util-ajax/src/test/java/org/eclipse/jetty/util/ajax/JSONTest.java b/jetty-util-ajax/src/test/java/org/eclipse/jetty/util/ajax/JSONTest.java
index b8dfa10c98b..015a6c9354e 100644
--- a/jetty-util-ajax/src/test/java/org/eclipse/jetty/util/ajax/JSONTest.java
+++ b/jetty-util-ajax/src/test/java/org/eclipse/jetty/util/ajax/JSONTest.java
@@ -445,6 +445,7 @@ public class JSONTest
{
}
+ @Override
public void fromJSON(Map object)
{
name=(String)object.get("name");
@@ -452,6 +453,7 @@ public class JSONTest
number=((Number)object.get("number")).intValue();
}
+ @Override
public void toJSON(Output out)
{
out.addClass(Woggle.class);
@@ -460,6 +462,7 @@ public class JSONTest
out.add("number",number);
}
+ @Override
public String toString()
{
return name+"<<"+nested+">>"+number;
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java
index 48ed597cdd8..b1417413545 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java
@@ -582,51 +582,61 @@ public class ArrayTernaryTrie extends AbstractTrie
_trie = new ArrayTernaryTrie<>(insensitive,capacity);
}
+ @Override
public boolean put(V v)
{
return put(v.toString(),v);
}
+ @Override
public int hashCode()
{
return _trie.hashCode();
}
+ @Override
public V remove(String s)
{
return _trie.remove(s);
}
+ @Override
public V get(String s)
{
return _trie.get(s);
}
+ @Override
public V get(ByteBuffer b)
{
return _trie.get(b);
}
+ @Override
public V getBest(byte[] b, int offset, int len)
{
return _trie.getBest(b,offset,len);
}
+ @Override
public boolean isCaseInsensitive()
{
return _trie.isCaseInsensitive();
}
+ @Override
public boolean equals(Object obj)
{
return _trie.equals(obj);
}
+ @Override
public void clear()
{
_trie.clear();
}
+ @Override
public boolean put(String s, V v)
{
boolean added = _trie.put(s,v);
@@ -642,41 +652,49 @@ public class ArrayTernaryTrie extends AbstractTrie
return added;
}
+ @Override
public V get(String s, int offset, int len)
{
return _trie.get(s,offset,len);
}
+ @Override
public V get(ByteBuffer b, int offset, int len)
{
return _trie.get(b,offset,len);
}
+ @Override
public V getBest(String s)
{
return _trie.getBest(s);
}
+ @Override
public V getBest(String s, int offset, int length)
{
return _trie.getBest(s,offset,length);
}
+ @Override
public V getBest(ByteBuffer b, int offset, int len)
{
return _trie.getBest(b,offset,len);
}
+ @Override
public String toString()
{
return _trie.toString();
}
+ @Override
public Set keySet()
{
return _trie.keySet();
}
+ @Override
public boolean isFull()
{
return false;
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 37690444674..13c4370f1d9 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
@@ -85,6 +85,7 @@ public class IO
/*
* @see java.lang.Runnable#run()
*/
+ @Override
public void run()
{
try {
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/InetAddressSet.java b/jetty-util/src/main/java/org/eclipse/jetty/util/InetAddressSet.java
index 6274ce5e4fc..30efacda595 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/InetAddressSet.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/InetAddressSet.java
@@ -147,6 +147,7 @@ public class InetAddressSet extends AbstractSet implements Set,
_address=address;
}
+ @Override
public boolean test(InetAddress address, byte[] raw)
{
return _address.equals(address);
@@ -197,6 +198,7 @@ public class InetAddressSet extends AbstractSet implements Set,
}
}
+ @Override
public boolean test(InetAddress item, byte[] raw)
{
if (raw.length!=_min.length)
@@ -258,6 +260,7 @@ public class InetAddressSet extends AbstractSet implements Set,
throw new IllegalArgumentException("CIDR bits non zero: "+pattern);
}
+ @Override
public boolean test(InetAddress item, byte[] raw)
{
if (raw.length!=_raw.length)
@@ -303,6 +306,7 @@ public class InetAddressSet extends AbstractSet implements Set,
}
}
+ @Override
public boolean test(InetAddress item, byte[] raw)
{
if (raw.length!=4)
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java b/jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java
index dde70e12578..ec5bc39dec6 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java
@@ -214,6 +214,7 @@ public class JavaVersion
return suffix;
}
+ @Override
public String toString()
{
return version;
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
index 5e2a7f6ebaa..a7455e4e698 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
@@ -190,6 +190,7 @@ public class MultiPartInputStreamParser
/**
* @see javax.servlet.http.Part#getContentType()
*/
+ @Override
public String getContentType()
{
return _contentType;
@@ -198,6 +199,7 @@ public class MultiPartInputStreamParser
/**
* @see javax.servlet.http.Part#getHeader(java.lang.String)
*/
+ @Override
public String getHeader(String name)
{
if (name == null)
@@ -208,6 +210,7 @@ public class MultiPartInputStreamParser
/**
* @see javax.servlet.http.Part#getHeaderNames()
*/
+ @Override
public Collection getHeaderNames()
{
return _headers.keySet();
@@ -216,6 +219,7 @@ public class MultiPartInputStreamParser
/**
* @see javax.servlet.http.Part#getHeaders(java.lang.String)
*/
+ @Override
public Collection getHeaders(String name)
{
return _headers.getValues(name);
@@ -224,6 +228,7 @@ public class MultiPartInputStreamParser
/**
* @see javax.servlet.http.Part#getInputStream()
*/
+ @Override
public InputStream getInputStream() throws IOException
{
if (_file != null)
@@ -258,6 +263,7 @@ public class MultiPartInputStreamParser
/**
* @see javax.servlet.http.Part#getName()
*/
+ @Override
public String getName()
{
return _name;
@@ -266,6 +272,7 @@ public class MultiPartInputStreamParser
/**
* @see javax.servlet.http.Part#getSize()
*/
+ @Override
public long getSize()
{
return _size;
@@ -274,6 +281,7 @@ public class MultiPartInputStreamParser
/**
* @see javax.servlet.http.Part#write(java.lang.String)
*/
+ @Override
public void write(String fileName) throws IOException
{
if (_file == null)
@@ -314,6 +322,7 @@ public class MultiPartInputStreamParser
* (ie no longer temporary)
* @see javax.servlet.http.Part#delete()
*/
+ @Override
public void delete() throws IOException
{
if (_file != null && _file.exists())
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 7afe0edd9f4..57ba31a30cc 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
@@ -333,6 +333,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
return path;
}
+ @Override
public boolean test(Path path)
{
if (excludeHidden && isHidden(path))
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java b/jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java
index 4115971db3b..aba6e34b229 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java
@@ -361,6 +361,7 @@ public class RolloverFileOutputStream extends OutputStream
}
/* ------------------------------------------------------------ */
+ @Override
public void write(int b) throws IOException
{
synchronized(this)
@@ -392,6 +393,7 @@ public class RolloverFileOutputStream extends OutputStream
}
/* ------------------------------------------------------------ */
+ @Override
public void flush() throws IOException
{
synchronized(this)
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java
index 976613eaa2f..4b6d963969e 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java
@@ -858,6 +858,7 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
* @return the list of beans of the given class from the entire managed hierarchy
* @param the Bean type
*/
+ @Override
public Collection getContainedBeans(Class clazz)
{
Set beans = new HashSet<>();
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileNoticeLifeCycleListener.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileNoticeLifeCycleListener.java
index 9959d9dab82..3c37c833a8d 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileNoticeLifeCycleListener.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileNoticeLifeCycleListener.java
@@ -52,26 +52,31 @@ public class FileNoticeLifeCycleListener implements LifeCycle.Listener
}
}
+ @Override
public void lifeCycleStarting(LifeCycle event)
{
writeState("STARTING",event);
}
+ @Override
public void lifeCycleStarted(LifeCycle event)
{
writeState("STARTED",event);
}
+ @Override
public void lifeCycleFailure(LifeCycle event, Throwable cause)
{
writeState("FAILED",event);
}
+ @Override
public void lifeCycleStopping(LifeCycle event)
{
writeState("STOPPING",event);
}
+ @Override
public void lifeCycleStopped(LifeCycle event)
{
writeState("STOPPED",event);
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/log/AbstractLogger.java b/jetty-util/src/main/java/org/eclipse/jetty/util/log/AbstractLogger.java
index e17c701546f..f27a55a3dff 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/AbstractLogger.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/AbstractLogger.java
@@ -228,6 +228,7 @@ public abstract class AbstractLogger implements Logger
}
+ @Override
public void debug(String msg, long arg)
{
if (isDebugEnabled())
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/log/JavaUtilLog.java b/jetty-util/src/main/java/org/eclipse/jetty/util/log/JavaUtilLog.java
index 3b373b57730..4c760dacd2f 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/JavaUtilLog.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/JavaUtilLog.java
@@ -91,6 +91,7 @@ public class JavaUtilLog extends AbstractLogger
{
AccessController.doPrivileged(new PrivilegedAction