-
Notifications
You must be signed in to change notification settings - Fork 351
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make JacksonFeature configurable (#5074)
Signed-off-by: Maxim Nesen <[email protected]>
- Loading branch information
Showing
11 changed files
with
358 additions
and
16 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
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
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
43 changes: 43 additions & 0 deletions
43
...a/org/glassfish/jersey/jackson/internal/DefaultJsonJacksonProviderForBothModulesTest.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,43 @@ | ||
| /* | ||
| * Copyright (c) 2022 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 org.junit.Assert.assertEquals; | ||
|
|
||
| public class DefaultJsonJacksonProviderForBothModulesTest extends JerseyTest { | ||
| @Override | ||
| protected final Application configure() { | ||
| return new ResourceConfig(ServiceTest.class) | ||
| .property("jersey.config.json.jackson.enabled.modules", "Jdk8Module"); | ||
| } | ||
|
|
||
| @Test | ||
| public final void testDisabledModule() { | ||
| final String response = target("entity/simple") | ||
| .request().get(String.class); | ||
|
|
||
| assertEquals("{\"name\":\"Hello\",\"value\":\"World\"}", response); | ||
| } | ||
|
|
||
| } |
71 changes: 71 additions & 0 deletions
71
...g/glassfish/jersey/jackson/internal/DefaultJsonJacksonProviderForDisabledModulesTest.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,71 @@ | ||
| /* | ||
| * Copyright (c) 2022 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.CommonProperties; | ||
| import org.glassfish.jersey.jackson.JacksonFeature; | ||
| import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider; | ||
| import org.glassfish.jersey.jackson.internal.model.JAXBServiceTest; | ||
| 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.annotation.PostConstruct; | ||
| import javax.inject.Inject; | ||
| import javax.ws.rs.core.Application; | ||
| import javax.ws.rs.core.Configuration; | ||
|
|
||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertNotEquals; | ||
|
|
||
| public class DefaultJsonJacksonProviderForDisabledModulesTest extends JerseyTest { | ||
| @Override | ||
| protected final Application configure() { | ||
| return new ResourceConfig(ServiceTest.class, JAXBServiceTest.class) | ||
| .property("jersey.config.json.jackson.disabled.modules", "Jdk8Module"); | ||
| } | ||
|
|
||
| @Test | ||
| public final void testDisabledModule() { | ||
| getClient() | ||
| .register(JacksonFeature.class) | ||
| .register(TestJacksonJaxbJsonProvider.class) | ||
| .property("jersey.config.json.jackson.disabled.modules", "Jdk8Module"); | ||
| final String response = target("JAXBEntity") | ||
| .request().get(String.class); | ||
| assertNotEquals("{\"key\":\"key\",\"value\":\"value\"}", response); | ||
| } | ||
|
|
||
| private static class TestJacksonJaxbJsonProvider extends JacksonJaxbJsonProvider { | ||
|
|
||
| @Inject | ||
| private Configuration configuration; | ||
|
|
||
| @PostConstruct | ||
| public void checkModulesCount() { | ||
| final String disabledModules = | ||
| CommonProperties.getValue(configuration.getProperties(), | ||
| configuration.getRuntimeType(), | ||
| CommonProperties.JSON_JACKSON_DISABLED_MODULES, String.class); | ||
| assertEquals("Jdk8Module", disabledModules); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
Oops, something went wrong.