[dna-commits] DNA SVN: r848 - trunk/dna-graph/src/main/java/org/jboss/dna/graph.
dna-commits at lists.jboss.org
dna-commits at lists.jboss.org
Thu Apr 23 12:29:29 EDT 2009
Author: rhauch
Date: 2009-04-23 12:29:28 -0400 (Thu, 23 Apr 2009)
New Revision: 848
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java
Log:
DNA-381 The Graph API should allow creating a node if it does not already exist
Added "createIfMissing(...)" methods that mirror the "create(...)" methods, but which use a different NodeConflictBehavior setting.
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java 2009-04-23 16:25:30 UTC (rev 847)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java 2009-04-23 16:29:28 UTC (rev 848)
@@ -945,7 +945,8 @@
}
/**
- * Begin the request to create a node located at the supplied path. This request is submitted to the repository immediately.
+ * Begin the request to create a node located at the supplied path, if the node does not exist. This request is submitted to
+ * the repository immediately.
* <p>
* If you have the {@link Location} of the parent (for the new node) from a previous request, it is better and more efficient
* to use {@link #createUnder(Location)}. However, this method work just as well if all you have is the {@link Path} to the
@@ -966,6 +967,131 @@
}
/**
+ * Begin the request to create a node located at the supplied path, if the node does not exist. This request is submitted to
+ * the repository immediately.
+ * <p>
+ * If you have the {@link Location} of the parent (for the new node) from a previous request, it is better and more efficient
+ * to use {@link #createUnder(Location)}. However, this method work just as well if all you have is the {@link Path} to the
+ * parent or new node.
+ * </p>
+ *
+ * @param atPath the path to the node that is to be created.
+ * @return an object that may be used to start another request
+ */
+ public GetNodeConjunction<Graph> createIfMissing( String atPath ) {
+ Path at = createPath(atPath);
+ Path parent = at.getParent();
+ Name child = at.getLastSegment().getName();
+ Location location = requests.createNode(Location.create(parent),
+ getCurrentWorkspaceName(),
+ child,
+ EMPTY_PROPERTIES,
+ NodeConflictBehavior.DO_NOT_REPLACE).getActualLocationOfNode();
+ return new GetNodeOrReturnGraph(location);
+ }
+
+ /**
+ * Begin the request to create a node located at the supplied path, if the node does not exist. This request is submitted to
+ * the repository immediately.
+ * <p>
+ * If you have the {@link Location} of the parent (for the new node) from a previous request, it is better and more efficient
+ * to use {@link #createUnder(Location)}. However, this method work just as well if all you have is the {@link Path} to the
+ * parent or new node.
+ * </p>
+ *
+ * @param at the path to the node that is to be created.
+ * @return an object that may be used to start another request
+ */
+ public GetNodeConjunction<Graph> createIfMissing( final Path at ) {
+ Path parent = at.getParent();
+ Name child = at.getLastSegment().getName();
+ Location location = requests.createNode(Location.create(parent),
+ getCurrentWorkspaceName(),
+ child,
+ EMPTY_PROPERTIES,
+ NodeConflictBehavior.DO_NOT_REPLACE).getActualLocationOfNode();
+ return new GetNodeOrReturnGraph(location);
+ }
+
+ /**
+ * Begin the request to create a node located at the supplied path, if the node does not exist. This request is submitted to
+ * the repository immediately.
+ * <p>
+ * If you have the {@link Location} of the parent (for the new node) from a previous request, it is better and more efficient
+ * to use {@link #createUnder(Location)}. However, this method work just as well if all you have is the {@link Path} to the
+ * parent or new node.
+ * </p>
+ *
+ * @param atPath the path to the node that is to be created.
+ * @param properties the properties for the new node
+ * @return an object that may be used to start another request
+ */
+ public GetNodeConjunction<Graph> createIfMissing( String atPath,
+ Property... properties ) {
+ Path at = createPath(atPath);
+ Path parent = at.getParent();
+ Name child = at.getLastSegment().getName();
+ Location location = requests.createNode(Location.create(parent),
+ getCurrentWorkspaceName(),
+ child,
+ properties,
+ NodeConflictBehavior.UPDATE).getActualLocationOfNode();
+ return new GetNodeOrReturnGraph(location);
+ }
+
+ /**
+ * Begin the request to create a node located at the supplied path, if the node does not exist. This request is submitted to
+ * the repository immediately.
+ * <p>
+ * If you have the {@link Location} of the parent (for the new node) from a previous request, it is better and more efficient
+ * to use {@link #createUnder(Location)}. However, this method work just as well if all you have is the {@link Path} to the
+ * parent or new node.
+ * </p>
+ *
+ * @param at the path to the node that is to be created.
+ * @param properties the properties for the new node
+ * @return an object that may be used to start another request
+ */
+ public GetNodeConjunction<Graph> createIfMissing( Path at,
+ Property... properties ) {
+ CheckArg.isNotNull(at, "at");
+ Path parent = at.getParent();
+ Name child = at.getLastSegment().getName();
+ Location location = requests.createNode(Location.create(parent),
+ getCurrentWorkspaceName(),
+ child,
+ properties,
+ NodeConflictBehavior.UPDATE).getActualLocationOfNode();
+ return new GetNodeOrReturnGraph(location);
+ }
+
+ /**
+ * Begin the request to create a node located at the supplied path, if the node does not exist. This request is submitted to
+ * the repository immediately.
+ * <p>
+ * If you have the {@link Location} of the parent (for the new node) from a previous request, it is better and more efficient
+ * to use {@link #createUnder(Location)}. However, this method work just as well if all you have is the {@link Path} to the
+ * parent or new node.
+ * </p>
+ *
+ * @param at the path to the node that is to be created.
+ * @param properties the properties for the new node
+ * @return an object that may be used to start another request
+ */
+ public GetNodeConjunction<Graph> createIfMissing( Path at,
+ Iterable<Property> properties ) {
+ CheckArg.isNotNull(at, "at");
+ Path parent = at.getParent();
+ Name child = at.getLastSegment().getName();
+ Location location = requests.createNode(Location.create(parent),
+ getCurrentWorkspaceName(),
+ child,
+ properties.iterator(),
+ NodeConflictBehavior.UPDATE).getActualLocationOfNode();
+ return new GetNodeOrReturnGraph(location);
+ }
+
+ /**
* Begin the request to create a node under the existing parent node at the supplied location. Use this method if you are
* creating a node when you have the {@link Location} of a parent from a previous request.
* <p>
@@ -2901,11 +3027,12 @@
public On<BatchConjunction> to( Object firstValue,
Object... otherValues ) {
- firstValue = convertReferenceValue(firstValue);
+ Object[] values = new Object[otherValues.length + 1];
+ values[0] = convertReferenceValue(firstValue);
for (int i = 0, len = otherValues.length; i != len; ++i) {
- otherValues[i] = convertReferenceValue(otherValues[i]);
+ values[i + 1] = convertReferenceValue(otherValues[i]);
}
- return set(getContext().getPropertyFactory().create(propertyName, firstValue, otherValues));
+ return set(getContext().getPropertyFactory().create(propertyName, values));
}
public On<BatchConjunction> to( Iterable<?> values ) {
@@ -4699,6 +4826,37 @@
public interface BatchConjunction extends Conjunction<Batch>, Executable<Node> {
}
+ public interface GetNodeConjunction<Next> extends Conjunction<Next> {
+ Node andReturn();
+ }
+
+ protected class GetNodeOrReturnGraph implements GetNodeConjunction<Graph> {
+ private final Location location;
+
+ GetNodeOrReturnGraph( Location location ) {
+ assert location != null;
+ this.location = location;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.graph.Graph.Conjunction#and()
+ */
+ public Graph and() {
+ return Graph.this;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.graph.Graph.GetNodeConjunction#andReturn()
+ */
+ public Node andReturn() {
+ return and().getNodeAt(location);
+ }
+ }
+
// ----------------------------------------------------------------------------------------------------------------
// Node Implementation
// ----------------------------------------------------------------------------------------------------------------
More information about the dna-commits
mailing list