[RESTEASY-2347] added property check and related unit test

resteasy · Nov 12, 2019 · ad89f72 · ad89f72
1 parent e490913
commit ad89f72
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 2 deletions.
diff --git a/...binding/src/main/java/org/jboss/resteasy/plugins/providers/jsonb/JsonBindingProvider.java b/...binding/src/main/java/org/jboss/resteasy/plugins/providers/jsonb/JsonBindingProvider.java
@@ -49,8 +49,12 @@ public class JsonBindingProvider extends AbstractJsonBindingProvider
    public JsonBindingProvider() {
       super();
       ResteasyConfiguration context = ResteasyProviderFactory.getContextData(ResteasyConfiguration.class);
-      disabled = (context != null && (Boolean.parseBoolean(context.getParameter(ResteasyContextParameters.RESTEASY_PREFER_JACKSON_OVER_JSONB))
-            || Boolean.parseBoolean(context.getParameter("resteasy.jsonp.enable"))));
+      if (context == null) {
+         disabled = Boolean.getBoolean(ResteasyContextParameters.RESTEASY_PREFER_JACKSON_OVER_JSONB);
+      } else {
+         disabled = (Boolean.parseBoolean(context.getParameter(ResteasyContextParameters.RESTEASY_PREFER_JACKSON_OVER_JSONB))
+                 || Boolean.parseBoolean(context.getParameter("resteasy.jsonp.enable")));
+      }
    }
 
    @Override

diff --git a/testsuite/unit-tests/pom.xml b/testsuite/unit-tests/pom.xml
@@ -88,6 +88,12 @@
             <version>${version.resteasy.testsuite}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-json-binding-provider</artifactId>
+            <version>${version.resteasy.testsuite}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>

diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/JsonBindingTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/JsonBindingTest.java
@@ -0,0 +1,43 @@
+package org.jboss.resteasy.test.providers;
+
+import org.jboss.resteasy.plugins.providers.jsonb.JsonBindingProvider;
+import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;
+import javax.ws.rs.core.MediaType;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+/**
+ * Check when ResteasyConfiguration.class is null in JsonBindingProvider
+ * system property is checked and the property is set accordingly.
+ * There are integration tests that check the properly setting when
+ * a ResteasyConfiguration.class is provided.
+ */
+public class JsonBindingTest {
+    private MediaType mediaType = new MediaType("application", "json");
+
+    @Test
+    public void testUseJSONB() throws Exception
+    {
+        String origValue = System.getProperty(ResteasyContextParameters.RESTEASY_PREFER_JACKSON_OVER_JSONB);
+
+        System.setProperty(ResteasyContextParameters.RESTEASY_PREFER_JACKSON_OVER_JSONB, "true");
+        JsonBindingProvider jbp = new JsonBindingProvider();
+        boolean result = jbp.isReadable(null, null, null, mediaType);
+
+        if (origValue == null) {
+            System.setProperty(ResteasyContextParameters.RESTEASY_PREFER_JACKSON_OVER_JSONB, "");
+        } else {
+            System.setProperty(ResteasyContextParameters.RESTEASY_PREFER_JACKSON_OVER_JSONB, origValue);
+        }
+        assertFalse(result);
+    }
+
+    @Test
+    public void testUseJACKSON() throws Exception
+    {
+        JsonBindingProvider jbp = new JsonBindingProvider();
+        boolean result = jbp.isReadable(null, null, null, mediaType);
+        assertTrue(result);
+    }
+}