Return-Path: X-Original-To: apmail-streams-commits-archive@minotaur.apache.org Delivered-To: apmail-streams-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 081D111BCD for ; Thu, 4 Sep 2014 17:12:14 +0000 (UTC) Received: (qmail 84228 invoked by uid 500); 4 Sep 2014 17:12:14 -0000 Delivered-To: apmail-streams-commits-archive@streams.apache.org Received: (qmail 84207 invoked by uid 500); 4 Sep 2014 17:12:13 -0000 Mailing-List: contact commits-help@streams.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@streams.incubator.apache.org Delivered-To: mailing list commits@streams.incubator.apache.org Received: (qmail 84198 invoked by uid 99); 4 Sep 2014 17:12:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2014 17:12:13 +0000 X-ASF-Spam-Status: No, hits=-2001.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 Sep 2014 17:12:10 +0000 Received: (qmail 83061 invoked by uid 99); 4 Sep 2014 17:11:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2014 17:11:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AAEADA082DE; Thu, 4 Sep 2014 17:11:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sblackmon@apache.org To: commits@streams.incubator.apache.org Date: Thu, 04 Sep 2014 17:12:25 -0000 Message-Id: <09d95a04090f4460a93247fd08430c8e@git.apache.org> In-Reply-To: <1f0cf972e6c64f87936d0d9bca2bc4c6@git.apache.org> References: <1f0cf972e6c64f87936d0d9bca2bc4c6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [37/41] git commit: STREAMS-157 | Modified the way that IDs are set so that we are more tolerant to null values, which can be necessary X-Virus-Checked: Checked by ClamAV on apache.org STREAMS-157 | Modified the way that IDs are set so that we are more tolerant to null values, which can be necessary Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/873c232e Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/873c232e Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/873c232e Branch: refs/heads/pp Commit: 873c232eca7ee81761092988d072b0ec6505501f Parents: 493f43a Author: Robert Douglas Authored: Mon Aug 25 16:26:19 2014 -0500 Committer: Robert Douglas Committed: Mon Aug 25 16:26:19 2014 -0500 ---------------------------------------------------------------------- .../elasticsearch/ElasticsearchPersistWriter.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/873c232e/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java index 4edc60f..664dd24 100644 --- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java +++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java @@ -146,9 +146,7 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, DatumSt String index = (String) streamsDatum.getMetadata().get("index"); String type = (String) streamsDatum.getMetadata().get("type"); - String id = Optional.fromNullable( - (String) streamsDatum.getMetadata().get("id")) - .or(streamsDatum.getId()); + String id = setId(streamsDatum); if(index == null || (config.getForceUseConfig() != null && config.getForceUseConfig())) { index = config.getIndex(); @@ -166,6 +164,17 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, DatumSt } } + private String setId(StreamsDatum streamsDatum) { + String id = Optional.fromNullable( + (String) streamsDatum.getMetadata().get("id")) + .orNull(); + + if(id == null) + id = Optional.fromNullable(streamsDatum.getId()) + .orNull(); + + return id; + } private String convertAndAppendMetadata(StreamsDatum streamsDatum) throws IOException { Object object = streamsDatum.getDocument();