Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A3183200CBA for ; Mon, 3 Jul 2017 17:14:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A0D9F160BEC; Mon, 3 Jul 2017 15:14:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C095A160BE4 for ; Mon, 3 Jul 2017 17:14:28 +0200 (CEST) Received: (qmail 14981 invoked by uid 500); 3 Jul 2017 15:14:28 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 14972 invoked by uid 99); 3 Jul 2017 15:14:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jul 2017 15:14:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D64A3DFBC6; Mon, 3 Jul 2017 15:14:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lburgazzoli@apache.org To: commits@camel.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: camel git commit: CAMEL-11507: camel-servicenow : add an header to indicate the answer data type Date: Mon, 3 Jul 2017 15:14:27 +0000 (UTC) archived-at: Mon, 03 Jul 2017 15:14:29 -0000 Repository: camel Updated Branches: refs/heads/camel-2.19.x ce5c96f0b -> 54f77196e CAMEL-11507: camel-servicenow : add an header to indicate the answer data type Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/54f77196 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/54f77196 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/54f77196 Branch: refs/heads/camel-2.19.x Commit: 54f77196e85788b077088c3e6a4385414b6a094f Parents: ce5c96f Author: lburgazzoli Authored: Mon Jul 3 17:10:00 2017 +0200 Committer: lburgazzoli Committed: Mon Jul 3 17:11:25 2017 +0200 ---------------------------------------------------------------------- .../camel/component/servicenow/AbstractServiceNowProcessor.java | 2 ++ .../org/apache/camel/component/servicenow/ServiceNowConstants.java | 1 + .../apache/camel/component/servicenow/ServiceNowImportSetTest.java | 1 + .../org/apache/camel/component/servicenow/ServiceNowTableTest.java | 1 + 4 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/54f77196/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/AbstractServiceNowProcessor.java ---------------------------------------------------------------------- diff --git a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/AbstractServiceNowProcessor.java b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/AbstractServiceNowProcessor.java index b7d81d2..6dc66a3 100644 --- a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/AbstractServiceNowProcessor.java +++ b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/AbstractServiceNowProcessor.java @@ -143,6 +143,7 @@ public abstract class AbstractServiceNowProcessor implements Processor { protected AbstractServiceNowProcessor setBody(Message message, Class model, Response response) throws Exception { if (message != null && response != null) { if (ObjectHelper.isNotEmpty(response.getHeaderString(HttpHeaders.CONTENT_TYPE))) { + JsonNode root = response.readEntity(JsonNode.class); Map responseAttributes = null; @@ -156,6 +157,7 @@ public abstract class AbstractServiceNowProcessor implements Processor { if (ObjectHelper.equal("result", key, true)) { Object body = unwrap(node, model); if (body != null) { + message.setHeader(ServiceNowConstants.RESPONSE_TYPE, body.getClass()); message.setBody(body); } } else { http://git-wip-us.apache.org/repos/asf/camel/blob/54f77196/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConstants.java b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConstants.java index 13eb9cf..0f4b7ad 100644 --- a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConstants.java +++ b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowConstants.java @@ -34,6 +34,7 @@ public final class ServiceNowConstants { public static final String CONTENT_META = "CamelServiceNowContentMeta"; public static final String RESPONSE_META = "CamelServiceNowResponseMeta"; public static final String API_VERSION = "CamelServiceNowApiVersion"; + public static final String RESPONSE_TYPE = "CamelServiceNowResponseType"; public static final String ATTACHMENT_META_HEADER = "X-Attachment-Metadata"; http://git-wip-us.apache.org/repos/asf/camel/blob/54f77196/components/camel-servicenow/src/test/java/org/apache/camel/component/servicenow/ServiceNowImportSetTest.java ---------------------------------------------------------------------- diff --git a/components/camel-servicenow/src/test/java/org/apache/camel/component/servicenow/ServiceNowImportSetTest.java b/components/camel-servicenow/src/test/java/org/apache/camel/component/servicenow/ServiceNowImportSetTest.java index c46758c..df924df 100644 --- a/components/camel-servicenow/src/test/java/org/apache/camel/component/servicenow/ServiceNowImportSetTest.java +++ b/components/camel-servicenow/src/test/java/org/apache/camel/component/servicenow/ServiceNowImportSetTest.java @@ -53,6 +53,7 @@ public class ServiceNowImportSetTest extends ServiceNowTestSupport { mock.reset(); mock.expectedMessageCount(1); + mock.expectedHeaderReceived(ServiceNowConstants.RESPONSE_TYPE, List.class); IncidentImportRequest incident = new IncidentImportRequest(); incident.shortDescription = "test"; http://git-wip-us.apache.org/repos/asf/camel/blob/54f77196/components/camel-servicenow/src/test/java/org/apache/camel/component/servicenow/ServiceNowTableTest.java ---------------------------------------------------------------------- diff --git a/components/camel-servicenow/src/test/java/org/apache/camel/component/servicenow/ServiceNowTableTest.java b/components/camel-servicenow/src/test/java/org/apache/camel/component/servicenow/ServiceNowTableTest.java index b5403b0..62ba190 100644 --- a/components/camel-servicenow/src/test/java/org/apache/camel/component/servicenow/ServiceNowTableTest.java +++ b/components/camel-servicenow/src/test/java/org/apache/camel/component/servicenow/ServiceNowTableTest.java @@ -50,6 +50,7 @@ public class ServiceNowTableTest extends ServiceNowTestSupport { assertNotNull(items); assertTrue(items.size() <= 10); + assertNotNull(exchange.getIn().getHeader(ServiceNowConstants.RESPONSE_TYPE)); assertNotNull(exchange.getIn().getHeader(ServiceNowConstants.OFFSET_FIRST)); assertNotNull(exchange.getIn().getHeader(ServiceNowConstants.OFFSET_NEXT)); assertNotNull(exchange.getIn().getHeader(ServiceNowConstants.OFFSET_LAST));