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 13B1311EC3 for ; Wed, 17 Sep 2014 22:02:04 +0000 (UTC) Received: (qmail 65118 invoked by uid 500); 17 Sep 2014 22:02:04 -0000 Delivered-To: apmail-streams-commits-archive@streams.apache.org Received: (qmail 65095 invoked by uid 500); 17 Sep 2014 22:02:04 -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 65086 invoked by uid 99); 17 Sep 2014 22:02:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2014 22:02:03 +0000 X-ASF-Spam-Status: No, hits=-2000.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; Wed, 17 Sep 2014 22:01:40 +0000 Received: (qmail 64297 invoked by uid 99); 17 Sep 2014 22:01:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2014 22:01:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 81AD6A19A65; Wed, 17 Sep 2014 22:01:37 +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: Wed, 17 Sep 2014 22:01:37 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: writer should work without metadata X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-streams Updated Branches: refs/heads/master 35a8fbf4b -> b4d71241b writer should work without metadata Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/df00e4a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/df00e4a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/df00e4a0 Branch: refs/heads/master Commit: df00e4a06376bacda755618595922cd3382d121a Parents: 3ee5175 Author: Steve Blackmon Authored: Thu Sep 11 11:32:53 2014 -0500 Committer: Steve Blackmon Committed: Thu Sep 11 11:32:53 2014 -0500 ---------------------------------------------------------------------- .../elasticsearch/ElasticsearchPersistWriter.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/df00e4a0/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 664dd24..bfb21f5 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 @@ -144,9 +144,18 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, DatumSt checkForBackOff(); - String index = (String) streamsDatum.getMetadata().get("index"); - String type = (String) streamsDatum.getMetadata().get("type"); - String id = setId(streamsDatum); + Map metadata = streamsDatum.getMetadata(); + + String index = null; + String type = null; + String id = streamsDatum.getId(); + + if( metadata != null && metadata.containsKey("index")) + index = (String) streamsDatum.getMetadata().get("index"); + if( metadata != null && metadata.containsKey("type")) + type = (String) streamsDatum.getMetadata().get("type"); + if( id == null && metadata != null && metadata.containsKey("id")) + id = (String) streamsDatum.getMetadata().get("id"); if(index == null || (config.getForceUseConfig() != null && config.getForceUseConfig())) { index = config.getIndex();