Browse Source
This commit polishes the renaming of JsonComponent to JacksonComponent and the use of JacksonModule instead of Module in Jackson 2. This also adds integration tests that use a JacksonComponent with WebMvcTest and WebFluxTest. Closes gh-47864pull/47903/head
22 changed files with 294 additions and 28 deletions
@ -0,0 +1,28 @@
@@ -0,0 +1,28 @@
|
||||
/* |
||||
* Copyright 2012-present 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. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.springframework.boot.webflux.test.autoconfigure; |
||||
|
||||
import org.springframework.boot.jackson.JacksonComponent; |
||||
|
||||
/** |
||||
* Example result that requires a {@link JacksonComponent}. |
||||
* |
||||
* @param id sample data |
||||
* @author Stephane Nicoll |
||||
*/ |
||||
public record ExampleResult(String id) { |
||||
} |
||||
@ -0,0 +1,38 @@
@@ -0,0 +1,38 @@
|
||||
/* |
||||
* Copyright 2012-present 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. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.springframework.boot.webflux.test.autoconfigure; |
||||
|
||||
import tools.jackson.core.JsonGenerator; |
||||
import tools.jackson.databind.SerializationContext; |
||||
|
||||
import org.springframework.boot.jackson.JacksonComponent; |
||||
import org.springframework.boot.jackson.ObjectValueSerializer; |
||||
|
||||
/** |
||||
* {@link ObjectValueSerializer} for {@link ExampleResult}. |
||||
* |
||||
* @author Stephane Nicoll |
||||
*/ |
||||
@JacksonComponent |
||||
public class ExampleResultSerializer extends ObjectValueSerializer<ExampleResult> { |
||||
|
||||
@Override |
||||
protected void serializeObject(ExampleResult item, JsonGenerator jsonWriter, SerializationContext context) { |
||||
jsonWriter.writeStringProperty("identifier", item.id()); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,50 @@
@@ -0,0 +1,50 @@
|
||||
/* |
||||
* Copyright 2012-present 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. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.springframework.boot.webflux.test.autoconfigure; |
||||
|
||||
import org.junit.jupiter.api.Test; |
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.boot.jackson.JacksonComponent; |
||||
import org.springframework.test.json.JsonCompareMode; |
||||
import org.springframework.test.web.reactive.server.WebTestClient; |
||||
|
||||
/** |
||||
* Tests for {@link WebFluxTest @WebFluxTest} to validate {@link JacksonComponent} beans |
||||
* are discovered. |
||||
* |
||||
* @author Stephane Nicoll |
||||
*/ |
||||
@WebFluxTest(controllers = ExampleController2.class) |
||||
class WebFluxTestJacksonComponentIntegrationTests { |
||||
|
||||
@Autowired |
||||
private WebTestClient webClient; |
||||
|
||||
@Test |
||||
void shouldFindConverter() { |
||||
|
||||
this.webClient.post() |
||||
.uri("/two/" + "1234abcd") |
||||
.exchange() |
||||
.expectStatus() |
||||
.isOk() |
||||
.expectBody() |
||||
.json("{ \"identifier\": \"1234abcd\" }", JsonCompareMode.LENIENT); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,28 @@
@@ -0,0 +1,28 @@
|
||||
/* |
||||
* Copyright 2012-present 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. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.springframework.boot.webmvc.test.autoconfigure.mockmvc; |
||||
|
||||
import org.springframework.boot.jackson.JacksonComponent; |
||||
|
||||
/** |
||||
* Example result that requires a {@link JacksonComponent}. |
||||
* |
||||
* @param id sample data |
||||
* @author Stephane Nicoll |
||||
*/ |
||||
public record ExampleResult(String id) { |
||||
} |
||||
@ -0,0 +1,38 @@
@@ -0,0 +1,38 @@
|
||||
/* |
||||
* Copyright 2012-present 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. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.springframework.boot.webmvc.test.autoconfigure.mockmvc; |
||||
|
||||
import tools.jackson.core.JsonGenerator; |
||||
import tools.jackson.databind.SerializationContext; |
||||
|
||||
import org.springframework.boot.jackson.JacksonComponent; |
||||
import org.springframework.boot.jackson.ObjectValueSerializer; |
||||
|
||||
/** |
||||
* {@link ObjectValueSerializer} for {@link ExampleResult}. |
||||
* |
||||
* @author Stephane Nicoll |
||||
*/ |
||||
@JacksonComponent |
||||
public class ExampleResultSerializer extends ObjectValueSerializer<ExampleResult> { |
||||
|
||||
@Override |
||||
protected void serializeObject(ExampleResult item, JsonGenerator jsonWriter, SerializationContext context) { |
||||
jsonWriter.writeStringProperty("identifier", item.id()); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,47 @@
@@ -0,0 +1,47 @@
|
||||
/* |
||||
* Copyright 2012-present 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. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.springframework.boot.webmvc.test.autoconfigure.mockmvc; |
||||
|
||||
import org.junit.jupiter.api.Test; |
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.boot.jackson.JacksonComponent; |
||||
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; |
||||
import org.springframework.test.web.servlet.assertj.MockMvcTester; |
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
|
||||
/** |
||||
* Tests for {@link WebMvcTest @WebMvcTest} to validate {@link JacksonComponent} beans are |
||||
* discovered. |
||||
* |
||||
* @author Stephane Nicoll |
||||
*/ |
||||
@WebMvcTest(controllers = ExampleController2.class) |
||||
class WebMvcTestJacksonComponentIntegrationTests { |
||||
|
||||
@Autowired |
||||
private MockMvcTester mvc; |
||||
|
||||
@Test |
||||
void shouldFindJacksonComponent() { |
||||
assertThat(this.mvc.post().uri("/two/1234abcd")).hasStatusOk().bodyJson().isLenientlyEqualTo(""" |
||||
{ "identifier": "1234abcd" } |
||||
"""); |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue