* * @param timeout the time to wait * @param unit the timeout unit diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyConfiguration.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyConfiguration.java index ef68b543655..0a8f79138a0 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyConfiguration.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyConfiguration.java @@ -129,7 +129,7 @@ public class ProxyConfiguration } /** - * @return the list of origins that must be proxied + * @return the set of origins that must be proxied * @see #matches(Origin) * @see #getExcludedAddresses() */ @@ -139,7 +139,7 @@ public class ProxyConfiguration } /** - * @return the list of origins that must not be proxied. + * @return the set of origins that must not be proxied. * @see #matches(Origin) * @see #getIncludedAddresses() */ diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/ProtocolHttpUpgrader.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/ProtocolHttpUpgrader.java index 4525fd10cc1..515ba6b9c70 100644 --- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/ProtocolHttpUpgrader.java +++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/internal/ProtocolHttpUpgrader.java @@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory; *
Works in conjunction with {@link HttpClientTransportDynamic} * so that the protocol to upgrade to must be one of the application * protocols supported by HttpClientTransportDynamic.
- * */ public class ProtocolHttpUpgrader implements HttpUpgrader { diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java index 1c43b670881..da26e2642ba 100644 --- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java +++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCookie.java @@ -574,12 +574,6 @@ public class HttpCookie /** * Check if all old parameters match the new parameters. * - * @param oldName - * @param oldDomain - * @param oldPath - * @param newName - * @param newDomain - * @param newPath * @return true if old and new names match exactly and the old and new domains match case-insensitively and the paths match exactly */ private static boolean match(String oldName, String oldDomain, String oldPath, String newName, String newDomain, String newPath) diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractByteBufferPool.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractByteBufferPool.java index f2d1ace01c7..748ec94a3a3 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractByteBufferPool.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractByteBufferPool.java @@ -30,7 +30,7 @@ import org.eclipse.jetty.util.annotation.ManagedOperation; /** * The {@code maxHeapMemory} and {@code maxDirectMemory} default heuristic is to use {@link Runtime#maxMemory()} - * divided by 4. + * divided by 4. */ @ManagedObject abstract class AbstractByteBufferPool implements ByteBufferPool diff --git a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/AbstractContextProvider.java b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/AbstractContextProvider.java index 7746e2c248d..4bb739b263a 100644 --- a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/AbstractContextProvider.java +++ b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/AbstractContextProvider.java @@ -33,8 +33,10 @@ import org.slf4j.LoggerFactory; /** * AbstractContextProvider * + ** Base class for DeploymentManager Providers that can deploy ContextHandlers into * Jetty that have been discovered via OSGI either as bundles or services. + *
*/ public abstract class AbstractContextProvider extends AbstractLifeCycle implements AppProvider { diff --git a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/OSGiApp.java b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/OSGiApp.java index 5b250c5552f..e67bce0d41b 100644 --- a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/OSGiApp.java +++ b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/OSGiApp.java @@ -14,9 +14,7 @@ package org.eclipse.jetty.osgi; import java.io.File; -import java.net.URI; import java.net.URL; -import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Dictionary; @@ -30,7 +28,6 @@ import org.eclipse.jetty.deploy.DeploymentManager; import org.eclipse.jetty.ee.Deployable; import org.eclipse.jetty.osgi.util.BundleFileLocatorHelperFactory; import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.util.FileID; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceFactory; @@ -60,7 +57,6 @@ public class OSGiApp extends App * Get the install location of a Bundle as a Path * @param bundle the Bundle whose location to return * @return the installed location of the Bundle as a Path - * @throws Exception */ private static Path getBundlePath(Bundle bundle) throws Exception { @@ -77,7 +73,6 @@ public class OSGiApp extends App * as found on equinox. Eg file:///a/b/c/org.eclipse.osgi/89/0/bundleFile * @param bundle the bundle * @return a Resource representing the bundle's installed location - * @throws Exception */ private static Resource getBundleAsResource(Bundle bundle) throws Exception { @@ -93,7 +88,7 @@ public class OSGiApp extends App /** * Get or create a contextPath from bundle headers and information * - * @param bundle + * @param bundle the bundle * @return a contextPath */ private static String getContextPath(Bundle bundle) @@ -229,8 +224,6 @@ public class OSGiApp extends App /** * Register the Jetty deployed context/webapp as a service, as * according to the OSGi Web Application Specification. - * - * @throws Exception */ public void registerAsOSGiService() throws Exception { diff --git a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/util/DefaultBundleClassLoaderHelper.java b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/util/DefaultBundleClassLoaderHelper.java index 026ed6b22af..436af836b9e 100644 --- a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/util/DefaultBundleClassLoaderHelper.java +++ b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/util/DefaultBundleClassLoaderHelper.java @@ -383,7 +383,7 @@ public class DefaultBundleClassLoaderHelper implements BundleClassLoaderHelper { try { - /** + /* * In Concierge: * * Option A: diff --git a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/util/Util.java b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/util/Util.java index d3d17afb33a..4de82de4014 100644 --- a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/util/Util.java +++ b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/util/Util.java @@ -108,8 +108,6 @@ public class Util * @param bundleSymbolicNames comma separated list of symbolic bundle names * @param bundleContext the bundle on whose behalf to resolve * @return List of resolved Paths matching the bundle symbolic names - * - * @throws Exception */ public static ListA rule to rewrite the path and query that match a regular expression pattern with a fixed string.
*The replacement String follows standard {@link Matcher#replaceAll(String)} behavior, including named groups
- * */ public class RewriteRegexRule extends RegexRule { diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Context.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Context.java index aa2ef27c48a..2dc98357939 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Context.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Context.java @@ -51,8 +51,8 @@ public interface Context extends Attributes, Decorator, Executor MimeTypes getMimeTypes(); - @Override /** execute runnable in container thread scoped to context */ + @Override void execute(Runnable runnable); /** scope the calling thread to the context and run the runnable. */ diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index 252622d54a9..a2b41f31916 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -372,7 +372,7 @@ public class ContextHandler extends Handler.Wrapper implements Attributes, Grace * virtual host name. A context with no virtual host names or a null virtual host name is available to all requests that are not served by a context with a * matching virtual host name. * - * @return Array of virtual hosts that this context responds to. A null/empty array means any hostname is acceptable. Host names may be String + * @return list of virtual hosts that this context responds to. A null/empty array means any hostname is acceptable. Host names may be String * representation of IP addresses. Host names may start with '*.' to wildcard one level of names. Hosts and wildcard hosts may be followed with * '@connectorname', in which case they will match only if the the {@link Connector#getName()} for the request also matches. If an entry is just * '@connectorname' it will match any host if that connector was used. Note - In previous versions if one or more connectorname only entries existed diff --git a/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionCache.java b/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionCache.java index 0e3fe09bdcc..fc66124950a 100644 --- a/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionCache.java +++ b/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/AbstractSessionCache.java @@ -410,7 +410,7 @@ public abstract class AbstractSessionCache extends ContainerLifeCycle implements * to the cache. The usage count of the fresh session is incremented. * * @param id the id - * @param session + * @param session the session */ @Override public void add(String id, Session session) throws Exception diff --git a/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/SessionCache.java b/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/SessionCache.java index 5019000c59d..f92733b1884 100644 --- a/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/SessionCache.java +++ b/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/SessionCache.java @@ -94,9 +94,8 @@ public interface SessionCache extends LifeCycle * Adds a new Session, with a never-before-used id, * to the cache. * - * @param id - * @param session - * @throws Exception + * @param id id + * @param session session */ void add(String id, Session session) throws Exception; @@ -271,7 +270,7 @@ public interface SessionCache extends LifeCycle /** * If true, all existing sessions in the cache will be invalidated when * the server shuts down. Default is false. - * @param invalidateOnShutdown + * @param invalidateOnShutdown true invalidate all sessions in cache on server shutdown */ void setInvalidateOnShutdown(boolean invalidateOnShutdown); diff --git a/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java index 89a1427396f..815419366b6 100644 --- a/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java +++ b/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java @@ -472,7 +472,7 @@ public class StartArgs * For full list of enabled modules, use {@link Modules#getEnabled()} * * - * @return the list of selected modules (by name) that the configuration has. + * @return the set of selected modules (by name) that the configuration has. * @see Modules#getEnabled() */ public Setjar, with no classifier){@code maven://////} {@code
+ * {@code
* "foo.tar.gz" "gz"
* "foo.bar" "bar"
* "foo." ""
* "foo" null
* ".bar" null
* null null
- * }
+ * }
*
* @param uri The URI to search
* @return The last segment extension. Null if input uri is null, or scheme is null, or URI is not a `jar:file:` or `file:` based URI
@@ -142,14 +142,14 @@ public class FileID
* for the extension (if any), excluding the dot, lower-cased.
*
*
- * {@code
+ * {@code
* "foo.tar.gz" "gz"
* "foo.bar" "bar"
* "foo." ""
* "foo" null
* ".bar" null
* null null
- * }
+ * }
*
* @param path The string path
* @return The last segment extension, or null if not a file, or null if there is no extension present
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
index 2bf907768b0..7eb328ec34f 100644
--- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
+++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
@@ -17,11 +17,10 @@ import java.util.Set;
import java.util.function.Predicate;
/**
- * Utility class to maintain a set of inclusions and exclusions.
+ * Utility class to maintain a set of inclusions and exclusions.
*This extension of the {@link IncludeExcludeSet} class is used * when the type of the set elements is the same as the type of - * the predicate test. - *
+ * the predicate test.
* * @paramUtility class to maintain a set of inclusions and exclusions.
*Maintains a set of included and excluded elements. The method {@link #test(Object)} * will return true IFF the passed object is not in the excluded set AND ( either the - * included set is empty OR the object is in the included set) + * included set is empty OR the object is in the included set)
*The type of the underlying {@link Set} used may be passed into the - * constructor, so special sets like Servlet PathMap may be used. - *
+ * constructor, so special sets like Servlet PathMap may be used.
* * @paramThe type of the instance passed to the predicate diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java index 440ab8c7bfd..f71298a305a 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java @@ -358,6 +358,7 @@ public class PathResource extends Resource *
* *| path | diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/Constraint.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/Constraint.java index 53f73d67cdf..eea1f67ae4c 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/Constraint.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/Constraint.java @@ -150,7 +150,7 @@ public class Constraint implements Cloneable, Serializable } /** - * @return List of roles for this constraint. + * @return String array of roles for this constraint. */ public String[] getRoles() { diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java index 28be08f727f..c5fdc73ffa0 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java @@ -9,7 +9,7 @@ * all copies. */ -/** +/* * Unix crypt(3C) utility * * @version 0.9, 11/25/96 @@ -28,11 +28,6 @@ * by Iris Van den Broeke, Daniel Deville */ -/** - * modified April 2001 - * by Iris Van den Broeke, Daniel Deville - */ - package org.eclipse.jetty.util.security; import java.nio.charset.StandardCharsets; diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java index 7eb8b298bfa..45188a0bf7e 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java @@ -15,7 +15,6 @@ package org.eclipse.jetty.websocket.core.internal; import java.nio.channels.ClosedChannelException; -import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.thread.AutoLock; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; @@ -129,7 +128,7 @@ public class WebSocketSessionState * *
|---|