Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0E8B618B61 for ; Fri, 15 Jan 2016 15:05:54 +0000 (UTC) Received: (qmail 65434 invoked by uid 500); 15 Jan 2016 15:05:54 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 65372 invoked by uid 500); 15 Jan 2016 15:05:54 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 65363 invoked by uid 99); 15 Jan 2016 15:05:53 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2016 15:05:53 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 832A5C2356 for ; Fri, 15 Jan 2016 15:05:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 9K3kJ1csdwoS for ; Fri, 15 Jan 2016 15:05:52 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id 8CEB931AC4 for ; Fri, 15 Jan 2016 15:05:51 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 96E05E04F2 for ; Fri, 15 Jan 2016 15:05:50 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 64EC03A0142 for ; Fri, 15 Jan 2016 15:05:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1724831 - in /sling/trunk/contrib/extensions/sling-pipes/src: main/java/org/apache/sling/pipes/WritePipe.java test/java/org/apache/sling/pipes/WritePipeTest.java test/resources/fruits.json test/resources/write.json Date: Fri, 15 Jan 2016 15:05:50 -0000 To: commits@sling.apache.org From: rombert@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160115150550.64EC03A0142@svn01-us-west.apache.org> Author: rombert Date: Fri Jan 15 15:05:49 2016 New Revision: 1724831 URL: http://svn.apache.org/viewvc?rev=1724831&view=rev Log: SLING-5433 - WritePipe should remove a property when value is evaluated as null Submitted-By: Nicolas Peltier Modified: sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/WritePipe.java sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java sling/trunk/contrib/extensions/sling-pipes/src/test/resources/fruits.json sling/trunk/contrib/extensions/sling-pipes/src/test/resources/write.json Modified: sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/WritePipe.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/WritePipe.java?rev=1724831&r1=1724830&r2=1724831&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/WritePipe.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/WritePipe.java Fri Jan 15 15:05:49 2016 @@ -112,7 +112,7 @@ public class WritePipe extends BasePipe if (value == null) { //null value are not handled by modifiable value maps, //removing the property if it exists - Resource propertyResource = resource.getChild(key); + Resource propertyResource = target.getChild(key); if (propertyResource != null) { logger.info("removing {}", propertyResource.getPath()); if (!isDryRun()){ Modified: sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java?rev=1724831&r1=1724830&r2=1724831&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java Fri Jan 15 15:05:49 2016 @@ -53,6 +53,7 @@ public class WritePipeTest extends Abstr ValueMap properties = context.resourceResolver().getResource("/content/fruits/apple").adaptTo(ValueMap.class); assertTrue("There should be hasSeed set to true", properties.get("hasSeed", false)); assertArrayEquals("Colors should be correctly set", new String[]{"green", "red"}, properties.get("colors", String[].class)); + assertFalse("worm property should be gone (${null} conf)", properties.get("worm", false)); } /** Modified: sling/trunk/contrib/extensions/sling-pipes/src/test/resources/fruits.json URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/resources/fruits.json?rev=1724831&r1=1724830&r2=1724831&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/test/resources/fruits.json (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/test/resources/fruits.json Fri Jan 15 15:05:49 2016 @@ -3,6 +3,7 @@ "index":["apple","banana"], "apple":{ "jcr:primaryType":"nt:unstructured", + "worm":"true", "isnota":{ "jcr:primaryType":"nt:unstructured", "pea":{ Modified: sling/trunk/contrib/extensions/sling-pipes/src/test/resources/write.json URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/resources/write.json?rev=1724831&r1=1724830&r2=1724831&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/test/resources/write.json (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/test/resources/write.json Fri Jan 15 15:05:49 2016 @@ -7,6 +7,7 @@ "conf": { "jcr:primaryType":"nt:unstructured", "hasSeed":true, + "worm":"${null}", "colors":["green","red"] } },