curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject curator git commit: minor renaming - beginning of site doc
Date Tue, 03 May 2016 17:36:56 GMT
Repository: curator
Updated Branches:
  refs/heads/CURATOR-322 93a2a74c4 -> 3d9eb203b


minor renaming - beginning of site doc


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/3d9eb203
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3d9eb203
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/3d9eb203

Branch: refs/heads/CURATOR-322
Commit: 3d9eb203b41736b9c314eac2f3a22b7b4034f0bc
Parents: 93a2a74
Author: randgalt <randgalt@apache.org>
Authored: Tue May 3 12:35:33 2016 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Tue May 3 12:35:33 2016 -0500

----------------------------------------------------------------------
 .../framework/imps/CuratorMultiTransactionImpl.java       |  2 +-
 .../apache/curator/framework/imps/DeleteBuilderImpl.java  |  2 +-
 .../apache/curator/framework/imps/ExistsBuilderImpl.java  |  2 +-
 .../curator/framework/imps/GetChildrenBuilderImpl.java    |  2 +-
 .../apache/curator/framework/imps/GetDataBuilderImpl.java |  2 +-
 .../java/org/apache/curator/framework/schema/Schema.java  |  4 ++--
 curator-framework/src/site/confluence/schema.confluence   | 10 ++++++++++
 src/site/site.xml                                         |  1 +
 8 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/3d9eb203/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
index bfdf40f..a08bd0f 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorMultiTransactionImpl.java
@@ -133,7 +133,7 @@ public class CuratorMultiTransactionImpl implements
             }
             else if ( (curatorOp.get().getType() == ZooDefs.OpCode.delete) || (curatorOp.get().getType()
== ZooDefs.OpCode.deleteContainer) )
             {
-                schema.validateDeletion();
+                schema.validateDelete();
             }
             else if ( curatorOp.get().getType() == ZooDefs.OpCode.setData )
             {

http://git-wip-us.apache.org/repos/asf/curator/blob/3d9eb203/curator-framework/src/main/java/org/apache/curator/framework/imps/DeleteBuilderImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/DeleteBuilderImpl.java
b/curator-framework/src/main/java/org/apache/curator/framework/imps/DeleteBuilderImpl.java
index 54aac54..cbd12dd 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/DeleteBuilderImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/DeleteBuilderImpl.java
@@ -213,7 +213,7 @@ class DeleteBuilderImpl implements DeleteBuilder, BackgroundOperation<String>,
E
     @Override
     public Void forPath(String path) throws Exception
     {
-        client.getSchemaSet().getSchema(path).validateDeletion();
+        client.getSchemaSet().getSchema(path).validateDelete();
 
         final String unfixedPath = path;
         path = client.fixForNamespace(path);

http://git-wip-us.apache.org/repos/asf/curator/blob/3d9eb203/curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java
b/curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java
index 11721de..dd50efb 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/ExistsBuilderImpl.java
@@ -158,7 +158,7 @@ class ExistsBuilderImpl implements ExistsBuilder, BackgroundOperation<String>,
E
     {
         path = client.fixForNamespace(path);
 
-        client.getSchemaSet().getSchema(path).validateWatcher(watching.isWatched() || watching.hasWatcher());
+        client.getSchemaSet().getSchema(path).validateWatch(watching.isWatched() || watching.hasWatcher());
 
         Stat        returnStat = null;
         if ( backgrounding.inBackground() )

http://git-wip-us.apache.org/repos/asf/curator/blob/3d9eb203/curator-framework/src/main/java/org/apache/curator/framework/imps/GetChildrenBuilderImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/GetChildrenBuilderImpl.java
b/curator-framework/src/main/java/org/apache/curator/framework/imps/GetChildrenBuilderImpl.java
index e88f58f..0b1bb07 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/GetChildrenBuilderImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/GetChildrenBuilderImpl.java
@@ -195,7 +195,7 @@ class GetChildrenBuilderImpl implements GetChildrenBuilder, BackgroundOperation<
     @Override
     public List<String> forPath(String path) throws Exception
     {
-        client.getSchemaSet().getSchema(path).validateWatcher(watching.isWatched() || watching.hasWatcher());
+        client.getSchemaSet().getSchema(path).validateWatch(watching.isWatched() || watching.hasWatcher());
 
         path = client.fixForNamespace(path);
 

http://git-wip-us.apache.org/repos/asf/curator/blob/3d9eb203/curator-framework/src/main/java/org/apache/curator/framework/imps/GetDataBuilderImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/GetDataBuilderImpl.java
b/curator-framework/src/main/java/org/apache/curator/framework/imps/GetDataBuilderImpl.java
index 78bfd39..5528138 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/GetDataBuilderImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/GetDataBuilderImpl.java
@@ -275,7 +275,7 @@ class GetDataBuilderImpl implements GetDataBuilder, BackgroundOperation<String>,
     @Override
     public byte[] forPath(String path) throws Exception
     {
-        client.getSchemaSet().getSchema(path).validateWatcher(watching.isWatched() || watching.hasWatcher());
+        client.getSchemaSet().getSchema(path).validateWatch(watching.isWatched() || watching.hasWatcher());
 
         path = client.fixForNamespace(path);
 

http://git-wip-us.apache.org/repos/asf/curator/blob/3d9eb203/curator-framework/src/main/java/org/apache/curator/framework/schema/Schema.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/schema/Schema.java
b/curator-framework/src/main/java/org/apache/curator/framework/schema/Schema.java
index 3710dd8..465085d 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/schema/Schema.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/schema/Schema.java
@@ -86,7 +86,7 @@ public class Schema
      *
      * @throws SchemaViolation if schema does not allow znode deletion
      */
-    public void validateDeletion()
+    public void validateDelete()
     {
         if ( !canBeDeleted )
         {
@@ -100,7 +100,7 @@ public class Schema
      * @param isWatching true if attempt is being made to watch node
      * @throws SchemaViolation if schema's watching setting does not match
      */
-    public void validateWatcher(boolean isWatching)
+    public void validateWatch(boolean isWatching)
     {
         if ( isWatching && (watched == Allowance.CANNOT) )
         {

http://git-wip-us.apache.org/repos/asf/curator/blob/3d9eb203/curator-framework/src/site/confluence/schema.confluence
----------------------------------------------------------------------
diff --git a/curator-framework/src/site/confluence/schema.confluence b/curator-framework/src/site/confluence/schema.confluence
new file mode 100644
index 0000000..57420ca
--- /dev/null
+++ b/curator-framework/src/site/confluence/schema.confluence
@@ -0,0 +1,10 @@
+h1. Schema/Documentation Support
+
+Curator provides a mechanism to:
+
+* Document your ZooKeeper paths
+* Validate operations on ZooKeeper paths
+* Map a simple string to a ZooKeeper path
+
+
+

http://git-wip-us.apache.org/repos/asf/curator/blob/3d9eb203/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index cd04ec4..c28df31 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -73,6 +73,7 @@
             <item name="Framework" href="curator-framework/index.html"/>
             <item name="Utilities" href="utilities.html"/>
             <item name="Client" href="curator-client/index.html"/>
+            <item name="Schema Support" href="curator-framework/schema.html"/>
         </menu>
 
         <menu name="Details" inherit="top">


Mime
View raw message