Skip to content

Commit 7162d24

Browse files
Oblioolegz
authored andcommitted
revise import order and fix javadocs
Signed-off-by: Oblio <oblio.leitch@vermont.gov>
1 parent 65cd253 commit 7162d24

4 files changed

Lines changed: 12 additions & 23 deletions

File tree

spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessAsyncContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import jakarta.servlet.ServletResponse;
3131
import jakarta.servlet.http.HttpServletRequest;
3232
import jakarta.servlet.http.HttpServletResponse;
33-
3433
import org.jspecify.annotations.Nullable;
34+
3535
import org.springframework.beans.BeanUtils;
3636
import org.springframework.util.Assert;
3737
import org.springframework.web.util.WebUtils;

spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessHttpServletRequest.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
import jakarta.servlet.http.HttpSession;
5959
import jakarta.servlet.http.HttpUpgradeHandler;
6060
import jakarta.servlet.http.Part;
61-
6261
import org.jspecify.annotations.Nullable;
62+
6363
import org.springframework.http.HttpHeaders;
6464
import org.springframework.util.Assert;
6565
import org.springframework.util.CollectionUtils;
@@ -559,9 +559,7 @@ public void clearAttributes() {
559559
* <strong>not</strong> take into consideration any locales specified via the
560560
* {@code Accept-Language} header.
561561
*
562-
* @see javax.servlet.ServletRequest#getLocale()
563-
* @see #addPreferredLocale(Locale)
564-
* @see #setPreferredLocales(List)
562+
* @see jakarta.servlet.ServletRequest#getLocale()
565563
*/
566564
@Override
567565
public Locale getLocale() {
@@ -580,20 +578,17 @@ public Locale getLocale() {
580578
* <strong>not</strong> take into consideration any locales specified via the
581579
* {@code Accept-Language} header.
582580
*
583-
* @see javax.servlet.ServletRequest#getLocales()
584-
* @see #addPreferredLocale(Locale)
585-
* @see #setPreferredLocales(List)
581+
* @see jakarta.servlet.ServletRequest#getLocales()
586582
*/
587583
@Override
588584
public Enumeration<Locale> getLocales() {
589585
return Collections.enumeration(this.locales);
590586
}
591587

592588
/**
593-
* Return {@code true} if the {@link #setSecure secure} flag has been set to
594-
* {@code true} or if the {@link #getScheme scheme} is {@code https}.
589+
* Return {@code true} if the {@link #getScheme scheme} is {@code https}.
595590
*
596-
* @see javax.servlet.ServletRequest#isSecure()
591+
* @see jakarta.servlet.ServletRequest#isSecure()
597592
*/
598593
@Override
599594
public boolean isSecure() {

spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessHttpServletResponse.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
import jakarta.servlet.WriteListener;
3939
import jakarta.servlet.http.Cookie;
4040
import jakarta.servlet.http.HttpServletResponse;
41-
4241
import org.jspecify.annotations.Nullable;
42+
4343
import org.springframework.http.HttpHeaders;
4444
import org.springframework.util.Assert;
4545
import org.springframework.web.util.WebUtils;
@@ -118,8 +118,7 @@ public byte[] getContentAsByteArray() {
118118
* specified for the response by the application, either through
119119
* {@link HttpServletResponse} methods or through a charset parameter on the
120120
* {@code Content-Type}. If no charset has been explicitly defined, the
121-
* {@linkplain #setDefaultCharacterEncoding(String) default character encoding}
122-
* will be used.
121+
* default character encoding will be used.
123122
*
124123
* @return the content as a {@code String}
125124
* @throws UnsupportedEncodingException if the character encoding is not

spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessMVC.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
import jakarta.servlet.http.HttpServletResponse;
4747
import org.apache.commons.logging.Log;
4848
import org.apache.commons.logging.LogFactory;
49-
5049
import org.jspecify.annotations.Nullable;
50+
5151
import org.springframework.boot.SpringApplication;
5252
import org.springframework.boot.web.server.servlet.context.ServletWebServerApplicationContext;
5353
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
@@ -148,15 +148,10 @@ public void stop() {
148148
}
149149

150150
/**
151-
* Perform a request and return a type that allows chaining further actions,
152-
* such as asserting expectations, on the result.
151+
* Process a serverless request through the configured servlet/filter chain.
153152
*
154-
* @param requestBuilder used to prepare the request to execute; see static
155-
* factory methods in
156-
* {@link org.springframework.test.web.servlet.request.MockMvcRequestBuilders}
157-
* @return an instance of {@link ResultActions} (never {@code null})
158-
* @see org.springframework.test.web.servlet.request.MockMvcRequestBuilders
159-
* @see org.springframework.test.web.servlet.result.MockMvcResultMatchers
153+
* @param request the incoming request
154+
* @param response the outgoing response
160155
*/
161156
public void service(HttpServletRequest request, HttpServletResponse response) throws Exception {
162157
Assert.state(this.waitForContext(), "Failed to initialize Application within the specified time of " + this.initializationTimeout + " milliseconds. "

0 commit comments

Comments
 (0)