Make andRoute() a drop-in replacement for and(route()) [SPR-14904]

[spring-projects-issues]

Sébastien Deleuze opened SPR-14904 and commented

Maybe I missed something, but this code compiles:

private static RouterFunction<?> routes() {
		return route(GET("docs/api/**"), request ->
				status(FOUND).header(LOCATION, request.path().replace("/docs/", "/old/")).build()
			).and(route(GET("docs/reference/**"), request ->
				status(FOUND).header(LOCATION, request.path().replace("/docs/", "/old/")).build()
			).and(route(GET("docs/raw/**"), request ->
				status(FOUND).header(LOCATION, request.path().replace("/docs/", "/old/")).build()
			).and(route(GET("core/docs/reference/**"), request ->
				status(FOUND).header(LOCATION, "https://github.com/reactor/reactor-core/blob/master/README.md").build()
			)
		)));
	}

While this one fails with this error message: bad return type in lambda expression: can't convert ServerResponse<Void> to ServerResponse<Object>.

private static RouterFunction<?> routes() {
		return route(GET("docs/api/**"), request ->
				status(FOUND).header(LOCATION, request.path().replace("/docs/", "/old/")).build()
			).andRoute(GET("docs/reference/**"), request ->
				status(FOUND).header(LOCATION, request.path().replace("/docs/", "/old/")).build()
			).andRoute(GET("docs/raw/**"), request ->
				status(FOUND).header(LOCATION, request.path().replace("/docs/", "/old/")).build()
			).andRoute(GET("core/docs/reference/**"), request ->
				status(FOUND).header(LOCATION, "https://github.com/reactor/reactor-core/blob/master/README.md").build()
			);
	}

---

Affects: 5.0 M3

Referenced from: commits 6de062d

[spring-projects-issues]

Arjen Poutsma commented

Fixed in 6de062d