This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push: new 627ceeaddb Fix javadoc errors 627ceeaddb is described below commit 627ceeaddb5c6e0dc64904c54069b6637738e70b Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Fri Dec 8 07:50:05 2023 +0100 Fix javadoc errors --- http/base/pom.xml | 2 +- .../http/base/internal/registry/EventListenerRegistry.java | 2 +- .../apache/felix/http/base/internal/runtime/ListenerInfo.java | 2 +- .../http/base/internal/runtime/dto/BaseServletDTOBuilder.java | 10 +++++----- .../felix/http/base/internal/whiteboard/WhiteboardManager.java | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/http/base/pom.xml b/http/base/pom.xml index f95fa1e836..5ffafbb76c 100644 --- a/http/base/pom.xml +++ b/http/base/pom.xml @@ -28,7 +28,7 @@ <name>Apache Felix Http Base</name> <artifactId>org.apache.felix.http.base</artifactId> - <version>5.1.5-SNAPSHOT</version> + <version>5.1.3-SNAPSHOT</version> <packaging>jar</packaging> <scm> diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java index b2eea23333..1efabfd055 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java @@ -88,7 +88,7 @@ public final class EventListenerRegistry implements /** * Add listeners * - * @param listener handler + * @param handler The listener handler */ public void addListeners(@NotNull final ListenerHandler handler) { diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ListenerInfo.java b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ListenerInfo.java index eb34ec62a4..a9dac960b0 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ListenerInfo.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ListenerInfo.java @@ -74,8 +74,8 @@ public class ListenerInfo extends WhiteboardServiceInfo<EventListener> /** * Constructor * @param ref The service reference - * @param dtoTypes Optional dto types * @param types The listener types + * @param dtos Optional dto types */ public ListenerInfo(final ServiceReference<EventListener> ref, final Set<String> types, final String[] dtos) { diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BaseServletDTOBuilder.java b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BaseServletDTOBuilder.java index 3b3e791832..83d40a02bb 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BaseServletDTOBuilder.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BaseServletDTOBuilder.java @@ -25,9 +25,9 @@ import org.osgi.service.servlet.runtime.dto.BaseServletDTO; abstract class BaseServletDTOBuilder { /** - * Build a servlet DTO from a servlet info - * @param info The servlet info - * @return A servlet DTO + * Fill a servlet DTO from a servlet handler + * @param dto The base servlet DTO + * @param handler The servlet handler */ public static void fill(final BaseServletDTO dto, final ServletHandler handler) { @@ -40,9 +40,9 @@ abstract class BaseServletDTOBuilder } /** - * Build a servlet DTO from a servlet info + * Fill a servlet DTO from a servlet info + * @param dto The base servlet DTO * @param info The servlet info - * @return A servlet DTO */ public static void fill(final BaseServletDTO dto, final ServletInfo info) { diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java index 0f479169d6..93422105ba 100644 --- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java +++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java @@ -222,9 +222,9 @@ public final class WhiteboardManager /** * Handle session id changes - * @param session The session where the id changed + * @param event The session event * @param oldSessionId The old session id - * @param contextIds The context ids using that session + * @param contextNames The context names using that session */ public void sessionIdChanged(@NotNull final HttpSessionEvent event, final String oldSessionId, final Set<String> contextNames) { @@ -405,7 +405,7 @@ public final class WhiteboardManager /** * Remove a servlet context helper * - * @param The servlet context helper info + * @param info The servlet context helper info */ public void removeContextHelper(final ServletContextHelperInfo info) { @@ -911,7 +911,7 @@ public final class WhiteboardManager * * @param req The request * @param res The response - * @return {@code true} to continue with dispatching, {@code false} to terminate the request. + * @param dispatcher The dispatcher * @throws IOException * @throws ServletException */