diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java index b2bf41162d..af85c2c6a7 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java +++ b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -104,13 +104,13 @@ public final class ServerSentEvent { @Override public String toString() { - return ("ServerSentEvent [id = '" + this.id + "\', event='" + this.event + "\', retry=" + + return ("ServerSentEvent [id = '" + this.id + "', event='" + this.event + "', retry=" + this.retry + ", comment='" + this.comment + "', data=" + this.data + ']'); } /** - * Return a builder for a {@code SseEvent}. + * Return a builder for a {@code ServerSentEvent}. * @param the type of data that this event contains * @return the builder */ @@ -119,7 +119,7 @@ public final class ServerSentEvent { } /** - * Return a builder for a {@code SseEvent}, populated with the given {@linkplain #data() data}. + * Return a builder for a {@code ServerSentEvent}, populated with the given {@linkplain #data() data}. * @param the type of data that this event contains * @return the builder */ @@ -129,7 +129,7 @@ public final class ServerSentEvent { /** - * A mutable builder for a {@code SseEvent}. + * A mutable builder for a {@code ServerSentEvent}. * * @param the type of data that this event contains */ diff --git a/spring-web/src/main/java/org/springframework/web/service/invoker/AbstractNamedValueArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/service/invoker/AbstractNamedValueArgumentResolver.java index 0aaa91ac19..62b25d70a7 100644 --- a/spring-web/src/main/java/org/springframework/web/service/invoker/AbstractNamedValueArgumentResolver.java +++ b/spring-web/src/main/java/org/springframework/web/service/invoker/AbstractNamedValueArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,7 +47,6 @@ public abstract class AbstractNamedValueArgumentResolver implements HttpServiceA protected final Log logger = LogFactory.getLog(getClass()); - @Nullable private final ConversionService conversionService; @@ -248,7 +247,6 @@ public abstract class AbstractNamedValueArgumentResolver implements HttpServiceA public NamedValueInfo update(String name, boolean required, @Nullable String defaultValue) { return new NamedValueInfo(name, required, defaultValue, this.label, this.multiValued); } - } }