[JBPM-9247] Fields attribute isn't processed in Accept header

Signed-off-by: Karel Suta <ksuta@redhat.com>
kiegroup · Jul 21, 2020 · 70f39d0 · 70f39d0
1 parent 3bbca7e
commit 70f39d0
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 60 deletions.
diff --git a/...er-parent/kie-server-common/src/main/java/org/kie/server/common/rest/RestEasy960Util.java b/...er-parent/kie-server-common/src/main/java/org/kie/server/common/rest/RestEasy960Util.java
@@ -17,7 +17,9 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
@@ -40,6 +42,8 @@ public class RestEasy960Util {
     public static List<Variant> variants 
             = Variant.mediaTypes(MediaType.APPLICATION_XML_TYPE,
                                  new MediaType("application", "json", Collections.singletonMap("strict", "true")),
+                                 new MediaType("application", "json", Collections.singletonMap("fields", "not_null")),
+                                 new MediaType("application", "json", mapOf("strict", "true", "fields", "not_null")),
                                  MediaType.APPLICATION_JSON_TYPE)
                      .add().build();
     public static Variant defaultVariant 
@@ -70,4 +74,11 @@ public static Variant getVariant(HttpHeaders headers) {
         }
         return null;
     }
+
+    private static Map<String, String> mapOf(String key1, String value1, String key2, String value2) {
+        Map<String, String> result = new HashMap<>();
+        result.put(key1, value1);
+        result.put(key2, value2);
+        return Collections.unmodifiableMap(result);
+    }
 }
diff --git a/...jbpm/src/test/java/org/kie/server/integrationtests/jbpm/rest/JbpmRestIntegrationTest.java b/...jbpm/src/test/java/org/kie/server/integrationtests/jbpm/rest/JbpmRestIntegrationTest.java
@@ -15,6 +15,7 @@
 
 package org.kie.server.integrationtests.jbpm.rest;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -37,8 +38,11 @@
 import org.kie.server.api.model.ReleaseId;
 import org.kie.server.api.model.instance.DocumentInstance;
 import org.kie.server.api.model.instance.DocumentInstanceList;
+import org.kie.server.api.model.instance.ProcessInstance;
+import org.kie.server.api.model.instance.TaskSummary;
 import org.kie.server.api.model.type.JaxbLong;
 import org.kie.server.api.model.type.JaxbString;
+import org.kie.server.api.rest.RestURI;
 import org.kie.server.integrationtests.config.TestConfig;
 import org.kie.server.integrationtests.shared.KieServerDeployer;
 import org.kie.server.integrationtests.shared.KieServerUtil;
@@ -49,6 +53,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 import static org.kie.server.api.rest.RestURI.ABORT_PROCESS_INST_DEL_URI;
 import static org.kie.server.api.rest.RestURI.CONTAINER_ID;
 import static org.kie.server.api.rest.RestURI.DOCUMENT_ID;
@@ -59,13 +64,17 @@
 import static org.kie.server.api.rest.RestURI.PROCESS_ID;
 import static org.kie.server.api.rest.RestURI.PROCESS_INST_ID;
 import static org.kie.server.api.rest.RestURI.PROCESS_URI;
+import static org.kie.server.api.rest.RestURI.QUERY_URI;
 import static org.kie.server.api.rest.RestURI.START_PROCESS_POST_URI;
+import static org.kie.server.api.rest.RestURI.TASK_GET_URI;
+import static org.kie.server.api.rest.RestURI.TASK_INSTANCE_ID;
 import static org.kie.server.api.rest.RestURI.build;
 
 
 public class JbpmRestIntegrationTest extends RestJbpmBaseIntegrationTest {
 
     private static ReleaseId releaseId = new ReleaseId("org.kie.server.testing", "rest-processes", "1.0.0.Final");
+    private static ReleaseId releaseIdDefinitionProject = new ReleaseId("org.kie.server.testing", "definition-project", "1.0.0.Final");
 
     private static Logger logger = LoggerFactory.getLogger(JbpmRestIntegrationTest.class);
 
@@ -75,11 +84,13 @@ public class JbpmRestIntegrationTest extends RestJbpmBaseIntegrationTest {
     public static void buildAndDeployArtifacts() {
         KieServerDeployer.buildAndDeployCommonMavenParent();
         KieServerDeployer.buildAndDeployMavenProjectFromResource("/kjars-sources/rest-processes");
+        KieServerDeployer.buildAndDeployMavenProjectFromResource("/kjars-sources/definition-project");
         // set the accepted formats with quality param to express preference
         acceptHeadersByFormat.put(MarshallingFormat.JAXB, "application/xml;q=0.9,application/json;q=0.3");// xml is preferred over json
         acceptHeadersByFormat.put(MarshallingFormat.JSON, "application/json;q=0.9,application/xml;q=0.3");// json is preferred over xml
 
         createContainer(CONTAINER, releaseId);
+        createContainer(CONTAINER_ID, releaseIdDefinitionProject);
     }
 
     /**
@@ -218,6 +229,23 @@ public void testBasicJbpmRequestManyAcceptHeaders() throws Exception {
 
     }
 
+    @Test
+    public void testBasicJbpmRequestAcceptHeadersStrictAndField() throws Exception {
+        assumeTrue(marshallingFormat == MarshallingFormat.JSON);
+
+        long processId = processClient.startProcess(CONTAINER_ID, PROCESS_ID_USERTASK);
+        ProcessInstance desc = processClient.getProcessInstance(CONTAINER_ID, processId);
+        TaskSummary[] tasks = desc.getActiveUserTasks().getTasks();
+        assertTrue(tasks.length > 0);
+
+        WebTarget target = newRequest(RestURI.build(TestConfig.getKieServerHttpUrl(), QUERY_URI + "/" + TASK_GET_URI, Collections.singletonMap(TASK_INSTANCE_ID, tasks[0].getId())));
+        Assertions.assertThat(target.request(MediaType.APPLICATION_JSON_TYPE).get(String.class)).contains("null");
+        Assertions.assertThat(target.request().header("content-type", MediaType.APPLICATION_JSON + ";fields=not_null;strict=true").get(String.class)).doesNotContain("null");
+        Assertions.assertThat(target.request().header("content-type", MediaType.APPLICATION_JSON + ";fields=not_null").get(String.class)).doesNotContain("null");
+        Assertions.assertThat(target.request().header("accept", MediaType.APPLICATION_JSON + ";fields=not_null;strict=true").get(String.class)).doesNotContain("null");
+        Assertions.assertThat(target.request().header("accept", MediaType.APPLICATION_JSON + ";fields=not_null").get(String.class)).doesNotContain("null");
+    }
+
     @Test
     public void testUploadListDownloadDocument() throws Exception {
         KieServerUtil.deleteDocumentStorageFolder();

diff --git a/...t/java/org/kie/server/integrationtests/jbpm/rest/QueryServiceRestOnlyIntegrationTest.java b/...t/java/org/kie/server/integrationtests/jbpm/rest/QueryServiceRestOnlyIntegrationTest.java