Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Nullability support into Java DSL

Browse Source
This commit is contained in:
abilan
2023-04-14 14:16:36 -04:00
parent 053cc00484
commit d5181bf0d7
105 changed files with 514 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-integration-webflux/src/main/java/org/springframework/integration/webflux/dsl/WebFlux.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017-2019 the original author or authors.
* Copyright 2017-2023 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.
@@ -22,6 +22,7 @@ import java.util.function.Function;
import org.springframework.expression.Expression;
import org.springframework.integration.expression.FunctionExpression;
import org.springframework.integration.webflux.inbound.WebFluxInboundEndpoint;
import org.springframework.lang.Nullable;
import org.springframework.messaging.Message;
import org.springframework.web.reactive.function.client.WebClient;
@@ -82,7 +83,7 @@ public final class WebFlux {
* @param webClient {@link WebClient} to use.
* @return the WebFluxMessageHandlerSpec instance
*/
public static WebFluxMessageHandlerSpec outboundChannelAdapter(URI uri, WebClient webClient) {
public static WebFluxMessageHandlerSpec outboundChannelAdapter(URI uri, @Nullable WebClient webClient) {
return new WebFluxMessageHandlerSpec(uri, webClient)
.expectReply(false);
}
@@ -94,7 +95,7 @@ public final class WebFlux {
* @param webClient {@link WebClient} to use.
* @return the WebFluxMessageHandlerSpec instance
*/
public static WebFluxMessageHandlerSpec outboundChannelAdapter(String uri, WebClient webClient) {
public static WebFluxMessageHandlerSpec outboundChannelAdapter(String uri, @Nullable WebClient webClient) {
return new WebFluxMessageHandlerSpec(uri, webClient)
.expectReply(false);
}
@@ -123,7 +124,7 @@ public final class WebFlux {
* @return the WebFluxMessageHandlerSpec instance
*/
public static WebFluxMessageHandlerSpec outboundChannelAdapter(Expression uriExpression,
WebClient webClient) {
@Nullable WebClient webClient) {
return new WebFluxMessageHandlerSpec(uriExpression, webClient)
.expectReply(false);
@@ -177,7 +178,7 @@ public final class WebFlux {
* @param webClient {@link WebClient} to use.
* @return the WebFluxMessageHandlerSpec instance
*/
public static WebFluxMessageHandlerSpec outboundGateway(URI uri, WebClient webClient) {
public static WebFluxMessageHandlerSpec outboundGateway(URI uri, @Nullable WebClient webClient) {
return new WebFluxMessageHandlerSpec(uri, webClient);
}
@@ -188,7 +189,7 @@ public final class WebFlux {
* @param webClient {@link WebClient} to use.
* @return the WebFluxMessageHandlerSpec instance
*/
public static WebFluxMessageHandlerSpec outboundGateway(String uri, WebClient webClient) {
public static WebFluxMessageHandlerSpec outboundGateway(String uri, @Nullable WebClient webClient) {
return new WebFluxMessageHandlerSpec(uri, webClient);
}
@@ -202,7 +203,7 @@ public final class WebFlux {
* @return the WebFluxMessageHandlerSpec instance
*/
public static <P> WebFluxMessageHandlerSpec outboundGateway(Function<Message<P>, ?> uriFunction,
WebClient webClient) {
@Nullable WebClient webClient) {
return outboundGateway(new FunctionExpression<>(uriFunction), webClient);
}
@@ -216,7 +217,7 @@ public final class WebFlux {
* @return the WebFluxMessageHandlerSpec instance
*/
public static WebFluxMessageHandlerSpec outboundGateway(Expression uriExpression,
WebClient webClient) {
@Nullable WebClient webClient) {
return new WebFluxMessageHandlerSpec(uriExpression, webClient);
}

10
spring-integration-webflux/src/main/java/org/springframework/integration/webflux/dsl/WebFluxMessageHandlerSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017-2021 the original author or authors.
* Copyright 2017-2023 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.
@@ -27,6 +27,7 @@ import org.springframework.integration.expression.FunctionExpression;
import org.springframework.integration.expression.ValueExpression;
import org.springframework.integration.http.dsl.BaseHttpMessageHandlerSpec;
import org.springframework.integration.webflux.outbound.WebFluxRequestExecutingMessageHandler;
import org.springframework.lang.Nullable;
import org.springframework.messaging.Message;
import org.springframework.web.reactive.function.BodyExtractor;
import org.springframework.web.reactive.function.client.WebClient;
@@ -46,17 +47,18 @@ import org.springframework.web.reactive.function.client.WebClient;
public class WebFluxMessageHandlerSpec
extends BaseHttpMessageHandlerSpec<WebFluxMessageHandlerSpec, WebFluxRequestExecutingMessageHandler> {
@Nullable
protected final WebClient webClient; // NOSONAR - final
protected WebFluxMessageHandlerSpec(URI uri, WebClient webClient) {
protected WebFluxMessageHandlerSpec(URI uri, @Nullable WebClient webClient) {
this(new ValueExpression<>(uri), webClient);
}
protected WebFluxMessageHandlerSpec(String uri, WebClient webClient) {
protected WebFluxMessageHandlerSpec(String uri, @Nullable WebClient webClient) {
this(new LiteralExpression(uri), webClient);
}
protected WebFluxMessageHandlerSpec(Expression uriExpression, WebClient webClient) {
protected WebFluxMessageHandlerSpec(Expression uriExpression, @Nullable WebClient webClient) {
super(new WebFluxRequestExecutingMessageHandler(uriExpression, webClient));
this.webClient = webClient;
}

2
spring-integration-webflux/src/main/java/org/springframework/integration/webflux/dsl/package-info.java
View File

@@ -1,4 +1,6 @@
/**
* Provides WebFlux Components support for Spring Integration Java DSL.
*/
@org.springframework.lang.NonNullApi
@org.springframework.lang.NonNullFields
package org.springframework.integration.webflux.dsl;