You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/02/14 18:20:36 UTC
[tomcat] 02/02: Remove redundant modifiers
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e5519e446bbcfd2ce88ad3a38596541de53aedc9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 14 17:21:09 2023 +0000
Remove redundant modifiers
Identified by CheckStyle
~80% fixed automatically by Eclipse
~20% reviewed manually
Based on PR #578 by Dimitrios Soumis
---
java/jakarta/annotation/Generated.java | 6 +-
java/jakarta/annotation/Resource.java | 16 +-
java/jakarta/annotation/Resources.java | 2 +-
java/jakarta/annotation/security/DeclareRoles.java | 2 +-
java/jakarta/annotation/security/RolesAllowed.java | 2 +-
java/jakarta/annotation/security/RunAs.java | 2 +-
java/jakarta/el/ArrayELResolver.java | 4 +-
java/jakarta/el/BeanELResolver.java | 8 +-
java/jakarta/el/CompositeELResolver.java | 2 +-
java/jakarta/el/ELContextListener.java | 2 +-
java/jakarta/el/ELProcessor.java | 2 +-
java/jakarta/el/ExpressionFactory.java | 6 +-
java/jakarta/el/ListELResolver.java | 2 +-
java/jakarta/el/StandardELContext.java | 4 +-
java/jakarta/el/Util.java | 12 +-
.../security/auth/message/MessagePolicy.java | 10 +-
.../auth/message/callback/PrivateKeyCallback.java | 2 +-
.../auth/message/callback/SecretKeyCallback.java | 2 +-
.../auth/message/config/AuthConfigFactory.java | 2 +-
java/jakarta/servlet/AsyncContext.java | 12 +-
java/jakarta/servlet/Filter.java | 6 +-
java/jakarta/servlet/FilterChain.java | 2 +-
java/jakarta/servlet/FilterConfig.java | 8 +-
java/jakarta/servlet/FilterRegistration.java | 10 +-
java/jakarta/servlet/ReadListener.java | 6 +-
java/jakarta/servlet/Registration.java | 16 +-
java/jakarta/servlet/RequestDispatcher.java | 40 +-
java/jakarta/servlet/Servlet.java | 10 +-
java/jakarta/servlet/ServletConfig.java | 8 +-
java/jakarta/servlet/ServletContext.java | 114 +++---
.../servlet/ServletContextAttributeListener.java | 6 +-
java/jakarta/servlet/ServletContextListener.java | 4 +-
java/jakarta/servlet/ServletRegistration.java | 16 +-
java/jakarta/servlet/ServletRequest.java | 72 ++--
.../servlet/ServletRequestAttributeListener.java | 6 +-
java/jakarta/servlet/ServletRequestListener.java | 4 +-
java/jakarta/servlet/ServletResponse.java | 32 +-
java/jakarta/servlet/SessionCookieConfig.java | 34 +-
java/jakarta/servlet/WriteListener.java | 4 +-
.../servlet/descriptor/JspConfigDescriptor.java | 4 +-
.../descriptor/JspPropertyGroupDescriptor.java | 26 +-
.../servlet/descriptor/TaglibDescriptor.java | 4 +-
java/jakarta/servlet/http/HttpServlet.java | 4 +-
java/jakarta/servlet/http/HttpServletRequest.java | 78 ++--
java/jakarta/servlet/http/HttpServletResponse.java | 122 +++---
java/jakarta/servlet/http/HttpSession.java | 24 +-
.../http/HttpSessionActivationListener.java | 4 +-
.../servlet/http/HttpSessionAttributeListener.java | 6 +-
.../servlet/http/HttpSessionBindingListener.java | 4 +-
.../servlet/http/HttpSessionIdListener.java | 2 +-
java/jakarta/servlet/http/HttpSessionListener.java | 4 +-
java/jakarta/servlet/http/Part.java | 20 +-
java/jakarta/servlet/jsp/HttpJspPage.java | 2 +-
.../jakarta/servlet/jsp/JspApplicationContext.java | 6 +-
java/jakarta/servlet/jsp/JspPage.java | 4 +-
java/jakarta/servlet/jsp/el/FunctionMapper.java | 2 +-
.../servlet/jsp/el/ImplicitObjectELResolver.java | 4 +-
java/jakarta/servlet/jsp/el/VariableResolver.java | 2 +-
java/jakarta/servlet/jsp/tagext/BodyTag.java | 4 +-
.../servlet/jsp/tagext/DynamicAttributes.java | 2 +-
java/jakarta/servlet/jsp/tagext/IterationTag.java | 3 +-
java/jakarta/servlet/jsp/tagext/JspIdConsumer.java | 2 +-
java/jakarta/servlet/jsp/tagext/SimpleTag.java | 10 +-
java/jakarta/servlet/jsp/tagext/Tag.java | 8 +-
java/jakarta/transaction/Status.java | 20 +-
java/jakarta/transaction/Synchronization.java | 4 +-
java/jakarta/transaction/Transaction.java | 14 +-
java/jakarta/transaction/TransactionManager.java | 18 +-
java/jakarta/websocket/ClientEndpoint.java | 2 +-
java/jakarta/websocket/ClientEndpointConfig.java | 6 +-
.../websocket/DefaultClientEndpointConfig.java | 2 +-
java/jakarta/websocket/HandshakeResponse.java | 2 +-
.../server/DefaultServerEndpointConfig.java | 6 +-
.../jakarta/websocket/server/HandshakeRequest.java | 8 +-
java/jakarta/websocket/server/ServerContainer.java | 6 +-
java/jakarta/websocket/server/ServerEndpoint.java | 2 +-
.../websocket/server/ServerEndpointConfig.java | 4 +-
java/jakarta/xml/ws/WebServiceRef.java | 10 +-
java/jakarta/xml/ws/WebServiceRefs.java | 2 +-
java/org/apache/catalina/AccessLog.java | 16 +-
java/org/apache/catalina/AsyncDispatcher.java | 2 +-
java/org/apache/catalina/Authenticator.java | 6 +-
java/org/apache/catalina/Cluster.java | 12 +-
java/org/apache/catalina/Container.java | 82 ++--
java/org/apache/catalina/ContainerListener.java | 2 +-
java/org/apache/catalina/ContainerServlet.java | 4 +-
java/org/apache/catalina/Context.java | 434 ++++++++++-----------
java/org/apache/catalina/DistributedManager.java | 4 +-
java/org/apache/catalina/Engine.java | 12 +-
java/org/apache/catalina/Executor.java | 2 +-
java/org/apache/catalina/Group.java | 22 +-
java/org/apache/catalina/Host.java | 56 +--
java/org/apache/catalina/Lifecycle.java | 46 +--
java/org/apache/catalina/LifecycleListener.java | 2 +-
java/org/apache/catalina/LifecycleState.java | 2 +-
java/org/apache/catalina/Loader.java | 18 +-
java/org/apache/catalina/Manager.java | 80 ++--
java/org/apache/catalina/Pipeline.java | 16 +-
java/org/apache/catalina/Realm.java | 32 +-
java/org/apache/catalina/Role.java | 10 +-
java/org/apache/catalina/Server.java | 58 +--
java/org/apache/catalina/Service.java | 32 +-
java/org/apache/catalina/Session.java | 82 ++--
java/org/apache/catalina/SessionIdGenerator.java | 12 +-
java/org/apache/catalina/SessionListener.java | 2 +-
java/org/apache/catalina/Store.java | 20 +-
.../org/apache/catalina/ThreadBindingListener.java | 4 +-
java/org/apache/catalina/User.java | 34 +-
java/org/apache/catalina/UserDatabase.java | 44 +--
java/org/apache/catalina/Valve.java | 10 +-
java/org/apache/catalina/Wrapper.java | 78 ++--
.../jaspic/AuthConfigFactoryImpl.java | 8 +-
.../catalina/connector/CoyoteInputStream.java | 10 +-
.../org/apache/catalina/connector/InputBuffer.java | 2 +-
.../apache/catalina/connector/OutputBuffer.java | 2 +-
java/org/apache/catalina/connector/Request.java | 2 +-
.../apache/catalina/connector/RequestFacade.java | 10 +-
java/org/apache/catalina/connector/Response.java | 6 +-
.../apache/catalina/connector/ResponseFacade.java | 4 +-
.../apache/catalina/core/ApplicationContext.java | 2 +-
.../catalina/core/ApplicationContextFacade.java | 2 +-
.../catalina/core/ApplicationDispatcher.java | 2 +-
.../catalina/core/ApplicationHttpRequest.java | 2 +-
.../catalina/core/ApplicationHttpResponse.java | 2 +-
.../apache/catalina/core/ApplicationMapping.java | 2 +-
.../apache/catalina/core/ApplicationRequest.java | 2 +-
.../apache/catalina/core/ApplicationResponse.java | 2 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 4 +-
java/org/apache/catalina/core/ContainerBase.java | 4 +-
.../catalina/core/DefaultInstanceManager.java | 8 +-
java/org/apache/catalina/core/StandardContext.java | 2 +-
.../apache/catalina/core/StandardContextValve.java | 4 +-
.../apache/catalina/core/StandardEngineValve.java | 4 +-
.../apache/catalina/core/StandardHostValve.java | 4 +-
java/org/apache/catalina/core/StandardServer.java | 6 +-
.../apache/catalina/core/StandardWrapperValve.java | 4 +-
.../catalina/filters/CsrfPreventionFilter.java | 2 +-
.../org/apache/catalina/filters/ExpiresFilter.java | 2 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 2 +-
.../catalina/filters/RestCsrfPreventionFilter.java | 16 +-
java/org/apache/catalina/ha/CatalinaCluster.java | 34 +-
java/org/apache/catalina/ha/ClusterDeployer.java | 14 +-
java/org/apache/catalina/ha/ClusterManager.java | 22 +-
java/org/apache/catalina/ha/ClusterMessage.java | 10 +-
java/org/apache/catalina/ha/ClusterSession.java | 4 +-
java/org/apache/catalina/ha/ClusterValve.java | 4 +-
java/org/apache/catalina/ha/backend/Sender.java | 4 +-
.../catalina/ha/deploy/FileChangeListener.java | 4 +-
.../apache/catalina/ha/session/DeltaRequest.java | 4 +-
.../apache/catalina/ha/session/SessionMessage.java | 28 +-
.../catalina/loader/WebappClassLoaderBase.java | 4 +-
java/org/apache/catalina/mapper/Mapper.java | 40 +-
java/org/apache/catalina/mbeans/MBeanFactory.java | 2 +-
.../apache/catalina/realm/GenericPrincipal.java | 2 +-
java/org/apache/catalina/realm/MemoryRuleSet.java | 2 +-
.../catalina/realm/X509UsernameRetriever.java | 2 +-
.../catalina/security/SecurityClassLoad.java | 20 +-
.../apache/catalina/security/SecurityConfig.java | 2 +-
.../apache/catalina/servlets/DefaultServlet.java | 8 +-
.../apache/catalina/servlets/WebdavServlet.java | 6 +-
.../apache/catalina/session/StandardSession.java | 2 +-
.../apache/catalina/ssi/ExpressionParseTree.java | 2 +-
java/org/apache/catalina/ssi/SSICommand.java | 2 +-
.../apache/catalina/ssi/SSIExternalResolver.java | 16 +-
java/org/apache/catalina/startup/Catalina.java | 4 +-
.../org/apache/catalina/startup/ContextConfig.java | 8 +-
java/org/apache/catalina/startup/HostConfig.java | 10 +-
java/org/apache/catalina/startup/UserConfig.java | 2 +-
java/org/apache/catalina/startup/UserDatabase.java | 8 +-
java/org/apache/catalina/tribes/Channel.java | 70 ++--
.../apache/catalina/tribes/ChannelInterceptor.java | 37 +-
.../apache/catalina/tribes/ChannelListener.java | 10 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 22 +-
.../apache/catalina/tribes/ChannelReceiver.java | 22 +-
java/org/apache/catalina/tribes/ChannelSender.java | 17 +-
java/org/apache/catalina/tribes/ErrorHandler.java | 4 +-
java/org/apache/catalina/tribes/Heartbeat.java | 2 +-
java/org/apache/catalina/tribes/JmxChannel.java | 12 +-
.../org/apache/catalina/tribes/ManagedChannel.java | 14 +-
java/org/apache/catalina/tribes/Member.java | 44 +--
.../apache/catalina/tribes/MembershipListener.java | 4 +-
.../apache/catalina/tribes/MembershipProvider.java | 16 +-
.../apache/catalina/tribes/MembershipService.java | 44 +--
.../apache/catalina/tribes/MessageListener.java | 4 +-
.../catalina/tribes/group/ExtendedRpcCallback.java | 4 +-
.../catalina/tribes/group/GroupChannelMBean.java | 28 +-
.../apache/catalina/tribes/group/RpcCallback.java | 4 +-
.../interceptors/DomainFilterInterceptorMBean.java | 8 +-
.../group/interceptors/EncryptInterceptor.java | 6 +-
.../interceptors/EncryptInterceptorMBean.java | 16 +-
.../FragmentationInterceptorMBean.java | 8 +-
.../group/interceptors/GzipInterceptorMBean.java | 42 +-
.../MessageDispatchInterceptorMBean.java | 24 +-
.../StaticMembershipInterceptorMBean.java | 4 +-
.../interceptors/TcpFailureDetectorMBean.java | 24 +-
.../interceptors/TcpPingInterceptorMBean.java | 6 +-
.../interceptors/ThroughputInterceptorMBean.java | 28 +-
.../apache/catalina/tribes/io/ListenCallback.java | 2 +-
.../tribes/membership/McastServiceMBean.java | 34 +-
.../membership/StaticMembershipServiceMBean.java | 18 +-
.../cloud/CloudMembershipServiceMBean.java | 14 +-
.../tribes/membership/cloud/StreamProvider.java | 2 +-
.../tribes/tipis/AbstractReplicatedMap.java | 6 +-
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 28 +-
.../catalina/tribes/transport/DataSender.java | 22 +-
.../tribes/transport/MultiPointSender.java | 10 +-
.../catalina/tribes/transport/PooledSender.java | 2 +-
.../catalina/tribes/transport/RxTaskPool.java | 4 +-
.../tribes/transport/nio/NioReceiverMBean.java | 54 +--
.../transport/nio/PooledParallelSenderMBean.java | 44 +--
.../catalina/tribes/util/ExecutorFactory.java | 10 +-
.../apache/catalina/users/MemoryUserDatabase.java | 6 +-
java/org/apache/catalina/util/ToStringUtil.java | 2 +-
.../catalina/valves/AbstractAccessLogValve.java | 4 +-
.../catalina/valves/StuckThreadDetectionValve.java | 4 +-
.../catalina/valves/rewrite/ResolverImpl.java | 2 +-
.../apache/catalina/valves/rewrite/RewriteMap.java | 4 +-
.../catalina/webresources/CachedResource.java | 2 +-
.../apache/catalina/webresources/JarContents.java | 2 +-
.../catalina/webresources/JarWarResourceSet.java | 2 +-
java/org/apache/coyote/ActionHook.java | 2 +-
java/org/apache/coyote/Adapter.java | 12 +-
java/org/apache/coyote/AsyncStateMachine.java | 2 +-
java/org/apache/coyote/ContinueResponseTiming.java | 2 +-
java/org/apache/coyote/ErrorState.java | 2 +-
java/org/apache/coyote/InputBuffer.java | 4 +-
java/org/apache/coyote/OutputBuffer.java | 4 +-
java/org/apache/coyote/ProtocolHandler.java | 44 +--
java/org/apache/coyote/Request.java | 4 +-
java/org/apache/coyote/Response.java | 4 +-
java/org/apache/coyote/UpgradeProtocol.java | 14 +-
java/org/apache/coyote/UpgradeToken.java | 8 +-
java/org/apache/coyote/ajp/Constants.java | 8 +-
.../org/apache/coyote/http11/HttpOutputBuffer.java | 4 +-
java/org/apache/coyote/http11/InputFilter.java | 12 +-
java/org/apache/coyote/http11/OutputFilter.java | 6 +-
.../http11/upgrade/UpgradeServletInputStream.java | 2 +-
.../http11/upgrade/UpgradeServletOutputStream.java | 2 +-
java/org/apache/coyote/http2/FrameType.java | 2 +-
.../coyote/http2/Http2AsyncUpgradeHandler.java | 2 +-
java/org/apache/coyote/http2/Http2Error.java | 2 +-
java/org/apache/coyote/http2/Http2Parser.java | 4 +-
.../apache/coyote/http2/Http2UpgradeHandler.java | 18 +-
java/org/apache/coyote/http2/Setting.java | 4 +-
java/org/apache/coyote/http2/Stream.java | 6 +-
java/org/apache/coyote/http2/StreamRunnable.java | 2 +-
.../apache/coyote/http2/StreamStateMachine.java | 2 +-
java/org/apache/el/lang/ELArithmetic.java | 16 +-
java/org/apache/el/lang/ELSupport.java | 2 +-
java/org/apache/el/lang/ExpressionBuilder.java | 8 +-
java/org/apache/el/parser/AstIdentifier.java | 2 +-
java/org/apache/el/parser/AstValue.java | 2 +-
.../apache/el/parser/ELParserTreeConstants.java | 88 ++---
java/org/apache/el/parser/Node.java | 36 +-
java/org/apache/el/parser/NodeVisitor.java | 2 +-
java/org/apache/el/stream/Stream.java | 6 +-
.../org/apache/el/stream/StreamELResolverImpl.java | 2 +-
java/org/apache/el/util/ReflectionUtil.java | 4 +-
java/org/apache/jasper/Options.java | 92 ++---
java/org/apache/jasper/compiler/ELInterpreter.java | 2 +-
java/org/apache/jasper/compiler/ELNode.java | 2 +-
.../apache/jasper/compiler/EncodingDetector.java | 2 +-
.../apache/jasper/compiler/ErrorDispatcher.java | 2 +-
java/org/apache/jasper/compiler/ErrorHandler.java | 8 +-
java/org/apache/jasper/compiler/Generator.java | 6 +-
.../jasper/compiler/ImplicitTagLibraryInfo.java | 2 +-
java/org/apache/jasper/compiler/JasperTagInfo.java | 2 +-
.../apache/jasper/compiler/JspDocumentParser.java | 2 +-
java/org/apache/jasper/compiler/JspReader.java | 4 +-
java/org/apache/jasper/compiler/JspUtil.java | 2 +-
java/org/apache/jasper/compiler/Node.java | 134 +++----
java/org/apache/jasper/compiler/PageDataImpl.java | 6 +-
.../apache/jasper/compiler/ParserController.java | 2 +-
.../apache/jasper/compiler/ScriptingVariabler.java | 2 +-
java/org/apache/jasper/compiler/TagConstants.java | 114 +++---
.../apache/jasper/compiler/TagFileProcessor.java | 2 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 2 +-
.../apache/jasper/compiler/TagPluginManager.java | 2 +-
java/org/apache/jasper/compiler/TextOptimizer.java | 2 +-
java/org/apache/jasper/compiler/TldCache.java | 2 +-
java/org/apache/jasper/el/JasperELResolver.java | 2 +-
java/org/apache/jasper/runtime/JspFactoryImpl.java | 2 +-
.../apache/jasper/runtime/JspSourceDependent.java | 2 +-
java/org/apache/jasper/runtime/JspWriterImpl.java | 2 +-
.../org/apache/jasper/runtime/PageContextImpl.java | 2 +-
.../org/apache/jasper/util/FastRemovalDequeue.java | 14 +-
java/org/apache/juli/AsyncFileHandler.java | 2 +-
java/org/apache/juli/OneLineFormatter.java | 6 +-
java/org/apache/juli/logging/DirectJDKLog.java | 2 +-
java/org/apache/juli/logging/Log.java | 36 +-
.../org/apache/tomcat/InstanceManagerBindings.java | 6 +-
java/org/apache/tomcat/JarScanner.java | 6 +-
java/org/apache/tomcat/JarScannerCallback.java | 6 +-
java/org/apache/tomcat/PeriodicEventListener.java | 2 +-
java/org/apache/tomcat/buildutil/CheckEol.java | 2 +-
.../apache/tomcat/buildutil/translate/Import.java | 2 +-
.../dbcp/dbcp2/LifetimeExceededException.java | 4 +-
.../tomcat/dbcp/dbcp2/ObjectNameWrapper.java | 2 +-
.../dbcp2/datasources/CPDSConnectionFactory.java | 8 +-
.../datasources/KeyedCPDSConnectionFactory.java | 4 +-
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 8 +-
.../dbcp/pool2/impl/BaseGenericObjectPool.java | 2 +-
.../apache/tomcat/dbcp/pool2/impl/CallStack.java | 2 +-
.../dbcp/pool2/impl/GenericKeyedObjectPool.java | 2 +-
.../pool2/impl/InterruptibleReentrantLock.java | 2 +-
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 10 +-
java/org/apache/tomcat/jni/SSLContext.java | 4 +-
.../org/apache/tomcat/util/IntrospectionUtils.java | 8 +-
.../tomcat/util/bcel/classfile/ConstantUtf8.java | 2 +-
java/org/apache/tomcat/util/buf/ByteChunk.java | 12 +-
java/org/apache/tomcat/util/buf/CharChunk.java | 8 +-
java/org/apache/tomcat/util/buf/UDecoder.java | 2 +-
java/org/apache/tomcat/util/buf/UEncoder.java | 2 +-
.../util/collections/CaseInsensitiveKeyMap.java | 6 +-
.../collections/ManagedConcurrentWeakHashMap.java | 2 +-
.../tomcat/util/descriptor/web/Injectable.java | 6 +-
.../tomcat/util/descriptor/web/WebRuleSet.java | 42 +-
java/org/apache/tomcat/util/digester/Digester.java | 4 +-
.../tomcat/util/digester/DocumentProperties.java | 4 +-
.../util/digester/ObjectCreationFactory.java | 6 +-
java/org/apache/tomcat/util/digester/Rules.java | 12 +-
.../tomcat/util/file/ConfigurationSource.java | 14 +-
.../tomcat/util/http/FastHttpDateFormat.java | 6 +-
java/org/apache/tomcat/util/http/MimeHeaders.java | 4 +-
java/org/apache/tomcat/util/http/ResponseUtil.java | 6 +-
.../org/apache/tomcat/util/http/parser/Cookie.java | 2 +-
java/org/apache/tomcat/util/http/parser/Host.java | 2 +-
.../apache/tomcat/util/http/parser/HttpParser.java | 2 +-
.../util/modeler/BaseNotificationBroadcaster.java | 2 +-
.../apache/tomcat/util/modeler/RegistryMBean.java | 10 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 16 +-
.../tomcat/util/net/ApplicationBufferHandler.java | 10 +-
java/org/apache/tomcat/util/net/DispatchType.java | 2 +-
java/org/apache/tomcat/util/net/SSLContext.java | 16 +-
java/org/apache/tomcat/util/net/SSLHostConfig.java | 2 +-
.../tomcat/util/net/SSLHostConfigCertificate.java | 2 +-
.../apache/tomcat/util/net/SSLSessionManager.java | 2 +-
java/org/apache/tomcat/util/net/SSLSupport.java | 32 +-
java/org/apache/tomcat/util/net/SSLUtil.java | 16 +-
.../apache/tomcat/util/net/SocketWrapperBase.java | 2 +-
.../util/net/openssl/OpenSSLX509Certificate.java | 2 +-
.../tomcat/util/net/openssl/ciphers/Cipher.java | 2 +-
.../ciphers/OpenSSLCipherConfigurationParser.java | 2 +-
.../tomcat/util/net/openssl/ciphers/Protocol.java | 2 +-
.../tomcat/util/scan/StandardJarScanner.java | 2 +-
.../org/apache/tomcat/util/threads/LimitLatch.java | 2 +-
.../tomcat/util/threads/ResizableExecutor.java | 10 +-
.../ObjectReflectionPropertyInspector.java | 2 +-
.../tomcat/websocket/AsyncChannelGroupUtil.java | 2 +-
.../websocket/AsyncChannelWrapperSecure.java | 12 +-
.../tomcat/websocket/AuthenticationType.java | 2 +-
.../tomcat/websocket/BackgroundProcessManager.java | 2 +-
.../tomcat/websocket/FutureToSendHandler.java | 2 +-
java/org/apache/tomcat/websocket/MessagePart.java | 2 +-
java/org/apache/tomcat/websocket/Util.java | 2 +-
.../org/apache/tomcat/websocket/WsFrameClient.java | 2 +-
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 18 +-
.../tomcat/websocket/WsWebSocketContainer.java | 2 +-
.../tomcat/websocket/pojo/PojoMethodMapping.java | 2 +-
.../tomcat/websocket/server/UriTemplate.java | 2 +-
.../tomcat/websocket/server/WsServerContainer.java | 4 +-
.../apache/tomcat/jdbc/pool/PoolConfiguration.java | 216 +++++-----
.../tomcat/jdbc/pool/PooledConnectionMBean.java | 34 +-
.../org/apache/tomcat/jdbc/pool/Validator.java | 2 +-
.../pool/interceptor/ResetAbandonedTimerMBean.java | 2 +-
.../pool/interceptor/SlowQueryReportJmxMBean.java | 2 +-
.../jdbc/pool/interceptor/StatementCacheMBean.java | 10 +-
.../tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java | 38 +-
.../interceptor/StatementCounterInterceptor.java | 2 +-
.../apache/tomcat/jdbc/test/TestValidation.java | 2 +-
res/checkstyle/checkstyle.xml | 2 -
test/jakarta/el/TestResourceBundleELResolver.java | 4 +-
.../servlet/http/HttpServletDoHeadBaseTest.java | 4 +-
test/jakarta/servlet/http/TestHttpServlet.java | 10 +-
.../servlet/http/TestHttpServletPerformance.java | 2 +-
.../authenticator/TestCallbackHandlerImpl.java | 27 +-
.../TestJaspicCallbackHandlerInAuthenticator.java | 15 -
.../TesterDigestAuthenticatorPerformance.java | 4 +-
.../jaspic/TestAuthConfigFactoryImpl.java | 2 +-
.../TestCoyoteAdapterCanonicalization.java | 2 +-
.../connector/TestCoyoteAdapterRequestFuzzing.java | 2 +-
.../catalina/connector/TestCoyoteOutputStream.java | 8 +-
.../catalina/connector/TestOutputBuffer.java | 4 +-
.../org/apache/catalina/connector/TestRequest.java | 2 +-
.../apache/catalina/connector/TestSendFile.java | 2 +-
.../catalina/core/TestApplicationContext.java | 4 +-
...TestApplicationContextGetRequestDispatcher.java | 4 +-
.../catalina/core/TestApplicationHttpRequest.java | 4 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 26 +-
.../core/TestAsyncContextStateChanges.java | 2 +-
.../apache/catalina/core/TestStandardContext.java | 2 +-
.../catalina/core/TestStandardContextValve.java | 4 +-
.../catalina/core/TestSwallowAbortedUploads.java | 2 +-
.../catalina/filters/TestAddCharSetFilter.java | 2 +-
.../filters/TestCsrfPreventionFilter2.java | 2 +-
.../TestWebappClassLoaderExecutorMemoryLeak.java | 2 +-
.../apache/catalina/mapper/TestMapperListener.java | 2 +-
.../catalina/nonblocking/TestNonBlockingAPI.java | 30 +-
.../servlets/DefaultServletEncodingBaseTest.java | 2 +-
.../catalina/servlets/TestDefaultServlet.java | 4 +-
.../catalina/servlets/TestDefaultServletPut.java | 2 +-
test/org/apache/catalina/session/Benchmarks.java | 4 +-
test/org/apache/catalina/session/Threading.java | 2 +-
.../apache/catalina/startup/TestContextConfig.java | 2 +-
.../catalina/startup/TestMultipartConfig.java | 2 +-
.../catalina/startup/TestTomcatClassLoader.java | 2 +-
.../catalina/startup/TestWebappServiceLoader.java | 2 +-
test/org/apache/catalina/tribes/demos/MapDemo.java | 2 +-
.../group/interceptors/TestEncryptInterceptor.java | 2 +-
test/org/apache/catalina/valves/Benchmarks.java | 2 +-
.../valves/TestLoadBalancerDrainingValve.java | 2 +-
test/org/apache/coyote/TestIoTimeouts.java | 4 +-
.../coyote/ajp/TestAbstractAjpProcessor.java | 4 +-
test/org/apache/coyote/ajp/TesterAjpMessage.java | 8 +-
.../coyote/http11/TestHttp11InputBuffer.java | 10 +-
.../coyote/http11/TestHttp11InputBufferCRLF.java | 2 +-
.../coyote/http11/TestHttp11OutputBuffer.java | 2 +-
.../apache/coyote/http11/TestHttp11Processor.java | 14 +-
.../http11/filters/TestChunkedInputFilter.java | 6 +-
.../apache/coyote/http11/upgrade/TestUpgrade.java | 6 +-
.../http11/upgrade/TestUpgradeInternalHandler.java | 4 +-
test/org/apache/coyote/http2/Http2TestBase.java | 6 +-
.../apache/coyote/http2/TestAbstractStream.java | 2 +-
test/org/apache/coyote/http2/TestAsyncTimeout.java | 4 +-
test/org/apache/coyote/http2/TestHpack.java | 2 +-
.../coyote/http2/TestHttp2InitialConnection.java | 2 +-
test/org/apache/coyote/http2/TestHttp2Limits.java | 2 +-
.../apache/coyote/http2/TestStreamQueryString.java | 2 +-
test/org/apache/el/lang/TestELSupport.java | 22 +-
.../org/apache/jasper/el/TestJasperELResolver.java | 2 +-
.../optimizations/TestELInterpreterTagSetters.java | 2 +-
.../TestStringInterpreterTagSetters.java | 2 +-
.../runtime/TestTagHandlerPoolPerformance.java | 4 +-
test/org/apache/jasper/runtime/TesterBean.java | 2 +-
.../org/apache/juli/TestClassLoaderLogManager.java | 4 +-
.../juli/TestOneLineFormatterPerformance.java | 2 +-
.../tomcat/unittest/TesterThreadedPerformance.java | 2 +-
.../util/buf/TestCharsetCachePerformance.java | 4 +-
.../util/buf/TestMessageBytesConversion.java | 4 +-
.../apache/tomcat/util/http/TestCookieParsing.java | 4 +-
.../http/TestCookieProcessorGenerationHttp.java | 2 +-
.../http/TestFastHttpDateFormatPerformance.java | 2 +-
.../util/http/TestMimeHeadersIntegration.java | 2 +-
.../apache/tomcat/util/http/TestParameters.java | 2 +-
.../util/http/TestRequestUtilSameOrigin.java | 2 +-
.../tomcat/util/http/parser/TestMediaType.java | 2 +-
.../util/net/openssl/ciphers/TestCipher.java | 2 +-
.../apache/tomcat/util/threads/TestLimitLatch.java | 2 +-
test/org/apache/tomcat/websocket/TestUtil.java | 2 +-
.../tomcat/websocket/TesterFirehoseServer.java | 2 +-
.../WEB-INF/classes/async/Stockticker.java | 6 +-
.../examples/WEB-INF/classes/examples/FooTag.java | 2 +-
.../WEB-INF/classes/websocket/drawboard/Room.java | 2 +-
453 files changed, 2631 insertions(+), 2656 deletions(-)
diff --git a/java/jakarta/annotation/Generated.java b/java/jakarta/annotation/Generated.java
index 8348127a84..e13713dd50 100644
--- a/java/jakarta/annotation/Generated.java
+++ b/java/jakarta/annotation/Generated.java
@@ -37,13 +37,13 @@ public @interface Generated {
* @return The name of the code generator. It is recommended that the fully
* qualified name of the code generator is used.
*/
- public String[] value();
+ String[] value();
/**
* @return The date the code was generated
*/
- public String date() default "";
+ String date() default "";
/**
* @return Additional comments (if any) related to the code generation
*/
- public String comments() default "";
+ String comments() default "";
}
diff --git a/java/jakarta/annotation/Resource.java b/java/jakarta/annotation/Resource.java
index a80c573938..b779288923 100644
--- a/java/jakarta/annotation/Resource.java
+++ b/java/jakarta/annotation/Resource.java
@@ -37,7 +37,7 @@ public @interface Resource {
/**
* The AuthenticationType, either CONTAINER or APPLICATION
*/
- public enum AuthenticationType {
+ enum AuthenticationType {
/**
* Container authentication
*/
@@ -51,39 +51,39 @@ public @interface Resource {
/**
* @return a String with the name of the resource
*/
- public String name() default "";
+ String name() default "";
/**
* Uses generics since Common Annotations 1.2.
*
* @return The type for instances of this resource
*/
- public Class<?> type() default Object.class;
+ Class<?> type() default Object.class;
/**
* @return the AuthenticationType of the resource default CONTAINER
*/
- public AuthenticationType authenticationType() default AuthenticationType.CONTAINER;
+ AuthenticationType authenticationType() default AuthenticationType.CONTAINER;
/**
* @return true (default) if the resource is shareable, or false if not
*/
- public boolean shareable() default true;
+ boolean shareable() default true;
/**
* @return a string with the description for the resource
*/
- public String description() default "";
+ String description() default "";
/**
* @return a string with the mappedName of the resource
*/
- public String mappedName() default "";
+ String mappedName() default "";
/**
* @since Common Annotations 1.1
*
* @return The name of the entry, if any, to use for this resource
*/
- public String lookup() default "";
+ String lookup() default "";
}
diff --git a/java/jakarta/annotation/Resources.java b/java/jakarta/annotation/Resources.java
index 17c154bda8..6ade76d6a6 100644
--- a/java/jakarta/annotation/Resources.java
+++ b/java/jakarta/annotation/Resources.java
@@ -35,5 +35,5 @@ public @interface Resources {
/**
* @return a Resource[] with the value of this Resources
*/
- public Resource[] value();
+ Resource[] value();
}
diff --git a/java/jakarta/annotation/security/DeclareRoles.java b/java/jakarta/annotation/security/DeclareRoles.java
index 0f2eb21e90..3762af6a94 100644
--- a/java/jakarta/annotation/security/DeclareRoles.java
+++ b/java/jakarta/annotation/security/DeclareRoles.java
@@ -33,5 +33,5 @@ public @interface DeclareRoles {
/**
* @return a String[] with the roles
*/
- public String[] value();
+ String[] value();
}
diff --git a/java/jakarta/annotation/security/RolesAllowed.java b/java/jakarta/annotation/security/RolesAllowed.java
index 9bb62b578b..77cd130b40 100644
--- a/java/jakarta/annotation/security/RolesAllowed.java
+++ b/java/jakarta/annotation/security/RolesAllowed.java
@@ -33,5 +33,5 @@ public @interface RolesAllowed {
/**
* @return a String[] of the allowed roles
*/
- public String[] value();
+ String[] value();
}
diff --git a/java/jakarta/annotation/security/RunAs.java b/java/jakarta/annotation/security/RunAs.java
index 33fe2762e4..d5029b7ecc 100644
--- a/java/jakarta/annotation/security/RunAs.java
+++ b/java/jakarta/annotation/security/RunAs.java
@@ -33,5 +33,5 @@ public @interface RunAs {
/**
* @return a String with the value for RunAs
*/
- public String value();
+ String value();
}
diff --git a/java/jakarta/el/ArrayELResolver.java b/java/jakarta/el/ArrayELResolver.java
index 410c31b9ef..ae45f60795 100644
--- a/java/jakarta/el/ArrayELResolver.java
+++ b/java/jakarta/el/ArrayELResolver.java
@@ -142,14 +142,14 @@ public class ArrayELResolver extends ELResolver {
return null;
}
- private static final void checkBounds(Object base, int idx) {
+ private static void checkBounds(Object base, int idx) {
if (idx < 0 || idx >= Array.getLength(base)) {
throw new PropertyNotFoundException(
new ArrayIndexOutOfBoundsException(idx).getMessage());
}
}
- private static final int coerce(Object property) {
+ private static int coerce(Object property) {
if (property instanceof Number) {
return ((Number) property).intValue();
}
diff --git a/java/jakarta/el/BeanELResolver.java b/java/jakarta/el/BeanELResolver.java
index eb54c36bd6..869bcd5cf0 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -222,7 +222,7 @@ public class BeanELResolver extends ELResolver {
private final Class<?> type;
- public BeanProperties(Class<?> type) throws ELException {
+ BeanProperties(Class<?> type) throws ELException {
this.type = type;
this.properties = new HashMap<>();
try {
@@ -289,7 +289,7 @@ public class BeanELResolver extends ELResolver {
private Method write;
- public BeanProperty(Class<?> owner, PropertyDescriptor descriptor) {
+ BeanProperty(Class<?> owner, PropertyDescriptor descriptor) {
this.owner = owner;
this.descriptor = descriptor;
this.type = descriptor.getPropertyType();
@@ -329,7 +329,7 @@ public class BeanELResolver extends ELResolver {
}
}
- private final BeanProperty property(ELContext ctx, Object base,
+ private BeanProperty property(ELContext ctx, Object base,
Object property) {
Class<?> type = base.getClass();
String prop = property.toString();
@@ -349,7 +349,7 @@ public class BeanELResolver extends ELResolver {
private final Map<K,V> eden;
private final Map<K,V> longterm;
- public ConcurrentCache(int size) {
+ ConcurrentCache(int size) {
this.size = size;
this.eden = new ConcurrentHashMap<>(size);
this.longterm = new WeakHashMap<>(size);
diff --git a/java/jakarta/el/CompositeELResolver.java b/java/jakarta/el/CompositeELResolver.java
index 40821f5400..22f0a580c7 100644
--- a/java/jakarta/el/CompositeELResolver.java
+++ b/java/jakarta/el/CompositeELResolver.java
@@ -181,7 +181,7 @@ public class CompositeELResolver extends ELResolver {
private FeatureDescriptor next;
- public FeatureIterator(ELContext context, Object base, ELResolver[] resolvers, int size) {
+ FeatureIterator(ELContext context, Object base, ELResolver[] resolvers, int size) {
this.context = context;
this.base = base;
this.resolvers = resolvers;
diff --git a/java/jakarta/el/ELContextListener.java b/java/jakarta/el/ELContextListener.java
index 8b7bf268bf..99da2c7514 100644
--- a/java/jakarta/el/ELContextListener.java
+++ b/java/jakarta/el/ELContextListener.java
@@ -22,6 +22,6 @@ package jakarta.el;
*/
public interface ELContextListener extends java.util.EventListener {
- public void contextCreated(ELContextEvent event);
+ void contextCreated(ELContextEvent event);
}
diff --git a/java/jakarta/el/ELProcessor.java b/java/jakarta/el/ELProcessor.java
index 736ca9ce09..c7733c2a12 100644
--- a/java/jakarta/el/ELProcessor.java
+++ b/java/jakarta/el/ELProcessor.java
@@ -216,7 +216,7 @@ public class ELProcessor {
private final String name;
private final String[] parameterTypeNames;
- public MethodSignature(ELContext context, String methodName,
+ MethodSignature(ELContext context, String methodName,
String className) throws NoSuchMethodException {
int paramIndex = methodName.indexOf('(');
diff --git a/java/jakarta/el/ExpressionFactory.java b/java/jakarta/el/ExpressionFactory.java
index 4cc8f20897..3d38e9adc2 100644
--- a/java/jakarta/el/ExpressionFactory.java
+++ b/java/jakarta/el/ExpressionFactory.java
@@ -254,7 +254,7 @@ public abstract class ExpressionFactory {
private final int hash;
private final WeakReference<ClassLoader> ref;
- public CacheKey(ClassLoader cl) {
+ CacheKey(ClassLoader cl) {
hash = cl.hashCode();
ref = new WeakReference<>(cl);
}
@@ -285,7 +285,7 @@ public abstract class ExpressionFactory {
private String className;
private WeakReference<Class<?>> ref;
- public CacheValue() {
+ CacheValue() {
}
public ReadWriteLock getLock() {
@@ -380,7 +380,7 @@ public abstract class ExpressionFactory {
return null;
}
- private static final String getClassNameSysProp() {
+ private static String getClassNameSysProp() {
String value = System.getProperty(PROPERTY_NAME);
if (value != null && value.trim().length() > 0) {
return value.trim();
diff --git a/java/jakarta/el/ListELResolver.java b/java/jakarta/el/ListELResolver.java
index c894bea3cf..bf4446405b 100644
--- a/java/jakarta/el/ListELResolver.java
+++ b/java/jakarta/el/ListELResolver.java
@@ -146,7 +146,7 @@ public class ListELResolver extends ELResolver {
return null;
}
- private static final int coerce(Object property) {
+ private static int coerce(Object property) {
if (property instanceof Number) {
return ((Number) property).intValue();
}
diff --git a/java/jakarta/el/StandardELContext.java b/java/jakarta/el/StandardELContext.java
index 669a072627..9f04060ac0 100644
--- a/java/jakarta/el/StandardELContext.java
+++ b/java/jakarta/el/StandardELContext.java
@@ -147,7 +147,7 @@ public class StandardELContext extends ELContext {
private final Map<String,Object> beans;
- public StandardBeanNameResolver(Map<String,Object> beans) {
+ StandardBeanNameResolver(Map<String,Object> beans) {
this.beans = beans;
}
@@ -183,7 +183,7 @@ public class StandardELContext extends ELContext {
private final Map<String,Method> methods = new HashMap<>();
- public StandardFunctionMapper(Map<String,Method> initFunctionMap) {
+ StandardFunctionMapper(Map<String,Method> initFunctionMap) {
if (initFunctionMap != null) {
methods.putAll(initFunctionMap);
}
diff --git a/java/jakarta/el/Util.java b/java/jakarta/el/Util.java
index ee5848cb2d..40860e5231 100644
--- a/java/jakarta/el/Util.java
+++ b/java/jakarta/el/Util.java
@@ -167,7 +167,7 @@ class Util {
private final int hash;
private final WeakReference<ClassLoader> ref;
- public CacheKey(ClassLoader key) {
+ CacheKey(ClassLoader key) {
hash = key.hashCode();
ref = new WeakReference<>(key);
}
@@ -197,7 +197,7 @@ class Util {
private final ReadWriteLock lock = new ReentrantReadWriteLock();
private WeakReference<ExpressionFactory> ref;
- public CacheValue() {
+ CacheValue() {
}
public ReadWriteLock getLock() {
@@ -402,7 +402,7 @@ class Util {
}
- private static final String paramString(Class<?>[] types) {
+ private static String paramString(Class<?>[] types) {
if (types != null) {
StringBuilder sb = new StringBuilder();
for (Class<?> type : types) {
@@ -716,7 +716,7 @@ class Util {
private static class MethodWrapper extends Wrapper<Method> {
private final Method m;
- public MethodWrapper(Method m) {
+ MethodWrapper(Method m) {
this.m = m;
}
@@ -744,7 +744,7 @@ class Util {
private static class ConstructorWrapper extends Wrapper<Constructor<?>> {
private final Constructor<?> c;
- public ConstructorWrapper(Constructor<?> c) {
+ ConstructorWrapper(Constructor<?> c) {
this.c = c;
}
@@ -782,7 +782,7 @@ class Util {
private final int varArgsCount;
private final boolean bridge;
- public MatchResult(boolean varArgs, int exactCount, int assignableCount, int coercibleCount, int varArgsCount,
+ MatchResult(boolean varArgs, int exactCount, int assignableCount, int coercibleCount, int varArgsCount,
boolean bridge) {
this.varArgs = varArgs;
this.exactCount = exactCount;
diff --git a/java/jakarta/security/auth/message/MessagePolicy.java b/java/jakarta/security/auth/message/MessagePolicy.java
index 603705cd20..f58aaf5605 100644
--- a/java/jakarta/security/auth/message/MessagePolicy.java
+++ b/java/jakarta/security/auth/message/MessagePolicy.java
@@ -40,16 +40,16 @@ public class MessagePolicy {
return targetPolicies;
}
- public static interface ProtectionPolicy {
+ public interface ProtectionPolicy {
- static String AUTHENTICATE_SENDER = "#authenticateSender";
- static String AUTHENTICATE_CONTENT = "#authenticateContent";
- static String AUTHENTICATE_RECIPIENT = "#authenticateRecipient";
+ String AUTHENTICATE_SENDER = "#authenticateSender";
+ String AUTHENTICATE_CONTENT = "#authenticateContent";
+ String AUTHENTICATE_RECIPIENT = "#authenticateRecipient";
String getID();
}
- public static interface Target {
+ public interface Target {
Object get(MessageInfo messageInfo);
diff --git a/java/jakarta/security/auth/message/callback/PrivateKeyCallback.java b/java/jakarta/security/auth/message/callback/PrivateKeyCallback.java
index fb9d43b086..c489c5166f 100644
--- a/java/jakarta/security/auth/message/callback/PrivateKeyCallback.java
+++ b/java/jakarta/security/auth/message/callback/PrivateKeyCallback.java
@@ -56,7 +56,7 @@ public class PrivateKeyCallback implements Callback {
return chain;
}
- public static interface Request {
+ public interface Request {
}
public static class AliasRequest implements Request {
diff --git a/java/jakarta/security/auth/message/callback/SecretKeyCallback.java b/java/jakarta/security/auth/message/callback/SecretKeyCallback.java
index 71c6a4ddda..7e16ea42da 100644
--- a/java/jakarta/security/auth/message/callback/SecretKeyCallback.java
+++ b/java/jakarta/security/auth/message/callback/SecretKeyCallback.java
@@ -44,7 +44,7 @@ public class SecretKeyCallback implements Callback {
return key;
}
- public static interface Request {
+ public interface Request {
}
public static class AliasRequest implements Request {
diff --git a/java/jakarta/security/auth/message/config/AuthConfigFactory.java b/java/jakarta/security/auth/message/config/AuthConfigFactory.java
index 68282d6c65..f58a1e4b0c 100644
--- a/java/jakarta/security/auth/message/config/AuthConfigFactory.java
+++ b/java/jakarta/security/auth/message/config/AuthConfigFactory.java
@@ -175,7 +175,7 @@ public abstract class AuthConfigFactory {
return DEFAULT_JASPI_AUTHCONFIGFACTORYIMPL;
}
- public static interface RegistrationContext {
+ public interface RegistrationContext {
String getMessageLayer();
diff --git a/java/jakarta/servlet/AsyncContext.java b/java/jakarta/servlet/AsyncContext.java
index aafb05724e..91b2c60634 100644
--- a/java/jakarta/servlet/AsyncContext.java
+++ b/java/jakarta/servlet/AsyncContext.java
@@ -26,37 +26,37 @@ public interface AsyncContext {
/**
* The attribute name for the URI of the async request
*/
- public static final String ASYNC_REQUEST_URI =
+ String ASYNC_REQUEST_URI =
"jakarta.servlet.async.request_uri";
/**
* The attribute name for the Context Path of the async request
*/
- public static final String ASYNC_CONTEXT_PATH =
+ String ASYNC_CONTEXT_PATH =
"jakarta.servlet.async.context_path";
/**
* The attribute name for the Mapping of the async request
*/
- public static final String ASYNC_MAPPING =
+ String ASYNC_MAPPING =
"jakarta.servlet.async.mapping";
/**
* The attribute name for the Path Info of the async request
*/
- public static final String ASYNC_PATH_INFO =
+ String ASYNC_PATH_INFO =
"jakarta.servlet.async.path_info";
/**
* The attribute name for the Servlet Path of the async request
*/
- public static final String ASYNC_SERVLET_PATH =
+ String ASYNC_SERVLET_PATH =
"jakarta.servlet.async.servlet_path";
/**
* The attribute name for the Query String of the async request
*/
- public static final String ASYNC_QUERY_STRING =
+ String ASYNC_QUERY_STRING =
"jakarta.servlet.async.query_string";
/**
diff --git a/java/jakarta/servlet/Filter.java b/java/jakarta/servlet/Filter.java
index dbbe71821d..4473ec3d7f 100644
--- a/java/jakarta/servlet/Filter.java
+++ b/java/jakarta/servlet/Filter.java
@@ -65,7 +65,7 @@ public interface Filter {
*
* @throws ServletException if the initialisation fails
*/
- public default void init(FilterConfig filterConfig) throws ServletException {}
+ default void init(FilterConfig filterConfig) throws ServletException {}
/**
* The <code>doFilter</code> method of the Filter is called by the container
@@ -98,7 +98,7 @@ public interface Filter {
* processing of the request
* @throws ServletException if the processing fails for any other reason
*/
- public void doFilter(ServletRequest request, ServletResponse response,
+ void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException;
/**
@@ -116,5 +116,5 @@ public interface Filter {
*
* The default implementation is a NO-OP.
*/
- public default void destroy() {}
+ default void destroy() {}
}
diff --git a/java/jakarta/servlet/FilterChain.java b/java/jakarta/servlet/FilterChain.java
index 67ef19833e..d227808886 100644
--- a/java/jakarta/servlet/FilterChain.java
+++ b/java/jakarta/servlet/FilterChain.java
@@ -44,7 +44,7 @@ public interface FilterChain {
* request
* @throws ServletException if the processing fails for any other reason
*/
- public void doFilter(ServletRequest request, ServletResponse response)
+ void doFilter(ServletRequest request, ServletResponse response)
throws IOException, ServletException;
}
diff --git a/java/jakarta/servlet/FilterConfig.java b/java/jakarta/servlet/FilterConfig.java
index a7875651dc..a888ec7e16 100644
--- a/java/jakarta/servlet/FilterConfig.java
+++ b/java/jakarta/servlet/FilterConfig.java
@@ -33,7 +33,7 @@ public interface FilterConfig {
* @return The filter-name of this filter as defined in the deployment
* descriptor.
*/
- public String getFilterName();
+ String getFilterName();
/**
* Returns a reference to the {@link ServletContext} in which the caller is
@@ -44,7 +44,7 @@ public interface FilterConfig {
*
* @see ServletContext
*/
- public ServletContext getServletContext();
+ ServletContext getServletContext();
/**
* Returns a <code>String</code> containing the value of the named
@@ -58,7 +58,7 @@ public interface FilterConfig {
* @return <code>String</code> containing the value of the initialization
* parameter
*/
- public String getInitParameter(String name);
+ String getInitParameter(String name);
/**
* Returns the names of the filter's initialization parameters as an
@@ -68,6 +68,6 @@ public interface FilterConfig {
* @return <code>Enumeration</code> of <code>String</code> objects
* containing the names of the filter's initialization parameters
*/
- public Enumeration<String> getInitParameterNames();
+ Enumeration<String> getInitParameterNames();
}
diff --git a/java/jakarta/servlet/FilterRegistration.java b/java/jakarta/servlet/FilterRegistration.java
index 1d1c9c167a..d75f7643aa 100644
--- a/java/jakarta/servlet/FilterRegistration.java
+++ b/java/jakarta/servlet/FilterRegistration.java
@@ -41,7 +41,7 @@ public interface FilterRegistration extends Registration {
* @throws IllegalStateException if the associated ServletContext has
* already been initialised
*/
- public void addMappingForServletNames(
+ void addMappingForServletNames(
EnumSet<DispatcherType> dispatcherTypes,
boolean isMatchAfter, String... servletNames);
@@ -51,7 +51,7 @@ public interface FilterRegistration extends Registration {
*
* @return a Collection of the Servlet name mappings
*/
- public Collection<String> getServletNameMappings();
+ Collection<String> getServletNameMappings();
/**
* Add a mapping for this filter to one or more URL patterns.
@@ -68,7 +68,7 @@ public interface FilterRegistration extends Registration {
* @throws IllegalStateException if the associated ServletContext has
* already been initialised
*/
- public void addMappingForUrlPatterns(
+ void addMappingForUrlPatterns(
EnumSet<DispatcherType> dispatcherTypes,
boolean isMatchAfter, String... urlPatterns);
@@ -78,13 +78,13 @@ public interface FilterRegistration extends Registration {
*
* @return a Collection of the URL pattern mappings
*/
- public Collection<String> getUrlPatternMappings();
+ Collection<String> getUrlPatternMappings();
/**
* Interface through which a Filter registered via one of the addFilter
* methods on ServletContext may be further configured.
*/
- public static interface Dynamic extends FilterRegistration, Registration.Dynamic {
+ interface Dynamic extends FilterRegistration, Registration.Dynamic {
// No additional methods
}
}
diff --git a/java/jakarta/servlet/ReadListener.java b/java/jakarta/servlet/ReadListener.java
index c31bba6170..08488ec4bc 100644
--- a/java/jakarta/servlet/ReadListener.java
+++ b/java/jakarta/servlet/ReadListener.java
@@ -34,19 +34,19 @@ public interface ReadListener extends java.util.EventListener{
*
* @throws IOException id an I/O error occurs while processing the event
*/
- public abstract void onDataAvailable() throws IOException;
+ void onDataAvailable() throws IOException;
/**
* Invoked when the request body has been fully read.
*
* @throws IOException id an I/O error occurs while processing the event
*/
- public abstract void onAllDataRead() throws IOException;
+ void onAllDataRead() throws IOException;
/**
* Invoked if an error occurs while reading the request body.
*
* @param throwable The exception that occurred
*/
- public abstract void onError(java.lang.Throwable throwable);
+ void onError(java.lang.Throwable throwable);
}
diff --git a/java/jakarta/servlet/Registration.java b/java/jakarta/servlet/Registration.java
index 3213fa47b4..b88c41e1cd 100644
--- a/java/jakarta/servlet/Registration.java
+++ b/java/jakarta/servlet/Registration.java
@@ -31,14 +31,14 @@ public interface Registration {
*
* @return the name of the Servlet.
*/
- public String getName();
+ String getName();
/**
* Obtain the name of the implementation class for the Servlet.
*
* @return the name of the implementation class for the Servlet.
*/
- public String getClassName();
+ String getClassName();
/**
* Add an initialisation parameter if not already added.
@@ -53,7 +53,7 @@ public interface Registration {
* @throws IllegalStateException if the ServletContext associated with this
* registration has already been initialised
*/
- public boolean setInitParameter(String name, String value);
+ boolean setInitParameter(String name, String value);
/**
* Get the value of an initialisation parameter.
@@ -62,7 +62,7 @@ public interface Registration {
*
* @return The value of the named initialisation parameter
*/
- public String getInitParameter(String name);
+ String getInitParameter(String name);
/**
* Add multiple initialisation parameters. If any of the supplied
@@ -79,7 +79,7 @@ public interface Registration {
* @throws IllegalStateException if the ServletContext associated with this
* registration has already been initialised
*/
- public Set<String> setInitParameters(Map<String,String> initParameters);
+ Set<String> setInitParameters(Map<String,String> initParameters);
/**
* Get the names and values of all the initialisation parameters.
@@ -87,14 +87,14 @@ public interface Registration {
* @return A Map of initialisation parameter names and associated values
* keyed by name
*/
- public Map<String, String> getInitParameters();
+ Map<String, String> getInitParameters();
/**
* Interface through which a Servlet or Filter registered via one of the
* addServlet or addFilter methods, respectively, on ServletContext may be
* further configured.
*/
- public interface Dynamic extends Registration {
+ interface Dynamic extends Registration {
/**
* Mark this Servlet/Filter as supported asynchronous processing.
@@ -105,6 +105,6 @@ public interface Registration {
* @throws IllegalStateException if the ServletContext associated with
* this registration has already been initialised
*/
- public void setAsyncSupported(boolean isAsyncSupported);
+ void setAsyncSupported(boolean isAsyncSupported);
}
}
diff --git a/java/jakarta/servlet/RequestDispatcher.java b/java/jakarta/servlet/RequestDispatcher.java
index 0c94b00921..ccd478b5b2 100644
--- a/java/jakarta/servlet/RequestDispatcher.java
+++ b/java/jakarta/servlet/RequestDispatcher.java
@@ -44,7 +44,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- static final String FORWARD_REQUEST_URI = "jakarta.servlet.forward.request_uri";
+ String FORWARD_REQUEST_URI = "jakarta.servlet.forward.request_uri";
/**
* The name of the request attribute that should be set by the container
@@ -55,7 +55,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- static final String FORWARD_CONTEXT_PATH = "jakarta.servlet.forward.context_path";
+ String FORWARD_CONTEXT_PATH = "jakarta.servlet.forward.context_path";
/**
* The name of the request attribute that should be set by the container
@@ -66,7 +66,7 @@ public interface RequestDispatcher {
*
* @since Servlet 4.0
*/
- static final String FORWARD_MAPPING = "jakarta.servlet.forward.mapping";
+ String FORWARD_MAPPING = "jakarta.servlet.forward.mapping";
/**
* The name of the request attribute that should be set by the container
@@ -77,7 +77,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- static final String FORWARD_PATH_INFO = "jakarta.servlet.forward.path_info";
+ String FORWARD_PATH_INFO = "jakarta.servlet.forward.path_info";
/**
* The name of the request attribute that should be set by the container
@@ -88,7 +88,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- static final String FORWARD_SERVLET_PATH = "jakarta.servlet.forward.servlet_path";
+ String FORWARD_SERVLET_PATH = "jakarta.servlet.forward.servlet_path";
/**
* The name of the request attribute that should be set by the container
@@ -99,7 +99,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- static final String FORWARD_QUERY_STRING = "jakarta.servlet.forward.query_string";
+ String FORWARD_QUERY_STRING = "jakarta.servlet.forward.query_string";
/**
* The name of the request attribute that should be set by the container
@@ -111,7 +111,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- static final String INCLUDE_REQUEST_URI = "jakarta.servlet.include.request_uri";
+ String INCLUDE_REQUEST_URI = "jakarta.servlet.include.request_uri";
/**
* The name of the request attribute that should be set by the container
@@ -123,7 +123,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- static final String INCLUDE_CONTEXT_PATH = "jakarta.servlet.include.context_path";
+ String INCLUDE_CONTEXT_PATH = "jakarta.servlet.include.context_path";
/**
* The name of the request attribute that should be set by the container
@@ -135,7 +135,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- static final String INCLUDE_PATH_INFO = "jakarta.servlet.include.path_info";
+ String INCLUDE_PATH_INFO = "jakarta.servlet.include.path_info";
/**
* The name of the request attribute that should be set by the container
@@ -147,7 +147,7 @@ public interface RequestDispatcher {
*
* @since Servlet 4.0
*/
- static final String INCLUDE_MAPPING = "jakarta.servlet.include.mapping";
+ String INCLUDE_MAPPING = "jakarta.servlet.include.mapping";
/**
* The name of the request attribute that should be set by the container
@@ -159,7 +159,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- static final String INCLUDE_SERVLET_PATH = "jakarta.servlet.include.servlet_path";
+ String INCLUDE_SERVLET_PATH = "jakarta.servlet.include.servlet_path";
/**
* The name of the request attribute that should be set by the container
@@ -171,7 +171,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- static final String INCLUDE_QUERY_STRING = "jakarta.servlet.include.query_string";
+ String INCLUDE_QUERY_STRING = "jakarta.servlet.include.query_string";
/**
* The name of the request attribute that should be set by the container
@@ -181,7 +181,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- public static final String ERROR_EXCEPTION = "jakarta.servlet.error.exception";
+ String ERROR_EXCEPTION = "jakarta.servlet.error.exception";
/**
* The name of the request attribute that should be set by the container
@@ -191,7 +191,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- public static final String ERROR_EXCEPTION_TYPE = "jakarta.servlet.error.exception_type";
+ String ERROR_EXCEPTION_TYPE = "jakarta.servlet.error.exception_type";
/**
* The name of the request attribute that should be set by the container
@@ -201,7 +201,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- public static final String ERROR_MESSAGE = "jakarta.servlet.error.message";
+ String ERROR_MESSAGE = "jakarta.servlet.error.message";
/**
* The name of the request attribute that should be set by the container
@@ -211,7 +211,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- public static final String ERROR_REQUEST_URI = "jakarta.servlet.error.request_uri";
+ String ERROR_REQUEST_URI = "jakarta.servlet.error.request_uri";
/**
* The name of the request attribute that should be set by the container
@@ -221,7 +221,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- public static final String ERROR_SERVLET_NAME = "jakarta.servlet.error.servlet_name";
+ String ERROR_SERVLET_NAME = "jakarta.servlet.error.servlet_name";
/**
* The name of the request attribute that should be set by the container
@@ -231,7 +231,7 @@ public interface RequestDispatcher {
*
* @since Servlet 3.0
*/
- public static final String ERROR_STATUS_CODE = "jakarta.servlet.error.status_code";
+ String ERROR_STATUS_CODE = "jakarta.servlet.error.status_code";
/**
* Forwards a request from a servlet to another resource (servlet, JSP file,
@@ -276,7 +276,7 @@ public interface RequestDispatcher {
* @exception IllegalStateException
* if the response was already committed
*/
- public void forward(ServletRequest request, ServletResponse response)
+ void forward(ServletRequest request, ServletResponse response)
throws ServletException, IOException;
/**
@@ -310,6 +310,6 @@ public interface RequestDispatcher {
* @exception IOException
* if the included resource throws this exception
*/
- public void include(ServletRequest request, ServletResponse response)
+ void include(ServletRequest request, ServletResponse response)
throws ServletException, IOException;
}
diff --git a/java/jakarta/servlet/Servlet.java b/java/jakarta/servlet/Servlet.java
index 2ee76a1b71..f19b751711 100644
--- a/java/jakarta/servlet/Servlet.java
+++ b/java/jakarta/servlet/Servlet.java
@@ -84,7 +84,7 @@ public interface Servlet {
* @see UnavailableException
* @see #getServletConfig
*/
- public void init(ServletConfig config) throws ServletException;
+ void init(ServletConfig config) throws ServletException;
/**
* Returns a {@link ServletConfig} object, which contains initialization and
@@ -102,7 +102,7 @@ public interface Servlet {
*
* @see #init
*/
- public ServletConfig getServletConfig();
+ ServletConfig getServletConfig();
/**
* Called by the servlet container to allow the servlet to respond to a
@@ -143,7 +143,7 @@ public interface Servlet {
* @exception IOException
* if an input or output exception occurs
*/
- public void service(ServletRequest req, ServletResponse res)
+ void service(ServletRequest req, ServletResponse res)
throws ServletException, IOException;
/**
@@ -156,7 +156,7 @@ public interface Servlet {
*
* @return a <code>String</code> containing servlet information
*/
- public String getServletInfo();
+ String getServletInfo();
/**
* Called by the servlet container to indicate to a servlet that the servlet
@@ -172,5 +172,5 @@ public interface Servlet {
* sure that any persistent state is synchronized with the servlet's current
* state in memory.
*/
- public void destroy();
+ void destroy();
}
diff --git a/java/jakarta/servlet/ServletConfig.java b/java/jakarta/servlet/ServletConfig.java
index a8cdfc3ec1..ee3f0d8a60 100644
--- a/java/jakarta/servlet/ServletConfig.java
+++ b/java/jakarta/servlet/ServletConfig.java
@@ -32,7 +32,7 @@ public interface ServletConfig {
*
* @return the name of the servlet instance
*/
- public String getServletName();
+ String getServletName();
/**
* Returns a reference to the {@link ServletContext} in which the caller is
@@ -42,7 +42,7 @@ public interface ServletConfig {
* with its servlet container
* @see ServletContext
*/
- public ServletContext getServletContext();
+ ServletContext getServletContext();
/**
* Returns a <code>String</code> containing the value of the named
@@ -55,7 +55,7 @@ public interface ServletConfig {
* @return a <code>String</code> containing the value of the initialization
* parameter
*/
- public String getInitParameter(String name);
+ String getInitParameter(String name);
/**
* Returns the names of the servlet's initialization parameters as an
@@ -65,5 +65,5 @@ public interface ServletConfig {
* @return an <code>Enumeration</code> of <code>String</code> objects
* containing the names of the servlet's initialization parameters
*/
- public Enumeration<String> getInitParameterNames();
+ Enumeration<String> getInitParameterNames();
}
diff --git a/java/jakarta/servlet/ServletContext.java b/java/jakarta/servlet/ServletContext.java
index 97a99d6872..08a23b4199 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -55,7 +55,7 @@ public interface ServletContext {
* The name of the ServletContext attribute that holds the temporary file
* location for the web application.
*/
- public static final String TEMPDIR = "jakarta.servlet.context.tempdir";
+ String TEMPDIR = "jakarta.servlet.context.tempdir";
/**
* The name of the ServletContext attribute that holds the ordered list of
@@ -63,7 +63,7 @@ public interface ServletContext {
*
* @since Servlet 3.0
*/
- public static final String ORDERED_LIBS = "jakarta.servlet.context.orderedLibs";
+ String ORDERED_LIBS = "jakarta.servlet.context.orderedLibs";
/**
* Return the main path associated with this context.
@@ -72,7 +72,7 @@ public interface ServletContext {
*
* @since Servlet 2.5
*/
- public String getContextPath();
+ String getContextPath();
/**
* Returns a <code>ServletContext</code> object that corresponds to a
@@ -95,7 +95,7 @@ public interface ServletContext {
* to restrict this access.
* @see RequestDispatcher
*/
- public ServletContext getContext(String uripath);
+ ServletContext getContext(String uripath);
/**
* Returns the major version of the Java Servlet API that this servlet
@@ -104,7 +104,7 @@ public interface ServletContext {
*
* @return 6
*/
- public int getMajorVersion();
+ int getMajorVersion();
/**
* Returns the minor version of the Servlet API that this servlet container
@@ -113,7 +113,7 @@ public interface ServletContext {
*
* @return 0
*/
- public int getMinorVersion();
+ int getMinorVersion();
/**
* Obtain the major version of the servlet specification for which this web
@@ -123,7 +123,7 @@ public interface ServletContext {
*
* @since Servlet 3.0
*/
- public int getEffectiveMajorVersion();
+ int getEffectiveMajorVersion();
/**
* Obtain the minor version of the servlet specification for which this web
@@ -133,7 +133,7 @@ public interface ServletContext {
*
* @since Servlet 3.0
*/
- public int getEffectiveMinorVersion();
+ int getEffectiveMinorVersion();
/**
* Returns the MIME type of the specified file, or <code>null</code> if the
@@ -146,7 +146,7 @@ public interface ServletContext {
* a <code>String</code> specifying the name of a file
* @return a <code>String</code> specifying the file's MIME type
*/
- public String getMimeType(String file);
+ String getMimeType(String file);
/**
* Returns a directory-like listing of all the paths to resources within the
@@ -177,7 +177,7 @@ public interface ServletContext {
* supplied path.
* @since Servlet 2.3
*/
- public Set<String> getResourcePaths(String path);
+ Set<String> getResourcePaths(String path);
/**
* Returns a URL to the resource that is mapped to a specified path. The
@@ -214,7 +214,7 @@ public interface ServletContext {
* @exception MalformedURLException
* if the pathname is not given in the correct form
*/
- public URL getResource(String path) throws MalformedURLException;
+ URL getResource(String path) throws MalformedURLException;
/**
* Returns the resource located at the named path as an
@@ -242,7 +242,7 @@ public interface ServletContext {
* @return the <code>InputStream</code> returned to the servlet, or
* <code>null</code> if no resource exists at the specified path
*/
- public InputStream getResourceAsStream(String path);
+ InputStream getResourceAsStream(String path);
/**
* Returns a {@link RequestDispatcher} object that acts as a wrapper for the
@@ -265,7 +265,7 @@ public interface ServletContext {
* @see RequestDispatcher
* @see ServletContext#getContext
*/
- public RequestDispatcher getRequestDispatcher(String path);
+ RequestDispatcher getRequestDispatcher(String path);
/**
* Returns a {@link RequestDispatcher} object that acts as a wrapper for the
@@ -289,7 +289,7 @@ public interface ServletContext {
* @see ServletContext#getContext
* @see ServletConfig#getServletName
*/
- public RequestDispatcher getNamedDispatcher(String name);
+ RequestDispatcher getNamedDispatcher(String name);
/**
* Writes the specified message to a servlet log file, usually an event log.
@@ -300,7 +300,7 @@ public interface ServletContext {
* a <code>String</code> specifying the message to be written to
* the log file
*/
- public void log(String msg);
+ void log(String msg);
/**
* Writes an explanatory message and a stack trace for a given
@@ -313,7 +313,7 @@ public interface ServletContext {
* @param throwable
* the <code>Throwable</code> error or exception
*/
- public void log(String message, Throwable throwable);
+ void log(String message, Throwable throwable);
/**
* Returns a <code>String</code> containing the real path for a given
@@ -334,7 +334,7 @@ public interface ServletContext {
* @return a <code>String</code> specifying the real path, or null if the
* translation cannot be performed
*/
- public String getRealPath(String path);
+ String getRealPath(String path);
/**
* Returns the name and version of the servlet container on which the
@@ -352,7 +352,7 @@ public interface ServletContext {
* @return a <code>String</code> containing at least the servlet container
* name and version number
*/
- public String getServerInfo();
+ String getServerInfo();
/**
* Returns a <code>String</code> containing the value of the named
@@ -373,7 +373,7 @@ public interface ServletContext {
* <code>null</code>
* @see ServletConfig#getInitParameter
*/
- public String getInitParameter(String name);
+ String getInitParameter(String name);
/**
* Returns the names of the context's initialization parameters as an
@@ -385,7 +385,7 @@ public interface ServletContext {
* @see ServletConfig#getInitParameter
*/
- public Enumeration<String> getInitParameterNames();
+ Enumeration<String> getInitParameterNames();
/**
* Set the given initialisation parameter to the given value.
@@ -407,7 +407,7 @@ public interface ServletContext {
* <code>null</code>
* @since Servlet 3.0
*/
- public boolean setInitParameter(String name, String value);
+ boolean setInitParameter(String name, String value);
/**
* Returns the servlet container attribute with the given name, or
@@ -430,7 +430,7 @@ public interface ServletContext {
* <code>null</code>
* @see ServletContext#getAttributeNames
*/
- public Object getAttribute(String name);
+ Object getAttribute(String name);
/**
* Returns an <code>Enumeration</code> containing the attribute names
@@ -441,7 +441,7 @@ public interface ServletContext {
*
* @see #getAttribute
*/
- public Enumeration<String> getAttributeNames();
+ Enumeration<String> getAttributeNames();
/**
* Binds an object to a given attribute name in this servlet context. If the
@@ -465,7 +465,7 @@ public interface ServletContext {
* @throws NullPointerException If the provided attribute name is
* <code>null</code>
*/
- public void setAttribute(String name, Object object);
+ void setAttribute(String name, Object object);
/**
* Removes the attribute with the given name from the servlet context. After
@@ -479,7 +479,7 @@ public interface ServletContext {
* a <code>String</code> specifying the name of the attribute to
* be removed
*/
- public void removeAttribute(String name);
+ void removeAttribute(String name);
/**
* Returns the name of this web application corresponding to this
@@ -490,7 +490,7 @@ public interface ServletContext {
* declared in the deployment descriptor.
* @since Servlet 2.3
*/
- public String getServletContextName();
+ String getServletContextName();
/**
* Register a servlet implementation for use in this ServletContext.
@@ -508,7 +508,7 @@ public interface ServletContext {
* use this method.
* @since Servlet 3.0
*/
- public ServletRegistration.Dynamic addServlet(String servletName, String className);
+ ServletRegistration.Dynamic addServlet(String servletName, String className);
/**
* Register a servlet instance for use in this ServletContext.
@@ -526,7 +526,7 @@ public interface ServletContext {
* use this method.
* @since Servlet 3.0
*/
- public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet);
+ ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet);
/**
* Add servlet to the context.
@@ -546,7 +546,7 @@ public interface ServletContext {
* use this method.
* @since Servlet 3.0
*/
- public ServletRegistration.Dynamic addServlet(String servletName,
+ ServletRegistration.Dynamic addServlet(String servletName,
Class<? extends Servlet> servletClass);
/**
@@ -562,7 +562,7 @@ public interface ServletContext {
*
* @since Servlet 4.0
*/
- public ServletRegistration.Dynamic addJspFile(String jspName, String jspFile);
+ ServletRegistration.Dynamic addJspFile(String jspName, String jspFile);
/**
* Create an Servlet instance using the given class. The instance is just
@@ -584,7 +584,7 @@ public interface ServletContext {
*
* @since Servlet 3.0
*/
- public <T extends Servlet> T createServlet(Class<T> c)
+ <T extends Servlet> T createServlet(Class<T> c)
throws ServletException;
/**
@@ -606,7 +606,7 @@ public interface ServletContext {
*
* @since Servlet 3.0
*/
- public ServletRegistration getServletRegistration(String servletName);
+ ServletRegistration getServletRegistration(String servletName);
/**
* Obtain a Map of servlet names to servlet registrations for all servlets
@@ -625,7 +625,7 @@ public interface ServletContext {
*
* @since Servlet 3.0
*/
- public Map<String, ? extends ServletRegistration> getServletRegistrations();
+ Map<String, ? extends ServletRegistration> getServletRegistrations();
/**
* Add filter to context.
@@ -645,7 +645,7 @@ public interface ServletContext {
* If the context has already been initialised
* @since Servlet 3.0
*/
- public FilterRegistration.Dynamic addFilter(String filterName, String className);
+ FilterRegistration.Dynamic addFilter(String filterName, String className);
/**
* Add filter to context.
@@ -665,7 +665,7 @@ public interface ServletContext {
* If the context has already been initialised
* @since Servlet 3.0
*/
- public FilterRegistration.Dynamic addFilter(String filterName, Filter filter);
+ FilterRegistration.Dynamic addFilter(String filterName, Filter filter);
/**
* Add filter to context.
@@ -685,7 +685,7 @@ public interface ServletContext {
* If the context has already been initialised
* @since Servlet 3.0
*/
- public FilterRegistration.Dynamic addFilter(String filterName,
+ FilterRegistration.Dynamic addFilter(String filterName,
Class<? extends Filter> filterClass);
/**
@@ -708,7 +708,7 @@ public interface ServletContext {
*
* @since Servlet 3.0
*/
- public <T extends Filter> T createFilter(Class<T> c) throws ServletException;
+ <T extends Filter> T createFilter(Class<T> c) throws ServletException;
/**
* TODO SERVLET3 - Add comments
@@ -723,7 +723,7 @@ public interface ServletContext {
* use this method.
* @since Servlet 3.0
*/
- public FilterRegistration getFilterRegistration(String filterName);
+ FilterRegistration getFilterRegistration(String filterName);
/**
* @return TODO
@@ -736,7 +736,7 @@ public interface ServletContext {
* use this method.
* @since Servlet 3.0 TODO SERVLET3 - Add comments
*/
- public Map<String, ? extends FilterRegistration> getFilterRegistrations();
+ Map<String, ? extends FilterRegistration> getFilterRegistrations();
/**
* @return TODO
@@ -749,7 +749,7 @@ public interface ServletContext {
* use this method.
* @since Servlet 3.0 TODO SERVLET3 - Add comments
*/
- public SessionCookieConfig getSessionCookieConfig();
+ SessionCookieConfig getSessionCookieConfig();
/**
* Configures the available session tracking modes for this web application.
@@ -770,7 +770,7 @@ public interface ServletContext {
* use this method.
* @since Servlet 3.0
*/
- public void setSessionTrackingModes(
+ void setSessionTrackingModes(
Set<SessionTrackingMode> sessionTrackingModes);
/**
@@ -787,7 +787,7 @@ public interface ServletContext {
*
* @since Servlet 3.0
*/
- public Set<SessionTrackingMode> getDefaultSessionTrackingModes();
+ Set<SessionTrackingMode> getDefaultSessionTrackingModes();
/**
* Obtains the currently enabled session tracking modes for this web
@@ -798,7 +798,7 @@ public interface ServletContext {
*
* @since Servlet 3.0
*/
- public Set<SessionTrackingMode> getEffectiveSessionTrackingModes();
+ Set<SessionTrackingMode> getEffectiveSessionTrackingModes();
/**
* TODO SERVLET3 - Add comments
@@ -812,7 +812,7 @@ public interface ServletContext {
* use this method.
* @since Servlet 3.0
*/
- public void addListener(String className);
+ void addListener(String className);
/**
* TODO SERVLET3 - Add comments
@@ -827,7 +827,7 @@ public interface ServletContext {
* use this method.
* @since Servlet 3.0
*/
- public <T extends EventListener> void addListener(T t);
+ <T extends EventListener> void addListener(T t);
/**
* TODO SERVLET3 - Add comments
@@ -841,7 +841,7 @@ public interface ServletContext {
* use this method.
* @since Servlet 3.0
*/
- public void addListener(Class<? extends EventListener> listenerClass);
+ void addListener(Class<? extends EventListener> listenerClass);
/**
* TODO SERVLET3 - Add comments
@@ -858,7 +858,7 @@ public interface ServletContext {
* use this method.
* @since Servlet 3.0
*/
- public <T extends EventListener> T createListener(Class<T> c)
+ <T extends EventListener> T createListener(Class<T> c)
throws ServletException;
/**
@@ -866,7 +866,7 @@ public interface ServletContext {
*
* @since Servlet 3.0 TODO SERVLET3 - Add comments
*/
- public JspConfigDescriptor getJspConfigDescriptor();
+ JspConfigDescriptor getJspConfigDescriptor();
/**
* Get the web application class loader associated with this ServletContext.
@@ -878,7 +878,7 @@ public interface ServletContext {
*
* @since Servlet 3.0
*/
- public ClassLoader getClassLoader();
+ ClassLoader getClassLoader();
/**
* Add to the declared roles for this ServletContext.
@@ -896,7 +896,7 @@ public interface ServletContext {
* initialised
* @since Servlet 3.0
*/
- public void declareRoles(String... roleNames);
+ void declareRoles(String... roleNames);
/**
* Get the primary name of the virtual host on which this context is
@@ -907,7 +907,7 @@ public interface ServletContext {
*
* @since Servlet 3.1
*/
- public String getVirtualServerName();
+ String getVirtualServerName();
/**
* Get the default session timeout.
@@ -916,7 +916,7 @@ public interface ServletContext {
*
* @since Servlet 4.0
*/
- public int getSessionTimeout();
+ int getSessionTimeout();
/**
* Set the default session timeout. This method may only be called before
@@ -936,7 +936,7 @@ public interface ServletContext {
*
* @since Servlet 4.0
*/
- public void setSessionTimeout(int sessionTimeout);
+ void setSessionTimeout(int sessionTimeout);
/**
* Get the default character encoding for reading request bodies.
@@ -946,7 +946,7 @@ public interface ServletContext {
*
* @since Servlet 4.0
*/
- public String getRequestCharacterEncoding();
+ String getRequestCharacterEncoding();
/**
* Set the default character encoding to use for reading request bodies.
@@ -967,7 +967,7 @@ public interface ServletContext {
*
* @since Servlet 4.0
*/
- public void setRequestCharacterEncoding(String encoding);
+ void setRequestCharacterEncoding(String encoding);
/**
* Get the default character encoding for writing response bodies.
@@ -977,7 +977,7 @@ public interface ServletContext {
*
* @since Servlet 4.0
*/
- public String getResponseCharacterEncoding();
+ String getResponseCharacterEncoding();
/**
* Set the default character encoding to use for writing response bodies.
@@ -998,5 +998,5 @@ public interface ServletContext {
*
* @since Servlet 4.0
*/
- public void setResponseCharacterEncoding(String encoding);
+ void setResponseCharacterEncoding(String encoding);
}
diff --git a/java/jakarta/servlet/ServletContextAttributeListener.java b/java/jakarta/servlet/ServletContextAttributeListener.java
index ded0ca87ea..c217778108 100644
--- a/java/jakarta/servlet/ServletContextAttributeListener.java
+++ b/java/jakarta/servlet/ServletContextAttributeListener.java
@@ -36,7 +36,7 @@ public interface ServletContextAttributeListener extends EventListener {
* The default implementation is a NO-OP.
* @param scae Information about the new attribute
*/
- public default void attributeAdded(ServletContextAttributeEvent scae) {
+ default void attributeAdded(ServletContextAttributeEvent scae) {
}
/**
@@ -45,7 +45,7 @@ public interface ServletContextAttributeListener extends EventListener {
* The default implementation is a NO-OP.
* @param scae Information about the removed attribute
*/
- public default void attributeRemoved(ServletContextAttributeEvent scae) {
+ default void attributeRemoved(ServletContextAttributeEvent scae) {
}
/**
@@ -54,6 +54,6 @@ public interface ServletContextAttributeListener extends EventListener {
* The default implementation is a NO-OP.
* @param scae Information about the replaced attribute
*/
- public default void attributeReplaced(ServletContextAttributeEvent scae) {
+ default void attributeReplaced(ServletContextAttributeEvent scae) {
}
}
diff --git a/java/jakarta/servlet/ServletContextListener.java b/java/jakarta/servlet/ServletContextListener.java
index 88327efe97..991a77a2fe 100644
--- a/java/jakarta/servlet/ServletContextListener.java
+++ b/java/jakarta/servlet/ServletContextListener.java
@@ -37,7 +37,7 @@ public interface ServletContextListener extends EventListener {
* The default implementation is a NO-OP.
* @param sce Information about the ServletContext that was initialized
*/
- public default void contextInitialized(ServletContextEvent sce) {
+ default void contextInitialized(ServletContextEvent sce) {
}
/**
@@ -47,6 +47,6 @@ public interface ServletContextListener extends EventListener {
* The default implementation is a NO-OP.
* @param sce Information about the ServletContext that was destroyed
*/
- public default void contextDestroyed(ServletContextEvent sce) {
+ default void contextDestroyed(ServletContextEvent sce) {
}
}
diff --git a/java/jakarta/servlet/ServletRegistration.java b/java/jakarta/servlet/ServletRegistration.java
index f2c80cf21e..699f486479 100644
--- a/java/jakarta/servlet/ServletRegistration.java
+++ b/java/jakarta/servlet/ServletRegistration.java
@@ -44,7 +44,7 @@ public interface ServletRegistration extends Registration {
* @throws IllegalStateException if the associated ServletContext has
* already been initialised
*/
- public Set<String> addMapping(String... urlPatterns);
+ Set<String> addMapping(String... urlPatterns);
/**
* Gets the currently available mappings of the Servlet represented by this
@@ -56,7 +56,7 @@ public interface ServletRegistration extends Registration {
* @return a (possibly empty) Collection of the currently available mappings
* of the Servlet represented by this ServletRegistration
*/
- public Collection<String> getMappings();
+ Collection<String> getMappings();
/**
* Obtain the name of the user / group under which the Servlet has been
@@ -65,13 +65,13 @@ public interface ServletRegistration extends Registration {
* @return the name of the user / group or {@code null} if none has been
* specified
*/
- public String getRunAsRole();
+ String getRunAsRole();
/**
* Interface through which a Servlet registered via one of the addServlet
* methods on ServletContext may be further configured.
*/
- public static interface Dynamic extends ServletRegistration, Registration.Dynamic {
+ interface Dynamic extends ServletRegistration, Registration.Dynamic {
/**
* Set the loadOnStartup order for the Servlet
@@ -80,7 +80,7 @@ public interface ServletRegistration extends Registration {
* started (higher numbers are started after lower
* numbers)
*/
- public void setLoadOnStartup(int loadOnStartup);
+ void setLoadOnStartup(int loadOnStartup);
/**
* Add security constraints to this Servlet.
@@ -90,7 +90,7 @@ public interface ServletRegistration extends Registration {
* @return urls currently mapped to this registration that are already
* present in web.xml
*/
- public Set<String> setServletSecurity(ServletSecurityElement constraint);
+ Set<String> setServletSecurity(ServletSecurityElement constraint);
/**
* Set the multi-part configuration for the associated Servlet. To clear
@@ -100,7 +100,7 @@ public interface ServletRegistration extends Registration {
* @param multipartConfig The configuration to associate with the
* Servlet
*/
- public void setMultipartConfig(MultipartConfigElement multipartConfig);
+ void setMultipartConfig(MultipartConfigElement multipartConfig);
/**
* Set the name of the user / group under which the Servlet should be
@@ -108,6 +108,6 @@ public interface ServletRegistration extends Registration {
*
* @param roleName name of the user / group or {@code null} if none
*/
- public void setRunAsRole(String roleName);
+ void setRunAsRole(String roleName);
}
}
diff --git a/java/jakarta/servlet/ServletRequest.java b/java/jakarta/servlet/ServletRequest.java
index ea0c549e4b..712c56dc0b 100644
--- a/java/jakarta/servlet/ServletRequest.java
+++ b/java/jakarta/servlet/ServletRequest.java
@@ -61,7 +61,7 @@ public interface ServletRequest {
* @return an <code>Object</code> containing the value of the attribute, or
* <code>null</code> if the attribute does not exist
*/
- public Object getAttribute(String name);
+ Object getAttribute(String name);
/**
* Returns an <code>Enumeration</code> containing the names of the
@@ -72,7 +72,7 @@ public interface ServletRequest {
* @return an <code>Enumeration</code> of strings containing the names of the
* request's attributes
*/
- public Enumeration<String> getAttributeNames();
+ Enumeration<String> getAttributeNames();
/**
* Returns the name of the character encoding used in the body of this
@@ -90,7 +90,7 @@ public interface ServletRequest {
* encoding, or <code>null</code> if the request does not specify a
* character encoding
*/
- public String getCharacterEncoding();
+ String getCharacterEncoding();
/**
* Overrides the name of the character encoding used in the body of this
@@ -103,7 +103,7 @@ public interface ServletRequest {
* @throws java.io.UnsupportedEncodingException
* if this is not a valid encoding
*/
- public void setCharacterEncoding(String env)
+ void setCharacterEncoding(String env)
throws java.io.UnsupportedEncodingException;
/**
@@ -114,7 +114,7 @@ public interface ServletRequest {
* @return an integer containing the length of the request body or -1 if the
* length is not known or is greater than {@link Integer#MAX_VALUE}
*/
- public int getContentLength();
+ int getContentLength();
/**
* Returns the length, in bytes, of the request body and made available by
@@ -125,7 +125,7 @@ public interface ServletRequest {
* the length is not known
* @since Servlet 3.1
*/
- public long getContentLengthLong();
+ long getContentLengthLong();
/**
* Returns the MIME type of the body of the request, or <code>null</code> if
@@ -135,7 +135,7 @@ public interface ServletRequest {
* @return a <code>String</code> containing the name of the MIME type of the
* request, or null if the type is not known
*/
- public String getContentType();
+ String getContentType();
/**
* Retrieves the body of the request as binary data using a
@@ -150,7 +150,7 @@ public interface ServletRequest {
* @exception IOException
* if an input or output exception occurred
*/
- public ServletInputStream getInputStream() throws IOException;
+ ServletInputStream getInputStream() throws IOException;
/**
* Returns the value of a request parameter as a <code>String</code>, or
@@ -177,7 +177,7 @@ public interface ServletRequest {
* parameter
* @see #getParameterValues
*/
- public String getParameter(String name);
+ String getParameter(String name);
/**
* Returns an <code>Enumeration</code> of <code>String</code> objects
@@ -190,7 +190,7 @@ public interface ServletRequest {
* or an empty <code>Enumeration</code> if the request has no
* parameters
*/
- public Enumeration<String> getParameterNames();
+ Enumeration<String> getParameterNames();
/**
* Returns an array of <code>String</code> objects containing all of the
@@ -206,7 +206,7 @@ public interface ServletRequest {
* values
* @see #getParameter
*/
- public String[] getParameterValues(String name);
+ String[] getParameterValues(String name);
/**
* Returns a java.util.Map of the parameters of this request. Request
@@ -219,7 +219,7 @@ public interface ServletRequest {
* of type String. The values in the parameter map are of type
* String array.
*/
- public Map<String, String[]> getParameterMap();
+ Map<String, String[]> getParameterMap();
/**
* Returns the name and version of the protocol the request uses in the form
@@ -230,7 +230,7 @@ public interface ServletRequest {
* @return a <code>String</code> containing the protocol name and version
* number
*/
- public String getProtocol();
+ String getProtocol();
/**
* Returns the name of the scheme used to make this request, for example,
@@ -240,7 +240,7 @@ public interface ServletRequest {
* @return a <code>String</code> containing the name of the scheme used to
* make this request
*/
- public String getScheme();
+ String getScheme();
/**
* Returns the host name of the server to which the request was sent. It is
@@ -249,7 +249,7 @@ public interface ServletRequest {
*
* @return a <code>String</code> containing the name of the server
*/
- public String getServerName();
+ String getServerName();
/**
* Returns the port number to which the request was sent. It is the value of
@@ -258,7 +258,7 @@ public interface ServletRequest {
*
* @return an integer specifying the port number
*/
- public int getServerPort();
+ int getServerPort();
/**
* Retrieves the body of the request as character data using a
@@ -277,7 +277,7 @@ public interface ServletRequest {
* if an input or output exception occurred
* @see #getInputStream
*/
- public BufferedReader getReader() throws IOException;
+ BufferedReader getReader() throws IOException;
/**
* Returns the Internet Protocol (IP) address of the client or last proxy
@@ -287,7 +287,7 @@ public interface ServletRequest {
* @return a <code>String</code> containing the IP address of the client
* that sent the request
*/
- public String getRemoteAddr();
+ String getRemoteAddr();
/**
* Returns the fully qualified name of the client or the last proxy that
@@ -299,7 +299,7 @@ public interface ServletRequest {
* @return a <code>String</code> containing the fully qualified name of the
* client
*/
- public String getRemoteHost();
+ String getRemoteHost();
/**
* Stores an attribute in this request. Attributes are reset between
@@ -324,7 +324,7 @@ public interface ServletRequest {
* @param o
* the <code>Object</code> to be stored
*/
- public void setAttribute(String name, Object o);
+ void setAttribute(String name, Object o);
/**
* Removes an attribute from this request. This method is not generally
@@ -341,7 +341,7 @@ public interface ServletRequest {
* a <code>String</code> specifying the name of the attribute to
* remove
*/
- public void removeAttribute(String name);
+ void removeAttribute(String name);
/**
* Returns the preferred <code>Locale</code> that the client will accept
@@ -351,7 +351,7 @@ public interface ServletRequest {
*
* @return the preferred <code>Locale</code> for the client
*/
- public Locale getLocale();
+ Locale getLocale();
/**
* Returns an <code>Enumeration</code> of <code>Locale</code> objects
@@ -364,7 +364,7 @@ public interface ServletRequest {
* @return an <code>Enumeration</code> of preferred <code>Locale</code>
* objects for the client
*/
- public Enumeration<Locale> getLocales();
+ Enumeration<Locale> getLocales();
/**
* Returns a boolean indicating whether this request was made using a secure
@@ -373,7 +373,7 @@ public interface ServletRequest {
* @return a boolean indicating if the request was made using a secure
* channel
*/
- public boolean isSecure();
+ boolean isSecure();
/**
* Returns a {@link RequestDispatcher} object that acts as a wrapper for the
@@ -401,7 +401,7 @@ public interface ServletRequest {
* @see RequestDispatcher
* @see ServletContext#getRequestDispatcher
*/
- public RequestDispatcher getRequestDispatcher(String path);
+ RequestDispatcher getRequestDispatcher(String path);
/**
* Returns the Internet Protocol (IP) source port of the client or last
@@ -411,7 +411,7 @@ public interface ServletRequest {
*
* @since Servlet 2.4
*/
- public int getRemotePort();
+ int getRemotePort();
/**
* Returns the host name of the Internet Protocol (IP) interface on which
@@ -421,7 +421,7 @@ public interface ServletRequest {
* the request was received.
* @since Servlet 2.4
*/
- public String getLocalName();
+ String getLocalName();
/**
* Returns the Internet Protocol (IP) address of the interface on which the
@@ -431,7 +431,7 @@ public interface ServletRequest {
* request was received.
* @since Servlet 2.4
*/
- public String getLocalAddr();
+ String getLocalAddr();
/**
* Returns the Internet Protocol (IP) port number of the interface on which
@@ -441,20 +441,20 @@ public interface ServletRequest {
*
* @since Servlet 2.4
*/
- public int getLocalPort();
+ int getLocalPort();
/**
* @return TODO
* @since Servlet 3.0 TODO SERVLET3 - Add comments
*/
- public ServletContext getServletContext();
+ ServletContext getServletContext();
/**
* @return TODO
* @throws IllegalStateException If async is not supported for this request
* @since Servlet 3.0 TODO SERVLET3 - Add comments
*/
- public AsyncContext startAsync() throws IllegalStateException;
+ AsyncContext startAsync() throws IllegalStateException;
/**
* @param servletRequest The ServletRequest with which to initialise the
@@ -465,20 +465,20 @@ public interface ServletRequest {
* @throws IllegalStateException If async is not supported for this request
* @since Servlet 3.0 TODO SERVLET3 - Add comments
*/
- public AsyncContext startAsync(ServletRequest servletRequest,
+ AsyncContext startAsync(ServletRequest servletRequest,
ServletResponse servletResponse) throws IllegalStateException;
/**
* @return TODO
* @since Servlet 3.0 TODO SERVLET3 - Add comments
*/
- public boolean isAsyncStarted();
+ boolean isAsyncStarted();
/**
* @return TODO
* @since Servlet 3.0 TODO SERVLET3 - Add comments
*/
- public boolean isAsyncSupported();
+ boolean isAsyncSupported();
/**
* Get the current AsyncContext.
@@ -490,13 +490,13 @@ public interface ServletRequest {
*
* @since Servlet 3.0
*/
- public AsyncContext getAsyncContext();
+ AsyncContext getAsyncContext();
/**
* @return TODO
* @since Servlet 3.0 TODO SERVLET3 - Add comments
*/
- public DispatcherType getDispatcherType();
+ DispatcherType getDispatcherType();
/**
* Obtain a unique (within the lifetime of the Servlet container) identifier
diff --git a/java/jakarta/servlet/ServletRequestAttributeListener.java b/java/jakarta/servlet/ServletRequestAttributeListener.java
index 28a8631f92..a4a8912132 100644
--- a/java/jakarta/servlet/ServletRequestAttributeListener.java
+++ b/java/jakarta/servlet/ServletRequestAttributeListener.java
@@ -37,7 +37,7 @@ public interface ServletRequestAttributeListener extends EventListener {
* The default implementation is a NO-OP.
* @param srae Information about the new request attribute
*/
- public default void attributeAdded(ServletRequestAttributeEvent srae) {
+ default void attributeAdded(ServletRequestAttributeEvent srae) {
}
/**
@@ -46,7 +46,7 @@ public interface ServletRequestAttributeListener extends EventListener {
* The default implementation is a NO-OP.
* @param srae Information about the removed request attribute
*/
- public default void attributeRemoved(ServletRequestAttributeEvent srae) {
+ default void attributeRemoved(ServletRequestAttributeEvent srae) {
}
/**
@@ -55,7 +55,7 @@ public interface ServletRequestAttributeListener extends EventListener {
* The default implementation is a NO-OP.
* @param srae Information about the replaced request attribute
*/
- public default void attributeReplaced(ServletRequestAttributeEvent srae) {
+ default void attributeReplaced(ServletRequestAttributeEvent srae) {
}
}
diff --git a/java/jakarta/servlet/ServletRequestListener.java b/java/jakarta/servlet/ServletRequestListener.java
index 45087440ea..5ad6e79b0f 100644
--- a/java/jakarta/servlet/ServletRequestListener.java
+++ b/java/jakarta/servlet/ServletRequestListener.java
@@ -35,7 +35,7 @@ public interface ServletRequestListener extends EventListener {
* The default implementation is a NO-OP.
* @param sre Information about the request
*/
- public default void requestDestroyed (ServletRequestEvent sre) {
+ default void requestDestroyed (ServletRequestEvent sre) {
}
/**
@@ -43,6 +43,6 @@ public interface ServletRequestListener extends EventListener {
* The default implementation is a NO-OP.
* @param sre Information about the request
*/
- public default void requestInitialized (ServletRequestEvent sre) {
+ default void requestInitialized (ServletRequestEvent sre) {
}
}
diff --git a/java/jakarta/servlet/ServletResponse.java b/java/jakarta/servlet/ServletResponse.java
index 595051515a..ff85e3bada 100644
--- a/java/jakarta/servlet/ServletResponse.java
+++ b/java/jakarta/servlet/ServletResponse.java
@@ -81,7 +81,7 @@ public interface ServletResponse {
* @return a <code>String</code> specifying the name of the character
* encoding, for example, <code>UTF-8</code>
*/
- public String getCharacterEncoding();
+ String getCharacterEncoding();
/**
* Returns the content type used for the MIME body sent in this response.
@@ -97,7 +97,7 @@ public interface ServletResponse {
* <code>text/html; charset=UTF-8</code>, or null
* @since Servlet 2.4
*/
- public String getContentType();
+ String getContentType();
/**
* Returns a {@link ServletOutputStream} suitable for writing binary data in
@@ -115,7 +115,7 @@ public interface ServletResponse {
* if an input or output exception occurred
* @see #getWriter
*/
- public ServletOutputStream getOutputStream() throws IOException;
+ ServletOutputStream getOutputStream() throws IOException;
/**
* Returns a <code>PrintWriter</code> object that can send character text to
@@ -144,7 +144,7 @@ public interface ServletResponse {
* @see #getOutputStream
* @see #setCharacterEncoding
*/
- public PrintWriter getWriter() throws IOException;
+ PrintWriter getWriter() throws IOException;
/**
* Sets the character encoding (MIME charset) of the response being sent to
@@ -176,7 +176,7 @@ public interface ServletResponse {
* @see #setContentType #setLocale
* @since Servlet 2.4
*/
- public void setCharacterEncoding(String charset);
+ void setCharacterEncoding(String charset);
/**
* Sets the length of the content body in the response In HTTP servlets,
@@ -186,7 +186,7 @@ public interface ServletResponse {
* an integer specifying the length of the content being returned
* to the client; sets the Content-Length header
*/
- public void setContentLength(int len);
+ void setContentLength(int len);
/**
* Sets the length of the content body in the response In HTTP servlets,
@@ -198,7 +198,7 @@ public interface ServletResponse {
*
* @since Servlet 3.1
*/
- public void setContentLengthLong(long length);
+ void setContentLengthLong(long length);
/**
* Sets the content type of the response being sent to the client, if the
@@ -226,7 +226,7 @@ public interface ServletResponse {
* @see #getOutputStream
* @see #getWriter
*/
- public void setContentType(String type);
+ void setContentType(String type);
/**
* Sets the preferred buffer size for the body of the response. The servlet
@@ -251,7 +251,7 @@ public interface ServletResponse {
* @see #isCommitted
* @see #reset
*/
- public void setBufferSize(int size);
+ void setBufferSize(int size);
/**
* Returns the actual buffer size used for the response. If no buffering is
@@ -263,7 +263,7 @@ public interface ServletResponse {
* @see #isCommitted
* @see #reset
*/
- public int getBufferSize();
+ int getBufferSize();
/**
* Forces any content in the buffer to be written to the client. A call to
@@ -277,7 +277,7 @@ public interface ServletResponse {
* @see #isCommitted
* @see #reset
*/
- public void flushBuffer() throws IOException;
+ void flushBuffer() throws IOException;
/**
* Clears the content of the underlying buffer in the response without
@@ -291,7 +291,7 @@ public interface ServletResponse {
*
* @since Servlet 2.3
*/
- public void resetBuffer();
+ void resetBuffer();
/**
* Returns a boolean indicating if the response has been committed. A
@@ -303,7 +303,7 @@ public interface ServletResponse {
* @see #flushBuffer
* @see #reset
*/
- public boolean isCommitted();
+ boolean isCommitted();
/**
* Clears any data that exists in the buffer as well as the status code and
@@ -317,7 +317,7 @@ public interface ServletResponse {
* @see #flushBuffer
* @see #isCommitted
*/
- public void reset();
+ void reset();
/**
* Sets the locale of the response, if the response has not been committed
@@ -353,7 +353,7 @@ public interface ServletResponse {
* @see #setContentType
* @see #setCharacterEncoding
*/
- public void setLocale(Locale loc);
+ void setLocale(Locale loc);
/**
* Returns the locale specified for this response using the
@@ -366,6 +366,6 @@ public interface ServletResponse {
*
* @see #setLocale
*/
- public Locale getLocale();
+ Locale getLocale();
}
diff --git a/java/jakarta/servlet/SessionCookieConfig.java b/java/jakarta/servlet/SessionCookieConfig.java
index 7d03bd252d..10b3f2a169 100644
--- a/java/jakarta/servlet/SessionCookieConfig.java
+++ b/java/jakarta/servlet/SessionCookieConfig.java
@@ -34,14 +34,14 @@ public interface SessionCookieConfig {
* @throws IllegalStateException if the associated ServletContext has
* already been initialised
*/
- public void setName(String name);
+ void setName(String name);
/**
* Obtain the name to use for the session cookies.
*
* @return the name to use for session cookies.
*/
- public String getName();
+ String getName();
/**
* Sets the domain for the session cookie
@@ -51,14 +51,14 @@ public interface SessionCookieConfig {
* @throws IllegalStateException if the associated ServletContext has
* already been initialised
*/
- public void setDomain(String domain);
+ void setDomain(String domain);
/**
* Obtain the domain to use for session cookies.
*
* @return the domain to use for session cookies.
*/
- public String getDomain();
+ String getDomain();
/**
* Sets the path of the session cookie.
@@ -68,7 +68,7 @@ public interface SessionCookieConfig {
* @throws IllegalStateException if the associated ServletContext has
* already been initialised
*/
- public void setPath(String path);
+ void setPath(String path);
/**
* Obtain the path to use for session cookies. This is normally the context
@@ -76,7 +76,7 @@ public interface SessionCookieConfig {
*
* @return The path to use for session cookies.
*/
- public String getPath();
+ String getPath();
/**
* If called, this method has no effect.
@@ -89,7 +89,7 @@ public interface SessionCookieConfig {
* @deprecated This is no longer required with RFC 6265
*/
@Deprecated(since = "Servlet 6.0", forRemoval = true)
- public void setComment(String comment);
+ void setComment(String comment);
/**
* With the adoption of support for RFC 6265, this method should no longer be used.
@@ -99,7 +99,7 @@ public interface SessionCookieConfig {
* @deprecated This is no longer required with RFC 6265
*/
@Deprecated(since = "Servlet 6.0", forRemoval = true)
- public String getComment();
+ String getComment();
/**
* Sets the httpOnly flag for the session cookie.
@@ -109,14 +109,14 @@ public interface SessionCookieConfig {
* @throws IllegalStateException if the associated ServletContext has
* already been initialised
*/
- public void setHttpOnly(boolean httpOnly);
+ void setHttpOnly(boolean httpOnly);
/**
* Will session cookies be created with the httpOnly flag set?
*
* @return {@code true} if the flag should be set, otherwise {@code false}
*/
- public boolean isHttpOnly();
+ boolean isHttpOnly();
/**
* Sets the secure flag for the session cookie.
@@ -126,14 +126,14 @@ public interface SessionCookieConfig {
* @throws IllegalStateException if the associated ServletContext has
* already been initialised
*/
- public void setSecure(boolean secure);
+ void setSecure(boolean secure);
/**
* Will session cookies be created with the secure flag set?
*
* @return {@code true} if the flag should be set, otherwise {@code false}
*/
- public boolean isSecure();
+ boolean isSecure();
/**
* Sets the maximum age.
@@ -142,14 +142,14 @@ public interface SessionCookieConfig {
* @throws IllegalStateException if the associated ServletContext has
* already been initialised
*/
- public void setMaxAge(int MaxAge);
+ void setMaxAge(int MaxAge);
/**
* Obtain the maximum age to set for a session cookie.
*
* @return the maximum age in seconds
*/
- public int getMaxAge();
+ int getMaxAge();
/**
* Sets the value for the given session cookie attribute. When a value is
@@ -170,7 +170,7 @@ public interface SessionCookieConfig {
*
* @since Servlet 6.0
*/
- public void setAttribute(String name, String value);
+ void setAttribute(String name, String value);
/**
* Obtain the value for a sesison cookie given attribute. Values returned
@@ -183,7 +183,7 @@ public interface SessionCookieConfig {
*
* @since Servlet 6.0
*/
- public String getAttribute(String name);
+ String getAttribute(String name);
/**
* Obtain the Map of attributes and values (excluding version) for this
@@ -193,5 +193,5 @@ public interface SessionCookieConfig {
*
* @since Servlet 6.0
*/
- public Map<String,String> getAttributes();
+ Map<String,String> getAttributes();
}
diff --git a/java/jakarta/servlet/WriteListener.java b/java/jakarta/servlet/WriteListener.java
index 6052e210fc..074875db9c 100644
--- a/java/jakarta/servlet/WriteListener.java
+++ b/java/jakarta/servlet/WriteListener.java
@@ -34,12 +34,12 @@ public interface WriteListener extends java.util.EventListener{
*
* @throws IOException if an I/O error occurs while processing this event
*/
- public void onWritePossible() throws IOException;
+ void onWritePossible() throws IOException;
/**
* Invoked if an error occurs while writing the response.
*
* @param throwable The throwable that represents the error that occurred
*/
- public void onError(java.lang.Throwable throwable);
+ void onError(java.lang.Throwable throwable);
}
\ No newline at end of file
diff --git a/java/jakarta/servlet/descriptor/JspConfigDescriptor.java b/java/jakarta/servlet/descriptor/JspConfigDescriptor.java
index 78b78de59f..baee57a4cf 100644
--- a/java/jakarta/servlet/descriptor/JspConfigDescriptor.java
+++ b/java/jakarta/servlet/descriptor/JspConfigDescriptor.java
@@ -34,7 +34,7 @@ public interface JspConfigDescriptor {
*
* @return the tag library descriptors
*/
- public Collection<TaglibDescriptor> getTaglibs();
+ Collection<TaglibDescriptor> getTaglibs();
/**
* Provide the set of JSP property groups obtained from the
@@ -43,5 +43,5 @@ public interface JspConfigDescriptor {
*
* @return the JSP property groups
*/
- public Collection<JspPropertyGroupDescriptor> getJspPropertyGroups();
+ Collection<JspPropertyGroupDescriptor> getJspPropertyGroups();
}
diff --git a/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java b/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
index 84555c0c8f..34fac21246 100644
--- a/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
+++ b/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
@@ -30,14 +30,14 @@ public interface JspPropertyGroupDescriptor {
*
* @return the patterns to which this group applies
*/
- public Collection<String> getUrlPatterns();
+ Collection<String> getUrlPatterns();
/**
* Is Expression Language ignored for this group?
*
* @return {@code true} if EL is ignored, otherwise {@code false}
*/
- public String getElIgnored();
+ String getElIgnored();
/**
* Will the use of an unknown identifier in EL within a JSP page trigger an
@@ -47,21 +47,21 @@ public interface JspPropertyGroupDescriptor {
*
* @since Servlet 6.0
*/
- public String getErrorOnELNotFound();
+ String getErrorOnELNotFound();
/**
* Obtain the page encoding for this group.
*
* @return the page encoding for this group
*/
- public String getPageEncoding();
+ String getPageEncoding();
/**
* Is scripting disabled for this group?
*
* @return {@code true} if scripting is disabled, otherwise {@code false}
*/
- public String getScriptingInvalid();
+ String getScriptingInvalid();
/**
* Should the JSPs in this group be treated as JSP documents?
@@ -69,21 +69,21 @@ public interface JspPropertyGroupDescriptor {
* @return {@code true} if the JSPs should be treated as JSP documents,
* otherwise {@code false}
*/
- public String getIsXml();
+ String getIsXml();
/**
* Obtain the preludes to include for this group.
*
* @return the preludes to include for this group
*/
- public Collection<String> getIncludePreludes();
+ Collection<String> getIncludePreludes();
/**
* Obtain the codas to include for this group.
*
* @return the codas to include for this group.
*/
- public Collection<String> getIncludeCodas();
+ Collection<String> getIncludeCodas();
/**
* Is the deferred El syntax <code>#{...}</code> allowed to be used as a
@@ -92,7 +92,7 @@ public interface JspPropertyGroupDescriptor {
* @return {@code true} if the deferred EL syntax is allowed to be used as
* a literal, otherwise {@code false}
*/
- public String getDeferredSyntaxAllowedAsLiteral();
+ String getDeferredSyntaxAllowedAsLiteral();
/**
* Should the JSPs in this group have template text that only contains
@@ -101,21 +101,21 @@ public interface JspPropertyGroupDescriptor {
* @return {@code true} if the whitespace be removed, otherwise
* {@code false}
*/
- public String getTrimDirectiveWhitespaces();
+ String getTrimDirectiveWhitespaces();
/**
* Obtain the default content type this group of JSP pages.#
*
* @return the default content type this group of JSP pages
*/
- public String getDefaultContentType();
+ String getDefaultContentType();
/**
* Obtain the per-page buffer configuration for this group of JSP pages.
*
* @return the per-page buffer configuration for this group of JSP pages
*/
- public String getBuffer();
+ String getBuffer();
/**
* Should an error be raised at translation time for a page in this group if
@@ -124,5 +124,5 @@ public interface JspPropertyGroupDescriptor {
* @return {@code true} if an error should be raised, otherwise
* {@code false}
*/
- public String getErrorOnUndeclaredNamespace();
+ String getErrorOnUndeclaredNamespace();
}
diff --git a/java/jakarta/servlet/descriptor/TaglibDescriptor.java b/java/jakarta/servlet/descriptor/TaglibDescriptor.java
index 4971093ba3..545377dc09 100644
--- a/java/jakarta/servlet/descriptor/TaglibDescriptor.java
+++ b/java/jakarta/servlet/descriptor/TaglibDescriptor.java
@@ -28,12 +28,12 @@ public interface TaglibDescriptor {
*
* @return the URI for the tag library
*/
- public String getTaglibURI();
+ String getTaglibURI();
/**
* Obtain the location of the tag library.
*
* @return the location of the tag library
*/
- public String getTaglibLocation();
+ String getTaglibLocation();
}
diff --git a/java/jakarta/servlet/http/HttpServlet.java b/java/jakarta/servlet/http/HttpServlet.java
index 930529fdde..7f3c3e8901 100644
--- a/java/jakarta/servlet/http/HttpServlet.java
+++ b/java/jakarta/servlet/http/HttpServlet.java
@@ -850,7 +850,7 @@ public abstract class HttpServlet extends GenericServlet {
private final String encoding;
private PrintWriter pw;
- public NoBodyPrintWriter(NoBodyOutputStream out, String encoding) throws UnsupportedEncodingException {
+ NoBodyPrintWriter(NoBodyOutputStream out, String encoding) throws UnsupportedEncodingException {
super(out);
this.out = out;
this.encoding = encoding;
@@ -1018,7 +1018,7 @@ public abstract class HttpServlet extends GenericServlet {
private final NoBodyResponse noBodyResponse;
- public NoBodyAsyncContextListener(NoBodyResponse noBodyResponse) {
+ NoBodyAsyncContextListener(NoBodyResponse noBodyResponse) {
this.noBodyResponse = noBodyResponse;
}
diff --git a/java/jakarta/servlet/http/HttpServletRequest.java b/java/jakarta/servlet/http/HttpServletRequest.java
index 050620b735..5e20cfdcad 100644
--- a/java/jakarta/servlet/http/HttpServletRequest.java
+++ b/java/jakarta/servlet/http/HttpServletRequest.java
@@ -36,19 +36,19 @@ public interface HttpServletRequest extends ServletRequest {
/**
* String identifier for Basic authentication. Value "BASIC"
*/
- public static final String BASIC_AUTH = "BASIC";
+ String BASIC_AUTH = "BASIC";
/**
* String identifier for Form authentication. Value "FORM"
*/
- public static final String FORM_AUTH = "FORM";
+ String FORM_AUTH = "FORM";
/**
* String identifier for Client Certificate authentication. Value "CLIENT_CERT"
*/
- public static final String CLIENT_CERT_AUTH = "CLIENT_CERT";
+ String CLIENT_CERT_AUTH = "CLIENT_CERT";
/**
* String identifier for Digest authentication. Value "DIGEST"
*/
- public static final String DIGEST_AUTH = "DIGEST";
+ String DIGEST_AUTH = "DIGEST";
/**
* Returns the name of the authentication scheme used to protect the servlet. All servlet containers support basic,
@@ -61,7 +61,7 @@ public interface HttpServletRequest extends ServletRequest {
* comparison) or the container-specific string indicating the authentication scheme, or
* <code>null</code> if the request was not authenticated.
*/
- public String getAuthType();
+ String getAuthType();
/**
* Returns an array containing all of the <code>Cookie</code> objects the client sent with this request. This method
@@ -70,7 +70,7 @@ public interface HttpServletRequest extends ServletRequest {
* @return an array of all the <code>Cookies</code> included with this request, or <code>null</code> if the request
* has no cookies
*/
- public Cookie[] getCookies();
+ Cookie[] getCookies();
/**
* Returns the value of the specified request header as a <code>long</code> value that represents a
@@ -90,7 +90,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @exception IllegalArgumentException If the header value can't be converted to a date
*/
- public long getDateHeader(String name);
+ long getDateHeader(String name);
/**
* Returns the value of the specified request header as a <code>String</code>. If the request did not include a
@@ -103,7 +103,7 @@ public interface HttpServletRequest extends ServletRequest {
* @return a <code>String</code> containing the value of the requested header, or <code>null</code> if the request
* does not have a header of that name
*/
- public String getHeader(String name);
+ String getHeader(String name);
/**
* Returns all the values of the specified request header as an <code>Enumeration</code> of <code>String</code>
@@ -121,7 +121,7 @@ public interface HttpServletRequest extends ServletRequest {
* any headers of that name return an empty enumeration. If the container does not allow access to
* header information, return null
*/
- public Enumeration<String> getHeaders(String name);
+ Enumeration<String> getHeaders(String name);
/**
* Returns an enumeration of all the header names this request contains. If the request has no headers, this method
@@ -133,7 +133,7 @@ public interface HttpServletRequest extends ServletRequest {
* @return an enumeration of all the header names sent with this request; if the request has no headers, an empty
* enumeration; if the servlet container does not allow servlets to use this method, <code>null</code>
*/
- public Enumeration<String> getHeaderNames();
+ Enumeration<String> getHeaderNames();
/**
* Returns the value of the specified request header as an <code>int</code>. If the request does not have a header
@@ -149,14 +149,14 @@ public interface HttpServletRequest extends ServletRequest {
*
* @exception NumberFormatException If the header value can't be converted to an <code>int</code>
*/
- public int getIntHeader(String name);
+ int getIntHeader(String name);
/**
* Obtain the mapping information for this request.
*
* @return the mapping information for this request
*/
- public default HttpServletMapping getHttpServletMapping() {
+ default HttpServletMapping getHttpServletMapping() {
return new HttpServletMapping() {
@Override
@@ -187,7 +187,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @return a <code>String</code> specifying the name of the method with which this request was made
*/
- public String getMethod();
+ String getMethod();
/**
* Returns any extra path information associated with the URL the client sent when it made this request. The extra
@@ -202,7 +202,7 @@ public interface HttpServletRequest extends ServletRequest {
* after the servlet path but before the query string in the request URL; or {@code null} if the URL
* does not have any extra path information
*/
- public String getPathInfo();
+ String getPathInfo();
/**
* Returns any extra path information after the servlet name but before the query string, and translates it to a
@@ -215,7 +215,7 @@ public interface HttpServletRequest extends ServletRequest {
* @return a <code>String</code> specifying the real path, or <code>null</code> if the URL does not have any extra
* path information
*/
- public String getPathTranslated();
+ String getPathTranslated();
/**
* Obtain a builder for generating push requests. {@link PushBuilder} documents how this request will be used as the
@@ -229,7 +229,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @since Servlet 4.0
*/
- public default PushBuilder newPushBuilder() {
+ default PushBuilder newPushBuilder() {
return null;
}
@@ -240,7 +240,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @return a <code>String</code> specifying the portion of the request URI that indicates the context of the request
*/
- public String getContextPath();
+ String getContextPath();
/**
* Returns the query string that is contained in the request URL after the path. This method returns
@@ -249,7 +249,7 @@ public interface HttpServletRequest extends ServletRequest {
* @return a <code>String</code> containing the query string or <code>null</code> if the URL contains no query
* string. The value is not decoded by the container.
*/
- public String getQueryString();
+ String getQueryString();
/**
* Returns the login of the user making this request, if the user has been authenticated, or <code>null</code> if
@@ -259,7 +259,7 @@ public interface HttpServletRequest extends ServletRequest {
* @return a <code>String</code> specifying the login of the user making this request, or <code>null</code> if the
* user login is not known
*/
- public String getRemoteUser();
+ String getRemoteUser();
/**
* Returns a boolean indicating whether the authenticated user is included in the specified logical "role". Roles
@@ -271,7 +271,7 @@ public interface HttpServletRequest extends ServletRequest {
* @return a <code>boolean</code> indicating whether the user making this request belongs to a given role;
* <code>false</code> if the user has not been authenticated
*/
- public boolean isUserInRole(String role);
+ boolean isUserInRole(String role);
/**
* Returns a <code>java.security.Principal</code> object containing the name of the current authenticated user. If
@@ -280,7 +280,7 @@ public interface HttpServletRequest extends ServletRequest {
* @return a <code>java.security.Principal</code> containing the name of the user making this request;
* <code>null</code> if the user has not been authenticated
*/
- public java.security.Principal getUserPrincipal();
+ java.security.Principal getUserPrincipal();
/**
* Returns the session ID specified by the client. This may not be the same as the ID of the current valid session
@@ -291,7 +291,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @see #isRequestedSessionIdValid
*/
- public String getRequestedSessionId();
+ String getRequestedSessionId();
/**
* Returns the part of this request's URL from the protocol name up to the query string in the first line of the
@@ -321,7 +321,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @see #getRequestURL
*/
- public String getRequestURI();
+ String getRequestURI();
/**
* Reconstructs the URL the client used to make the request. The returned URL contains a protocol, server name, port
@@ -334,7 +334,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @return a <code>StringBuffer</code> object containing the reconstructed URL
*/
- public StringBuffer getRequestURL();
+ StringBuffer getRequestURL();
/**
* Returns the part of this request's URL that calls the servlet. This path starts with a "/" character and includes
@@ -351,7 +351,7 @@ public interface HttpServletRequest extends ServletRequest {
* being called, as specified in the request URL, or an empty string if the servlet used to process the
* request is matched using the "/*" pattern.
*/
- public String getServletPath();
+ String getServletPath();
/**
* Returns the current <code>HttpSession</code> associated with this request or, if there is no current session and
@@ -372,7 +372,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @see #getSession()
*/
- public HttpSession getSession(boolean create);
+ HttpSession getSession(boolean create);
/**
* Returns the current session associated with this request, or if the request does not have a session, creates one.
@@ -381,7 +381,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @see #getSession(boolean)
*/
- public HttpSession getSession();
+ HttpSession getSession();
/**
* Changes the session ID of the session associated with this request. This method does not create a new session
@@ -393,7 +393,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @since Servlet 3.1
*/
- public String changeSessionId();
+ String changeSessionId();
/**
* Checks whether the requested session ID is still valid.
@@ -404,7 +404,7 @@ public interface HttpServletRequest extends ServletRequest {
* @see #getRequestedSessionId
* @see #getSession
*/
- public boolean isRequestedSessionIdValid();
+ boolean isRequestedSessionIdValid();
/**
* Checks whether the requested session ID came in as a cookie.
@@ -413,7 +413,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @see #getSession
*/
- public boolean isRequestedSessionIdFromCookie();
+ boolean isRequestedSessionIdFromCookie();
/**
* Checks whether the requested session ID came in as part of the request URL.
@@ -422,7 +422,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @see #getSession
*/
- public boolean isRequestedSessionIdFromURL();
+ boolean isRequestedSessionIdFromURL();
/**
* Triggers the same authentication process as would be triggered if the request is for a resource that is protected
@@ -440,7 +440,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @since Servlet 3.0
*/
- public boolean authenticate(HttpServletResponse response) throws IOException, ServletException;
+ boolean authenticate(HttpServletResponse response) throws IOException, ServletException;
/**
* Authenticate the provided user name and password and then associated the authenticated user with the request.
@@ -454,7 +454,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @since Servlet 3.0
*/
- public void login(String username, String password) throws ServletException;
+ void login(String username, String password) throws ServletException;
/**
* Removes any authenticated user from the request.
@@ -463,7 +463,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @since Servlet 3.0
*/
- public void logout() throws ServletException;
+ void logout() throws ServletException;
/**
* Return a collection of all uploaded Parts.
@@ -476,7 +476,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @since Servlet 3.0
*/
- public Collection<Part> getParts() throws IOException, ServletException;
+ Collection<Part> getParts() throws IOException, ServletException;
/**
* Gets the named Part or null if the Part does not exist. Triggers upload of all Parts.
@@ -491,7 +491,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @since Servlet 3.0
*/
- public Part getPart(String name) throws IOException, ServletException;
+ Part getPart(String name) throws IOException, ServletException;
/**
* Start the HTTP upgrade process and create and instance of the provided protocol handler class. The connection
@@ -508,7 +508,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @since Servlet 3.1
*/
- public <T extends HttpUpgradeHandler> T upgrade(Class<T> httpUpgradeHandlerClass)
+ <T extends HttpUpgradeHandler> T upgrade(Class<T> httpUpgradeHandlerClass)
throws java.io.IOException, ServletException;
/**
@@ -518,7 +518,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @since Servlet 4.0
*/
- public default Map<String, String> getTrailerFields() {
+ default Map<String, String> getTrailerFields() {
return Collections.emptyMap();
}
@@ -536,7 +536,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @since Servlet 4.0
*/
- public default boolean isTrailerFieldsReady() {
+ default boolean isTrailerFieldsReady() {
return true;
}
}
diff --git a/java/jakarta/servlet/http/HttpServletResponse.java b/java/jakarta/servlet/http/HttpServletResponse.java
index 7b1e84e2fa..e754c65bfe 100644
--- a/java/jakarta/servlet/http/HttpServletResponse.java
+++ b/java/jakarta/servlet/http/HttpServletResponse.java
@@ -39,7 +39,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @param cookie the Cookie to return to the client
*/
- public void addCookie(Cookie cookie);
+ void addCookie(Cookie cookie);
/**
* Returns a boolean indicating whether the named response header has already been set.
@@ -48,7 +48,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @return <code>true</code> if the named response header has already been set; <code>false</code> otherwise
*/
- public boolean containsHeader(String name);
+ boolean containsHeader(String name);
/**
* Encodes the specified URL by including the session ID in it, or, if encoding is not needed, returns the URL
@@ -63,7 +63,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @return the encoded URL if encoding is needed; the unchanged URL otherwise.
*/
- public String encodeURL(String url);
+ String encodeURL(String url);
/**
* Encodes the specified URL for use in the <code>sendRedirect</code> method or, if encoding is not needed, returns
@@ -80,7 +80,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @see #sendRedirect
*/
- public String encodeRedirectURL(String url);
+ String encodeRedirectURL(String url);
/**
* Sends an error response to the client using the specified status code and clears the output buffer. The server
@@ -98,7 +98,7 @@ public interface HttpServletResponse extends ServletResponse {
* @exception IOException If an input or output exception occurs
* @exception IllegalStateException If the response was committed
*/
- public void sendError(int sc, String msg) throws IOException;
+ void sendError(int sc, String msg) throws IOException;
/**
* Sends an error response to the client using the specified status code and clears the buffer. This is equivalent
@@ -109,7 +109,7 @@ public interface HttpServletResponse extends ServletResponse {
* @exception IOException If an input or output exception occurs
* @exception IllegalStateException If the response was committed before this method call
*/
- public void sendError(int sc) throws IOException;
+ void sendError(int sc) throws IOException;
/**
* Sends a temporary redirect response to the client using the specified redirect location URL. This method can
@@ -127,7 +127,7 @@ public interface HttpServletResponse extends ServletResponse {
* @exception IllegalStateException If the response was committed or if a partial URL is given and cannot be
* converted into a valid URL
*/
- public void sendRedirect(String location) throws IOException;
+ void sendRedirect(String location) throws IOException;
/**
* Sets a response header with the given name and date-value. The date is specified in terms of milliseconds since
@@ -140,7 +140,7 @@ public interface HttpServletResponse extends ServletResponse {
* @see #containsHeader
* @see #addDateHeader
*/
- public void setDateHeader(String name, long date);
+ void setDateHeader(String name, long date);
/**
* Adds a response header with the given name and date-value. The date is specified in terms of milliseconds since
@@ -151,7 +151,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @see #setDateHeader
*/
- public void addDateHeader(String name, long date);
+ void addDateHeader(String name, long date);
/**
* Sets a response header with the given name and value. If the header had already been set, the new value
@@ -165,7 +165,7 @@ public interface HttpServletResponse extends ServletResponse {
* @see #containsHeader
* @see #addHeader
*/
- public void setHeader(String name, String value);
+ void setHeader(String name, String value);
/**
* Adds a response header with the given name and value. This method allows response headers to have multiple
@@ -177,7 +177,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @see #setHeader
*/
- public void addHeader(String name, String value);
+ void addHeader(String name, String value);
/**
* Sets a response header with the given name and integer value. If the header had already been set, the new value
@@ -190,7 +190,7 @@ public interface HttpServletResponse extends ServletResponse {
* @see #containsHeader
* @see #addIntHeader
*/
- public void setIntHeader(String name, int value);
+ void setIntHeader(String name, int value);
/**
* Adds a response header with the given name and integer value. This method allows response headers to have
@@ -201,7 +201,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @see #setIntHeader
*/
- public void addIntHeader(String name, int value);
+ void addIntHeader(String name, int value);
/**
* Sets the status code for this response. This method is used to set the return status code when there is no error
@@ -214,7 +214,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @see #sendError
*/
- public void setStatus(int sc);
+ void setStatus(int sc);
/**
* Get the HTTP status code for this Response.
@@ -223,7 +223,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @since Servlet 3.0
*/
- public int getStatus();
+ int getStatus();
/**
* Return the value for the specified header, or <code>null</code> if this header has not been set. If more than one
@@ -237,7 +237,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @since Servlet 3.0
*/
- public String getHeader(String name);
+ String getHeader(String name);
/**
* Return a Collection of all the header values associated with the specified header name.
@@ -249,7 +249,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @since Servlet 3.0
*/
- public Collection<String> getHeaders(String name);
+ Collection<String> getHeaders(String name);
/**
* Get the header names set for this HTTP response.
@@ -258,7 +258,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @since Servlet 3.0
*/
- public Collection<String> getHeaderNames();
+ Collection<String> getHeaderNames();
/**
* Configure the supplier of the trailer headers. The supplier will be called in the scope of the thread that
@@ -273,7 +273,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @since Servlet 4.0
*/
- public default void setTrailerFields(Supplier<Map<String, String>> supplier) {
+ default void setTrailerFields(Supplier<Map<String, String>> supplier) {
// NO-OP
}
@@ -285,7 +285,7 @@ public interface HttpServletResponse extends ServletResponse {
*
* @since Servlet 4.0
*/
- public default Supplier<Map<String, String>> getTrailerFields() {
+ default Supplier<Map<String, String>> getTrailerFields() {
return null;
}
@@ -296,228 +296,228 @@ public interface HttpServletResponse extends ServletResponse {
/**
* Status code (100) indicating the client can continue.
*/
- public static final int SC_CONTINUE = 100;
+ int SC_CONTINUE = 100;
/**
* Status code (101) indicating the server is switching protocols according to Upgrade header.
*/
- public static final int SC_SWITCHING_PROTOCOLS = 101;
+ int SC_SWITCHING_PROTOCOLS = 101;
/**
* Status code (200) indicating the request succeeded normally.
*/
- public static final int SC_OK = 200;
+ int SC_OK = 200;
/**
* Status code (201) indicating the request succeeded and created a new resource on the server.
*/
- public static final int SC_CREATED = 201;
+ int SC_CREATED = 201;
/**
* Status code (202) indicating that a request was accepted for processing, but was not completed.
*/
- public static final int SC_ACCEPTED = 202;
+ int SC_ACCEPTED = 202;
/**
* Status code (203) indicating that the meta information presented by the client did not originate from the server.
*/
- public static final int SC_NON_AUTHORITATIVE_INFORMATION = 203;
+ int SC_NON_AUTHORITATIVE_INFORMATION = 203;
/**
* Status code (204) indicating that the request succeeded but that there was no new information to return.
*/
- public static final int SC_NO_CONTENT = 204;
+ int SC_NO_CONTENT = 204;
/**
* Status code (205) indicating that the agent <em>SHOULD</em> reset the document view which caused the request to
* be sent.
*/
- public static final int SC_RESET_CONTENT = 205;
+ int SC_RESET_CONTENT = 205;
/**
* Status code (206) indicating that the server has fulfilled the partial GET request for the resource.
*/
- public static final int SC_PARTIAL_CONTENT = 206;
+ int SC_PARTIAL_CONTENT = 206;
/**
* Status code (300) indicating that the requested resource corresponds to any one of a set of representations, each
* with its own specific location.
*/
- public static final int SC_MULTIPLE_CHOICES = 300;
+ int SC_MULTIPLE_CHOICES = 300;
/**
* Status code (301) indicating that the resource has permanently moved to a new location, and that future
* references should use a new URI with their requests.
*/
- public static final int SC_MOVED_PERMANENTLY = 301;
+ int SC_MOVED_PERMANENTLY = 301;
/**
* Status code (302) indicating that the resource has temporarily moved to another location, but that future
* references should still use the original URI to access the resource. This definition is being retained for
* backwards compatibility. SC_FOUND is now the preferred definition.
*/
- public static final int SC_MOVED_TEMPORARILY = 302;
+ int SC_MOVED_TEMPORARILY = 302;
/**
* Status code (302) indicating that the resource reside temporarily under a different URI. Since the redirection
* might be altered on occasion, the client should continue to use the Request-URI for future requests.(HTTP/1.1) To
* represent the status code (302), it is recommended to use this variable.
*/
- public static final int SC_FOUND = 302;
+ int SC_FOUND = 302;
/**
* Status code (303) indicating that the response to the request can be found under a different URI.
*/
- public static final int SC_SEE_OTHER = 303;
+ int SC_SEE_OTHER = 303;
/**
* Status code (304) indicating that a conditional GET operation found that the resource was available and not
* modified.
*/
- public static final int SC_NOT_MODIFIED = 304;
+ int SC_NOT_MODIFIED = 304;
/**
* Status code (305) indicating that the requested resource <em>MUST</em> be accessed through the proxy given by the
* <code><em>Location</em></code> field.
*/
- public static final int SC_USE_PROXY = 305;
+ int SC_USE_PROXY = 305;
/**
* Status code (307) indicating that the requested resource resides temporarily under a different URI. The temporary
* URI <em>SHOULD</em> be given by the <code><em>Location</em></code> field in the response.
*/
- public static final int SC_TEMPORARY_REDIRECT = 307;
+ int SC_TEMPORARY_REDIRECT = 307;
/**
* Status code (400) indicating the request sent by the client was syntactically incorrect.
*/
- public static final int SC_BAD_REQUEST = 400;
+ int SC_BAD_REQUEST = 400;
/**
* Status code (401) indicating that the request requires HTTP authentication.
*/
- public static final int SC_UNAUTHORIZED = 401;
+ int SC_UNAUTHORIZED = 401;
/**
* Status code (402) reserved for future use.
*/
- public static final int SC_PAYMENT_REQUIRED = 402;
+ int SC_PAYMENT_REQUIRED = 402;
/**
* Status code (403) indicating the server understood the request but refused to fulfill it.
*/
- public static final int SC_FORBIDDEN = 403;
+ int SC_FORBIDDEN = 403;
/**
* Status code (404) indicating that the requested resource is not available.
*/
- public static final int SC_NOT_FOUND = 404;
+ int SC_NOT_FOUND = 404;
/**
* Status code (405) indicating that the method specified in the <code><em>Request-Line</em></code> is not allowed
* for the resource identified by the <code><em>Request-URI</em></code>.
*/
- public static final int SC_METHOD_NOT_ALLOWED = 405;
+ int SC_METHOD_NOT_ALLOWED = 405;
/**
* Status code (406) indicating that the resource identified by the request is only capable of generating response
* entities which have content characteristics not acceptable according to the accept headers sent in the request.
*/
- public static final int SC_NOT_ACCEPTABLE = 406;
+ int SC_NOT_ACCEPTABLE = 406;
/**
* Status code (407) indicating that the client <em>MUST</em> first authenticate itself with the proxy.
*/
- public static final int SC_PROXY_AUTHENTICATION_REQUIRED = 407;
+ int SC_PROXY_AUTHENTICATION_REQUIRED = 407;
/**
* Status code (408) indicating that the client did not produce a request within the time that the server was
* prepared to wait.
*/
- public static final int SC_REQUEST_TIMEOUT = 408;
+ int SC_REQUEST_TIMEOUT = 408;
/**
* Status code (409) indicating that the request could not be completed due to a conflict with the current state of
* the resource.
*/
- public static final int SC_CONFLICT = 409;
+ int SC_CONFLICT = 409;
/**
* Status code (410) indicating that the resource is no longer available at the server and no forwarding address is
* known. This condition <em>SHOULD</em> be considered permanent.
*/
- public static final int SC_GONE = 410;
+ int SC_GONE = 410;
/**
* Status code (411) indicating that the request cannot be handled without a defined
* <code><em>Content-Length</em></code>.
*/
- public static final int SC_LENGTH_REQUIRED = 411;
+ int SC_LENGTH_REQUIRED = 411;
/**
* Status code (412) indicating that the precondition given in one or more of the request-header fields evaluated to
* false when it was tested on the server.
*/
- public static final int SC_PRECONDITION_FAILED = 412;
+ int SC_PRECONDITION_FAILED = 412;
/**
* Status code (413) indicating that the server is refusing to process the request because the request entity is
* larger than the server is willing or able to process.
*/
- public static final int SC_REQUEST_ENTITY_TOO_LARGE = 413;
+ int SC_REQUEST_ENTITY_TOO_LARGE = 413;
/**
* Status code (414) indicating that the server is refusing to service the request because the
* <code><em>Request-URI</em></code> is longer than the server is willing to interpret.
*/
- public static final int SC_REQUEST_URI_TOO_LONG = 414;
+ int SC_REQUEST_URI_TOO_LONG = 414;
/**
* Status code (415) indicating that the server is refusing to service the request because the entity of the request
* is in a format not supported by the requested resource for the requested method.
*/
- public static final int SC_UNSUPPORTED_MEDIA_TYPE = 415;
+ int SC_UNSUPPORTED_MEDIA_TYPE = 415;
/**
* Status code (416) indicating that the server cannot serve the requested byte range.
*/
- public static final int SC_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
+ int SC_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
/**
* Status code (417) indicating that the server could not meet the expectation given in the Expect request header.
*/
- public static final int SC_EXPECTATION_FAILED = 417;
+ int SC_EXPECTATION_FAILED = 417;
/**
* Status code (500) indicating an error inside the HTTP server which prevented it from fulfilling the request.
*/
- public static final int SC_INTERNAL_SERVER_ERROR = 500;
+ int SC_INTERNAL_SERVER_ERROR = 500;
/**
* Status code (501) indicating the HTTP server does not support the functionality needed to fulfill the request.
*/
- public static final int SC_NOT_IMPLEMENTED = 501;
+ int SC_NOT_IMPLEMENTED = 501;
/**
* Status code (502) indicating that the HTTP server received an invalid response from a server it consulted when
* acting as a proxy or gateway.
*/
- public static final int SC_BAD_GATEWAY = 502;
+ int SC_BAD_GATEWAY = 502;
/**
* Status code (503) indicating that the HTTP server is temporarily overloaded, and unable to handle the request.
*/
- public static final int SC_SERVICE_UNAVAILABLE = 503;
+ int SC_SERVICE_UNAVAILABLE = 503;
/**
* Status code (504) indicating that the server did not receive a timely response from the upstream server while
* acting as a gateway or proxy.
*/
- public static final int SC_GATEWAY_TIMEOUT = 504;
+ int SC_GATEWAY_TIMEOUT = 504;
/**
* Status code (505) indicating that the server does not support or refuses to support the HTTP protocol version
* that was used in the request message.
*/
- public static final int SC_HTTP_VERSION_NOT_SUPPORTED = 505;
+ int SC_HTTP_VERSION_NOT_SUPPORTED = 505;
}
diff --git a/java/jakarta/servlet/http/HttpSession.java b/java/jakarta/servlet/http/HttpSession.java
index fdea4e1365..ecadd1e9bf 100644
--- a/java/jakarta/servlet/http/HttpSession.java
+++ b/java/jakarta/servlet/http/HttpSession.java
@@ -64,7 +64,7 @@ public interface HttpSession {
*
* @exception IllegalStateException if this method is called on an invalidated session
*/
- public long getCreationTime();
+ long getCreationTime();
/**
* Returns a string containing the unique identifier assigned to this session. The identifier is assigned by the
@@ -74,7 +74,7 @@ public interface HttpSession {
*
* @exception IllegalStateException if this method is called on an invalidated session
*/
- public String getId();
+ String getId();
/**
* Returns the last time the client sent a request associated with this session, as the number of milliseconds since
@@ -88,7 +88,7 @@ public interface HttpSession {
*
* @exception IllegalStateException if this method is called on an invalidated session
*/
- public long getLastAccessedTime();
+ long getLastAccessedTime();
/**
* Returns the ServletContext to which this session belongs.
@@ -97,7 +97,7 @@ public interface HttpSession {
*
* @since Servlet 2.3
*/
- public ServletContext getServletContext();
+ ServletContext getServletContext();
/**
* Specifies the time, in seconds, between client requests before the servlet container will invalidate this
@@ -105,7 +105,7 @@ public interface HttpSession {
*
* @param interval An integer specifying the number of seconds
*/
- public void setMaxInactiveInterval(int interval);
+ void setMaxInactiveInterval(int interval);
/**
* Returns the maximum time interval, in seconds, that the servlet container will keep this session open between
@@ -117,7 +117,7 @@ public interface HttpSession {
*
* @see #setMaxInactiveInterval
*/
- public int getMaxInactiveInterval();
+ int getMaxInactiveInterval();
/**
* Returns the object bound with the specified name in this session, or <code>null</code> if no object is bound
@@ -129,7 +129,7 @@ public interface HttpSession {
*
* @exception IllegalStateException if this method is called on an invalidated session
*/
- public Object getAttribute(String name);
+ Object getAttribute(String name);
/**
* Returns an <code>Enumeration</code> of <code>String</code> objects containing the names of all the objects bound
@@ -140,7 +140,7 @@ public interface HttpSession {
*
* @exception IllegalStateException if this method is called on an invalidated session
*/
- public Enumeration<String> getAttributeNames();
+ Enumeration<String> getAttributeNames();
/**
* Binds an object to this session, using the name specified. If an object of the same name is already bound to the
@@ -161,7 +161,7 @@ public interface HttpSession {
*
* @exception IllegalStateException if this method is called on an invalidated session
*/
- public void setAttribute(String name, Object value);
+ void setAttribute(String name, Object value);
/**
* Removes the object bound with the specified name from this session. If the session does not have an object bound
@@ -175,14 +175,14 @@ public interface HttpSession {
*
* @exception IllegalStateException if this method is called on an invalidated session
*/
- public void removeAttribute(String name);
+ void removeAttribute(String name);
/**
* Invalidates this session then unbinds any objects bound to it.
*
* @exception IllegalStateException if this method is called on an already invalidated session
*/
- public void invalidate();
+ void invalidate();
/**
* Returns <code>true</code> if the client does not yet know about the session or if the client chooses not to join
@@ -193,5 +193,5 @@ public interface HttpSession {
*
* @exception IllegalStateException if this method is called on an already invalidated session
*/
- public boolean isNew();
+ boolean isNew();
}
diff --git a/java/jakarta/servlet/http/HttpSessionActivationListener.java b/java/jakarta/servlet/http/HttpSessionActivationListener.java
index 3c3b9c16c0..625fe5e2ba 100644
--- a/java/jakarta/servlet/http/HttpSessionActivationListener.java
+++ b/java/jakarta/servlet/http/HttpSessionActivationListener.java
@@ -32,7 +32,7 @@ public interface HttpSessionActivationListener extends EventListener {
*
* @param se Information about the session this is about to be passivated
*/
- public default void sessionWillPassivate(HttpSessionEvent se) {
+ default void sessionWillPassivate(HttpSessionEvent se) {
}
/**
@@ -40,7 +40,7 @@ public interface HttpSessionActivationListener extends EventListener {
*
* @param se Information about the session this has just been activated
*/
- public default void sessionDidActivate(HttpSessionEvent se) {
+ default void sessionDidActivate(HttpSessionEvent se) {
}
}
diff --git a/java/jakarta/servlet/http/HttpSessionAttributeListener.java b/java/jakarta/servlet/http/HttpSessionAttributeListener.java
index d935a06cf7..4d0031277a 100644
--- a/java/jakarta/servlet/http/HttpSessionAttributeListener.java
+++ b/java/jakarta/servlet/http/HttpSessionAttributeListener.java
@@ -32,7 +32,7 @@ public interface HttpSessionAttributeListener extends EventListener {
*
* @param se Information about the added attribute
*/
- public default void attributeAdded(HttpSessionBindingEvent se) {
+ default void attributeAdded(HttpSessionBindingEvent se) {
}
/**
@@ -41,7 +41,7 @@ public interface HttpSessionAttributeListener extends EventListener {
*
* @param se Information about the removed attribute
*/
- public default void attributeRemoved(HttpSessionBindingEvent se) {
+ default void attributeRemoved(HttpSessionBindingEvent se) {
}
/**
@@ -50,6 +50,6 @@ public interface HttpSessionAttributeListener extends EventListener {
*
* @param se Information about the replaced attribute
*/
- public default void attributeReplaced(HttpSessionBindingEvent se) {
+ default void attributeReplaced(HttpSessionBindingEvent se) {
}
}
diff --git a/java/jakarta/servlet/http/HttpSessionBindingListener.java b/java/jakarta/servlet/http/HttpSessionBindingListener.java
index f7df501d4a..5c16e735e6 100644
--- a/java/jakarta/servlet/http/HttpSessionBindingListener.java
+++ b/java/jakarta/servlet/http/HttpSessionBindingListener.java
@@ -36,7 +36,7 @@ public interface HttpSessionBindingListener extends EventListener {
*
* @see #valueUnbound
*/
- public default void valueBound(HttpSessionBindingEvent event) {
+ default void valueBound(HttpSessionBindingEvent event) {
}
/**
@@ -47,6 +47,6 @@ public interface HttpSessionBindingListener extends EventListener {
*
* @see #valueBound
*/
- public default void valueUnbound(HttpSessionBindingEvent event) {
+ default void valueUnbound(HttpSessionBindingEvent event) {
}
}
diff --git a/java/jakarta/servlet/http/HttpSessionIdListener.java b/java/jakarta/servlet/http/HttpSessionIdListener.java
index 39fa05f283..e48ec3da25 100644
--- a/java/jakarta/servlet/http/HttpSessionIdListener.java
+++ b/java/jakarta/servlet/http/HttpSessionIdListener.java
@@ -37,5 +37,5 @@ public interface HttpSessionIdListener extends EventListener {
* @param se the notification event
* @param oldSessionId the old session ID
*/
- public void sessionIdChanged(HttpSessionEvent se, String oldSessionId);
+ void sessionIdChanged(HttpSessionEvent se, String oldSessionId);
}
diff --git a/java/jakarta/servlet/http/HttpSessionListener.java b/java/jakarta/servlet/http/HttpSessionListener.java
index 2db74b38ec..bd3fd17e90 100644
--- a/java/jakarta/servlet/http/HttpSessionListener.java
+++ b/java/jakarta/servlet/http/HttpSessionListener.java
@@ -34,7 +34,7 @@ public interface HttpSessionListener extends EventListener {
*
* @param se the notification event
*/
- public default void sessionCreated(HttpSessionEvent se) {
+ default void sessionCreated(HttpSessionEvent se) {
}
/**
@@ -42,6 +42,6 @@ public interface HttpSessionListener extends EventListener {
*
* @param se the notification event
*/
- public default void sessionDestroyed(HttpSessionEvent se) {
+ default void sessionDestroyed(HttpSessionEvent se) {
}
}
diff --git a/java/jakarta/servlet/http/Part.java b/java/jakarta/servlet/http/Part.java
index 9f740029b4..f60a259e25 100644
--- a/java/jakarta/servlet/http/Part.java
+++ b/java/jakarta/servlet/http/Part.java
@@ -35,21 +35,21 @@ public interface Part {
*
* @throws IOException if an I/O occurs while obtaining the stream
*/
- public InputStream getInputStream() throws IOException;
+ InputStream getInputStream() throws IOException;
/**
* Obtain the content type passed by the browser.
*
* @return The content type passed by the browser or <code>null</code> if not defined.
*/
- public String getContentType();
+ String getContentType();
/**
* Obtain the name of the field in the multipart form corresponding to this part.
*
* @return The name of the field in the multipart form corresponding to this part.
*/
- public String getName();
+ String getName();
/**
* If this part represents an uploaded file, gets the file name submitted in the upload. Returns {@code null} if no
@@ -59,14 +59,14 @@ public interface Part {
*
* @since Servlet 3.1
*/
- public String getSubmittedFileName();
+ String getSubmittedFileName();
/**
* Obtain the size of this part.
*
* @return The size of the part if bytes
*/
- public long getSize();
+ long getSize();
/**
* A convenience method to write an uploaded part to disk. The client code is not concerned with whether or not the
@@ -80,7 +80,7 @@ public interface Part {
*
* @throws IOException if an I/O occurs while attempting to write the part
*/
- public void write(String fileName) throws IOException;
+ void write(String fileName) throws IOException;
/**
* Deletes the underlying storage for a part, including deleting any associated temporary disk file. Although the
@@ -93,7 +93,7 @@ public interface Part {
*
* @throws IOException if an I/O occurs while attempting to delete the part
*/
- public void delete() throws IOException;
+ void delete() throws IOException;
/**
* Obtains the value of the specified part header as a String. If there are multiple headers with the same name,
@@ -103,7 +103,7 @@ public interface Part {
*
* @return The header value or <code>null</code> if the header is not present
*/
- public String getHeader(String name);
+ String getHeader(String name);
/**
* Obtain all the values of the specified part header.
@@ -113,12 +113,12 @@ public interface Part {
* @return All the values of the specified part header. If the part did not include any headers of the specified
* name, this method returns an empty Collection.
*/
- public Collection<String> getHeaders(String name);
+ Collection<String> getHeaders(String name);
/**
* Get the header names provided for this part.
*
* @return a Collection of all the header names provided for this part.
*/
- public Collection<String> getHeaderNames();
+ Collection<String> getHeaderNames();
}
diff --git a/java/jakarta/servlet/jsp/HttpJspPage.java b/java/jakarta/servlet/jsp/HttpJspPage.java
index c247e7b83c..2f757f8964 100644
--- a/java/jakarta/servlet/jsp/HttpJspPage.java
+++ b/java/jakarta/servlet/jsp/HttpJspPage.java
@@ -54,7 +54,7 @@ public interface HttpJspPage extends JspPage {
* @throws IOException Thrown if an error occurred while writing the
* response for this page.
*/
- public void _jspService(HttpServletRequest request,
+ void _jspService(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException;
}
diff --git a/java/jakarta/servlet/jsp/JspApplicationContext.java b/java/jakarta/servlet/jsp/JspApplicationContext.java
index 5d05934559..47d06006e9 100644
--- a/java/jakarta/servlet/jsp/JspApplicationContext.java
+++ b/java/jakarta/servlet/jsp/JspApplicationContext.java
@@ -39,7 +39,7 @@ public interface JspApplicationContext {
*
* @param listener The listener to add
*/
- public void addELContextListener(ELContextListener listener);
+ void addELContextListener(ELContextListener listener);
/**
* <p>
@@ -65,7 +65,7 @@ public interface JspApplicationContext {
* if called after the application's
* <code>ServletContextListeners</code> have been initialized.
*/
- public void addELResolver(ELResolver resolver);
+ void addELResolver(ELResolver resolver);
/**
* <p>
@@ -75,6 +75,6 @@ public interface JspApplicationContext {
*
* @return an <code>ExpressionFactory</code> implementation
*/
- public ExpressionFactory getExpressionFactory();
+ ExpressionFactory getExpressionFactory();
}
diff --git a/java/jakarta/servlet/jsp/JspPage.java b/java/jakarta/servlet/jsp/JspPage.java
index 4e4026a372..078e22623c 100644
--- a/java/jakarta/servlet/jsp/JspPage.java
+++ b/java/jakarta/servlet/jsp/JspPage.java
@@ -74,7 +74,7 @@ public interface JspPage extends Servlet {
*
* A JSP page should redefine the init() method from Servlet.
*/
- public void jspInit();
+ void jspInit();
/**
* The jspDestroy() method is invoked when the JSP page is about to be
@@ -85,6 +85,6 @@ public interface JspPage extends Servlet {
*
* A JSP page should redefine the destroy() method from Servlet.
*/
- public void jspDestroy();
+ void jspDestroy();
}
diff --git a/java/jakarta/servlet/jsp/el/FunctionMapper.java b/java/jakarta/servlet/jsp/el/FunctionMapper.java
index 317583cb2b..6026109fc5 100644
--- a/java/jakarta/servlet/jsp/el/FunctionMapper.java
+++ b/java/jakarta/servlet/jsp/el/FunctionMapper.java
@@ -35,5 +35,5 @@ public interface FunctionMapper {
* @param localName the short name of the function
* @return the result of the method mapping. Null means no entry found.
*/
- public java.lang.reflect.Method resolveFunction(String prefix, String localName);
+ java.lang.reflect.Method resolveFunction(String prefix, String localName);
}
diff --git a/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java b/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
index 4093c93329..0d1ce61f5b 100644
--- a/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -212,7 +212,7 @@ public class ImplicitObjectELResolver extends ELResolver {
private Map<String,Object> sessionScope;
- public ScopeManager(PageContext page) {
+ ScopeManager(PageContext page) {
this.page = page;
}
@@ -543,7 +543,7 @@ public class ImplicitObjectELResolver extends ELResolver {
private final String key;
- public ScopeEntry(String key) {
+ ScopeEntry(String key) {
this.key = key;
}
diff --git a/java/jakarta/servlet/jsp/el/VariableResolver.java b/java/jakarta/servlet/jsp/el/VariableResolver.java
index 7f3c3b7a24..48e587d4f0 100644
--- a/java/jakarta/servlet/jsp/el/VariableResolver.java
+++ b/java/jakarta/servlet/jsp/el/VariableResolver.java
@@ -46,5 +46,5 @@ public interface VariableResolver {
* if a failure occurred while trying to resolve the given
* variable
*/
- public Object resolveVariable(String pName) throws ELException;
+ Object resolveVariable(String pName) throws ELException;
}
diff --git a/java/jakarta/servlet/jsp/tagext/BodyTag.java b/java/jakarta/servlet/jsp/tagext/BodyTag.java
index abee1c1c38..73df1c06b6 100644
--- a/java/jakarta/servlet/jsp/tagext/BodyTag.java
+++ b/java/jakarta/servlet/jsp/tagext/BodyTag.java
@@ -109,7 +109,7 @@ public interface BodyTag extends IterationTag {
* IterationTag.EVAL_BODY_AGAIN.
*/
@Deprecated
- public static final int EVAL_BODY_TAG = 2;
+ int EVAL_BODY_TAG = 2;
/**
* Request the creation of new buffer, a BodyContent on which to evaluate
@@ -117,7 +117,7 @@ public interface BodyTag extends IterationTag {
* BodyTag. This is an illegal return value for doStartTag when the class
* does not implement BodyTag.
*/
- public static final int EVAL_BODY_BUFFERED = 2;
+ int EVAL_BODY_BUFFERED = 2;
/**
* Set the bodyContent property. This method is invoked by the JSP page
diff --git a/java/jakarta/servlet/jsp/tagext/DynamicAttributes.java b/java/jakarta/servlet/jsp/tagext/DynamicAttributes.java
index f26019598d..e5d1a289e9 100644
--- a/java/jakarta/servlet/jsp/tagext/DynamicAttributes.java
+++ b/java/jakarta/servlet/jsp/tagext/DynamicAttributes.java
@@ -45,5 +45,5 @@ public interface DynamicAttributes {
* signal that it does not accept the given attribute. The
* container must not call doStartTag() or doTag() for this tag.
*/
- public void setDynamicAttribute(String uri, String localName, Object value) throws JspException;
+ void setDynamicAttribute(String uri, String localName, Object value) throws JspException;
}
diff --git a/java/jakarta/servlet/jsp/tagext/IterationTag.java b/java/jakarta/servlet/jsp/tagext/IterationTag.java
index ea273fa51d..49065a8da2 100644
--- a/java/jakarta/servlet/jsp/tagext/IterationTag.java
+++ b/java/jakarta/servlet/jsp/tagext/IterationTag.java
@@ -83,7 +83,7 @@ public interface IterationTag extends Tag {
*
*/
- public static final int EVAL_BODY_AGAIN = 2;
+ int EVAL_BODY_AGAIN = 2;
/**
* Process body (re)evaluation. This method is invoked by the
@@ -115,6 +115,5 @@ public interface IterationTag extends Tag {
* @return whether additional evaluations of the body are desired
* @throws JspException if an error occurred while processing this tag
*/
-
int doAfterBody() throws JspException;
}
diff --git a/java/jakarta/servlet/jsp/tagext/JspIdConsumer.java b/java/jakarta/servlet/jsp/tagext/JspIdConsumer.java
index a6950d0d75..23ac83f34c 100644
--- a/java/jakarta/servlet/jsp/tagext/JspIdConsumer.java
+++ b/java/jakarta/servlet/jsp/tagext/JspIdConsumer.java
@@ -27,5 +27,5 @@ public interface JspIdConsumer {
*
* @param jspId The unique Id
*/
- public void setJspId(String jspId);
+ void setJspId(String jspId);
}
diff --git a/java/jakarta/servlet/jsp/tagext/SimpleTag.java b/java/jakarta/servlet/jsp/tagext/SimpleTag.java
index 972eece862..e15fc6ca25 100644
--- a/java/jakarta/servlet/jsp/tagext/SimpleTag.java
+++ b/java/jakarta/servlet/jsp/tagext/SimpleTag.java
@@ -94,7 +94,7 @@ public interface SimpleTag extends JspTag {
* @throws java.io.IOException If there was an error writing to the
* output stream.
*/
- public void doTag()
+ void doTag()
throws jakarta.servlet.jsp.JspException, java.io.IOException;
/**
@@ -105,14 +105,14 @@ public interface SimpleTag extends JspTag {
*
* @param parent the tag that encloses this tag
*/
- public void setParent( JspTag parent );
+ void setParent( JspTag parent );
/**
* Returns the parent of this tag, for collaboration purposes.
*
* @return the parent of this tag
*/
- public JspTag getParent();
+ JspTag getParent();
/**
* Called by the container to provide this tag handler with
@@ -122,7 +122,7 @@ public interface SimpleTag extends JspTag {
* @param pc the page context for this invocation
* @see Tag#setPageContext
*/
- public void setJspContext( JspContext pc );
+ void setJspContext( JspContext pc );
/**
* Provides the body of this tag as a JspFragment object, able to be
@@ -134,7 +134,7 @@ public interface SimpleTag extends JspTag {
*
* @param jspBody The fragment encapsulating the body of this tag.
*/
- public void setJspBody( JspFragment jspBody );
+ void setJspBody( JspFragment jspBody );
}
diff --git a/java/jakarta/servlet/jsp/tagext/Tag.java b/java/jakarta/servlet/jsp/tagext/Tag.java
index aefa1cb7e0..cd5291fcfb 100644
--- a/java/jakarta/servlet/jsp/tagext/Tag.java
+++ b/java/jakarta/servlet/jsp/tagext/Tag.java
@@ -95,28 +95,28 @@ public interface Tag extends JspTag {
* Valid return value for doStartTag and doAfterBody.
*/
- public static final int SKIP_BODY = 0;
+ int SKIP_BODY = 0;
/**
* Evaluate body into existing out stream.
* Valid return value for doStartTag.
*/
- public static final int EVAL_BODY_INCLUDE = 1;
+ int EVAL_BODY_INCLUDE = 1;
/**
* Skip the rest of the page.
* Valid return value for doEndTag.
*/
- public static final int SKIP_PAGE = 5;
+ int SKIP_PAGE = 5;
/**
* Continue evaluating the page.
* Valid return value for doEndTag().
*/
- public static final int EVAL_PAGE = 6;
+ int EVAL_PAGE = 6;
// Setters for Tag handler data
diff --git a/java/jakarta/transaction/Status.java b/java/jakarta/transaction/Status.java
index 9c68a50ed0..9b113fc406 100644
--- a/java/jakarta/transaction/Status.java
+++ b/java/jakarta/transaction/Status.java
@@ -17,14 +17,14 @@
package jakarta.transaction;
public interface Status {
- public static final int STATUS_ACTIVE = 0;
- public static final int STATUS_MARKED_ROLLBACK = 1;
- public static final int STATUS_PREPARED = 2;
- public static final int STATUS_COMMITTED = 3;
- public static final int STATUS_ROLLEDBACK = 4;
- public static final int STATUS_UNKNOWN = 5;
- public static final int STATUS_NO_TRANSACTION = 6;
- public static final int STATUS_PREPARING = 7;
- public static final int STATUS_COMMITTING = 8;
- public static final int STATUS_ROLLING_BACK = 9;
+ int STATUS_ACTIVE = 0;
+ int STATUS_MARKED_ROLLBACK = 1;
+ int STATUS_PREPARED = 2;
+ int STATUS_COMMITTED = 3;
+ int STATUS_ROLLEDBACK = 4;
+ int STATUS_UNKNOWN = 5;
+ int STATUS_NO_TRANSACTION = 6;
+ int STATUS_PREPARING = 7;
+ int STATUS_COMMITTING = 8;
+ int STATUS_ROLLING_BACK = 9;
}
diff --git a/java/jakarta/transaction/Synchronization.java b/java/jakarta/transaction/Synchronization.java
index 2fe66d86bc..129c1d741b 100644
--- a/java/jakarta/transaction/Synchronization.java
+++ b/java/jakarta/transaction/Synchronization.java
@@ -17,6 +17,6 @@
package jakarta.transaction;
public interface Synchronization {
- public void beforeCompletion();
- public void afterCompletion(int status);
+ void beforeCompletion();
+ void afterCompletion(int status);
}
diff --git a/java/jakarta/transaction/Transaction.java b/java/jakarta/transaction/Transaction.java
index 4cfced6db5..b7922acf5a 100644
--- a/java/jakarta/transaction/Transaction.java
+++ b/java/jakarta/transaction/Transaction.java
@@ -20,23 +20,23 @@ import javax.transaction.xa.XAResource;
public interface Transaction {
- public void commit() throws RollbackException, HeuristicMixedException,
+ void commit() throws RollbackException, HeuristicMixedException,
HeuristicRollbackException, SecurityException,
IllegalStateException, SystemException;
- public boolean delistResource(XAResource xaRes, int flag)
+ boolean delistResource(XAResource xaRes, int flag)
throws IllegalStateException, SystemException;
- public boolean enlistResource(XAResource xaRes)
+ boolean enlistResource(XAResource xaRes)
throws RollbackException, IllegalStateException, SystemException;
- public int getStatus() throws SystemException;
+ int getStatus() throws SystemException;
- public void registerSynchronization(Synchronization sync)
+ void registerSynchronization(Synchronization sync)
throws RollbackException, IllegalStateException, SystemException;
- public void rollback() throws IllegalStateException, SystemException;
+ void rollback() throws IllegalStateException, SystemException;
- public void setRollbackOnly() throws IllegalStateException, SystemException;
+ void setRollbackOnly() throws IllegalStateException, SystemException;
}
diff --git a/java/jakarta/transaction/TransactionManager.java b/java/jakarta/transaction/TransactionManager.java
index caddaab443..86cfdf78d7 100644
--- a/java/jakarta/transaction/TransactionManager.java
+++ b/java/jakarta/transaction/TransactionManager.java
@@ -17,25 +17,25 @@
package jakarta.transaction;
public interface TransactionManager {
- public void begin() throws NotSupportedException, SystemException;
+ void begin() throws NotSupportedException, SystemException;
- public void commit() throws RollbackException, HeuristicMixedException,
+ void commit() throws RollbackException, HeuristicMixedException,
HeuristicRollbackException, SecurityException,
IllegalStateException, SystemException;
- public int getStatus() throws SystemException;
+ int getStatus() throws SystemException;
- public Transaction getTransaction() throws SystemException;
+ Transaction getTransaction() throws SystemException;
- public void resume(Transaction tobj) throws InvalidTransactionException,
+ void resume(Transaction tobj) throws InvalidTransactionException,
IllegalStateException, SystemException;
- public void rollback()
+ void rollback()
throws IllegalStateException, SecurityException, SystemException;
- public void setRollbackOnly() throws IllegalStateException, SystemException;
+ void setRollbackOnly() throws IllegalStateException, SystemException;
- public void setTransactionTimeout(int seconds) throws SystemException;
+ void setTransactionTimeout(int seconds) throws SystemException;
- public Transaction suspend() throws SystemException;
+ Transaction suspend() throws SystemException;
}
diff --git a/java/jakarta/websocket/ClientEndpoint.java b/java/jakarta/websocket/ClientEndpoint.java
index 4c44b0716a..fb19ad0cd1 100644
--- a/java/jakarta/websocket/ClientEndpoint.java
+++ b/java/jakarta/websocket/ClientEndpoint.java
@@ -29,6 +29,6 @@ public @interface ClientEndpoint {
String[] subprotocols() default {};
Class<? extends Decoder>[] decoders() default {};
Class<? extends Encoder>[] encoders() default {};
- public Class<? extends Configurator> configurator()
+ Class<? extends Configurator> configurator()
default Configurator.class;
}
diff --git a/java/jakarta/websocket/ClientEndpointConfig.java b/java/jakarta/websocket/ClientEndpointConfig.java
index fbf752b82f..e74d4675f9 100644
--- a/java/jakarta/websocket/ClientEndpointConfig.java
+++ b/java/jakarta/websocket/ClientEndpointConfig.java
@@ -30,9 +30,9 @@ public interface ClientEndpointConfig extends EndpointConfig {
SSLContext getSSLContext();
- public Configurator getConfigurator();
+ Configurator getConfigurator();
- public final class Builder {
+ final class Builder {
private static final Configurator DEFAULT_CONFIGURATOR =
new Configurator() {};
@@ -121,7 +121,7 @@ public interface ClientEndpointConfig extends EndpointConfig {
}
- public class Configurator {
+ class Configurator {
/**
* Provides the client with a mechanism to inspect and/or modify the headers
diff --git a/java/jakarta/websocket/DefaultClientEndpointConfig.java b/java/jakarta/websocket/DefaultClientEndpointConfig.java
index cf2980937d..456c0d613f 100644
--- a/java/jakarta/websocket/DefaultClientEndpointConfig.java
+++ b/java/jakarta/websocket/DefaultClientEndpointConfig.java
@@ -79,7 +79,7 @@ final class DefaultClientEndpointConfig implements ClientEndpointConfig {
@Override
- public final Map<String, Object> getUserProperties() {
+ public Map<String, Object> getUserProperties() {
return userProperties;
}
diff --git a/java/jakarta/websocket/HandshakeResponse.java b/java/jakarta/websocket/HandshakeResponse.java
index 6754020cb5..e5faf9d801 100644
--- a/java/jakarta/websocket/HandshakeResponse.java
+++ b/java/jakarta/websocket/HandshakeResponse.java
@@ -24,7 +24,7 @@ public interface HandshakeResponse {
/**
* Name of the WebSocket accept HTTP header.
*/
- public static final String SEC_WEBSOCKET_ACCEPT = "Sec-WebSocket-Accept";
+ String SEC_WEBSOCKET_ACCEPT = "Sec-WebSocket-Accept";
Map<String,List<String>> getHeaders();
}
diff --git a/java/jakarta/websocket/server/DefaultServerEndpointConfig.java b/java/jakarta/websocket/server/DefaultServerEndpointConfig.java
index e0122f2faa..7dc0a3ebe0 100644
--- a/java/jakarta/websocket/server/DefaultServerEndpointConfig.java
+++ b/java/jakarta/websocket/server/DefaultServerEndpointConfig.java
@@ -79,17 +79,17 @@ final class DefaultServerEndpointConfig implements ServerEndpointConfig {
}
@Override
- public final Map<String, Object> getUserProperties() {
+ public Map<String, Object> getUserProperties() {
return userProperties;
}
@Override
- public final List<String> getSubprotocols() {
+ public List<String> getSubprotocols() {
return subprotocols;
}
@Override
- public final List<Extension> getExtensions() {
+ public List<Extension> getExtensions() {
return extensions;
}
}
diff --git a/java/jakarta/websocket/server/HandshakeRequest.java b/java/jakarta/websocket/server/HandshakeRequest.java
index 2edb554608..0d9c37dfc9 100644
--- a/java/jakarta/websocket/server/HandshakeRequest.java
+++ b/java/jakarta/websocket/server/HandshakeRequest.java
@@ -26,10 +26,10 @@ import java.util.Map;
*/
public interface HandshakeRequest {
- static final String SEC_WEBSOCKET_KEY = "Sec-WebSocket-Key";
- static final String SEC_WEBSOCKET_PROTOCOL = "Sec-WebSocket-Protocol";
- static final String SEC_WEBSOCKET_VERSION = "Sec-WebSocket-Version";
- static final String SEC_WEBSOCKET_EXTENSIONS= "Sec-WebSocket-Extensions";
+ String SEC_WEBSOCKET_KEY = "Sec-WebSocket-Key";
+ String SEC_WEBSOCKET_PROTOCOL = "Sec-WebSocket-Protocol";
+ String SEC_WEBSOCKET_VERSION = "Sec-WebSocket-Version";
+ String SEC_WEBSOCKET_EXTENSIONS= "Sec-WebSocket-Extensions";
Map<String,List<String>> getHeaders();
diff --git a/java/jakarta/websocket/server/ServerContainer.java b/java/jakarta/websocket/server/ServerContainer.java
index dbeaaea876..5f8b1c0ad5 100644
--- a/java/jakarta/websocket/server/ServerContainer.java
+++ b/java/jakarta/websocket/server/ServerContainer.java
@@ -26,9 +26,9 @@ import jakarta.websocket.WebSocketContainer;
* Provides the ability to deploy endpoints programmatically.
*/
public interface ServerContainer extends WebSocketContainer {
- public abstract void addEndpoint(Class<?> clazz) throws DeploymentException;
+ void addEndpoint(Class<?> clazz) throws DeploymentException;
- public abstract void addEndpoint(ServerEndpointConfig sec) throws DeploymentException;
+ void addEndpoint(ServerEndpointConfig sec) throws DeploymentException;
/**
* Upgrade the HTTP connection represented by the {@code HttpServletRequest} and {@code HttpServletResponse} to the
@@ -57,6 +57,6 @@ public interface ServerContainer extends WebSocketContainer {
*
* @since WebSocket 2.0
*/
- public void upgradeHttpToWebSocket(Object httpServletRequest, Object httpServletResponse, ServerEndpointConfig sec,
+ void upgradeHttpToWebSocket(Object httpServletRequest, Object httpServletResponse, ServerEndpointConfig sec,
Map<String,String> pathParameters) throws IOException, DeploymentException;
}
diff --git a/java/jakarta/websocket/server/ServerEndpoint.java b/java/jakarta/websocket/server/ServerEndpoint.java
index 9c7f013070..e8ba09a198 100644
--- a/java/jakarta/websocket/server/ServerEndpoint.java
+++ b/java/jakarta/websocket/server/ServerEndpoint.java
@@ -41,6 +41,6 @@ public @interface ServerEndpoint {
Class<? extends Encoder>[] encoders() default {};
- public Class<? extends ServerEndpointConfig.Configurator> configurator()
+ Class<? extends ServerEndpointConfig.Configurator> configurator()
default ServerEndpointConfig.Configurator.class;
}
diff --git a/java/jakarta/websocket/server/ServerEndpointConfig.java b/java/jakarta/websocket/server/ServerEndpointConfig.java
index 036c833621..329aa937da 100644
--- a/java/jakarta/websocket/server/ServerEndpointConfig.java
+++ b/java/jakarta/websocket/server/ServerEndpointConfig.java
@@ -52,7 +52,7 @@ public interface ServerEndpointConfig extends EndpointConfig {
Configurator getConfigurator();
- public final class Builder {
+ final class Builder {
public static Builder create(
Class<?> endpointClass, String path) {
@@ -151,7 +151,7 @@ public interface ServerEndpointConfig extends EndpointConfig {
}
- public class Configurator {
+ class Configurator {
private static volatile Configurator defaultImpl = null;
private static final Object defaultImplLock = new Object();
diff --git a/java/jakarta/xml/ws/WebServiceRef.java b/java/jakarta/xml/ws/WebServiceRef.java
index d90a037f33..653cbbf9be 100644
--- a/java/jakarta/xml/ws/WebServiceRef.java
+++ b/java/jakarta/xml/ws/WebServiceRef.java
@@ -25,11 +25,11 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface WebServiceRef {
- public String name() default "";
+ String name() default "";
@SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to match specification
- public Class type() default java.lang.Object.class;
+ Class type() default java.lang.Object.class;
@SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to match specification
- public Class value() default java.lang.Object.class;
- public String wsdlLocation() default "";
- public String mappedName() default "";
+ Class value() default java.lang.Object.class;
+ String wsdlLocation() default "";
+ String mappedName() default "";
}
diff --git a/java/jakarta/xml/ws/WebServiceRefs.java b/java/jakarta/xml/ws/WebServiceRefs.java
index f15f98a22c..0b69d9e1f2 100644
--- a/java/jakarta/xml/ws/WebServiceRefs.java
+++ b/java/jakarta/xml/ws/WebServiceRefs.java
@@ -25,5 +25,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface WebServiceRefs {
- public WebServiceRef[] value();
+ WebServiceRef[] value();
}
diff --git a/java/org/apache/catalina/AccessLog.java b/java/org/apache/catalina/AccessLog.java
index f96b30825c..046facc265 100644
--- a/java/org/apache/catalina/AccessLog.java
+++ b/java/org/apache/catalina/AccessLog.java
@@ -36,35 +36,35 @@ public interface AccessLog {
* Name of request attribute used to override the remote address recorded by
* the AccessLog.
*/
- public static final String REMOTE_ADDR_ATTRIBUTE =
+ String REMOTE_ADDR_ATTRIBUTE =
"org.apache.catalina.AccessLog.RemoteAddr";
/**
* Name of request attribute used to override remote host name recorded by
* the AccessLog.
*/
- public static final String REMOTE_HOST_ATTRIBUTE =
+ String REMOTE_HOST_ATTRIBUTE =
"org.apache.catalina.AccessLog.RemoteHost";
/**
* Name of request attribute used to override the protocol recorded by the
* AccessLog.
*/
- public static final String PROTOCOL_ATTRIBUTE =
+ String PROTOCOL_ATTRIBUTE =
"org.apache.catalina.AccessLog.Protocol";
/**
* Name of request attribute used to override the server name recorded by
* the AccessLog.
*/
- public static final String SERVER_NAME_ATTRIBUTE =
+ String SERVER_NAME_ATTRIBUTE =
"org.apache.catalina.AccessLog.ServerName";
/**
* Name of request attribute used to override the server port recorded by
* the AccessLog.
*/
- public static final String SERVER_PORT_ATTRIBUTE =
+ String SERVER_PORT_ATTRIBUTE =
"org.apache.catalina.AccessLog.ServerPort";
@@ -79,7 +79,7 @@ public interface AccessLog {
* versions prior to 10, the time unit was
* milliseconds
*/
- public void log(Request request, Response response, long time);
+ void log(Request request, Response response, long time);
/**
* Should this valve use request attributes for IP address, hostname,
@@ -98,12 +98,12 @@ public interface AccessLog {
* to be used, <code>false</code> causes
* the original values to be used.
*/
- public void setRequestAttributesEnabled(boolean requestAttributesEnabled);
+ void setRequestAttributesEnabled(boolean requestAttributesEnabled);
/**
* @see #setRequestAttributesEnabled(boolean)
* @return <code>true</code> if the attributes will be logged, otherwise
* <code>false</code>
*/
- public boolean getRequestAttributesEnabled();
+ boolean getRequestAttributesEnabled();
}
diff --git a/java/org/apache/catalina/AsyncDispatcher.java b/java/org/apache/catalina/AsyncDispatcher.java
index 52d3373ce8..84271d8519 100644
--- a/java/org/apache/catalina/AsyncDispatcher.java
+++ b/java/org/apache/catalina/AsyncDispatcher.java
@@ -34,6 +34,6 @@ public interface AsyncDispatcher {
* @throws IOException if an I/O error occurs while processing the
* dispatch
*/
- public void dispatch(ServletRequest request, ServletResponse response)
+ void dispatch(ServletRequest request, ServletResponse response)
throws ServletException, IOException;
}
diff --git a/java/org/apache/catalina/Authenticator.java b/java/org/apache/catalina/Authenticator.java
index d33b7b8940..1a050d4c16 100644
--- a/java/org/apache/catalina/Authenticator.java
+++ b/java/org/apache/catalina/Authenticator.java
@@ -47,11 +47,11 @@ public interface Authenticator {
*
* @exception IOException if an input/output error occurs
*/
- public boolean authenticate(Request request, HttpServletResponse response)
+ boolean authenticate(Request request, HttpServletResponse response)
throws IOException;
- public void login(String userName, String password, Request request)
+ void login(String userName, String password, Request request)
throws ServletException;
- public void logout(Request request);
+ void logout(Request request);
}
diff --git a/java/org/apache/catalina/Cluster.java b/java/org/apache/catalina/Cluster.java
index e76f1dd7e7..6e216800ba 100644
--- a/java/org/apache/catalina/Cluster.java
+++ b/java/org/apache/catalina/Cluster.java
@@ -36,7 +36,7 @@ public interface Cluster extends Contained {
*
* @return The name of the cluster associated with this server
*/
- public String getClusterName();
+ String getClusterName();
/**
@@ -45,7 +45,7 @@ public interface Cluster extends Contained {
*
* @param clusterName The clustername to join
*/
- public void setClusterName(String clusterName);
+ void setClusterName(String clusterName);
/**
@@ -57,7 +57,7 @@ public interface Cluster extends Contained {
*
* @return The newly created Manager instance
*/
- public Manager createManager(String name);
+ Manager createManager(String name);
/**
@@ -66,14 +66,14 @@ public interface Cluster extends Contained {
* cluster that this manager is participating in the cluster.
* @param manager Manager
*/
- public void registerManager(Manager manager);
+ void registerManager(Manager manager);
/**
* Removes a manager from the cluster
* @param manager Manager
*/
- public void removeManager(Manager manager);
+ void removeManager(Manager manager);
/**
@@ -81,5 +81,5 @@ public interface Cluster extends Contained {
* invoked inside the classloading context of this container. Unexpected
* throwables will be caught and logged.
*/
- public void backgroundProcess();
+ void backgroundProcess();
}
diff --git a/java/org/apache/catalina/Container.java b/java/org/apache/catalina/Container.java
index 0881a702fb..fd897dc0f9 100644
--- a/java/org/apache/catalina/Container.java
+++ b/java/org/apache/catalina/Container.java
@@ -84,28 +84,28 @@ public interface Container extends Lifecycle {
* The ContainerEvent event type sent when a child container is added
* by <code>addChild()</code>.
*/
- public static final String ADD_CHILD_EVENT = "addChild";
+ String ADD_CHILD_EVENT = "addChild";
/**
* The ContainerEvent event type sent when a valve is added
* by <code>addValve()</code>, if this Container supports pipelines.
*/
- public static final String ADD_VALVE_EVENT = "addValve";
+ String ADD_VALVE_EVENT = "addValve";
/**
* The ContainerEvent event type sent when a child container is removed
* by <code>removeChild()</code>.
*/
- public static final String REMOVE_CHILD_EVENT = "removeChild";
+ String REMOVE_CHILD_EVENT = "removeChild";
/**
* The ContainerEvent event type sent when a valve is removed
* by <code>removeValve()</code>, if this Container supports pipelines.
*/
- public static final String REMOVE_VALVE_EVENT = "removeValve";
+ String REMOVE_VALVE_EVENT = "removeValve";
// ------------------------------------------------------------- Properties
@@ -117,14 +117,14 @@ public interface Container extends Lifecycle {
* no associated Logger, return the Logger associated with the
* parent Container (if any); otherwise return <code>null</code>.
*/
- public Log getLogger();
+ Log getLogger();
/**
* Return the logger name that the container will use.
* @return the abbreviated name of this container for logging messages
*/
- public String getLogName();
+ String getLogName();
/**
@@ -132,7 +132,7 @@ public interface Container extends Lifecycle {
*
* @return the JMX name associated with this container.
*/
- public ObjectName getObjectName();
+ ObjectName getObjectName();
/**
@@ -141,7 +141,7 @@ public interface Container extends Lifecycle {
*
* @return The JMX domain name
*/
- public String getDomain();
+ String getDomain();
/**
@@ -151,7 +151,7 @@ public interface Container extends Lifecycle {
* @return A string suitable for appending to the ObjectName
*
*/
- public String getMBeanKeyProperties();
+ String getMBeanKeyProperties();
/**
@@ -160,7 +160,7 @@ public interface Container extends Lifecycle {
*
* @return The Pipeline
*/
- public Pipeline getPipeline();
+ Pipeline getPipeline();
/**
@@ -170,7 +170,7 @@ public interface Container extends Lifecycle {
* no associated Cluster, return the Cluster associated with our
* parent Container (if any); otherwise return <code>null</code>.
*/
- public Cluster getCluster();
+ Cluster getCluster();
/**
@@ -178,7 +178,7 @@ public interface Container extends Lifecycle {
*
* @param cluster the Cluster with which this Container is associated.
*/
- public void setCluster(Cluster cluster);
+ void setCluster(Cluster cluster);
/**
@@ -195,7 +195,7 @@ public interface Container extends Lifecycle {
* indicates that background processing will be managed by the
* parent.
*/
- public int getBackgroundProcessorDelay();
+ int getBackgroundProcessorDelay();
/**
@@ -205,7 +205,7 @@ public interface Container extends Lifecycle {
* @param delay The delay in seconds between the invocation of
* backgroundProcess methods
*/
- public void setBackgroundProcessorDelay(int delay);
+ void setBackgroundProcessorDelay(int delay);
/**
@@ -215,7 +215,7 @@ public interface Container extends Lifecycle {
*
* @return The human readable name of this container.
*/
- public String getName();
+ String getName();
/**
@@ -229,7 +229,7 @@ public interface Container extends Lifecycle {
* added to the children of a parent Container (after which the name
* may not be changed)
*/
- public void setName(String name);
+ void setName(String name);
/**
@@ -239,7 +239,7 @@ public interface Container extends Lifecycle {
* there is one. If there is no defined parent, return
* <code>null</code>.
*/
- public Container getParent();
+ Container getParent();
/**
@@ -253,7 +253,7 @@ public interface Container extends Lifecycle {
* @exception IllegalArgumentException if this Container refuses to become
* attached to the specified Container
*/
- public void setParent(Container container);
+ void setParent(Container container);
/**
@@ -263,7 +263,7 @@ public interface Container extends Lifecycle {
* {@link #getParent()}.{@link #getParentClassLoader()}. If no
* parent has been set, return the system class loader.
*/
- public ClassLoader getParentClassLoader();
+ ClassLoader getParentClassLoader();
/**
@@ -274,7 +274,7 @@ public interface Container extends Lifecycle {
*
* @param parent The new parent class loader
*/
- public void setParentClassLoader(ClassLoader parent);
+ void setParentClassLoader(ClassLoader parent);
/**
@@ -284,7 +284,7 @@ public interface Container extends Lifecycle {
* Realm associated with the parent Container (if any); otherwise
* return <code>null</code>.
*/
- public Realm getRealm();
+ Realm getRealm();
/**
@@ -292,7 +292,7 @@ public interface Container extends Lifecycle {
*
* @param realm The newly associated Realm
*/
- public void setRealm(Realm realm);
+ void setRealm(Realm realm);
/**
@@ -302,7 +302,7 @@ public interface Container extends Lifecycle {
* @param resourceName The resource file name
* @return the configuration path
*/
- public static String getConfigPath(Container container, String resourceName) {
+ static String getConfigPath(Container container, String resourceName) {
StringBuilder result = new StringBuilder();
Container host = null;
Container engine = null;
@@ -335,7 +335,7 @@ public interface Container extends Lifecycle {
* @param container The container to start from
* @return the Service, or null if not found
*/
- public static Service getService(Container container) {
+ static Service getService(Container container) {
while (container != null && !(container instanceof Engine)) {
container = container.getParent();
}
@@ -354,7 +354,7 @@ public interface Container extends Lifecycle {
* invoked inside the classloading context of this container. Unexpected
* throwables will be caught and logged.
*/
- public void backgroundProcess();
+ void backgroundProcess();
/**
@@ -374,7 +374,7 @@ public interface Container extends Lifecycle {
* @exception IllegalStateException if this Container does not support
* child Containers
*/
- public void addChild(Container child);
+ void addChild(Container child);
/**
@@ -382,7 +382,7 @@ public interface Container extends Lifecycle {
*
* @param listener The listener to add
*/
- public void addContainerListener(ContainerListener listener);
+ void addContainerListener(ContainerListener listener);
/**
@@ -390,7 +390,7 @@ public interface Container extends Lifecycle {
*
* @param listener The listener to add
*/
- public void addPropertyChangeListener(PropertyChangeListener listener);
+ void addPropertyChangeListener(PropertyChangeListener listener);
/**
@@ -401,7 +401,7 @@ public interface Container extends Lifecycle {
* @return The child Container with the given name or <code>null</code> if
* no such child exists.
*/
- public Container findChild(String name);
+ Container findChild(String name);
/**
@@ -410,7 +410,7 @@ public interface Container extends Lifecycle {
* @return An array containing all children of this container. If this
* Container has no children, a zero-length array is returned.
*/
- public Container[] findChildren();
+ Container[] findChildren();
/**
@@ -420,7 +420,7 @@ public interface Container extends Lifecycle {
* Container. If this Container has no registered container
* listeners, a zero-length array is returned.
*/
- public ContainerListener[] findContainerListeners();
+ ContainerListener[] findContainerListeners();
/**
@@ -429,7 +429,7 @@ public interface Container extends Lifecycle {
*
* @param child Existing child Container to be removed
*/
- public void removeChild(Container child);
+ void removeChild(Container child);
/**
@@ -437,7 +437,7 @@ public interface Container extends Lifecycle {
*
* @param listener The listener to remove
*/
- public void removeContainerListener(ContainerListener listener);
+ void removeContainerListener(ContainerListener listener);
/**
@@ -445,7 +445,7 @@ public interface Container extends Lifecycle {
*
* @param listener The listener to remove
*/
- public void removePropertyChangeListener(PropertyChangeListener listener);
+ void removePropertyChangeListener(PropertyChangeListener listener);
/**
@@ -456,7 +456,7 @@ public interface Container extends Lifecycle {
* @param type Event type
* @param data Event data
*/
- public void fireContainerEvent(String type, Object data);
+ void fireContainerEvent(String type, Object data);
/**
@@ -470,7 +470,7 @@ public interface Container extends Lifecycle {
* @param useDefault Flag that indicates that the request/response should
* be logged in the engine's default access log
*/
- public void logAccess(Request request, Response response, long time,
+ void logAccess(Request request, Response response, long time,
boolean useDefault);
@@ -483,7 +483,7 @@ public interface Container extends Lifecycle {
* @return The AccessLog to use for a request/response destined for this
* container
*/
- public AccessLog getAccessLog();
+ AccessLog getAccessLog();
/**
@@ -494,7 +494,7 @@ public interface Container extends Lifecycle {
* @return The currently configured number of threads used to start/stop
* children associated with this container
*/
- public int getStartStopThreads();
+ int getStartStopThreads();
/**
@@ -503,7 +503,7 @@ public interface Container extends Lifecycle {
* children to be processed in parallel.
* @param startStopThreads The new number of threads to be used
*/
- public void setStartStopThreads(int startStopThreads);
+ void setStartStopThreads(int startStopThreads);
/**
@@ -511,7 +511,7 @@ public interface Container extends Lifecycle {
*
* @return The location of CATALINA_BASE.
*/
- public File getCatalinaBase();
+ File getCatalinaBase();
/**
@@ -519,5 +519,5 @@ public interface Container extends Lifecycle {
*
* @return The location of CATALINA_HOME.
*/
- public File getCatalinaHome();
+ File getCatalinaHome();
}
diff --git a/java/org/apache/catalina/ContainerListener.java b/java/org/apache/catalina/ContainerListener.java
index 9d120ee5ec..ae7275836c 100644
--- a/java/org/apache/catalina/ContainerListener.java
+++ b/java/org/apache/catalina/ContainerListener.java
@@ -32,7 +32,7 @@ public interface ContainerListener {
*
* @param event ContainerEvent that has occurred
*/
- public void containerEvent(ContainerEvent event);
+ void containerEvent(ContainerEvent event);
}
diff --git a/java/org/apache/catalina/ContainerServlet.java b/java/org/apache/catalina/ContainerServlet.java
index be999b1d89..3db927d25f 100644
--- a/java/org/apache/catalina/ContainerServlet.java
+++ b/java/org/apache/catalina/ContainerServlet.java
@@ -32,7 +32,7 @@ public interface ContainerServlet {
*
* @return The Wrapper with which this Servlet is associated.
*/
- public Wrapper getWrapper();
+ Wrapper getWrapper();
/**
@@ -40,5 +40,5 @@ public interface ContainerServlet {
*
* @param wrapper The new associated Wrapper
*/
- public void setWrapper(Wrapper wrapper);
+ void setWrapper(Wrapper wrapper);
}
diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java
index a521fdca35..d8b286b358 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -66,22 +66,22 @@ public interface Context extends Container, ContextBind {
/**
* Container event for adding a welcome file.
*/
- public static final String ADD_WELCOME_FILE_EVENT = "addWelcomeFile";
+ String ADD_WELCOME_FILE_EVENT = "addWelcomeFile";
/**
* Container event for removing a wrapper.
*/
- public static final String REMOVE_WELCOME_FILE_EVENT = "removeWelcomeFile";
+ String REMOVE_WELCOME_FILE_EVENT = "removeWelcomeFile";
/**
* Container event for clearing welcome files.
*/
- public static final String CLEAR_WELCOME_FILES_EVENT = "clearWelcomeFiles";
+ String CLEAR_WELCOME_FILES_EVENT = "clearWelcomeFiles";
/**
* Container event for changing the ID of a session.
*/
- public static final String CHANGE_SESSION_ID_EVENT = "changeSessionId";
+ String CHANGE_SESSION_ID_EVENT = "changeSessionId";
// ------------------------------------------------------------- Properties
@@ -94,7 +94,7 @@ public interface Context extends Container, ContextBind {
* "multipart config" to parse multipart/form-data requests,
* <code>false</code> otherwise.
*/
- public boolean getAllowCasualMultipartParsing();
+ boolean getAllowCasualMultipartParsing();
/**
@@ -106,7 +106,7 @@ public interface Context extends Container, ContextBind {
* @param allowCasualMultipartParsing <code>true</code> to allow such
* casual parsing, <code>false</code> otherwise.
*/
- public void setAllowCasualMultipartParsing(boolean allowCasualMultipartParsing);
+ void setAllowCasualMultipartParsing(boolean allowCasualMultipartParsing);
/**
@@ -116,7 +116,7 @@ public interface Context extends Container, ContextBind {
* this web application in the order they were specified in the web
* application deployment descriptor
*/
- public Object[] getApplicationEventListeners();
+ Object[] getApplicationEventListeners();
/**
@@ -126,7 +126,7 @@ public interface Context extends Container, ContextBind {
*
* @param listeners The set of instantiated listener objects.
*/
- public void setApplicationEventListeners(Object listeners[]);
+ void setApplicationEventListeners(Object listeners[]);
/**
@@ -136,7 +136,7 @@ public interface Context extends Container, ContextBind {
* for this web application in the order they were specified in the
* web application deployment descriptor
*/
- public Object[] getApplicationLifecycleListeners();
+ Object[] getApplicationLifecycleListeners();
/**
@@ -146,7 +146,7 @@ public interface Context extends Container, ContextBind {
*
* @param listeners The set of instantiated listener objects.
*/
- public void setApplicationLifecycleListeners(Object listeners[]);
+ void setApplicationLifecycleListeners(Object listeners[]);
/**
@@ -159,7 +159,7 @@ public interface Context extends Container, ContextBind {
*
* @return The name of the character set to use with the given Locale
*/
- public String getCharset(Locale locale);
+ String getCharset(Locale locale);
/**
@@ -167,7 +167,7 @@ public interface Context extends Container, ContextBind {
*
* @return The URL of the XML descriptor for this context
*/
- public URL getConfigFile();
+ URL getConfigFile();
/**
@@ -175,7 +175,7 @@ public interface Context extends Container, ContextBind {
*
* @param configFile The URL of the XML descriptor for this context.
*/
- public void setConfigFile(URL configFile);
+ void setConfigFile(URL configFile);
/**
@@ -184,7 +184,7 @@ public interface Context extends Container, ContextBind {
* @return <code>true</code> if the Context has been correctly configured,
* otherwise <code>false</code>
*/
- public boolean getConfigured();
+ boolean getConfigured();
/**
@@ -194,7 +194,7 @@ public interface Context extends Container, ContextBind {
*
* @param configured The new correctly configured flag
*/
- public void setConfigured(boolean configured);
+ void setConfigured(boolean configured);
/**
@@ -204,7 +204,7 @@ public interface Context extends Container, ContextBind {
* session IDs for this web application, otherwise
* <code>false</code>
*/
- public boolean getCookies();
+ boolean getCookies();
/**
@@ -212,7 +212,7 @@ public interface Context extends Container, ContextBind {
*
* @param cookies The new flag
*/
- public void setCookies(boolean cookies);
+ void setCookies(boolean cookies);
/**
@@ -222,7 +222,7 @@ public interface Context extends Container, ContextBind {
* @return The value of the default session cookie name or null if not
* specified
*/
- public String getSessionCookieName();
+ String getSessionCookieName();
/**
@@ -231,7 +231,7 @@ public interface Context extends Container, ContextBind {
*
* @param sessionCookieName The name to use
*/
- public void setSessionCookieName(String sessionCookieName);
+ void setSessionCookieName(String sessionCookieName);
/**
@@ -240,7 +240,7 @@ public interface Context extends Container, ContextBind {
* @return <code>true</code> if the HttpOnly flag should be set on session
* cookies
*/
- public boolean getUseHttpOnly();
+ boolean getUseHttpOnly();
/**
@@ -249,7 +249,7 @@ public interface Context extends Container, ContextBind {
* @param useHttpOnly Set to <code>true</code> to use HttpOnly cookies
* for session cookies
*/
- public void setUseHttpOnly(boolean useHttpOnly);
+ void setUseHttpOnly(boolean useHttpOnly);
/**
@@ -259,7 +259,7 @@ public interface Context extends Container, ContextBind {
* @return The value of the default session cookie domain or null if not
* specified
*/
- public String getSessionCookieDomain();
+ String getSessionCookieDomain();
/**
@@ -268,7 +268,7 @@ public interface Context extends Container, ContextBind {
*
* @param sessionCookieDomain The domain to use
*/
- public void setSessionCookieDomain(String sessionCookieDomain);
+ void setSessionCookieDomain(String sessionCookieDomain);
/**
@@ -278,7 +278,7 @@ public interface Context extends Container, ContextBind {
* @return The value of the default session cookie path or null if not
* specified
*/
- public String getSessionCookiePath();
+ String getSessionCookiePath();
/**
@@ -287,7 +287,7 @@ public interface Context extends Container, ContextBind {
*
* @param sessionCookiePath The path to use
*/
- public void setSessionCookiePath(String sessionCookiePath);
+ void setSessionCookiePath(String sessionCookiePath);
/**
@@ -298,7 +298,7 @@ public interface Context extends Container, ContextBind {
* @return <code>true</code> if the slash is added, otherwise
* <code>false</code>
*/
- public boolean getSessionCookiePathUsesTrailingSlash();
+ boolean getSessionCookiePathUsesTrailingSlash();
/**
@@ -310,7 +310,7 @@ public interface Context extends Container, ContextBind {
* slash is should be added,
* otherwise <code>false</code>
*/
- public void setSessionCookiePathUsesTrailingSlash(
+ void setSessionCookiePathUsesTrailingSlash(
boolean sessionCookiePathUsesTrailingSlash);
@@ -320,7 +320,7 @@ public interface Context extends Container, ContextBind {
* @return <code>true</code> if cross-contest requests are allowed from this
* web applications, otherwise <code>false</code>
*/
- public boolean getCrossContext();
+ boolean getCrossContext();
/**
@@ -328,7 +328,7 @@ public interface Context extends Container, ContextBind {
*
* @return the name
*/
- public String getAltDDName();
+ String getAltDDName();
/**
@@ -336,7 +336,7 @@ public interface Context extends Container, ContextBind {
*
* @param altDDName The new name
*/
- public void setAltDDName(String altDDName) ;
+ void setAltDDName(String altDDName) ;
/**
@@ -344,7 +344,7 @@ public interface Context extends Container, ContextBind {
*
* @param crossContext The new cross contexts flag
*/
- public void setCrossContext(boolean crossContext);
+ void setCrossContext(boolean crossContext);
/**
@@ -352,7 +352,7 @@ public interface Context extends Container, ContextBind {
*
* @return The current value of the flag
*/
- public boolean getDenyUncoveredHttpMethods();
+ boolean getDenyUncoveredHttpMethods();
/**
@@ -360,7 +360,7 @@ public interface Context extends Container, ContextBind {
*
* @param denyUncoveredHttpMethods The new deny-uncovered-http-methods flag
*/
- public void setDenyUncoveredHttpMethods(boolean denyUncoveredHttpMethods);
+ void setDenyUncoveredHttpMethods(boolean denyUncoveredHttpMethods);
/**
@@ -368,7 +368,7 @@ public interface Context extends Container, ContextBind {
*
* @return The display name
*/
- public String getDisplayName();
+ String getDisplayName();
/**
@@ -376,7 +376,7 @@ public interface Context extends Container, ContextBind {
*
* @param displayName The new display name
*/
- public void setDisplayName(String displayName);
+ void setDisplayName(String displayName);
/**
@@ -384,7 +384,7 @@ public interface Context extends Container, ContextBind {
*
* @return The value of the distributable flag for this web application.
*/
- public boolean getDistributable();
+ boolean getDistributable();
/**
@@ -392,7 +392,7 @@ public interface Context extends Container, ContextBind {
*
* @param distributable The new distributable flag
*/
- public void setDistributable(boolean distributable);
+ void setDistributable(boolean distributable);
/**
@@ -401,7 +401,7 @@ public interface Context extends Container, ContextBind {
* @return An absolute pathname or a relative (to the Host's appBase)
* pathname.
*/
- public String getDocBase();
+ String getDocBase();
/**
@@ -411,7 +411,7 @@ public interface Context extends Container, ContextBind {
*
* @param docBase The new document root
*/
- public void setDocBase(String docBase);
+ void setDocBase(String docBase);
/**
@@ -419,7 +419,7 @@ public interface Context extends Container, ContextBind {
*
* @return The URL encoded (with UTF-8) context path
*/
- public String getEncodedPath();
+ String getEncodedPath();
/**
@@ -428,7 +428,7 @@ public interface Context extends Container, ContextBind {
* @return {@code true} if annotation parsing is disabled for this web
* application
*/
- public boolean getIgnoreAnnotations();
+ boolean getIgnoreAnnotations();
/**
@@ -437,13 +437,13 @@ public interface Context extends Container, ContextBind {
*
* @param ignoreAnnotations The boolean on the annotations parsing
*/
- public void setIgnoreAnnotations(boolean ignoreAnnotations);
+ void setIgnoreAnnotations(boolean ignoreAnnotations);
/**
* @return the login configuration descriptor for this web application.
*/
- public LoginConfig getLoginConfig();
+ LoginConfig getLoginConfig();
/**
@@ -451,13 +451,13 @@ public interface Context extends Container, ContextBind {
*
* @param config The new login configuration
*/
- public void setLoginConfig(LoginConfig config);
+ void setLoginConfig(LoginConfig config);
/**
* @return the naming resources associated with this web application.
*/
- public NamingResourcesImpl getNamingResources();
+ NamingResourcesImpl getNamingResources();
/**
@@ -465,13 +465,13 @@ public interface Context extends Container, ContextBind {
*
* @param namingResources The new naming resources
*/
- public void setNamingResources(NamingResourcesImpl namingResources);
+ void setNamingResources(NamingResourcesImpl namingResources);
/**
* @return the context path for this web application.
*/
- public String getPath();
+ String getPath();
/**
@@ -479,14 +479,14 @@ public interface Context extends Container, ContextBind {
*
* @param path The new context path
*/
- public void setPath(String path);
+ void setPath(String path);
/**
* @return the public identifier of the deployment descriptor DTD that is
* currently being parsed.
*/
- public String getPublicId();
+ String getPublicId();
/**
@@ -495,13 +495,13 @@ public interface Context extends Container, ContextBind {
*
* @param publicId The public identifier
*/
- public void setPublicId(String publicId);
+ void setPublicId(String publicId);
/**
* @return the reloadable flag for this web application.
*/
- public boolean getReloadable();
+ boolean getReloadable();
/**
@@ -509,13 +509,13 @@ public interface Context extends Container, ContextBind {
*
* @param reloadable The new reloadable flag
*/
- public void setReloadable(boolean reloadable);
+ void setReloadable(boolean reloadable);
/**
* @return the override flag for this web application.
*/
- public boolean getOverride();
+ boolean getOverride();
/**
@@ -523,13 +523,13 @@ public interface Context extends Container, ContextBind {
*
* @param override The new override flag
*/
- public void setOverride(boolean override);
+ void setOverride(boolean override);
/**
* @return the privileged flag for this web application.
*/
- public boolean getPrivileged();
+ boolean getPrivileged();
/**
@@ -537,20 +537,20 @@ public interface Context extends Container, ContextBind {
*
* @param privileged The new privileged flag
*/
- public void setPrivileged(boolean privileged);
+ void setPrivileged(boolean privileged);
/**
* @return the Servlet context for which this Context is a facade.
*/
- public ServletContext getServletContext();
+ ServletContext getServletContext();
/**
* @return the default session timeout (in minutes) for this
* web application.
*/
- public int getSessionTimeout();
+ int getSessionTimeout();
/**
@@ -559,7 +559,7 @@ public interface Context extends Container, ContextBind {
*
* @param timeout The new default session timeout
*/
- public void setSessionTimeout(int timeout);
+ void setSessionTimeout(int timeout);
/**
@@ -569,7 +569,7 @@ public interface Context extends Container, ContextBind {
* @return <code>true</code> if data will be swallowed (default),
* <code>false</code> otherwise.
*/
- public boolean getSwallowAbortedUploads();
+ boolean getSwallowAbortedUploads();
/**
@@ -579,12 +579,12 @@ public interface Context extends Container, ContextBind {
* @param swallowAbortedUploads <code>false</code> to disable
* swallowing, <code>true</code> otherwise (default).
*/
- public void setSwallowAbortedUploads(boolean swallowAbortedUploads);
+ void setSwallowAbortedUploads(boolean swallowAbortedUploads);
/**
* @return the value of the swallowOutput flag.
*/
- public boolean getSwallowOutput();
+ boolean getSwallowOutput();
/**
@@ -594,14 +594,14 @@ public interface Context extends Container, ContextBind {
*
* @param swallowOutput The new value
*/
- public void setSwallowOutput(boolean swallowOutput);
+ void setSwallowOutput(boolean swallowOutput);
/**
* @return the Java class name of the Wrapper implementation used
* for servlets registered in this Context.
*/
- public String getWrapperClass();
+ String getWrapperClass();
/**
@@ -610,7 +610,7 @@ public interface Context extends Container, ContextBind {
*
* @param wrapperClass The new wrapper class
*/
- public void setWrapperClass(String wrapperClass);
+ void setWrapperClass(String wrapperClass);
/**
@@ -619,7 +619,7 @@ public interface Context extends Container, ContextBind {
*
* @return true if namespace awareness is enabled.
*/
- public boolean getXmlNamespaceAware();
+ boolean getXmlNamespaceAware();
/**
@@ -628,7 +628,7 @@ public interface Context extends Container, ContextBind {
*
* @param xmlNamespaceAware true to enable namespace awareness
*/
- public void setXmlNamespaceAware(boolean xmlNamespaceAware);
+ void setXmlNamespaceAware(boolean xmlNamespaceAware);
/**
@@ -637,7 +637,7 @@ public interface Context extends Container, ContextBind {
*
* @return true if validation is enabled.
*/
- public boolean getXmlValidation();
+ boolean getXmlValidation();
/**
@@ -646,7 +646,7 @@ public interface Context extends Container, ContextBind {
*
* @param xmlValidation true to enable xml validation
*/
- public void setXmlValidation(boolean xmlValidation);
+ void setXmlValidation(boolean xmlValidation);
/**
@@ -655,7 +655,7 @@ public interface Context extends Container, ContextBind {
*
* @return true if access to external entities is blocked
*/
- public boolean getXmlBlockExternal();
+ boolean getXmlBlockExternal();
/**
@@ -665,7 +665,7 @@ public interface Context extends Container, ContextBind {
*
* @param xmlBlockExternal true to block external entities
*/
- public void setXmlBlockExternal(boolean xmlBlockExternal);
+ void setXmlBlockExternal(boolean xmlBlockExternal);
/**
@@ -674,7 +674,7 @@ public interface Context extends Container, ContextBind {
*
* @return true if validation is enabled.
*/
- public boolean getTldValidation();
+ boolean getTldValidation();
/**
@@ -683,7 +683,7 @@ public interface Context extends Container, ContextBind {
*
* @param tldValidation true to enable xml validation
*/
- public void setTldValidation(boolean tldValidation);
+ void setTldValidation(boolean tldValidation);
/**
@@ -691,20 +691,20 @@ public interface Context extends Container, ContextBind {
* context.
* @return The Jar Scanner configured for this context.
*/
- public JarScanner getJarScanner();
+ JarScanner getJarScanner();
/**
* Set the Jar Scanner to be used to scan for JAR resources for this
* context.
* @param jarScanner The Jar Scanner to be used for this context.
*/
- public void setJarScanner(JarScanner jarScanner);
+ void setJarScanner(JarScanner jarScanner);
/**
* @return the {@link Authenticator} that is used by this context. This is
* always non-{@code null} for a started Context
*/
- public Authenticator getAuthenticator();
+ Authenticator getAuthenticator();
/**
* Set whether or not the effective web.xml for this context should be
@@ -713,7 +713,7 @@ public interface Context extends Container, ContextBind {
* @param logEffectiveWebXml set to <code>true</code> to log the complete
* web.xml that will be used for the webapp
*/
- public void setLogEffectiveWebXml(boolean logEffectiveWebXml);
+ void setLogEffectiveWebXml(boolean logEffectiveWebXml);
/**
* Should the effective web.xml for this context be logged on context start?
@@ -721,19 +721,19 @@ public interface Context extends Container, ContextBind {
* @return true if the reconstructed web.xml that will be used for the
* webapp should be logged
*/
- public boolean getLogEffectiveWebXml();
+ boolean getLogEffectiveWebXml();
/**
* @return the instance manager associated with this context.
*/
- public InstanceManager getInstanceManager();
+ InstanceManager getInstanceManager();
/**
* Set the instance manager associated with this context.
*
* @param instanceManager the new instance manager instance
*/
- public void setInstanceManager(InstanceManager instanceManager);
+ void setInstanceManager(InstanceManager instanceManager);
/**
* Sets the regular expression that specifies which container provided SCIs
@@ -746,7 +746,7 @@ public interface Context extends Container, ContextBind {
* qualified class name of each container provided
* SCI should be checked
*/
- public void setContainerSciFilter(String containerSciFilter);
+ void setContainerSciFilter(String containerSciFilter);
/**
* Obtains the regular expression that specifies which container provided
@@ -758,7 +758,7 @@ public interface Context extends Container, ContextBind {
* @return The regular expression against which the fully qualified class
* name of each container provided SCI will be checked
*/
- public String getContainerSciFilter();
+ String getContainerSciFilter();
/**
@@ -767,7 +767,7 @@ public interface Context extends Container, ContextBind {
* @deprecated This method will be removed in Tomcat 11 onwards
*/
@Deprecated
- public default boolean isParallelAnnotationScanning() {
+ default boolean isParallelAnnotationScanning() {
return getParallelAnnotationScanning();
}
@@ -775,14 +775,14 @@ public interface Context extends Container, ContextBind {
* @return the value of the parallel annotation scanning flag. If true,
* it will dispatch scanning to the utility executor.
*/
- public boolean getParallelAnnotationScanning();
+ boolean getParallelAnnotationScanning();
/**
* Set the parallel annotation scanning value.
*
* @param parallelAnnotationScanning new parallel annotation scanning flag
*/
- public void setParallelAnnotationScanning(boolean parallelAnnotationScanning);
+ void setParallelAnnotationScanning(boolean parallelAnnotationScanning);
// --------------------------------------------------------- Public Methods
@@ -793,7 +793,7 @@ public interface Context extends Container, ContextBind {
*
* @param listener Java class name of a listener class
*/
- public void addApplicationListener(String listener);
+ void addApplicationListener(String listener);
/**
@@ -801,7 +801,7 @@ public interface Context extends Container, ContextBind {
*
* @param parameter The new application parameter
*/
- public void addApplicationParameter(ApplicationParameter parameter);
+ void addApplicationParameter(ApplicationParameter parameter);
/**
@@ -809,7 +809,7 @@ public interface Context extends Container, ContextBind {
*
* @param constraint The security constraint that should be added
*/
- public void addConstraint(SecurityConstraint constraint);
+ void addConstraint(SecurityConstraint constraint);
/**
@@ -817,7 +817,7 @@ public interface Context extends Container, ContextBind {
*
* @param errorPage The error page definition to be added
*/
- public void addErrorPage(ErrorPage errorPage);
+ void addErrorPage(ErrorPage errorPage);
/**
@@ -825,7 +825,7 @@ public interface Context extends Container, ContextBind {
*
* @param filterDef The filter definition to be added
*/
- public void addFilterDef(FilterDef filterDef);
+ void addFilterDef(FilterDef filterDef);
/**
@@ -833,7 +833,7 @@ public interface Context extends Container, ContextBind {
*
* @param filterMap The filter mapping to be added
*/
- public void addFilterMap(FilterMap filterMap);
+ void addFilterMap(FilterMap filterMap);
/**
* Add a filter mapping to this Context before the mappings defined in the
@@ -845,7 +845,7 @@ public interface Context extends Container, ContextBind {
* does not match an existing filter definition, or the filter mapping
* is malformed
*/
- public void addFilterMapBefore(FilterMap filterMap);
+ void addFilterMapBefore(FilterMap filterMap);
/**
@@ -854,7 +854,7 @@ public interface Context extends Container, ContextBind {
* @param locale locale to map an encoding for
* @param encoding encoding to be used for a give locale
*/
- public void addLocaleEncodingMappingParameter(String locale, String encoding);
+ void addLocaleEncodingMappingParameter(String locale, String encoding);
/**
@@ -864,7 +864,7 @@ public interface Context extends Container, ContextBind {
* @param extension Filename extension being mapped
* @param mimeType Corresponding MIME type
*/
- public void addMimeMapping(String extension, String mimeType);
+ void addMimeMapping(String extension, String mimeType);
/**
@@ -874,7 +874,7 @@ public interface Context extends Container, ContextBind {
* @param name Name of the new parameter
* @param value Value of the new parameter
*/
- public void addParameter(String name, String value);
+ void addParameter(String name, String value);
/**
@@ -883,7 +883,7 @@ public interface Context extends Container, ContextBind {
* @param role Security role used in the application
* @param link Actual security role to check for
*/
- public void addRoleMapping(String role, String link);
+ void addRoleMapping(String role, String link);
/**
@@ -891,7 +891,7 @@ public interface Context extends Container, ContextBind {
*
* @param role New security role
*/
- public void addSecurityRole(String role);
+ void addSecurityRole(String role);
/**
@@ -901,7 +901,7 @@ public interface Context extends Container, ContextBind {
* @param pattern URL pattern to be mapped
* @param name Name of the corresponding servlet to execute
*/
- public default void addServletMappingDecoded(String pattern, String name) {
+ default void addServletMappingDecoded(String pattern, String name) {
addServletMappingDecoded(pattern, name, false);
}
@@ -915,7 +915,7 @@ public interface Context extends Container, ContextBind {
* @param jspWildcard true if name identifies the JspServlet
* and pattern contains a wildcard; false otherwise
*/
- public void addServletMappingDecoded(String pattern, String name,
+ void addServletMappingDecoded(String pattern, String name,
boolean jspWildcard);
@@ -925,7 +925,7 @@ public interface Context extends Container, ContextBind {
*
* @param name Path to the resource, relative to docBase
*/
- public void addWatchedResource(String name);
+ void addWatchedResource(String name);
/**
@@ -933,7 +933,7 @@ public interface Context extends Container, ContextBind {
*
* @param name New welcome file name
*/
- public void addWelcomeFile(String name);
+ void addWelcomeFile(String name);
/**
@@ -942,7 +942,7 @@ public interface Context extends Container, ContextBind {
*
* @param listener Java class name of a LifecycleListener class
*/
- public void addWrapperLifecycle(String listener);
+ void addWrapperLifecycle(String listener);
/**
@@ -951,7 +951,7 @@ public interface Context extends Container, ContextBind {
*
* @param listener Java class name of a ContainerListener class
*/
- public void addWrapperListener(String listener);
+ void addWrapperListener(String listener);
/**
@@ -960,7 +960,7 @@ public interface Context extends Container, ContextBind {
* configuration with custom Context implementations.
* @return the instance manager
*/
- public InstanceManager createInstanceManager();
+ InstanceManager createInstanceManager();
/**
* Factory method to create and return a new Wrapper instance, of
@@ -970,27 +970,27 @@ public interface Context extends Container, ContextBind {
*
* @return a newly created wrapper instance that is used to wrap a Servlet
*/
- public Wrapper createWrapper();
+ Wrapper createWrapper();
/**
* @return the set of application listener class names configured
* for this application.
*/
- public String[] findApplicationListeners();
+ String[] findApplicationListeners();
/**
* @return the set of application parameters for this application.
*/
- public ApplicationParameter[] findApplicationParameters();
+ ApplicationParameter[] findApplicationParameters();
/**
* @return the set of security constraints for this web application.
* If there are none, a zero-length array is returned.
*/
- public SecurityConstraint[] findConstraints();
+ SecurityConstraint[] findConstraints();
/**
@@ -999,7 +999,7 @@ public interface Context extends Container, ContextBind {
*
* @param errorCode Error code to look up
*/
- public ErrorPage findErrorPage(int errorCode);
+ ErrorPage findErrorPage(int errorCode);
/**
@@ -1013,14 +1013,14 @@ public interface Context extends Container, ContextBind {
* @return the error page entry for the specified Java exception type,
* if any; otherwise return {@code null}.
*/
- public ErrorPage findErrorPage(Throwable throwable);
+ ErrorPage findErrorPage(Throwable throwable);
/**
* @return the set of defined error pages for all specified error codes
* and exception types.
*/
- public ErrorPage[] findErrorPages();
+ ErrorPage[] findErrorPages();
/**
@@ -1029,19 +1029,19 @@ public interface Context extends Container, ContextBind {
*
* @param filterName Filter name to look up
*/
- public FilterDef findFilterDef(String filterName);
+ FilterDef findFilterDef(String filterName);
/**
* @return the set of defined filters for this Context.
*/
- public FilterDef[] findFilterDefs();
+ FilterDef[] findFilterDefs();
/**
* @return the set of filter mappings for this Context.
*/
- public FilterMap[] findFilterMaps();
+ FilterMap[] findFilterMaps();
/**
@@ -1050,14 +1050,14 @@ public interface Context extends Container, ContextBind {
*
* @param extension Extension to map to a MIME type
*/
- public String findMimeMapping(String extension);
+ String findMimeMapping(String extension);
/**
* @return the extensions for which MIME mappings are defined. If there
* are none, a zero-length array is returned.
*/
- public String[] findMimeMappings();
+ String[] findMimeMappings();
/**
@@ -1066,7 +1066,7 @@ public interface Context extends Container, ContextBind {
*
* @param name Name of the parameter to return
*/
- public String findParameter(String name);
+ String findParameter(String name);
/**
@@ -1074,7 +1074,7 @@ public interface Context extends Container, ContextBind {
* for this Context. If no parameters are defined, a zero-length
* array is returned.
*/
- public String[] findParameters();
+ String[] findParameters();
/**
@@ -1085,7 +1085,7 @@ public interface Context extends Container, ContextBind {
* @param role Security role to map
* @return The role name that was mapped to the specified role
*/
- public String findRoleMapping(String role);
+ String findRoleMapping(String role);
/**
@@ -1094,14 +1094,14 @@ public interface Context extends Container, ContextBind {
*
* @param role Security role to verify
*/
- public boolean findSecurityRole(String role);
+ boolean findSecurityRole(String role);
/**
* @return the security roles defined for this application. If none
* have been defined, a zero-length array is returned.
*/
- public String[] findSecurityRoles();
+ String[] findSecurityRoles();
/**
@@ -1110,20 +1110,20 @@ public interface Context extends Container, ContextBind {
*
* @param pattern Pattern for which a mapping is requested
*/
- public String findServletMapping(String pattern);
+ String findServletMapping(String pattern);
/**
* @return the patterns of all defined servlet mappings for this
* Context. If no mappings are defined, a zero-length array is returned.
*/
- public String[] findServletMappings();
+ String[] findServletMappings();
/**
* @return the associated ThreadBindingListener.
*/
- public ThreadBindingListener getThreadBindingListener();
+ ThreadBindingListener getThreadBindingListener();
/**
@@ -1132,14 +1132,14 @@ public interface Context extends Container, ContextBind {
* @param threadBindingListener Set the listener that will receive
* notifications when entering and exiting the application scope
*/
- public void setThreadBindingListener(ThreadBindingListener threadBindingListener);
+ void setThreadBindingListener(ThreadBindingListener threadBindingListener);
/**
* @return the set of watched resources for this Context. If none are
* defined, a zero length array will be returned.
*/
- public String[] findWatchedResources();
+ String[] findWatchedResources();
/**
@@ -1148,28 +1148,28 @@ public interface Context extends Container, ContextBind {
*
* @param name Welcome file to verify
*/
- public boolean findWelcomeFile(String name);
+ boolean findWelcomeFile(String name);
/**
* @return the set of welcome files defined for this Context. If none are
* defined, a zero-length array is returned.
*/
- public String[] findWelcomeFiles();
+ String[] findWelcomeFiles();
/**
* @return the set of LifecycleListener classes that will be added to
* newly created Wrappers automatically.
*/
- public String[] findWrapperLifecycles();
+ String[] findWrapperLifecycles();
/**
* @return the set of ContainerListener classes that will be added to
* newly created Wrappers automatically.
*/
- public String[] findWrapperListeners();
+ String[] findWrapperListeners();
/**
@@ -1180,7 +1180,7 @@ public interface Context extends Container, ContextBind {
* @return <code>true</code> if the listeners fire successfully, else
* <code>false</code>
*/
- public boolean fireRequestInitEvent(ServletRequest request);
+ boolean fireRequestInitEvent(ServletRequest request);
/**
* Notify all {@link jakarta.servlet.ServletRequestListener}s that a request
@@ -1190,7 +1190,7 @@ public interface Context extends Container, ContextBind {
* @return <code>true</code> if the listeners fire successfully, else
* <code>false</code>
*/
- public boolean fireRequestDestroyEvent(ServletRequest request);
+ boolean fireRequestDestroyEvent(ServletRequest request);
/**
* Reload this web application, if reloading is supported.
@@ -1198,7 +1198,7 @@ public interface Context extends Container, ContextBind {
* @exception IllegalStateException if the <code>reloadable</code>
* property is set to <code>false</code>.
*/
- public void reload();
+ void reload();
/**
@@ -1207,7 +1207,7 @@ public interface Context extends Container, ContextBind {
*
* @param listener Java class name of the listener to be removed
*/
- public void removeApplicationListener(String listener);
+ void removeApplicationListener(String listener);
/**
@@ -1216,7 +1216,7 @@ public interface Context extends Container, ContextBind {
*
* @param name Name of the application parameter to remove
*/
- public void removeApplicationParameter(String name);
+ void removeApplicationParameter(String name);
/**
@@ -1224,7 +1224,7 @@ public interface Context extends Container, ContextBind {
*
* @param constraint Constraint to be removed
*/
- public void removeConstraint(SecurityConstraint constraint);
+ void removeConstraint(SecurityConstraint constraint);
/**
@@ -1233,7 +1233,7 @@ public interface Context extends Container, ContextBind {
*
* @param errorPage The error page definition to be removed
*/
- public void removeErrorPage(ErrorPage errorPage);
+ void removeErrorPage(ErrorPage errorPage);
/**
@@ -1242,7 +1242,7 @@ public interface Context extends Container, ContextBind {
*
* @param filterDef Filter definition to be removed
*/
- public void removeFilterDef(FilterDef filterDef);
+ void removeFilterDef(FilterDef filterDef);
/**
@@ -1250,7 +1250,7 @@ public interface Context extends Container, ContextBind {
*
* @param filterMap The filter mapping to be removed
*/
- public void removeFilterMap(FilterMap filterMap);
+ void removeFilterMap(FilterMap filterMap);
/**
@@ -1259,7 +1259,7 @@ public interface Context extends Container, ContextBind {
*
* @param extension Extension to remove the mapping for
*/
- public void removeMimeMapping(String extension);
+ void removeMimeMapping(String extension);
/**
@@ -1268,7 +1268,7 @@ public interface Context extends Container, ContextBind {
*
* @param name Name of the parameter to remove
*/
- public void removeParameter(String name);
+ void removeParameter(String name);
/**
@@ -1276,7 +1276,7 @@ public interface Context extends Container, ContextBind {
*
* @param role Security role (as used in the application) to remove
*/
- public void removeRoleMapping(String role);
+ void removeRoleMapping(String role);
/**
@@ -1284,7 +1284,7 @@ public interface Context extends Container, ContextBind {
*
* @param role Security role to remove
*/
- public void removeSecurityRole(String role);
+ void removeSecurityRole(String role);
/**
@@ -1293,7 +1293,7 @@ public interface Context extends Container, ContextBind {
*
* @param pattern URL pattern of the mapping to remove
*/
- public void removeServletMapping(String pattern);
+ void removeServletMapping(String pattern);
/**
@@ -1302,7 +1302,7 @@ public interface Context extends Container, ContextBind {
*
* @param name Name of the watched resource to be removed
*/
- public void removeWatchedResource(String name);
+ void removeWatchedResource(String name);
/**
@@ -1311,7 +1311,7 @@ public interface Context extends Container, ContextBind {
*
* @param name Name of the welcome file to be removed
*/
- public void removeWelcomeFile(String name);
+ void removeWelcomeFile(String name);
/**
@@ -1320,7 +1320,7 @@ public interface Context extends Container, ContextBind {
*
* @param listener Class name of a LifecycleListener class to be removed
*/
- public void removeWrapperLifecycle(String listener);
+ void removeWrapperLifecycle(String listener);
/**
@@ -1329,7 +1329,7 @@ public interface Context extends Container, ContextBind {
*
* @param listener Class name of a ContainerListener class to be removed
*/
- public void removeWrapperListener(String listener);
+ void removeWrapperListener(String listener);
/**
@@ -1338,14 +1338,14 @@ public interface Context extends Container, ContextBind {
*
* @param path The path to the desired resource
*/
- public String getRealPath(String path);
+ String getRealPath(String path);
/**
* @return the effective major version of the Servlet spec used by this
* context.
*/
- public int getEffectiveMajorVersion();
+ int getEffectiveMajorVersion();
/**
@@ -1354,14 +1354,14 @@ public interface Context extends Container, ContextBind {
*
* @param major Set the version number
*/
- public void setEffectiveMajorVersion(int major);
+ void setEffectiveMajorVersion(int major);
/**
* @return the effective minor version of the Servlet spec used by this
* context.
*/
- public int getEffectiveMinorVersion();
+ int getEffectiveMinorVersion();
/**
@@ -1370,14 +1370,14 @@ public interface Context extends Container, ContextBind {
*
* @param minor Set the version number
*/
- public void setEffectiveMinorVersion(int minor);
+ void setEffectiveMinorVersion(int minor);
/**
* @return the JSP configuration for this context.
* Will be null if there is no JSP configuration.
*/
- public JspConfigDescriptor getJspConfigDescriptor();
+ JspConfigDescriptor getJspConfigDescriptor();
/**
@@ -1386,7 +1386,7 @@ public interface Context extends Container, ContextBind {
*
* @param descriptor the new JSP configuration
*/
- public void setJspConfigDescriptor(JspConfigDescriptor descriptor);
+ void setJspConfigDescriptor(JspConfigDescriptor descriptor);
/**
@@ -1396,7 +1396,7 @@ public interface Context extends Container, ContextBind {
* @param classes The classes in which the initializer expressed an
* interest
*/
- public void addServletContainerInitializer(
+ void addServletContainerInitializer(
ServletContainerInitializer sci, Set<Class<?>> classes);
@@ -1405,7 +1405,7 @@ public interface Context extends Container, ContextBind {
*
* @return <code>true</code> if the context has been paused
*/
- public boolean getPaused();
+ boolean getPaused();
/**
@@ -1434,14 +1434,14 @@ public interface Context extends Container, ContextBind {
*
* @param resourceOnlyServlets The Servlet names comma separated list
*/
- public void setResourceOnlyServlets(String resourceOnlyServlets);
+ void setResourceOnlyServlets(String resourceOnlyServlets);
/**
* Obtains the list of Servlets that expect a resource to be present.
*
* @return A comma separated list of Servlet names as used in web.xml
*/
- public String getResourceOnlyServlets();
+ String getResourceOnlyServlets();
/**
* Checks the named Servlet to see if it expects a resource to be present.
@@ -1450,13 +1450,13 @@ public interface Context extends Container, ContextBind {
* @return <code>true</code> if the Servlet expects a resource,
* otherwise <code>false</code>
*/
- public boolean isResourceOnlyServlet(String servletName);
+ boolean isResourceOnlyServlet(String servletName);
/**
* @return the base name to use for WARs, directories or context.xml files
* for this context.
*/
- public String getBaseName();
+ String getBaseName();
/**
* Set the version of this web application - used to differentiate
@@ -1466,14 +1466,14 @@ public interface Context extends Container, ContextBind {
* @param webappVersion The webapp version associated with the context,
* which should be unique
*/
- public void setWebappVersion(String webappVersion);
+ void setWebappVersion(String webappVersion);
/**
* @return The version of this web application, used to differentiate
* different versions of the same web application when using parallel
* deployment. If not specified, defaults to the empty string.
*/
- public String getWebappVersion();
+ String getWebappVersion();
/**
* Configure whether or not requests listeners will be fired on forwards for
@@ -1481,13 +1481,13 @@ public interface Context extends Container, ContextBind {
*
* @param enable <code>true</code> to fire request listeners when forwarding
*/
- public void setFireRequestListenersOnForwards(boolean enable);
+ void setFireRequestListenersOnForwards(boolean enable);
/**
* @return whether or not requests listeners will be fired on forwards for
* this Context.
*/
- public boolean getFireRequestListenersOnForwards();
+ boolean getFireRequestListenersOnForwards();
/**
* Configures if a user presents authentication credentials, whether the
@@ -1497,14 +1497,14 @@ public interface Context extends Container, ContextBind {
* @param enable <code>true</code> to perform authentication even outside
* security constraints
*/
- public void setPreemptiveAuthentication(boolean enable);
+ void setPreemptiveAuthentication(boolean enable);
/**
* @return if a user presents authentication credentials, will the
* context will process them when the request is for a non-protected
* resource.
*/
- public boolean getPreemptiveAuthentication();
+ boolean getPreemptiveAuthentication();
/**
* Configures if a response body is included when a redirect response is
@@ -1512,43 +1512,43 @@ public interface Context extends Container, ContextBind {
*
* @param enable <code>true</code> to send a response body for redirects
*/
- public void setSendRedirectBody(boolean enable);
+ void setSendRedirectBody(boolean enable);
/**
* @return if the context is configured to include a response body as
* part of a redirect response.
*/
- public boolean getSendRedirectBody();
+ boolean getSendRedirectBody();
/**
* @return the Loader with which this Context is associated.
*/
- public Loader getLoader();
+ Loader getLoader();
/**
* Set the Loader with which this Context is associated.
*
* @param loader The newly associated loader
*/
- public void setLoader(Loader loader);
+ void setLoader(Loader loader);
/**
* @return the Resources with which this Context is associated.
*/
- public WebResourceRoot getResources();
+ WebResourceRoot getResources();
/**
* Set the Resources object with which this Context is associated.
*
* @param resources The newly associated Resources
*/
- public void setResources(WebResourceRoot resources);
+ void setResources(WebResourceRoot resources);
/**
* @return the Manager with which this Context is associated. If there is
* no associated Manager, return <code>null</code>.
*/
- public Manager getManager();
+ Manager getManager();
/**
@@ -1556,7 +1556,7 @@ public interface Context extends Container, ContextBind {
*
* @param manager The newly associated Manager
*/
- public void setManager(Manager manager);
+ void setManager(Manager manager);
/**
* Sets the flag that indicates if /WEB-INF/classes should be treated like
@@ -1565,14 +1565,14 @@ public interface Context extends Container, ContextBind {
*
* @param addWebinfClassesResources The new value for the flag
*/
- public void setAddWebinfClassesResources(boolean addWebinfClassesResources);
+ void setAddWebinfClassesResources(boolean addWebinfClassesResources);
/**
* @return the flag that indicates if /WEB-INF/classes should be treated like
* an exploded JAR and JAR resources made available as if they were in a
* JAR.
*/
- public boolean getAddWebinfClassesResources();
+ boolean getAddWebinfClassesResources();
/**
* Add a post construct method definition for the given class, if there is
@@ -1587,7 +1587,7 @@ public interface Context extends Container, ContextBind {
* <code>NULL</code>; if there is already post construct method
* definition for the given class
*/
- public void addPostConstructMethod(String clazz, String method);
+ void addPostConstructMethod(String clazz, String method);
/**
* Add a pre destroy method definition for the given class, if there is an
@@ -1602,7 +1602,7 @@ public interface Context extends Container, ContextBind {
* <code>NULL</code>; if there is already pre destroy method
* definition for the given class
*/
- public void addPreDestroyMethod(String clazz, String method);
+ void addPreDestroyMethod(String clazz, String method);
/**
* Removes the post construct method definition for the given class, if it
@@ -1611,7 +1611,7 @@ public interface Context extends Container, ContextBind {
* @param clazz
* Fully qualified class name
*/
- public void removePostConstructMethod(String clazz);
+ void removePostConstructMethod(String clazz);
/**
* Removes the pre destroy method definition for the given class, if it
@@ -1620,7 +1620,7 @@ public interface Context extends Container, ContextBind {
* @param clazz
* Fully qualified class name
*/
- public void removePreDestroyMethod(String clazz);
+ void removePreDestroyMethod(String clazz);
/**
* Returns the method name that is specified as post construct method for
@@ -1634,7 +1634,7 @@ public interface Context extends Container, ContextBind {
* the given class, if it exists; otherwise <code>NULL</code> will
* be returned.
*/
- public String findPostConstructMethod(String clazz);
+ String findPostConstructMethod(String clazz);
/**
* Returns the method name that is specified as pre destroy method for the
@@ -1647,7 +1647,7 @@ public interface Context extends Container, ContextBind {
* given class, if it exists; otherwise <code>NULL</code> will be
* returned.
*/
- public String findPreDestroyMethod(String clazz);
+ String findPreDestroyMethod(String clazz);
/**
* Returns a map with keys - fully qualified class names of the classes that
@@ -1658,7 +1658,7 @@ public interface Context extends Container, ContextBind {
* have post construct methods and the values are the corresponding
* method names.
*/
- public Map<String, String> findPostConstructMethods();
+ Map<String, String> findPostConstructMethods();
/**
* Returns a map with keys - fully qualified class names of the classes that
@@ -1669,13 +1669,13 @@ public interface Context extends Container, ContextBind {
* have pre destroy methods and the values are the corresponding
* method names.
*/
- public Map<String, String> findPreDestroyMethods();
+ Map<String, String> findPreDestroyMethods();
/**
* @return the token necessary for operations on the associated JNDI naming
* context.
*/
- public Object getNamingToken();
+ Object getNamingToken();
/**
* Sets the {@link CookieProcessor} that will be used to process cookies
@@ -1686,13 +1686,13 @@ public interface Context extends Container, ContextBind {
* @throws IllegalArgumentException If a {@code null} CookieProcessor is
* specified
*/
- public void setCookieProcessor(CookieProcessor cookieProcessor);
+ void setCookieProcessor(CookieProcessor cookieProcessor);
/**
* @return the {@link CookieProcessor} that will be used to process cookies
* for this Context.
*/
- public CookieProcessor getCookieProcessor();
+ CookieProcessor getCookieProcessor();
/**
* When a client provides the ID for a new session, should that ID be
@@ -1711,7 +1711,7 @@ public interface Context extends Container, ContextBind {
* @param validateClientProvidedNewSessionId
* {@code true} if validation should be applied
*/
- public void setValidateClientProvidedNewSessionId(boolean validateClientProvidedNewSessionId);
+ void setValidateClientProvidedNewSessionId(boolean validateClientProvidedNewSessionId);
/**
* Will client provided session IDs be validated (see {@link
@@ -1720,7 +1720,7 @@ public interface Context extends Container, ContextBind {
* @return {@code true} if validation will be applied. Otherwise, {@code
* false}
*/
- public boolean getValidateClientProvidedNewSessionId();
+ boolean getValidateClientProvidedNewSessionId();
/**
* If enabled, requests for a web application context root will be
@@ -1730,7 +1730,7 @@ public interface Context extends Container, ContextBind {
*
* @param mapperContextRootRedirectEnabled Should the redirects be enabled?
*/
- public void setMapperContextRootRedirectEnabled(boolean mapperContextRootRedirectEnabled);
+ void setMapperContextRootRedirectEnabled(boolean mapperContextRootRedirectEnabled);
/**
* Determines if requests for a web application context root will be
@@ -1741,7 +1741,7 @@ public interface Context extends Container, ContextBind {
* @return {@code true} if the Mapper level redirect is enabled for this
* Context.
*/
- public boolean getMapperContextRootRedirectEnabled();
+ boolean getMapperContextRootRedirectEnabled();
/**
* If enabled, requests for a directory will be redirected (adding a
@@ -1750,7 +1750,7 @@ public interface Context extends Container, ContextBind {
*
* @param mapperDirectoryRedirectEnabled Should the redirects be enabled?
*/
- public void setMapperDirectoryRedirectEnabled(boolean mapperDirectoryRedirectEnabled);
+ void setMapperDirectoryRedirectEnabled(boolean mapperDirectoryRedirectEnabled);
/**
* Determines if requests for a directory will be redirected (adding a
@@ -1760,7 +1760,7 @@ public interface Context extends Container, ContextBind {
* @return {@code true} if the Mapper level redirect is enabled for this
* Context.
*/
- public boolean getMapperDirectoryRedirectEnabled();
+ boolean getMapperDirectoryRedirectEnabled();
/**
* Controls whether HTTP 1.1 and later location headers generated by a call
@@ -1780,7 +1780,7 @@ public interface Context extends Container, ContextBind {
* @param useRelativeRedirects {@code true} to use relative redirects and
* {@code false} to use absolute redirects
*/
- public void setUseRelativeRedirects(boolean useRelativeRedirects);
+ void setUseRelativeRedirects(boolean useRelativeRedirects);
/**
* Will HTTP 1.1 and later location headers generated by a call to
@@ -1792,7 +1792,7 @@ public interface Context extends Container, ContextBind {
*
* @see #setUseRelativeRedirects(boolean)
*/
- public boolean getUseRelativeRedirects();
+ boolean getUseRelativeRedirects();
/**
* Are paths used in calls to obtain a request dispatcher expected to be
@@ -1803,7 +1803,7 @@ public interface Context extends Container, ContextBind {
* @param dispatchersUseEncodedPaths {@code true} to use encoded paths,
* otherwise {@code false}
*/
- public void setDispatchersUseEncodedPaths(boolean dispatchersUseEncodedPaths);
+ void setDispatchersUseEncodedPaths(boolean dispatchersUseEncodedPaths);
/**
* Are paths used in calls to obtain a request dispatcher expected to be
@@ -1814,35 +1814,35 @@ public interface Context extends Container, ContextBind {
* @return {@code true} if encoded paths will be used, otherwise
* {@code false}
*/
- public boolean getDispatchersUseEncodedPaths();
+ boolean getDispatchersUseEncodedPaths();
/**
* Set the default request body encoding for this web application.
*
* @param encoding The default encoding
*/
- public void setRequestCharacterEncoding(String encoding);
+ void setRequestCharacterEncoding(String encoding);
/**
* Get the default request body encoding for this web application.
*
* @return The default request body encoding
*/
- public String getRequestCharacterEncoding();
+ String getRequestCharacterEncoding();
/**
* Set the default response body encoding for this web application.
*
* @param encoding The default encoding
*/
- public void setResponseCharacterEncoding(String encoding);
+ void setResponseCharacterEncoding(String encoding);
/**
* Get the default response body encoding for this web application.
*
* @return The default response body encoding
*/
- public String getResponseCharacterEncoding();
+ String getResponseCharacterEncoding();
/**
* Configure if, when returning a context path from {@link
@@ -1851,7 +1851,7 @@ public interface Context extends Container, ContextBind {
*
* @param allowMultipleLeadingForwardSlashInPath The new value for the flag
*/
- public void setAllowMultipleLeadingForwardSlashInPath(
+ void setAllowMultipleLeadingForwardSlashInPath(
boolean allowMultipleLeadingForwardSlashInPath);
/**
@@ -1862,13 +1862,13 @@ public interface Context extends Container, ContextBind {
* @return <code>true</code> if multiple leading '/' characters are allowed,
* otherwise <code>false</code>
*/
- public boolean getAllowMultipleLeadingForwardSlashInPath();
+ boolean getAllowMultipleLeadingForwardSlashInPath();
- public void incrementInProgressAsyncCount();
+ void incrementInProgressAsyncCount();
- public void decrementInProgressAsyncCount();
+ void decrementInProgressAsyncCount();
/**
@@ -1879,7 +1879,7 @@ public interface Context extends Container, ContextBind {
* @param createUploadTargets {@code true} if Tomcat should attempt to
* create the upload target, otherwise {@code false}
*/
- public void setCreateUploadTargets(boolean createUploadTargets);
+ void setCreateUploadTargets(boolean createUploadTargets);
/**
@@ -1890,7 +1890,7 @@ public interface Context extends Container, ContextBind {
* @return {@code true} if Tomcat will attempt to create an upload target
* otherwise {@code false}
*/
- public boolean getCreateUploadTargets();
+ boolean getCreateUploadTargets();
/**
@@ -1902,14 +1902,14 @@ public interface Context extends Container, ContextBind {
* else the default value will be <code>false</code>.
* @return the flag value
*/
- public boolean getAlwaysAccessSession();
+ boolean getAlwaysAccessSession();
/**
* Set the session access behavior.
* @param alwaysAccessSession the new flag value
*/
- public void setAlwaysAccessSession(boolean alwaysAccessSession);
+ void setAlwaysAccessSession(boolean alwaysAccessSession);
/**
@@ -1924,7 +1924,7 @@ public interface Context extends Container, ContextBind {
* else the default value will be <code>false</code>.
* @return the flag value
*/
- public boolean getContextGetResourceRequiresSlash();
+ boolean getContextGetResourceRequiresSlash();
/**
@@ -1933,7 +1933,7 @@ public interface Context extends Container, ContextBind {
* a leading "/".
* @param contextGetResourceRequiresSlash the new flag value
*/
- public void setContextGetResourceRequiresSlash(boolean contextGetResourceRequiresSlash);
+ void setContextGetResourceRequiresSlash(boolean contextGetResourceRequiresSlash);
/**
@@ -1945,14 +1945,14 @@ public interface Context extends Container, ContextBind {
* else the default value will be <code>false</code>.
* @return the flag value
*/
- public boolean getDispatcherWrapsSameObject();
+ boolean getDispatcherWrapsSameObject();
/**
* Allow disabling the object wrap check in the request dispatcher.
* @param dispatcherWrapsSameObject the new flag value
*/
- public void setDispatcherWrapsSameObject(boolean dispatcherWrapsSameObject);
+ void setDispatcherWrapsSameObject(boolean dispatcherWrapsSameObject);
/**
@@ -1962,8 +1962,7 @@ public interface Context extends Container, ContextBind {
* @deprecated This method will be removed in Tomcat 11 onwards.
* Use {@link WebResourceRoot#getArchiveIndexStrategy()}
*/
- @Deprecated
- public boolean getUseBloomFilterForArchives();
+ @Deprecated boolean getUseBloomFilterForArchives();
/**
* Set bloom filter flag value.
@@ -1973,6 +1972,5 @@ public interface Context extends Container, ContextBind {
* @deprecated This method will be removed in Tomcat 11 onwards
* Use {@link WebResourceRoot#setArchiveIndexStrategy(String)}
*/
- @Deprecated
- public void setUseBloomFilterForArchives(boolean useBloomFilterForArchives);
+ @Deprecated void setUseBloomFilterForArchives(boolean useBloomFilterForArchives);
}
diff --git a/java/org/apache/catalina/DistributedManager.java b/java/org/apache/catalina/DistributedManager.java
index dbe015a52a..2ac5fd4e59 100644
--- a/java/org/apache/catalina/DistributedManager.java
+++ b/java/org/apache/catalina/DistributedManager.java
@@ -39,12 +39,12 @@ public interface DistributedManager {
*
* @return The total session count across the cluster.
*/
- public int getActiveSessionsFull();
+ int getActiveSessionsFull();
/**
* Returns the list of all sessions IDS (primary, backup and proxy).
*
* @return The complete set of sessions IDs across the cluster.
*/
- public Set<String> getSessionIdsFull();
+ Set<String> getSessionIdsFull();
}
diff --git a/java/org/apache/catalina/Engine.java b/java/org/apache/catalina/Engine.java
index 66b4411411..201e93ccff 100644
--- a/java/org/apache/catalina/Engine.java
+++ b/java/org/apache/catalina/Engine.java
@@ -45,7 +45,7 @@ public interface Engine extends Container {
/**
* @return the default host name for this Engine.
*/
- public String getDefaultHost();
+ String getDefaultHost();
/**
@@ -53,13 +53,13 @@ public interface Engine extends Container {
*
* @param defaultHost The new default host
*/
- public void setDefaultHost(String defaultHost);
+ void setDefaultHost(String defaultHost);
/**
* @return the JvmRouteId for this engine.
*/
- public String getJvmRoute();
+ String getJvmRoute();
/**
@@ -68,13 +68,13 @@ public interface Engine extends Container {
* @param jvmRouteId the (new) JVM Route ID. Each Engine within a cluster
* must have a unique JVM Route ID.
*/
- public void setJvmRoute(String jvmRouteId);
+ void setJvmRoute(String jvmRouteId);
/**
* @return the <code>Service</code> with which we are associated (if any).
*/
- public Service getService();
+ Service getService();
/**
@@ -82,5 +82,5 @@ public interface Engine extends Container {
*
* @param service The service that owns this Engine
*/
- public void setService(Service service);
+ void setService(Service service);
}
diff --git a/java/org/apache/catalina/Executor.java b/java/org/apache/catalina/Executor.java
index 5ea6a12ce3..bf9b5754f0 100644
--- a/java/org/apache/catalina/Executor.java
+++ b/java/org/apache/catalina/Executor.java
@@ -18,5 +18,5 @@ package org.apache.catalina;
public interface Executor extends java.util.concurrent.Executor, Lifecycle {
- public String getName();
+ String getName();
}
\ No newline at end of file
diff --git a/java/org/apache/catalina/Group.java b/java/org/apache/catalina/Group.java
index 05ece8ba88..9cf329e58e 100644
--- a/java/org/apache/catalina/Group.java
+++ b/java/org/apache/catalina/Group.java
@@ -34,7 +34,7 @@ public interface Group extends Principal {
/**
* @return the description of this group.
*/
- public String getDescription();
+ String getDescription();
/**
@@ -42,14 +42,14 @@ public interface Group extends Principal {
*
* @param description The new description
*/
- public void setDescription(String description);
+ void setDescription(String description);
/**
* @return the group name of this group, which must be unique
* within the scope of a {@link UserDatabase}.
*/
- public String getGroupname();
+ String getGroupname();
/**
@@ -58,25 +58,25 @@ public interface Group extends Principal {
*
* @param groupname The new group name
*/
- public void setGroupname(String groupname);
+ void setGroupname(String groupname);
/**
* @return the set of {@link Role}s assigned specifically to this group.
*/
- public Iterator<Role> getRoles();
+ Iterator<Role> getRoles();
/**
* @return the {@link UserDatabase} within which this Group is defined.
*/
- public UserDatabase getUserDatabase();
+ UserDatabase getUserDatabase();
/**
* @return the set of {@link User}s that are members of this group.
*/
- public Iterator<User> getUsers();
+ Iterator<User> getUsers();
// --------------------------------------------------------- Public Methods
@@ -86,7 +86,7 @@ public interface Group extends Principal {
*
* @param role The new role
*/
- public void addRole(Role role);
+ void addRole(Role role);
/**
@@ -97,7 +97,7 @@ public interface Group extends Principal {
* @return <code>true</code> if the group is assigned to the specified role
* otherwise <code>false</code>
*/
- public boolean isInRole(Role role);
+ boolean isInRole(Role role);
/**
@@ -105,13 +105,13 @@ public interface Group extends Principal {
*
* @param role The old role
*/
- public void removeRole(Role role);
+ void removeRole(Role role);
/**
* Remove all {@link Role}s from those assigned to this group.
*/
- public void removeRoles();
+ void removeRoles();
}
diff --git a/java/org/apache/catalina/Host.java b/java/org/apache/catalina/Host.java
index ba585f0273..f9af68e9ae 100644
--- a/java/org/apache/catalina/Host.java
+++ b/java/org/apache/catalina/Host.java
@@ -53,14 +53,14 @@ public interface Host extends Container {
* The ContainerEvent event type sent when a new alias is added
* by <code>addAlias()</code>.
*/
- public static final String ADD_ALIAS_EVENT = "addAlias";
+ String ADD_ALIAS_EVENT = "addAlias";
/**
* The ContainerEvent event type sent when an old alias is removed
* by <code>removeAlias()</code>.
*/
- public static final String REMOVE_ALIAS_EVENT = "removeAlias";
+ String REMOVE_ALIAS_EVENT = "removeAlias";
// ------------------------------------------------------------- Properties
@@ -72,7 +72,7 @@ public interface Host extends Container {
* If null, the base path defaults to
* ${catalina.base}/conf/<engine name>/<host name> directory
*/
- public String getXmlBase();
+ String getXmlBase();
/**
* Set the Xml root for this Host. This can be an absolute
@@ -81,19 +81,19 @@ public interface Host extends Container {
* ${catalina.base}/conf/<engine name>/<host name> directory
* @param xmlBase The new XML root
*/
- public void setXmlBase(String xmlBase);
+ void setXmlBase(String xmlBase);
/**
* @return a default configuration path of this Host. The file will be
* canonical if possible.
*/
- public File getConfigBaseFile();
+ File getConfigBaseFile();
/**
* @return the application root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
*/
- public String getAppBase();
+ String getAppBase();
/**
@@ -101,7 +101,7 @@ public interface Host extends Container {
* will be canonical if possible. There is no guarantee that that the
* appBase exists.
*/
- public File getAppBaseFile();
+ File getAppBaseFile();
/**
@@ -110,14 +110,14 @@ public interface Host extends Container {
*
* @param appBase The new application root
*/
- public void setAppBase(String appBase);
+ void setAppBase(String appBase);
/**
* @return the legacy (Java EE) application root for this Host. This can be
* an absolute pathname, a relative pathname, or a URL.
*/
- public String getLegacyAppBase();
+ String getLegacyAppBase();
/**
@@ -125,7 +125,7 @@ public interface Host extends Container {
* Host. The file will be canonical if possible. There is no guarantee that
* that the appBase exists.
*/
- public File getLegacyAppBaseFile();
+ File getLegacyAppBaseFile();
/**
@@ -134,7 +134,7 @@ public interface Host extends Container {
*
* @param legacyAppBase The new legacy application root
*/
- public void setLegacyAppBase(String legacyAppBase);
+ void setLegacyAppBase(String legacyAppBase);
/**
@@ -142,7 +142,7 @@ public interface Host extends Container {
* this host's child webapps should be discovered and automatically
* deployed dynamically.
*/
- public boolean getAutoDeploy();
+ boolean getAutoDeploy();
/**
@@ -150,14 +150,14 @@ public interface Host extends Container {
*
* @param autoDeploy The new auto deploy flag
*/
- public void setAutoDeploy(boolean autoDeploy);
+ void setAutoDeploy(boolean autoDeploy);
/**
* @return the Java class name of the context configuration class
* for new web applications.
*/
- public String getConfigClass();
+ String getConfigClass();
/**
@@ -166,7 +166,7 @@ public interface Host extends Container {
*
* @param configClass The new context configuration class
*/
- public void setConfigClass(String configClass);
+ void setConfigClass(String configClass);
/**
@@ -174,7 +174,7 @@ public interface Host extends Container {
* that this host's child webapps should be discovered and automatically
* deployed.
*/
- public boolean getDeployOnStartup();
+ boolean getDeployOnStartup();
/**
@@ -182,7 +182,7 @@ public interface Host extends Container {
*
* @param deployOnStartup The new deploy on startup flag
*/
- public void setDeployOnStartup(boolean deployOnStartup);
+ void setDeployOnStartup(boolean deployOnStartup);
/**
@@ -190,7 +190,7 @@ public interface Host extends Container {
* the host's appBase that will be ignored by the automatic deployment
* process.
*/
- public String getDeployIgnore();
+ String getDeployIgnore();
/**
@@ -198,7 +198,7 @@ public interface Host extends Container {
* directories in the host's appBase that will be ignored by the automatic
* deployment process.
*/
- public Pattern getDeployIgnorePattern();
+ Pattern getDeployIgnorePattern();
/**
@@ -208,7 +208,7 @@ public interface Host extends Container {
*
* @param deployIgnore A regular expression matching file names
*/
- public void setDeployIgnore(String deployIgnore);
+ void setDeployIgnore(String deployIgnore);
/**
@@ -216,7 +216,7 @@ public interface Host extends Container {
* is primarily for use by components deploying contexts that want to do
* this in a multi-threaded manner.
*/
- public ExecutorService getStartStopExecutor();
+ ExecutorService getStartStopExecutor();
/**
@@ -224,7 +224,7 @@ public interface Host extends Container {
* unless they already exist.
* @return true if the Host will attempt to create directories
*/
- public boolean getCreateDirs();
+ boolean getCreateDirs();
/**
@@ -233,7 +233,7 @@ public interface Host extends Container {
*
* @param createDirs The new value for this flag
*/
- public void setCreateDirs(boolean createDirs);
+ void setCreateDirs(boolean createDirs);
/**
@@ -241,7 +241,7 @@ public interface Host extends Container {
* versions of applications deployed using parallel deployment. This only
* takes effect is {@link #getAutoDeploy()} also returns <code>true</code>.
*/
- public boolean getUndeployOldVersions();
+ boolean getUndeployOldVersions();
/**
@@ -251,7 +251,7 @@ public interface Host extends Container {
*
* @param undeployOldVersions The new value for this flag
*/
- public void setUndeployOldVersions(boolean undeployOldVersions);
+ void setUndeployOldVersions(boolean undeployOldVersions);
// --------------------------------------------------------- Public Methods
@@ -261,14 +261,14 @@ public interface Host extends Container {
*
* @param alias The alias to be added
*/
- public void addAlias(String alias);
+ void addAlias(String alias);
/**
* @return the set of alias names for this Host. If none are defined,
* a zero length array is returned.
*/
- public String[] findAliases();
+ String[] findAliases();
/**
@@ -276,5 +276,5 @@ public interface Host extends Container {
*
* @param alias Alias name to be removed
*/
- public void removeAlias(String alias);
+ void removeAlias(String alias);
}
diff --git a/java/org/apache/catalina/Lifecycle.java b/java/org/apache/catalina/Lifecycle.java
index 3dfd7ea565..5095a596f4 100644
--- a/java/org/apache/catalina/Lifecycle.java
+++ b/java/org/apache/catalina/Lifecycle.java
@@ -89,67 +89,67 @@ public interface Lifecycle {
/**
* The LifecycleEvent type for the "component before init" event.
*/
- public static final String BEFORE_INIT_EVENT = "before_init";
+ String BEFORE_INIT_EVENT = "before_init";
/**
* The LifecycleEvent type for the "component after init" event.
*/
- public static final String AFTER_INIT_EVENT = "after_init";
+ String AFTER_INIT_EVENT = "after_init";
/**
* The LifecycleEvent type for the "component start" event.
*/
- public static final String START_EVENT = "start";
+ String START_EVENT = "start";
/**
* The LifecycleEvent type for the "component before start" event.
*/
- public static final String BEFORE_START_EVENT = "before_start";
+ String BEFORE_START_EVENT = "before_start";
/**
* The LifecycleEvent type for the "component after start" event.
*/
- public static final String AFTER_START_EVENT = "after_start";
+ String AFTER_START_EVENT = "after_start";
/**
* The LifecycleEvent type for the "component stop" event.
*/
- public static final String STOP_EVENT = "stop";
+ String STOP_EVENT = "stop";
/**
* The LifecycleEvent type for the "component before stop" event.
*/
- public static final String BEFORE_STOP_EVENT = "before_stop";
+ String BEFORE_STOP_EVENT = "before_stop";
/**
* The LifecycleEvent type for the "component after stop" event.
*/
- public static final String AFTER_STOP_EVENT = "after_stop";
+ String AFTER_STOP_EVENT = "after_stop";
/**
* The LifecycleEvent type for the "component after destroy" event.
*/
- public static final String AFTER_DESTROY_EVENT = "after_destroy";
+ String AFTER_DESTROY_EVENT = "after_destroy";
/**
* The LifecycleEvent type for the "component before destroy" event.
*/
- public static final String BEFORE_DESTROY_EVENT = "before_destroy";
+ String BEFORE_DESTROY_EVENT = "before_destroy";
/**
* The LifecycleEvent type for the "periodic" event.
*/
- public static final String PERIODIC_EVENT = "periodic";
+ String PERIODIC_EVENT = "periodic";
/**
@@ -158,7 +158,7 @@ public interface Lifecycle {
* need to signal when configuration should be performed - usually after
* {@link #BEFORE_START_EVENT} and before {@link #START_EVENT}.
*/
- public static final String CONFIGURE_START_EVENT = "configure_start";
+ String CONFIGURE_START_EVENT = "configure_start";
/**
@@ -167,7 +167,7 @@ public interface Lifecycle {
* need to signal when de-configuration should be performed - usually after
* {@link #STOP_EVENT} and before {@link #AFTER_STOP_EVENT}.
*/
- public static final String CONFIGURE_STOP_EVENT = "configure_stop";
+ String CONFIGURE_STOP_EVENT = "configure_stop";
// --------------------------------------------------------- Public Methods
@@ -178,7 +178,7 @@ public interface Lifecycle {
*
* @param listener The listener to add
*/
- public void addLifecycleListener(LifecycleListener listener);
+ void addLifecycleListener(LifecycleListener listener);
/**
@@ -188,7 +188,7 @@ public interface Lifecycle {
* life cycle. If this component has no listeners registered, a
* zero-length array is returned.
*/
- public LifecycleListener[] findLifecycleListeners();
+ LifecycleListener[] findLifecycleListeners();
/**
@@ -196,7 +196,7 @@ public interface Lifecycle {
*
* @param listener The listener to remove
*/
- public void removeLifecycleListener(LifecycleListener listener);
+ void removeLifecycleListener(LifecycleListener listener);
/**
@@ -211,7 +211,7 @@ public interface Lifecycle {
* @exception LifecycleException if this component detects a fatal error
* that prevents this component from being used
*/
- public void init() throws LifecycleException;
+ void init() throws LifecycleException;
/**
* Prepare for the beginning of active use of the public methods other than
@@ -239,7 +239,7 @@ public interface Lifecycle {
* @exception LifecycleException if this component detects a fatal error
* that prevents this component from being used
*/
- public void start() throws LifecycleException;
+ void start() throws LifecycleException;
/**
@@ -273,7 +273,7 @@ public interface Lifecycle {
* @exception LifecycleException if this component detects a fatal error
* that needs to be reported
*/
- public void stop() throws LifecycleException;
+ void stop() throws LifecycleException;
/**
* Prepare to discard the object. The following {@link LifecycleEvent}s will
@@ -286,7 +286,7 @@ public interface Lifecycle {
* @exception LifecycleException if this component detects a fatal error
* that prevents this component from being used
*/
- public void destroy() throws LifecycleException;
+ void destroy() throws LifecycleException;
/**
@@ -294,7 +294,7 @@ public interface Lifecycle {
*
* @return The current state of the source component.
*/
- public LifecycleState getState();
+ LifecycleState getState();
/**
@@ -305,7 +305,7 @@ public interface Lifecycle {
*
* @return The name of the current component state.
*/
- public String getStateName();
+ String getStateName();
/**
@@ -314,6 +314,6 @@ public interface Lifecycle {
* will automatically call {@link #destroy()} after {@link #stop()}
* completes.
*/
- public interface SingleUse {
+ interface SingleUse {
}
}
diff --git a/java/org/apache/catalina/LifecycleListener.java b/java/org/apache/catalina/LifecycleListener.java
index 09824e9714..0efe7eae46 100644
--- a/java/org/apache/catalina/LifecycleListener.java
+++ b/java/org/apache/catalina/LifecycleListener.java
@@ -33,7 +33,7 @@ public interface LifecycleListener {
*
* @param event LifecycleEvent that has occurred
*/
- public void lifecycleEvent(LifecycleEvent event);
+ void lifecycleEvent(LifecycleEvent event);
}
diff --git a/java/org/apache/catalina/LifecycleState.java b/java/org/apache/catalina/LifecycleState.java
index dccb253a43..717e58792f 100644
--- a/java/org/apache/catalina/LifecycleState.java
+++ b/java/org/apache/catalina/LifecycleState.java
@@ -37,7 +37,7 @@ public enum LifecycleState {
private final boolean available;
private final String lifecycleEvent;
- private LifecycleState(boolean available, String lifecycleEvent) {
+ LifecycleState(boolean available, String lifecycleEvent) {
this.available = available;
this.lifecycleEvent = lifecycleEvent;
}
diff --git a/java/org/apache/catalina/Loader.java b/java/org/apache/catalina/Loader.java
index 66c080d05b..667acf76c5 100644
--- a/java/org/apache/catalina/Loader.java
+++ b/java/org/apache/catalina/Loader.java
@@ -55,19 +55,19 @@ public interface Loader {
* invoked inside the classloading context of this container. Unexpected
* throwables will be caught and logged.
*/
- public void backgroundProcess();
+ void backgroundProcess();
/**
* @return the Java class loader to be used by this Container.
*/
- public ClassLoader getClassLoader();
+ ClassLoader getClassLoader();
/**
* @return the Context with which this Loader has been associated.
*/
- public Context getContext();
+ Context getContext();
/**
@@ -75,14 +75,14 @@ public interface Loader {
*
* @param context The associated Context
*/
- public void setContext(Context context);
+ void setContext(Context context);
/**
* @return the "follow standard delegation model" flag used to configure
* our ClassLoader.
*/
- public boolean getDelegate();
+ boolean getDelegate();
/**
@@ -91,7 +91,7 @@ public interface Loader {
*
* @param delegate The new flag
*/
- public void setDelegate(boolean delegate);
+ void setDelegate(boolean delegate);
/**
@@ -99,7 +99,7 @@ public interface Loader {
*
* @param listener The listener to add
*/
- public void addPropertyChangeListener(PropertyChangeListener listener);
+ void addPropertyChangeListener(PropertyChangeListener listener);
/**
@@ -109,7 +109,7 @@ public interface Loader {
* @return <code>true</code> when the repository has been modified,
* <code>false</code> otherwise
*/
- public boolean modified();
+ boolean modified();
/**
@@ -117,5 +117,5 @@ public interface Loader {
*
* @param listener The listener to remove
*/
- public void removePropertyChangeListener(PropertyChangeListener listener);
+ void removePropertyChangeListener(PropertyChangeListener listener);
}
diff --git a/java/org/apache/catalina/Manager.java b/java/org/apache/catalina/Manager.java
index 3cab011a00..db66fab3a2 100644
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -46,7 +46,7 @@ public interface Manager {
*
* @return The associated Context
*/
- public Context getContext();
+ Context getContext();
/**
@@ -58,13 +58,13 @@ public interface Manager {
*
* @param context The newly associated Context
*/
- public void setContext(Context context);
+ void setContext(Context context);
/**
* @return the session id generator
*/
- public SessionIdGenerator getSessionIdGenerator();
+ SessionIdGenerator getSessionIdGenerator();
/**
@@ -72,7 +72,7 @@ public interface Manager {
*
* @param sessionIdGenerator The session id generator
*/
- public void setSessionIdGenerator(SessionIdGenerator sessionIdGenerator);
+ void setSessionIdGenerator(SessionIdGenerator sessionIdGenerator);
/**
@@ -80,7 +80,7 @@ public interface Manager {
*
* @return Total number of sessions created by this manager.
*/
- public long getSessionCounter();
+ long getSessionCounter();
/**
@@ -88,7 +88,7 @@ public interface Manager {
*
* @param sessionCounter Total number of sessions created by this manager.
*/
- public void setSessionCounter(long sessionCounter);
+ void setSessionCounter(long sessionCounter);
/**
@@ -98,7 +98,7 @@ public interface Manager {
* @return Maximum number of sessions that have been active at the same
* time
*/
- public int getMaxActive();
+ int getMaxActive();
/**
@@ -108,7 +108,7 @@ public interface Manager {
* @param maxActive Maximum number of sessions that have been active at
* the same time.
*/
- public void setMaxActive(int maxActive);
+ void setMaxActive(int maxActive);
/**
@@ -116,7 +116,7 @@ public interface Manager {
*
* @return Number of currently active sessions
*/
- public int getActiveSessions();
+ int getActiveSessions();
/**
@@ -124,7 +124,7 @@ public interface Manager {
*
* @return Number of sessions that have expired
*/
- public long getExpiredSessions();
+ long getExpiredSessions();
/**
@@ -132,7 +132,7 @@ public interface Manager {
*
* @param expiredSessions Number of sessions that have expired
*/
- public void setExpiredSessions(long expiredSessions);
+ void setExpiredSessions(long expiredSessions);
/**
@@ -141,7 +141,7 @@ public interface Manager {
*
* @return Number of rejected sessions
*/
- public int getRejectedSessions();
+ int getRejectedSessions();
/**
@@ -151,7 +151,7 @@ public interface Manager {
* @return Longest time (in seconds) that an expired session had been
* alive.
*/
- public int getSessionMaxAliveTime();
+ int getSessionMaxAliveTime();
/**
@@ -161,7 +161,7 @@ public interface Manager {
* @param sessionMaxAliveTime Longest time (in seconds) that an expired
* session had been alive.
*/
- public void setSessionMaxAliveTime(int sessionMaxAliveTime);
+ void setSessionMaxAliveTime(int sessionMaxAliveTime);
/**
@@ -171,7 +171,7 @@ public interface Manager {
* @return Average time (in seconds) that expired sessions had been
* alive.
*/
- public int getSessionAverageAliveTime();
+ int getSessionAverageAliveTime();
/**
@@ -180,7 +180,7 @@ public interface Manager {
*
* @return The current rate (in sessions per minute) of session creation
*/
- public int getSessionCreateRate();
+ int getSessionCreateRate();
/**
@@ -189,7 +189,7 @@ public interface Manager {
*
* @return The current rate (in sessions per minute) of session expiration
*/
- public int getSessionExpireRate();
+ int getSessionExpireRate();
// --------------------------------------------------------- Public Methods
@@ -199,7 +199,7 @@ public interface Manager {
*
* @param session Session to be added
*/
- public void add(Session session);
+ void add(Session session);
/**
@@ -207,7 +207,7 @@ public interface Manager {
*
* @param listener The listener to add
*/
- public void addPropertyChangeListener(PropertyChangeListener listener);
+ void addPropertyChangeListener(PropertyChangeListener listener);
/**
@@ -218,7 +218,7 @@ public interface Manager {
*
* @return The new session ID
*/
- public default String rotateSessionId(Session session) {
+ default String rotateSessionId(Session session) {
String newSessionId = null;
// Assume there new Id is a duplicate until we prove it isn't. The
// chances of a duplicate are extremely low but the current ManagerBase
@@ -245,7 +245,7 @@ public interface Manager {
* @param session The session to change the session ID for
* @param newId new session ID
*/
- public void changeSessionId(Session session, String newId);
+ void changeSessionId(Session session, String newId);
/**
@@ -255,7 +255,7 @@ public interface Manager {
*
* @return An empty Session object
*/
- public Session createEmptySession();
+ Session createEmptySession();
/**
@@ -275,7 +275,7 @@ public interface Manager {
* @return An empty Session object with the given ID or a newly created
* session ID if none was specified
*/
- public Session createSession(String sessionId);
+ Session createSession(String sessionId);
/**
@@ -292,7 +292,7 @@ public interface Manager {
* @return the request session or {@code null} if a session with the
* requested ID could not be found
*/
- public Session findSession(String id) throws IOException;
+ Session findSession(String id) throws IOException;
/**
@@ -301,7 +301,7 @@ public interface Manager {
*
* @return All the currently active sessions managed by this manager
*/
- public Session[] findSessions();
+ Session[] findSessions();
/**
@@ -313,7 +313,7 @@ public interface Manager {
* found during the reload
* @exception IOException if an input/output error occurs
*/
- public void load() throws ClassNotFoundException, IOException;
+ void load() throws ClassNotFoundException, IOException;
/**
@@ -321,7 +321,7 @@ public interface Manager {
*
* @param session Session to be removed
*/
- public void remove(Session session);
+ void remove(Session session);
/**
@@ -330,7 +330,7 @@ public interface Manager {
* @param session Session to be removed
* @param update Should the expiration statistics be updated
*/
- public void remove(Session session, boolean update);
+ void remove(Session session, boolean update);
/**
@@ -338,7 +338,7 @@ public interface Manager {
*
* @param listener The listener to remove
*/
- public void removePropertyChangeListener(PropertyChangeListener listener);
+ void removePropertyChangeListener(PropertyChangeListener listener);
/**
@@ -348,7 +348,7 @@ public interface Manager {
*
* @exception IOException if an input/output error occurs
*/
- public void unload() throws IOException;
+ void unload() throws IOException;
/**
@@ -356,7 +356,7 @@ public interface Manager {
* basis and allows the manager to implement
* a method that executes periodic tasks, such as expiring sessions etc.
*/
- public void backgroundProcess();
+ void backgroundProcess();
/**
@@ -370,7 +370,7 @@ public interface Manager {
* @return {@code true} if the Manager would distribute the given attribute
* otherwise {@code false}
*/
- public boolean willAttributeDistribute(String name, Object value);
+ boolean willAttributeDistribute(String name, Object value);
/**
@@ -386,7 +386,7 @@ public interface Manager {
* @return {@code true} if the listener will be notified, {@code false} if
* it will not
*/
- public default boolean getNotifyBindingListenerOnUnchangedValue() {
+ default boolean getNotifyBindingListenerOnUnchangedValue() {
return false;
}
@@ -404,7 +404,7 @@ public interface Manager {
* will be called, {@code
* false} it will not
*/
- public void setNotifyBindingListenerOnUnchangedValue(
+ void setNotifyBindingListenerOnUnchangedValue(
boolean notifyBindingListenerOnUnchangedValue);
@@ -421,7 +421,7 @@ public interface Manager {
* @return {@code true} if the listener will be notified, {@code false} if
* it will not
*/
- public default boolean getNotifyAttributeListenerOnUnchangedValue() {
+ default boolean getNotifyAttributeListenerOnUnchangedValue() {
return true;
}
@@ -438,7 +438,7 @@ public interface Manager {
* will be called, {@code
* false} it will not
*/
- public void setNotifyAttributeListenerOnUnchangedValue(
+ void setNotifyAttributeListenerOnUnchangedValue(
boolean notifyAttributeListenerOnUnchangedValue);
@@ -451,7 +451,7 @@ public interface Manager {
* else the default value will be <code>false</code>.
* @return the flag value
*/
- public default boolean getSessionActivityCheck() {
+ default boolean getSessionActivityCheck() {
return Globals.STRICT_SERVLET_COMPLIANCE;
}
@@ -462,7 +462,7 @@ public interface Manager {
* least one active request will always be considered valid.
* @param sessionActivityCheck the new flag value
*/
- public void setSessionActivityCheck(boolean sessionActivityCheck);
+ void setSessionActivityCheck(boolean sessionActivityCheck);
/**
@@ -476,7 +476,7 @@ public interface Manager {
* else the default value will be <code>false</code>.
* @return the flag value
*/
- public default boolean getSessionLastAccessAtStart() {
+ default boolean getSessionLastAccessAtStart() {
return Globals.STRICT_SERVLET_COMPLIANCE;
}
@@ -489,6 +489,6 @@ public interface Manager {
* is calculated.
* @param sessionLastAccessAtStart the new flag value
*/
- public void setSessionLastAccessAtStart(boolean sessionLastAccessAtStart);
+ void setSessionLastAccessAtStart(boolean sessionLastAccessAtStart);
}
diff --git a/java/org/apache/catalina/Pipeline.java b/java/org/apache/catalina/Pipeline.java
index 58d2670fa7..67ce9540cc 100644
--- a/java/org/apache/catalina/Pipeline.java
+++ b/java/org/apache/catalina/Pipeline.java
@@ -42,7 +42,7 @@ public interface Pipeline extends Contained {
* @return the Valve instance that has been distinguished as the basic
* Valve for this Pipeline (if any).
*/
- public Valve getBasic();
+ Valve getBasic();
/**
@@ -57,7 +57,7 @@ public interface Pipeline extends Contained {
*
* @param valve Valve to be distinguished as the basic Valve
*/
- public void setBasic(Valve valve);
+ void setBasic(Valve valve);
/**
@@ -83,7 +83,7 @@ public interface Pipeline extends Contained {
* @exception IllegalStateException if the specified Valve is already
* associated with a different Container
*/
- public void addValve(Valve valve);
+ void addValve(Valve valve);
/**
@@ -91,7 +91,7 @@ public interface Pipeline extends Contained {
* Container, including the basic Valve (if any). If there are no
* such Valves, a zero-length array is returned.
*/
- public Valve[] getValves();
+ Valve[] getValves();
/**
@@ -106,21 +106,21 @@ public interface Pipeline extends Contained {
*
* @param valve Valve to be removed
*/
- public void removeValve(Valve valve);
+ void removeValve(Valve valve);
/**
* @return the Valve instance that has been distinguished as the basic
* Valve for this Pipeline (if any).
*/
- public Valve getFirst();
+ Valve getFirst();
/**
* Returns true if all the valves in this pipeline support async, false otherwise
* @return true if all the valves in this pipeline support async, false otherwise
*/
- public boolean isAsyncSupported();
+ boolean isAsyncSupported();
/**
@@ -131,5 +131,5 @@ public interface Pipeline extends Contained {
* Valve in this Pipeline that does not support async will be
* added
*/
- public void findNonAsyncValves(Set<String> result);
+ void findNonAsyncValves(Set<String> result);
}
diff --git a/java/org/apache/catalina/Realm.java b/java/org/apache/catalina/Realm.java
index fd030fa549..769db66e85 100644
--- a/java/org/apache/catalina/Realm.java
+++ b/java/org/apache/catalina/Realm.java
@@ -42,7 +42,7 @@ public interface Realm extends Contained {
/**
* @return the CredentialHandler configured for this Realm.
*/
- public CredentialHandler getCredentialHandler();
+ CredentialHandler getCredentialHandler();
/**
@@ -50,7 +50,7 @@ public interface Realm extends Contained {
*
* @param credentialHandler the {@link CredentialHandler} to use
*/
- public void setCredentialHandler(CredentialHandler credentialHandler);
+ void setCredentialHandler(CredentialHandler credentialHandler);
/**
@@ -58,7 +58,7 @@ public interface Realm extends Contained {
*
* @param listener The listener to add
*/
- public void addPropertyChangeListener(PropertyChangeListener listener);
+ void addPropertyChangeListener(PropertyChangeListener listener);
/**
@@ -68,7 +68,7 @@ public interface Realm extends Contained {
* @return the associated principal, or <code>null</code> if none is
* associated.
*/
- public Principal authenticate(String username);
+ Principal authenticate(String username);
/**
@@ -80,7 +80,7 @@ public interface Realm extends Contained {
* authenticating this username
* @return the associated principal, or <code>null</code> if there is none
*/
- public Principal authenticate(String username, String credentials);
+ Principal authenticate(String username, String credentials);
/**
@@ -101,7 +101,7 @@ public interface Realm extends Contained {
* MD5(Method + ":" + uri)
* @return the associated principal, or <code>null</code> if there is none.
*/
- public Principal authenticate(String username, String digest,
+ Principal authenticate(String username, String digest,
String nonce, String nc, String cnonce,
String qop, String realm,
String md5a2);
@@ -115,7 +115,7 @@ public interface Realm extends Contained {
* credentials in the returned Principal?
* @return the associated principal, or <code>null</code> if there is none
*/
- public Principal authenticate(GSSContext gssContext, boolean storeCreds);
+ Principal authenticate(GSSContext gssContext, boolean storeCreds);
/**
@@ -126,7 +126,7 @@ public interface Realm extends Contained {
* {@code null}
* @return the associated principal, or {@code null} if there is none
*/
- public Principal authenticate(GSSName gssName, GSSCredential gssCredential);
+ Principal authenticate(GSSName gssName, GSSCredential gssCredential);
/**
@@ -136,7 +136,7 @@ public interface Realm extends Contained {
* the array being the certificate of the client itself.
* @return the associated principal, or <code>null</code> if there is none
*/
- public Principal authenticate(X509Certificate certs[]);
+ Principal authenticate(X509Certificate certs[]);
/**
@@ -144,7 +144,7 @@ public interface Realm extends Contained {
* invoked inside the classloading context of this container. Unexpected
* throwables will be caught and logged.
*/
- public void backgroundProcess();
+ void backgroundProcess();
/**
@@ -156,7 +156,7 @@ public interface Realm extends Contained {
* @return the configured {@link SecurityConstraint}, of <code>null</code>
* if there is none
*/
- public SecurityConstraint [] findSecurityConstraints(Request request,
+ SecurityConstraint [] findSecurityConstraints(Request request,
Context context);
@@ -172,7 +172,7 @@ public interface Realm extends Contained {
*
* @exception IOException if an input/output error occurs
*/
- public boolean hasResourcePermission(Request request,
+ boolean hasResourcePermission(Request request,
Response response,
SecurityConstraint [] constraint,
Context context)
@@ -190,7 +190,7 @@ public interface Realm extends Contained {
* security role, within the context of this Realm; otherwise return
* <code>false</code>.
*/
- public boolean hasRole(Wrapper wrapper, Principal principal, String role);
+ boolean hasRole(Wrapper wrapper, Principal principal, String role);
/**
@@ -206,7 +206,7 @@ public interface Realm extends Contained {
*
* @exception IOException if an input/output error occurs
*/
- public boolean hasUserDataPermission(Request request,
+ boolean hasUserDataPermission(Request request,
Response response,
SecurityConstraint []constraint)
throws IOException;
@@ -217,14 +217,14 @@ public interface Realm extends Contained {
*
* @param listener The listener to remove
*/
- public void removePropertyChangeListener(PropertyChangeListener listener);
+ void removePropertyChangeListener(PropertyChangeListener listener);
/**
* Return the availability of the realm for authentication.
* @return <code>true</code> if the realm is able to perform authentication
*/
- public default boolean isAvailable() {
+ default boolean isAvailable() {
return true;
}
}
diff --git a/java/org/apache/catalina/Role.java b/java/org/apache/catalina/Role.java
index e4a0c22985..18fea5e3e3 100644
--- a/java/org/apache/catalina/Role.java
+++ b/java/org/apache/catalina/Role.java
@@ -36,7 +36,7 @@ public interface Role extends Principal {
/**
* @return the description of this role.
*/
- public String getDescription();
+ String getDescription();
/**
@@ -44,14 +44,14 @@ public interface Role extends Principal {
*
* @param description The new description
*/
- public void setDescription(String description);
+ void setDescription(String description);
/**
* @return the role name of this role, which must be unique
* within the scope of a {@link UserDatabase}.
*/
- public String getRolename();
+ String getRolename();
/**
@@ -60,13 +60,13 @@ public interface Role extends Principal {
*
* @param rolename The new role name
*/
- public void setRolename(String rolename);
+ void setRolename(String rolename);
/**
* @return the {@link UserDatabase} within which this Role is defined.
*/
- public UserDatabase getUserDatabase();
+ UserDatabase getUserDatabase();
}
diff --git a/java/org/apache/catalina/Server.java b/java/org/apache/catalina/Server.java
index 4c5d25c419..eff7279523 100644
--- a/java/org/apache/catalina/Server.java
+++ b/java/org/apache/catalina/Server.java
@@ -48,7 +48,7 @@ public interface Server extends Lifecycle {
/**
* @return the global naming resources.
*/
- public NamingResourcesImpl getGlobalNamingResources();
+ NamingResourcesImpl getGlobalNamingResources();
/**
@@ -56,14 +56,14 @@ public interface Server extends Lifecycle {
*
* @param globalNamingResources The new global naming resources
*/
- public void setGlobalNamingResources
+ void setGlobalNamingResources
(NamingResourcesImpl globalNamingResources);
/**
* @return the global naming resources context.
*/
- public javax.naming.Context getGlobalNamingContext();
+ javax.naming.Context getGlobalNamingContext();
/**
@@ -72,7 +72,7 @@ public interface Server extends Lifecycle {
* @see #getPortOffset()
* @see #getPortWithOffset()
*/
- public int getPort();
+ int getPort();
/**
@@ -82,7 +82,7 @@ public interface Server extends Lifecycle {
*
* @see #setPortOffset(int)
*/
- public void setPort(int port);
+ void setPort(int port);
/**
* Get the number that offsets the port used for shutdown commands.
@@ -91,7 +91,7 @@ public interface Server extends Lifecycle {
*
* @return the port offset
*/
- public int getPortOffset();
+ int getPortOffset();
/**
* Set the number that offsets the server port used for shutdown commands.
@@ -100,7 +100,7 @@ public interface Server extends Lifecycle {
*
* @param portOffset sets the port offset
*/
- public void setPortOffset(int portOffset);
+ void setPortOffset(int portOffset);
/**
* Get the actual port on which server is listening for the shutdown commands.
@@ -109,12 +109,12 @@ public interface Server extends Lifecycle {
*
* @return the port with offset
*/
- public int getPortWithOffset();
+ int getPortWithOffset();
/**
* @return the address on which we listen to for shutdown commands.
*/
- public String getAddress();
+ String getAddress();
/**
@@ -122,13 +122,13 @@ public interface Server extends Lifecycle {
*
* @param address The new address
*/
- public void setAddress(String address);
+ void setAddress(String address);
/**
* @return the shutdown command string we are waiting for.
*/
- public String getShutdown();
+ String getShutdown();
/**
@@ -136,7 +136,7 @@ public interface Server extends Lifecycle {
*
* @param shutdown The new shutdown command
*/
- public void setShutdown(String shutdown);
+ void setShutdown(String shutdown);
/**
@@ -144,7 +144,7 @@ public interface Server extends Lifecycle {
* {@link #getCatalina()} {@link Catalina#getParentClassLoader()}. If
* catalina has not been set, return the system class loader.
*/
- public ClassLoader getParentClassLoader();
+ ClassLoader getParentClassLoader();
/**
@@ -152,20 +152,20 @@ public interface Server extends Lifecycle {
*
* @param parent The new parent class loader
*/
- public void setParentClassLoader(ClassLoader parent);
+ void setParentClassLoader(ClassLoader parent);
/**
* @return the outer Catalina startup/shutdown component if present.
*/
- public Catalina getCatalina();
+ Catalina getCatalina();
/**
* Set the outer Catalina startup/shutdown component if present.
*
* @param catalina the outer Catalina component
*/
- public void setCatalina(Catalina catalina);
+ void setCatalina(Catalina catalina);
/**
@@ -173,7 +173,7 @@ public interface Server extends Lifecycle {
* may be the same (and are by default). If this is not set the value
* returned by {@link #getCatalinaHome()} will be used.
*/
- public File getCatalinaBase();
+ File getCatalinaBase();
/**
* Set the configured base (instance) directory. Note that home and base
@@ -181,14 +181,14 @@ public interface Server extends Lifecycle {
*
* @param catalinaBase the configured base directory
*/
- public void setCatalinaBase(File catalinaBase);
+ void setCatalinaBase(File catalinaBase);
/**
* @return the configured home (binary) directory. Note that home and base
* may be the same (and are by default).
*/
- public File getCatalinaHome();
+ File getCatalinaHome();
/**
* Set the configured home (binary) directory. Note that home and base
@@ -196,21 +196,21 @@ public interface Server extends Lifecycle {
*
* @param catalinaHome the configured home directory
*/
- public void setCatalinaHome(File catalinaHome);
+ void setCatalinaHome(File catalinaHome);
/**
* Get the utility thread count.
* @return the thread count
*/
- public int getUtilityThreads();
+ int getUtilityThreads();
/**
* Set the utility thread count.
* @param utilityThreads the new thread count
*/
- public void setUtilityThreads(int utilityThreads);
+ void setUtilityThreads(int utilityThreads);
// --------------------------------------------------------- Public Methods
@@ -221,13 +221,13 @@ public interface Server extends Lifecycle {
*
* @param service The Service to be added
*/
- public void addService(Service service);
+ void addService(Service service);
/**
* Wait until a proper shutdown command is received, then return.
*/
- public void await();
+ void await();
/**
@@ -236,13 +236,13 @@ public interface Server extends Lifecycle {
* @param name Name of the Service to be returned
* @return the specified Service, or <code>null</code> if none exists.
*/
- public Service findService(String name);
+ Service findService(String name);
/**
* @return the set of Services defined within this Server.
*/
- public Service[] findServices();
+ Service[] findServices();
/**
@@ -251,18 +251,18 @@ public interface Server extends Lifecycle {
*
* @param service The Service to be removed
*/
- public void removeService(Service service);
+ void removeService(Service service);
/**
* @return the token necessary for operations on the associated JNDI naming
* context.
*/
- public Object getNamingToken();
+ Object getNamingToken();
/**
* @return the utility executor managed by the Service.
*/
- public ScheduledExecutorService getUtilityExecutor();
+ ScheduledExecutorService getUtilityExecutor();
}
diff --git a/java/org/apache/catalina/Service.java b/java/org/apache/catalina/Service.java
index 32daaa8e11..0d7b37a6a3 100644
--- a/java/org/apache/catalina/Service.java
+++ b/java/org/apache/catalina/Service.java
@@ -39,7 +39,7 @@ public interface Service extends Lifecycle {
* @return the <code>Engine</code> that handles requests for all
* <code>Connectors</code> associated with this Service.
*/
- public Engine getContainer();
+ Engine getContainer();
/**
* Set the <code>Engine</code> that handles requests for all
@@ -47,51 +47,51 @@ public interface Service extends Lifecycle {
*
* @param engine The new Engine
*/
- public void setContainer(Engine engine);
+ void setContainer(Engine engine);
/**
* @return the name of this Service.
*/
- public String getName();
+ String getName();
/**
* Set the name of this Service.
*
* @param name The new service name
*/
- public void setName(String name);
+ void setName(String name);
/**
* @return the <code>Server</code> with which we are associated (if any).
*/
- public Server getServer();
+ Server getServer();
/**
* Set the <code>Server</code> with which we are associated (if any).
*
* @param server The server that owns this Service
*/
- public void setServer(Server server);
+ void setServer(Server server);
/**
* @return the parent class loader for this component. If not set, return
* {@link #getServer()} {@link Server#getParentClassLoader()}. If no server
* has been set, return the system class loader.
*/
- public ClassLoader getParentClassLoader();
+ ClassLoader getParentClassLoader();
/**
* Set the parent class loader for this service.
*
* @param parent The new parent class loader
*/
- public void setParentClassLoader(ClassLoader parent);
+ void setParentClassLoader(ClassLoader parent);
/**
* @return the domain under which this container will be / has been
* registered.
*/
- public String getDomain();
+ String getDomain();
// --------------------------------------------------------- Public Methods
@@ -102,14 +102,14 @@ public interface Service extends Lifecycle {
*
* @param connector The Connector to be added
*/
- public void addConnector(Connector connector);
+ void addConnector(Connector connector);
/**
* Find and return the set of Connectors associated with this Service.
*
* @return the set of associated Connectors
*/
- public Connector[] findConnectors();
+ Connector[] findConnectors();
/**
* Remove the specified Connector from the set associated from this
@@ -118,32 +118,32 @@ public interface Service extends Lifecycle {
*
* @param connector The Connector to be removed
*/
- public void removeConnector(Connector connector);
+ void removeConnector(Connector connector);
/**
* Adds a named executor to the service
* @param ex Executor
*/
- public void addExecutor(Executor ex);
+ void addExecutor(Executor ex);
/**
* Retrieves all executors
* @return Executor[]
*/
- public Executor[] findExecutors();
+ Executor[] findExecutors();
/**
* Retrieves executor by name, null if not found
* @param name String
* @return Executor
*/
- public Executor getExecutor(String name);
+ Executor getExecutor(String name);
/**
* Removes an executor from the service
* @param ex Executor
*/
- public void removeExecutor(Executor ex);
+ void removeExecutor(Executor ex);
/**
* @return the mapper associated with this Service.
diff --git a/java/org/apache/catalina/Session.java b/java/org/apache/catalina/Session.java
index 5047a4814d..4ec7aca0ed 100644
--- a/java/org/apache/catalina/Session.java
+++ b/java/org/apache/catalina/Session.java
@@ -39,25 +39,25 @@ public interface Session {
/**
* The SessionEvent event type when a session is created.
*/
- public static final String SESSION_CREATED_EVENT = "createSession";
+ String SESSION_CREATED_EVENT = "createSession";
/**
* The SessionEvent event type when a session is destroyed.
*/
- public static final String SESSION_DESTROYED_EVENT = "destroySession";
+ String SESSION_DESTROYED_EVENT = "destroySession";
/**
* The SessionEvent event type when a session is activated.
*/
- public static final String SESSION_ACTIVATED_EVENT = "activateSession";
+ String SESSION_ACTIVATED_EVENT = "activateSession";
/**
* The SessionEvent event type when a session is passivated.
*/
- public static final String SESSION_PASSIVATED_EVENT = "passivateSession";
+ String SESSION_PASSIVATED_EVENT = "passivateSession";
// ------------------------------------------------------------- Properties
@@ -67,7 +67,7 @@ public interface Session {
* @return the authentication type used to authenticate our cached
* Principal, if any.
*/
- public String getAuthType();
+ String getAuthType();
/**
@@ -76,20 +76,20 @@ public interface Session {
*
* @param authType The new cached authentication type
*/
- public void setAuthType(String authType);
+ void setAuthType(String authType);
/**
* @return the creation time for this session.
*/
- public long getCreationTime();
+ long getCreationTime();
/**
* @return the creation time for this session, bypassing the session validity
* checks.
*/
- public long getCreationTimeInternal();
+ long getCreationTimeInternal();
/**
@@ -98,19 +98,19 @@ public interface Session {
*
* @param time The new creation time
*/
- public void setCreationTime(long time);
+ void setCreationTime(long time);
/**
* @return the session identifier for this session.
*/
- public String getId();
+ String getId();
/**
* @return the session identifier for this session.
*/
- public String getIdInternal();
+ String getIdInternal();
/**
@@ -119,7 +119,7 @@ public interface Session {
*
* @param id The new session identifier
*/
- public void setId(String id);
+ void setId(String id);
/**
@@ -130,7 +130,7 @@ public interface Session {
* @param notify Should any associated listeners be notified that a new
* session has been created?
*/
- public void setId(String id, boolean notify);
+ void setId(String id, boolean notify);
/**
@@ -140,13 +140,13 @@ public interface Session {
* a value associated with the session, do not affect the access time.
* This one gets updated whenever a request starts.
*/
- public long getThisAccessedTime();
+ long getThisAccessedTime();
/**
* @return the last client access time without invalidation check
* @see #getThisAccessedTime()
*/
- public long getThisAccessedTimeInternal();
+ long getThisAccessedTimeInternal();
/**
* @return the last time the client sent a request associated with this
@@ -155,29 +155,29 @@ public interface Session {
* a value associated with the session, do not affect the access time.
* This one gets updated whenever a request finishes.
*/
- public long getLastAccessedTime();
+ long getLastAccessedTime();
/**
* @return the last client access time without invalidation check
* @see #getLastAccessedTime()
*/
- public long getLastAccessedTimeInternal();
+ long getLastAccessedTimeInternal();
/**
* @return the idle time (in milliseconds) from last client access time.
*/
- public long getIdleTime();
+ long getIdleTime();
/**
* @return the idle time from last client access time without invalidation check
* @see #getIdleTime()
*/
- public long getIdleTimeInternal();
+ long getIdleTimeInternal();
/**
* @return the Manager within which this Session is valid.
*/
- public Manager getManager();
+ Manager getManager();
/**
@@ -185,7 +185,7 @@ public interface Session {
*
* @param manager The new Manager
*/
- public void setManager(Manager manager);
+ void setManager(Manager manager);
/**
@@ -193,7 +193,7 @@ public interface Session {
* before the servlet container will invalidate the session. A negative
* time indicates that the session should never time out.
*/
- public int getMaxInactiveInterval();
+ int getMaxInactiveInterval();
/**
@@ -203,7 +203,7 @@ public interface Session {
*
* @param interval The new maximum interval
*/
- public void setMaxInactiveInterval(int interval);
+ void setMaxInactiveInterval(int interval);
/**
@@ -211,7 +211,7 @@ public interface Session {
*
* @param isNew The new value for the <code>isNew</code> flag
*/
- public void setNew(boolean isNew);
+ void setNew(boolean isNew);
/**
@@ -221,7 +221,7 @@ public interface Session {
* <code>Realm.authenticate()</code> calls on every request. If there
* is no current associated Principal, return <code>null</code>.
*/
- public Principal getPrincipal();
+ Principal getPrincipal();
/**
@@ -232,14 +232,14 @@ public interface Session {
*
* @param principal The new Principal, or <code>null</code> if none
*/
- public void setPrincipal(Principal principal);
+ void setPrincipal(Principal principal);
/**
* @return the <code>HttpSession</code> for which this object
* is the facade.
*/
- public HttpSession getSession();
+ HttpSession getSession();
/**
@@ -247,13 +247,13 @@ public interface Session {
*
* @param isValid The new value for the <code>isValid</code> flag
*/
- public void setValid(boolean isValid);
+ void setValid(boolean isValid);
/**
* @return <code>true</code> if the session is still valid
*/
- public boolean isValid();
+ boolean isValid();
// --------------------------------------------------------- Public Methods
@@ -264,7 +264,7 @@ public interface Session {
* should be called by the context when a request comes in for a particular
* session, even if the application does not reference it.
*/
- public void access();
+ void access();
/**
@@ -273,20 +273,20 @@ public interface Session {
* @param listener the SessionListener instance that should be notified
* for session events
*/
- public void addSessionListener(SessionListener listener);
+ void addSessionListener(SessionListener listener);
/**
* End access to the session.
*/
- public void endAccess();
+ void endAccess();
/**
* Perform the internal processing required to invalidate this session,
* without triggering an exception if the session has already expired.
*/
- public void expire();
+ void expire();
/**
@@ -295,21 +295,21 @@ public interface Session {
*
* @param name Name of the note to be returned
*/
- public Object getNote(String name);
+ Object getNote(String name);
/**
* @return an Iterator containing the String names of all notes bindings
* that exist for this session.
*/
- public Iterator<String> getNoteNames();
+ Iterator<String> getNoteNames();
/**
* Release all object references, and initialize instance variables, in
* preparation for reuse of this object.
*/
- public void recycle();
+ void recycle();
/**
@@ -318,7 +318,7 @@ public interface Session {
*
* @param name Name of the note to be removed
*/
- public void removeNote(String name);
+ void removeNote(String name);
/**
@@ -327,7 +327,7 @@ public interface Session {
* @param listener remove the session listener, which will no longer be
* notified
*/
- public void removeSessionListener(SessionListener listener);
+ void removeSessionListener(SessionListener listener);
/**
@@ -337,7 +337,7 @@ public interface Session {
* @param name Name to which the object should be bound
* @param value Object to be bound to the specified name
*/
- public void setNote(String name, Object value);
+ void setNote(String name, Object value);
/**
@@ -350,7 +350,7 @@ public interface Session {
* @param notifyContainerListeners Should any associated ContainerListeners
* be notified that session ID has been changed?
*/
- public void tellChangedSessionId(String newId, String oldId,
+ void tellChangedSessionId(String newId, String oldId,
boolean notifySessionListeners, boolean notifyContainerListeners);
@@ -372,5 +372,5 @@ public interface Session {
* @return {@code true} if distribution is supported, otherwise {@code
* false}
*/
- public boolean isAttributeDistributable(String name, Object value);
+ boolean isAttributeDistributable(String name, Object value);
}
diff --git a/java/org/apache/catalina/SessionIdGenerator.java b/java/org/apache/catalina/SessionIdGenerator.java
index b11a4c3256..09a08dfb19 100644
--- a/java/org/apache/catalina/SessionIdGenerator.java
+++ b/java/org/apache/catalina/SessionIdGenerator.java
@@ -22,7 +22,7 @@ public interface SessionIdGenerator {
* @return the node identifier associated with this node which will be
* included in the generated session ID.
*/
- public String getJvmRoute();
+ String getJvmRoute();
/**
* Specify the node identifier associated with this node which will be
@@ -30,26 +30,26 @@ public interface SessionIdGenerator {
*
* @param jvmRoute The node identifier
*/
- public void setJvmRoute(String jvmRoute);
+ void setJvmRoute(String jvmRoute);
/**
* @return the number of bytes for a session ID
*/
- public int getSessionIdLength();
+ int getSessionIdLength();
/**
* Specify the number of bytes for a session ID
*
* @param sessionIdLength Number of bytes
*/
- public void setSessionIdLength(int sessionIdLength);
+ void setSessionIdLength(int sessionIdLength);
/**
* Generate and return a new session identifier.
*
* @return the newly generated session id
*/
- public String generateSessionId();
+ String generateSessionId();
/**
* Generate and return a new session identifier.
@@ -57,5 +57,5 @@ public interface SessionIdGenerator {
* @param route node identifier to include in generated id
* @return the newly generated session id
*/
- public String generateSessionId(String route);
+ String generateSessionId(String route);
}
diff --git a/java/org/apache/catalina/SessionListener.java b/java/org/apache/catalina/SessionListener.java
index fe717509cb..47516abe02 100644
--- a/java/org/apache/catalina/SessionListener.java
+++ b/java/org/apache/catalina/SessionListener.java
@@ -32,7 +32,7 @@ public interface SessionListener extends EventListener {
*
* @param event SessionEvent that has occurred
*/
- public void sessionEvent(SessionEvent event);
+ void sessionEvent(SessionEvent event);
}
diff --git a/java/org/apache/catalina/Store.java b/java/org/apache/catalina/Store.java
index ccf582d4f7..9512121526 100644
--- a/java/org/apache/catalina/Store.java
+++ b/java/org/apache/catalina/Store.java
@@ -37,7 +37,7 @@ public interface Store {
/**
* @return the Manager instance associated with this Store.
*/
- public Manager getManager();
+ Manager getManager();
/**
@@ -45,7 +45,7 @@ public interface Store {
*
* @param manager The Manager which will use this Store.
*/
- public void setManager(Manager manager);
+ void setManager(Manager manager);
/**
@@ -53,7 +53,7 @@ public interface Store {
*
* @exception IOException if an input/output error occurs
*/
- public int getSize() throws IOException;
+ int getSize() throws IOException;
// --------------------------------------------------------- Public Methods
@@ -64,7 +64,7 @@ public interface Store {
*
* @param listener The listener to add
*/
- public void addPropertyChangeListener(PropertyChangeListener listener);
+ void addPropertyChangeListener(PropertyChangeListener listener);
/**
@@ -74,7 +74,7 @@ public interface Store {
*
* @exception IOException if an input/output error occurred
*/
- public String[] keys() throws IOException;
+ String[] keys() throws IOException;
/**
@@ -88,7 +88,7 @@ public interface Store {
* @exception IOException if an input/output error occurs
* @return the loaded Session instance
*/
- public Session load(String id)
+ Session load(String id)
throws ClassNotFoundException, IOException;
@@ -101,7 +101,7 @@ public interface Store {
*
* @exception IOException if an input/output error occurs
*/
- public void remove(String id) throws IOException;
+ void remove(String id) throws IOException;
/**
@@ -109,7 +109,7 @@ public interface Store {
*
* @exception IOException if an input/output error occurs
*/
- public void clear() throws IOException;
+ void clear() throws IOException;
/**
@@ -117,7 +117,7 @@ public interface Store {
*
* @param listener The listener to remove
*/
- public void removePropertyChangeListener(PropertyChangeListener listener);
+ void removePropertyChangeListener(PropertyChangeListener listener);
/**
@@ -128,7 +128,7 @@ public interface Store {
*
* @exception IOException if an input/output error occurs
*/
- public void save(Session session) throws IOException;
+ void save(Session session) throws IOException;
}
diff --git a/java/org/apache/catalina/ThreadBindingListener.java b/java/org/apache/catalina/ThreadBindingListener.java
index 4dbf138b4b..f901e534ad 100644
--- a/java/org/apache/catalina/ThreadBindingListener.java
+++ b/java/org/apache/catalina/ThreadBindingListener.java
@@ -23,7 +23,7 @@ package org.apache.catalina;
*/
public interface ThreadBindingListener {
- public void bind();
- public void unbind();
+ void bind();
+ void unbind();
}
diff --git a/java/org/apache/catalina/User.java b/java/org/apache/catalina/User.java
index fb339b979d..eb51a1b807 100644
--- a/java/org/apache/catalina/User.java
+++ b/java/org/apache/catalina/User.java
@@ -39,7 +39,7 @@ public interface User extends Principal {
/**
* @return the full name of this user.
*/
- public String getFullName();
+ String getFullName();
/**
@@ -47,13 +47,13 @@ public interface User extends Principal {
*
* @param fullName The new full name
*/
- public void setFullName(String fullName);
+ void setFullName(String fullName);
/**
* @return the set of {@link Group}s to which this user belongs.
*/
- public Iterator<Group> getGroups();
+ Iterator<Group> getGroups();
/**
@@ -61,7 +61,7 @@ public interface User extends Principal {
* identifier of an encoding scheme surrounded by curly braces, such as
* <code>{md5}xxxxx</code>.
*/
- public String getPassword();
+ String getPassword();
/**
@@ -71,26 +71,26 @@ public interface User extends Principal {
*
* @param password The new logon password
*/
- public void setPassword(String password);
+ void setPassword(String password);
/**
* @return the set of {@link Role}s assigned specifically to this user.
*/
- public Iterator<Role> getRoles();
+ Iterator<Role> getRoles();
/**
* @return the {@link UserDatabase} within which this User is defined.
*/
- public UserDatabase getUserDatabase();
+ UserDatabase getUserDatabase();
/**
* @return the logon username of this user, which must be unique
* within the scope of a {@link UserDatabase}.
*/
- public String getUsername();
+ String getUsername();
/**
@@ -99,7 +99,7 @@ public interface User extends Principal {
*
* @param username The new logon username
*/
- public void setUsername(String username);
+ void setUsername(String username);
// --------------------------------------------------------- Public Methods
@@ -110,7 +110,7 @@ public interface User extends Principal {
*
* @param group The new group
*/
- public void addGroup(Group group);
+ void addGroup(Group group);
/**
@@ -118,7 +118,7 @@ public interface User extends Principal {
*
* @param role The new role
*/
- public void addRole(Role role);
+ void addRole(Role role);
/**
@@ -127,7 +127,7 @@ public interface User extends Principal {
* @param group The group to check
* @return <code>true</code> if the user is in the specified group
*/
- public boolean isInGroup(Group group);
+ boolean isInGroup(Group group);
/**
@@ -138,7 +138,7 @@ public interface User extends Principal {
* @param role The role to check
* @return <code>true</code> if the user has the specified role
*/
- public boolean isInRole(Role role);
+ boolean isInRole(Role role);
/**
@@ -146,13 +146,13 @@ public interface User extends Principal {
*
* @param group The old group
*/
- public void removeGroup(Group group);
+ void removeGroup(Group group);
/**
* Remove all {@link Group}s from those this user belongs to.
*/
- public void removeGroups();
+ void removeGroups();
/**
@@ -160,13 +160,13 @@ public interface User extends Principal {
*
* @param role The old role
*/
- public void removeRole(Role role);
+ void removeRole(Role role);
/**
* Remove all {@link Role}s from those assigned to this user.
*/
- public void removeRoles();
+ void removeRoles();
}
diff --git a/java/org/apache/catalina/UserDatabase.java b/java/org/apache/catalina/UserDatabase.java
index 713cc1d324..e07b90b812 100644
--- a/java/org/apache/catalina/UserDatabase.java
+++ b/java/org/apache/catalina/UserDatabase.java
@@ -34,25 +34,25 @@ public interface UserDatabase {
/**
* @return the set of {@link Group}s defined in this user database.
*/
- public Iterator<Group> getGroups();
+ Iterator<Group> getGroups();
/**
* @return the unique global identifier of this user database.
*/
- public String getId();
+ String getId();
/**
* @return the set of {@link Role}s defined in this user database.
*/
- public Iterator<Role> getRoles();
+ Iterator<Role> getRoles();
/**
* @return the set of {@link User}s defined in this user database.
*/
- public Iterator<User> getUsers();
+ Iterator<User> getUsers();
// --------------------------------------------------------- Public Methods
@@ -62,7 +62,7 @@ public interface UserDatabase {
*
* @exception Exception if any exception is thrown during closing
*/
- public void close() throws Exception;
+ void close() throws Exception;
/**
@@ -72,7 +72,7 @@ public interface UserDatabase {
* @param description The description of this group
* @return The new group
*/
- public Group createGroup(String groupname, String description);
+ Group createGroup(String groupname, String description);
/**
@@ -82,7 +82,7 @@ public interface UserDatabase {
* @param description The description of this role
* @return The new role
*/
- public Role createRole(String rolename, String description);
+ Role createRole(String rolename, String description);
/**
@@ -93,7 +93,7 @@ public interface UserDatabase {
* @param fullName The full name of the new user
* @return The new user
*/
- public User createUser(String username, String password, String fullName);
+ User createUser(String username, String password, String fullName);
/**
@@ -102,7 +102,7 @@ public interface UserDatabase {
*
* @param groupname Name of the group to return
*/
- public Group findGroup(String groupname);
+ Group findGroup(String groupname);
/**
@@ -111,7 +111,7 @@ public interface UserDatabase {
*
* @param rolename Name of the role to return
*/
- public Role findRole(String rolename);
+ Role findRole(String rolename);
/**
@@ -120,7 +120,7 @@ public interface UserDatabase {
*
* @param username Name of the user to return
*/
- public User findUser(String username);
+ User findUser(String username);
/**
@@ -128,7 +128,7 @@ public interface UserDatabase {
*
* @exception Exception if any exception is thrown during opening
*/
- public void open() throws Exception;
+ void open() throws Exception;
/**
@@ -136,7 +136,7 @@ public interface UserDatabase {
*
* @param group The group to be removed
*/
- public void removeGroup(Group group);
+ void removeGroup(Group group);
/**
@@ -144,7 +144,7 @@ public interface UserDatabase {
*
* @param role The role to be removed
*/
- public void removeRole(Role role);
+ void removeRole(Role role);
/**
@@ -152,7 +152,7 @@ public interface UserDatabase {
*
* @param user The user to be removed
*/
- public void removeUser(User user);
+ void removeUser(User user);
/**
@@ -161,7 +161,7 @@ public interface UserDatabase {
*
* @param group The group that has been modified
*/
- public default void modifiedGroup(Group group) {}
+ default void modifiedGroup(Group group) {}
/**
@@ -170,7 +170,7 @@ public interface UserDatabase {
*
* @param role The role that has been modified
*/
- public default void modifiedRole(Role role) {}
+ default void modifiedRole(Role role) {}
/**
@@ -179,7 +179,7 @@ public interface UserDatabase {
*
* @param user The user that has been modified
*/
- public default void modifiedUser(User user) {}
+ default void modifiedUser(User user) {}
/**
@@ -188,14 +188,14 @@ public interface UserDatabase {
*
* @exception Exception if any exception is thrown during saving
*/
- public void save() throws Exception;
+ void save() throws Exception;
/**
* Perform any background processing (e.g. checking for changes in persisted
* storage) required for the user database.
*/
- public default void backgroundProcess() {
+ default void backgroundProcess() {
// NO-OP by default
}
@@ -205,7 +205,7 @@ public interface UserDatabase {
*
* @return true
*/
- public default boolean isAvailable() {
+ default boolean isAvailable() {
return true;
}
@@ -217,7 +217,7 @@ public interface UserDatabase {
*
* @return false
*/
- public default boolean isSparse() {
+ default boolean isSparse() {
return false;
}
}
diff --git a/java/org/apache/catalina/Valve.java b/java/org/apache/catalina/Valve.java
index 699cc1e51d..b986d27e80 100644
--- a/java/org/apache/catalina/Valve.java
+++ b/java/org/apache/catalina/Valve.java
@@ -45,7 +45,7 @@ public interface Valve {
/**
* @return the next Valve in the pipeline containing this Valve, if any.
*/
- public Valve getNext();
+ Valve getNext();
/**
@@ -53,7 +53,7 @@ public interface Valve {
*
* @param valve The new next valve, or <code>null</code> if none
*/
- public void setNext(Valve valve);
+ void setNext(Valve valve);
//---------------------------------------------------------- Public Methods
@@ -64,7 +64,7 @@ public interface Valve {
* invoked inside the classloading context of this container. Unexpected
* throwables will be caught and logged.
*/
- public void backgroundProcess();
+ void backgroundProcess();
/**
@@ -114,9 +114,9 @@ public interface Valve {
* @exception ServletException if a servlet error occurs, or is thrown
* by a subsequently invoked Valve, Filter, or Servlet
*/
- public void invoke(Request request, Response response)
+ void invoke(Request request, Response response)
throws IOException, ServletException;
- public boolean isAsyncSupported();
+ boolean isAsyncSupported();
}
diff --git a/java/org/apache/catalina/Wrapper.java b/java/org/apache/catalina/Wrapper.java
index b40252eeae..0803161df9 100644
--- a/java/org/apache/catalina/Wrapper.java
+++ b/java/org/apache/catalina/Wrapper.java
@@ -48,12 +48,12 @@ public interface Wrapper extends Container {
/**
* Container event for adding a wrapper.
*/
- public static final String ADD_MAPPING_EVENT = "addMapping";
+ String ADD_MAPPING_EVENT = "addMapping";
/**
* Container event for removing a wrapper.
*/
- public static final String REMOVE_MAPPING_EVENT = "removeMapping";
+ String REMOVE_MAPPING_EVENT = "removeMapping";
// ------------------------------------------------------------- Properties
@@ -65,7 +65,7 @@ public interface Wrapper extends Container {
* the servlet is currently available. A value equal to Long.MAX_VALUE
* is considered to mean that unavailability is permanent.
*/
- public long getAvailable();
+ long getAvailable();
/**
@@ -76,14 +76,14 @@ public interface Wrapper extends Container {
*
* @param available The new available date/time
*/
- public void setAvailable(long available);
+ void setAvailable(long available);
/**
* @return the load-on-startup order value (negative value means
* load on first call).
*/
- public int getLoadOnStartup();
+ int getLoadOnStartup();
/**
@@ -92,13 +92,13 @@ public interface Wrapper extends Container {
*
* @param value New load-on-startup value
*/
- public void setLoadOnStartup(int value);
+ void setLoadOnStartup(int value);
/**
* @return the run-as identity for this servlet.
*/
- public String getRunAs();
+ String getRunAs();
/**
@@ -106,13 +106,13 @@ public interface Wrapper extends Container {
*
* @param runAs New run-as identity value
*/
- public void setRunAs(String runAs);
+ void setRunAs(String runAs);
/**
* @return the fully qualified servlet class name for this servlet.
*/
- public String getServletClass();
+ String getServletClass();
/**
@@ -120,7 +120,7 @@ public interface Wrapper extends Container {
*
* @param servletClass Servlet class name
*/
- public void setServletClass(String servletClass);
+ void setServletClass(String servletClass);
/**
@@ -135,19 +135,19 @@ public interface Wrapper extends Container {
*
* @throws ServletException If the target servlet cannot be loaded
*/
- public String[] getServletMethods() throws ServletException;
+ String[] getServletMethods() throws ServletException;
/**
* @return <code>true</code> if this Servlet is currently unavailable.
*/
- public boolean isUnavailable();
+ boolean isUnavailable();
/**
* @return the associated Servlet instance.
*/
- public Servlet getServlet();
+ Servlet getServlet();
/**
@@ -155,7 +155,7 @@ public interface Wrapper extends Container {
*
* @param servlet The associated Servlet
*/
- public void setServlet(Servlet servlet);
+ void setServlet(Servlet servlet);
// --------------------------------------------------------- Public Methods
@@ -166,7 +166,7 @@ public interface Wrapper extends Container {
* @param name Name of this initialization parameter to add
* @param value Value of this initialization parameter to add
*/
- public void addInitParameter(String name, String value);
+ void addInitParameter(String name, String value);
/**
@@ -174,7 +174,7 @@ public interface Wrapper extends Container {
*
* @param mapping The new wrapper mapping
*/
- public void addMapping(String mapping);
+ void addMapping(String mapping);
/**
@@ -184,7 +184,7 @@ public interface Wrapper extends Container {
* @param name Role name used within this servlet
* @param link Role name used within the web application
*/
- public void addSecurityReference(String name, String link);
+ void addSecurityReference(String name, String link);
/**
@@ -197,7 +197,7 @@ public interface Wrapper extends Container {
* @exception ServletException if a loading error occurs
* @return a new Servlet instance
*/
- public Servlet allocate() throws ServletException;
+ Servlet allocate() throws ServletException;
/**
@@ -207,7 +207,7 @@ public interface Wrapper extends Container {
*
* @exception ServletException if a deallocation error occurs
*/
- public void deallocate(Servlet servlet) throws ServletException;
+ void deallocate(Servlet servlet) throws ServletException;
/**
@@ -216,20 +216,20 @@ public interface Wrapper extends Container {
*
* @param name Name of the requested initialization parameter
*/
- public String findInitParameter(String name);
+ String findInitParameter(String name);
/**
* @return the names of all defined initialization parameters for this
* servlet.
*/
- public String[] findInitParameters();
+ String[] findInitParameters();
/**
* @return the mappings associated with this wrapper.
*/
- public String[] findMappings();
+ String[] findMappings();
/**
@@ -238,20 +238,20 @@ public interface Wrapper extends Container {
*
* @param name Security role reference used within this servlet
*/
- public String findSecurityReference(String name);
+ String findSecurityReference(String name);
/**
* @return the set of security role reference names associated with
* this servlet, if any; otherwise return a zero-length array.
*/
- public String[] findSecurityReferences();
+ String[] findSecurityReferences();
/**
* Increment the error count value used when monitoring.
*/
- public void incrementErrorCount();
+ void incrementErrorCount();
/**
@@ -263,7 +263,7 @@ public interface Wrapper extends Container {
* @exception ServletException if the Servlet init() method threw
* an exception or if some other loading problem occurs
*/
- public void load() throws ServletException;
+ void load() throws ServletException;
/**
@@ -271,7 +271,7 @@ public interface Wrapper extends Container {
*
* @param name Name of the initialization parameter to remove
*/
- public void removeInitParameter(String name);
+ void removeInitParameter(String name);
/**
@@ -279,7 +279,7 @@ public interface Wrapper extends Container {
*
* @param mapping The pattern to remove
*/
- public void removeMapping(String mapping);
+ void removeMapping(String mapping);
/**
@@ -287,7 +287,7 @@ public interface Wrapper extends Container {
*
* @param name Security role used within this servlet to be removed
*/
- public void removeSecurityReference(String name);
+ void removeSecurityReference(String name);
/**
@@ -297,7 +297,7 @@ public interface Wrapper extends Container {
* @param unavailable The exception that occurred, or <code>null</code>
* to mark this Servlet as permanently unavailable
*/
- public void unavailable(UnavailableException unavailable);
+ void unavailable(UnavailableException unavailable);
/**
@@ -309,7 +309,7 @@ public interface Wrapper extends Container {
*
* @exception ServletException if an unload error occurs
*/
- public void unload() throws ServletException;
+ void unload() throws ServletException;
/**
@@ -317,7 +317,7 @@ public interface Wrapper extends Container {
* multi-part configuration has been defined, then <code>null</code> will be
* returned.
*/
- public MultipartConfigElement getMultipartConfigElement();
+ MultipartConfigElement getMultipartConfigElement();
/**
@@ -326,7 +326,7 @@ public interface Wrapper extends Container {
*
* @param multipartConfig The configuration associated with the Servlet
*/
- public void setMultipartConfigElement(
+ void setMultipartConfigElement(
MultipartConfigElement multipartConfig);
/**
@@ -335,40 +335,40 @@ public interface Wrapper extends Container {
*
* @return <code>true</code> if the Servlet supports async
*/
- public boolean isAsyncSupported();
+ boolean isAsyncSupported();
/**
* Set the async support for the associated Servlet.
*
* @param asyncSupport the new value
*/
- public void setAsyncSupported(boolean asyncSupport);
+ void setAsyncSupported(boolean asyncSupport);
/**
* Is the associated Servlet enabled? Defaults to <code>true</code>.
*
* @return <code>true</code> if the Servlet is enabled
*/
- public boolean isEnabled();
+ boolean isEnabled();
/**
* Sets the enabled attribute for the associated servlet.
*
* @param enabled the new value
*/
- public void setEnabled(boolean enabled);
+ void setEnabled(boolean enabled);
/**
* Is the Servlet overridable by a ServletContainerInitializer?
*
* @return <code>true</code> if the Servlet can be overridden in a ServletContainerInitializer
*/
- public boolean isOverridable();
+ boolean isOverridable();
/**
* Sets the overridable attribute for this Servlet.
*
* @param overridable the new value
*/
- public void setOverridable(boolean overridable);
+ void setOverridable(boolean overridable);
}
diff --git a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
index 644e76a2bc..41c1de3973 100644
--- a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
@@ -542,7 +542,7 @@ public class AuthConfigFactoryImpl extends AuthConfigFactory {
private final RegistrationListener listener;
- public RegistrationListenerWrapper(String messageLayer, String appContext,
+ RegistrationListenerWrapper(String messageLayer, String appContext,
RegistrationListener listener) {
this.messageLayer = messageLayer;
this.appContext = appContext;
@@ -570,7 +570,7 @@ public class AuthConfigFactoryImpl extends AuthConfigFactory {
private final ServerAuthModule module;
- public SingleModuleServerAuthContext(ServerAuthModule module) {
+ SingleModuleServerAuthContext(ServerAuthModule module) {
this.module = module;
}
@@ -597,7 +597,7 @@ public class AuthConfigFactoryImpl extends AuthConfigFactory {
private final ServerAuthContext context;
private final String appContext;
- public SingleContextServerAuthConfig(ServerAuthContext context, String appContext) {
+ SingleContextServerAuthConfig(ServerAuthContext context, String appContext) {
this.context = context;
this.appContext = appContext;
}
@@ -638,7 +638,7 @@ public class AuthConfigFactoryImpl extends AuthConfigFactory {
private final ServerAuthConfig serverAuthConfig;
- public SingleConfigAuthConfigProvider(ServerAuthConfig serverAuthConfig) {
+ SingleConfigAuthConfigProvider(ServerAuthConfig serverAuthConfig) {
this.serverAuthConfig = serverAuthConfig;
}
diff --git a/java/org/apache/catalina/connector/CoyoteInputStream.java b/java/org/apache/catalina/connector/CoyoteInputStream.java
index ac3ce2d13c..a1588d455d 100644
--- a/java/org/apache/catalina/connector/CoyoteInputStream.java
+++ b/java/org/apache/catalina/connector/CoyoteInputStream.java
@@ -222,7 +222,7 @@ public class CoyoteInputStream extends ServletInputStream {
private final InputBuffer inputBuffer;
- public PrivilegedAvailable(InputBuffer inputBuffer) {
+ PrivilegedAvailable(InputBuffer inputBuffer) {
this.inputBuffer = inputBuffer;
}
@@ -237,7 +237,7 @@ public class CoyoteInputStream extends ServletInputStream {
private final InputBuffer inputBuffer;
- public PrivilegedClose(InputBuffer inputBuffer) {
+ PrivilegedClose(InputBuffer inputBuffer) {
this.inputBuffer = inputBuffer;
}
@@ -253,7 +253,7 @@ public class CoyoteInputStream extends ServletInputStream {
... 11819 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org