-
Notifications
You must be signed in to change notification settings - Fork 358
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: allow json-jackson to auto-discover modules
Signed-off-by: Théo Gaillard <[email protected]>
- Loading branch information
Showing
6 changed files
with
168 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
...n/src/main/java/org/glassfish/jersey/jackson/internal/DefaultJacksonJaxbJsonProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0, which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the | ||
| * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, | ||
| * version 2 with the GNU Classpath Exception, which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| */ | ||
|
|
||
| package org.glassfish.jersey.jackson.internal; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import org.glassfish.jersey.jackson.internal.jackson.jaxrs.cfg.Annotations; | ||
| import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider; | ||
|
|
||
| import java.util.Objects; | ||
| import javax.inject.Singleton; | ||
|
|
||
| /** | ||
| * Entity Data provider based on Jackson JSON provider. | ||
| */ | ||
| @Singleton | ||
| public class DefaultJacksonJaxbJsonProvider extends JacksonJaxbJsonProvider { | ||
|
|
||
| public DefaultJacksonJaxbJsonProvider() { | ||
| findAndRegisterModules(); | ||
| } | ||
|
|
||
| public DefaultJacksonJaxbJsonProvider(final Annotations... annotationsToUse) { | ||
| super(annotationsToUse); | ||
| findAndRegisterModules(); | ||
| } | ||
|
|
||
| private void findAndRegisterModules() { | ||
| final ObjectMapper defaultMapper = _mapperConfig.getDefaultMapper(); | ||
| if (Objects.nonNull(defaultMapper)) { | ||
| defaultMapper.findAndRegisterModules(); | ||
| } | ||
|
|
||
| final ObjectMapper mapper = _mapperConfig.getConfiguredMapper(); | ||
| if (Objects.nonNull(mapper)) { | ||
| mapper.findAndRegisterModules(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
...c/test/java/org/glassfish/jersey/jackson/internal/DefaultJacksonJaxbJsonProviderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0, which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the | ||
| * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, | ||
| * version 2 with the GNU Classpath Exception, which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| */ | ||
|
|
||
| package org.glassfish.jersey.jackson.internal; | ||
|
|
||
| import org.glassfish.jersey.jackson.internal.model.ServiceTest; | ||
| import org.glassfish.jersey.server.ResourceConfig; | ||
| import org.glassfish.jersey.test.JerseyTest; | ||
| import org.junit.Test; | ||
|
|
||
| import javax.ws.rs.core.Application; | ||
|
|
||
| import static junit.framework.TestCase.assertEquals; | ||
|
|
||
| public final class DefaultJacksonJaxbJsonProviderTest extends JerseyTest { | ||
|
|
||
| @Override | ||
| protected final Application configure() { | ||
| return new ResourceConfig(ServiceTest.class); | ||
| } | ||
|
|
||
| @Test | ||
| public final void testJavaOptional() { | ||
| final String response = target("entity/simple").request().get(String.class); | ||
| assertEquals("{\"name\":\"Hello\",\"value\":\"World\"}", response); | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
...a/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/model/ServiceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0, which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the | ||
| * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, | ||
| * version 2 with the GNU Classpath Exception, which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| */ | ||
|
|
||
| package org.glassfish.jersey.jackson.internal.model; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonGetter; | ||
|
|
||
| import java.util.Optional; | ||
| import javax.ws.rs.GET; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.Produces; | ||
| import javax.ws.rs.core.MediaType; | ||
|
|
||
| @Path("/entity/") | ||
| public final class ServiceTest { | ||
|
|
||
| @GET | ||
| @Produces(MediaType.APPLICATION_JSON) | ||
| @Path("/simple") | ||
| public final EntityTest simple() { | ||
| return new EntityTest("Hello", "World"); | ||
| } | ||
|
|
||
| private static final class EntityTest { | ||
|
|
||
| private final String name; | ||
|
|
||
| private final String value; | ||
|
|
||
| EntityTest(final String name, final String value) { | ||
| this.name = name; | ||
| this.value = value; | ||
| } | ||
|
|
||
| @JsonGetter("name") | ||
| public final String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| @JsonGetter("value") | ||
| public final Optional<String> getValue() { | ||
| return Optional.ofNullable(value); | ||
| } | ||
| } | ||
| } |