camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/7] git commit: CAMEL-7064: Recognize existing nodes when iterating over provided path.
Date Thu, 12 Dec 2013 19:00:41 GMT
Updated Branches:
  refs/heads/camel-2.11.x 55de0d8b0 -> 9745451f3
  refs/heads/camel-2.12.x 93101ecbb -> 685f0b797
  refs/heads/master 051eef801 -> 4dc455378


CAMEL-7064: Recognize existing nodes when iterating over provided path.

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/548f83e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/548f83e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/548f83e9

Branch: refs/heads/master
Commit: 548f83e94a860d6091d300ca2db51785935e1737
Parents: 9cfd309
Author: Gregor Zurowski <gregor.zurowski@sothebys.com>
Authored: Thu Dec 12 12:03:28 2013 -0500
Committer: Gregor Zurowski <gregor.zurowski@sothebys.com>
Committed: Thu Dec 12 12:03:28 2013 -0500

----------------------------------------------------------------------
 .../apache/camel/component/jcr/JcrProducer.java |  8 +-
 .../component/jcr/JcrProducerSubNodeTest.java   | 84 ++++++++++++++++++++
 2 files changed, 90 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/548f83e9/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
index 2cbc1b5..fd7c950 100644
--- a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
+++ b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
@@ -123,8 +123,12 @@ public class JcrProducer extends DefaultProducer {
         Node result = parent;
         for (String component : path.split("/")) {
             component = Text.escapeIllegalJcrChars(component);
-            if (component.length() > 0 && !result.hasNode(component)) {
-                result = result.addNode(component);
+            if (component.length() > 0) {
+                if (result.hasNode(component)) {
+                    result = result.getNode(component);
+                } else {
+                    result = result.addNode(component);
+                }
             }
         }
         return result;

http://git-wip-us.apache.org/repos/asf/camel/blob/548f83e9/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
new file mode 100644
index 0000000..9123ab4
--- /dev/null
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jcr;
+
+import javax.jcr.Node;
+import javax.jcr.Session;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.ExchangeBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Before;
+import org.junit.Test;
+
+public class JcrProducerSubNodeTest extends JcrRouteTestSupport {
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        deleteDirectory("target/repository");
+        super.setUp();
+    }
+
+    @Test
+    public void testCreateNodeAndSubNode() throws Exception {
+        Session session = openSession();
+
+        try {
+            // create node
+            Exchange exchange1 = ExchangeBuilder.anExchange(context)
+                .withProperty(JcrConstants.JCR_NODE_NAME, "node")
+                .build();
+            Exchange out1 = template.send("direct:a", exchange1);
+            assertNotNull(out1);
+            String uuidNode = out1.getOut().getBody(String.class);
+
+            Node node = session.getNodeByIdentifier(uuidNode);
+            assertNotNull(node);
+            assertEquals("/home/test/node", node.getPath());
+            
+            // create sub node
+            Exchange exchange2 = ExchangeBuilder.anExchange(context)
+                .withProperty(JcrConstants.JCR_NODE_NAME, "node/subnode")
+                .build();
+            Exchange out2 = template.send("direct:a", exchange2);
+            assertNotNull(out2);
+            String uuidSubNode = out2.getOut().getBody(String.class);
+            
+            Node subNode = session.getNodeByIdentifier(uuidSubNode);
+            assertNotNull(subNode);
+            assertEquals("/home/test/node/subnode", subNode.getPath());
+            assertNotNull(subNode.getParent());
+            assertEquals("/home/test/node", subNode.getParent().getPath());
+        } finally {
+            if (session != null && session.isLive()) {
+                session.logout();
+            }
+        }
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:a")
+                .to("jcr://user:pass@repository/home/test");
+            }
+        };
+    }
+}


Mime
View raw message