You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ve...@apache.org on 2019/08/07 18:15:54 UTC

svn commit: r1864664 [16/21] - in /ranger/site/trunk: ./ apidocs/ apidocs/ui/ kms/apidocs/ kms/apidocs/ui/

Modified: ranger/site/trunk/apidocs/ui/swagger.json
URL: http://svn.apache.org/viewvc/ranger/site/trunk/apidocs/ui/swagger.json?rev=1864664&r1=1864663&r2=1864664&view=diff
==============================================================================
--- ranger/site/trunk/apidocs/ui/swagger.json (original)
+++ ranger/site/trunk/apidocs/ui/swagger.json Wed Aug  7 18:15:52 2019
@@ -6,7 +6,7 @@
       "url" : "http://www.apache.org/licenses/LICENSE-2.0.html",
       "name" : "Apache 2.0 License"
     },
-    "version" : "2.0.0",
+    "version" : "2.1.0-SNAPSHOT",
     "title" : "Ranger REST API"
   },
   "schemes" : [],
@@ -60,15 +60,15 @@
       "type" : "object",
       "title" : "AccessResult",
           "properties" : {
-            "policy" : {
-            "readOnly" : false,
-"$ref" : "#/definitions/json_RangerPolicy"
-            },
             "isFinal" : {
             "readOnly" : false,
 "description" : "",
 "type" : "boolean"
             },
+            "policy" : {
+            "readOnly" : false,
+"$ref" : "#/definitions/json_RangerPolicy"
+            },
             "result" : {
             "readOnly" : false,
 "description" : "",
@@ -77,155 +77,156 @@
             }
           },
       "example" : {
+  "isFinal" : true,
   "policy" : {
-    "zoneName" : "...",
-    "policyLabels" : [ "...", "..." ],
-    "denyPolicyItems" : [ {
-      "users" : [ "...", "..." ],
+    "resourceSignature" : "...",
+    "description" : "...",
+    "rowFilterPolicyItems" : [ {
+      "rowFilterInfo" : { },
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
-      "users" : [ "...", "..." ],
+      "rowFilterInfo" : { },
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
-    "resources" : {
-      "property1" : {
-        "isRecursive" : true,
-        "values" : [ "...", "..." ],
-        "isExcludes" : true
-      },
-      "property2" : {
-        "isRecursive" : true,
-        "values" : [ "...", "..." ],
-        "isExcludes" : true
-      }
-    },
-    "description" : "...",
     "policyItems" : [ {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    } ],
-    "validitySchedules" : [ {
-      "timeZone" : "...",
-      "endTime" : "...",
-      "recurrences" : [ { }, { } ],
-      "startTime" : "..."
-    }, {
-      "timeZone" : "...",
-      "endTime" : "...",
-      "recurrences" : [ { }, { } ],
-      "startTime" : "..."
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
-    "isAuditEnabled" : true,
-    "policyPriority" : 12345,
-    "service" : "...",
+    "policyType" : 12345,
     "allowExceptions" : [ {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    } ],
-    "conditions" : [ {
-      "type" : "...",
-      "values" : [ "...", "..." ]
-    }, {
-      "type" : "...",
-      "values" : [ "...", "..." ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
+    "service" : "...",
     "denyExceptions" : [ {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
-      "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    }, {
       "users" : [ "...", "..." ],
-      "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    } ],
-    "rowFilterPolicyItems" : [ {
-      "rowFilterInfo" : { },
-      "users" : [ "...", "..." ],
-      "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
+      "conditions" : [ { }, { } ],
       "roles" : [ "...", "..." ],
-      "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "groups" : [ "...", "..." ]
     }, {
-      "rowFilterInfo" : { },
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
-    "name" : "...",
-    "resourceSignature" : "...",
+    "conditions" : [ {
+      "values" : [ "...", "..." ],
+      "type" : "..."
+    }, {
+      "values" : [ "...", "..." ],
+      "type" : "..."
+    } ],
+    "policyPriority" : 12345,
+    "serviceType" : "...",
+    "policyLabels" : [ "...", "..." ],
+    "isDenyAllElse" : true,
     "dataMaskPolicyItems" : [ {
       "dataMaskInfo" : { },
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
       "dataMaskInfo" : { },
+      "accesses" : [ { }, { } ],
       "users" : [ "...", "..." ],
+      "delegateAdmin" : true,
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
+    } ],
+    "validitySchedules" : [ {
+      "recurrences" : [ { }, { } ],
+      "timeZone" : "...",
+      "endTime" : "...",
+      "startTime" : "..."
+    }, {
+      "recurrences" : [ { }, { } ],
+      "timeZone" : "...",
+      "endTime" : "...",
+      "startTime" : "..."
+    } ],
+    "resources" : {
+      "property1" : {
+        "values" : [ "...", "..." ],
+        "isRecursive" : true,
+        "isExcludes" : true
+      },
+      "property2" : {
+        "values" : [ "...", "..." ],
+        "isRecursive" : true,
+        "isExcludes" : true
+      }
+    },
+    "denyPolicyItems" : [ {
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
+      "delegateAdmin" : true,
+      "conditions" : [ { }, { } ],
       "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
+    }, {
+      "accesses" : [ { }, { } ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
+    "zoneName" : "...",
     "options" : {
       "property1" : { },
       "property2" : { }
     },
-    "policyType" : 12345,
-    "serviceType" : "...",
+    "name" : "...",
+    "isAuditEnabled" : true,
     "version" : 12345,
+    "createTime" : 12345,
+    "isEnabled" : true,
     "createdBy" : "...",
-    "updatedBy" : "...",
-    "id" : 12345,
     "guid" : "...",
-    "updateTime" : 12345,
-    "isEnabled" : true,
-    "createTime" : 12345
+    "id" : 12345,
+    "updatedBy" : "...",
+    "updateTime" : 12345
   },
-  "isFinal" : true,
   "result" : 12345
 },
       "description" : ""
@@ -235,7 +236,7 @@
       "type" : "object",
       "title" : "GrantRevokeRequest",
           "properties" : {
-            "replaceExistingPermissions" : {
+            "delegateAdmin" : {
             "readOnly" : false,
 "description" : "",
 "type" : "boolean"
@@ -245,15 +246,15 @@
 "description" : "",
 "type" : "string"
             },
-            "resource" : {
+            "users" : {
             "readOnly" : false,
 "description" : "",
-"type" : "object",
-"additionalProperties" : {
+"type" : "array",
+"items" : {
   "type" : "string"
 }
             },
-            "zoneName" : {
+            "grantor" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
@@ -263,17 +264,22 @@
 "description" : "",
 "type" : "string"
             },
-            "delegateAdmin" : {
+            "clusterName" : {
             "readOnly" : false,
 "description" : "",
-"type" : "boolean"
+"type" : "string"
             },
-            "enableAudit" : {
+            "isRecursive" : {
             "readOnly" : false,
 "description" : "",
 "type" : "boolean"
             },
-            "grantorGroups" : {
+            "clientType" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "string"
+            },
+            "accessTypes" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
@@ -281,7 +287,7 @@
   "type" : "string"
 }
             },
-            "users" : {
+            "grantorGroups" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
@@ -289,11 +295,32 @@
   "type" : "string"
 }
             },
-            "requestData" : {
+            "replaceExistingPermissions" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "boolean"
+            },
+            "resource" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "object",
+"additionalProperties" : {
+  "type" : "string"
+}
+            },
+            "zoneName" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
+            "roles" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "array",
+"items" : {
+  "type" : "string"
+}
+            },
             "groups" : {
             "readOnly" : false,
 "description" : "",
@@ -302,7 +329,47 @@
   "type" : "string"
 }
             },
-            "clientType" : {
+            "requestData" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "string"
+            },
+            "enableAudit" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "boolean"
+            }
+          },
+      "example" : {
+  "delegateAdmin" : true,
+  "clientIPAddress" : "...",
+  "users" : [ "...", "..." ],
+  "grantor" : "...",
+  "sessionId" : "...",
+  "clusterName" : "...",
+  "isRecursive" : true,
+  "clientType" : "...",
+  "accessTypes" : [ "...", "..." ],
+  "grantorGroups" : [ "...", "..." ],
+  "replaceExistingPermissions" : true,
+  "resource" : {
+    "property1" : "...",
+    "property2" : "..."
+  },
+  "zoneName" : "...",
+  "roles" : [ "...", "..." ],
+  "groups" : [ "...", "..." ],
+  "requestData" : "...",
+  "enableAudit" : true
+},
+      "description" : ""
+    }
+    ,
+    "json_GrantRevokeRoleRequest" : {
+      "type" : "object",
+      "title" : "GrantRevokeRoleRequest",
+          "properties" : {
+            "requestData" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
@@ -312,12 +379,31 @@
 "description" : "",
 "type" : "string"
             },
-            "isRecursive" : {
+            "roles" : {
             "readOnly" : false,
 "description" : "",
-"type" : "boolean"
+"type" : "array",
+"items" : {
+  "type" : "string"
+}
             },
-            "accessTypes" : {
+            "targetRoles" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "array",
+"items" : {
+  "type" : "string"
+}
+            },
+            "users" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "array",
+"items" : {
+  "type" : "string"
+}
+            },
+            "grantorGroups" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
@@ -325,32 +411,53 @@
   "type" : "string"
 }
             },
+            "clientIPAddress" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "string"
+            },
+            "sessionId" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "string"
+            },
+            "clientType" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "string"
+            },
             "grantor" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
+            },
+            "grantOption" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "boolean"
+            },
+            "groups" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "array",
+"items" : {
+  "type" : "string"
+}
             }
           },
       "example" : {
-  "replaceExistingPermissions" : true,
+  "requestData" : "...",
+  "clusterName" : "...",
+  "roles" : [ "...", "..." ],
+  "targetRoles" : [ "...", "..." ],
+  "users" : [ "...", "..." ],
+  "grantorGroups" : [ "...", "..." ],
   "clientIPAddress" : "...",
-  "resource" : {
-    "property1" : "...",
-    "property2" : "..."
-  },
-  "zoneName" : "...",
   "sessionId" : "...",
-  "delegateAdmin" : true,
-  "enableAudit" : true,
-  "grantorGroups" : [ "...", "..." ],
-  "users" : [ "...", "..." ],
-  "requestData" : "...",
-  "groups" : [ "...", "..." ],
   "clientType" : "...",
-  "clusterName" : "...",
-  "isRecursive" : true,
-  "accessTypes" : [ "...", "..." ],
-  "grantor" : "..."
+  "grantor" : "...",
+  "grantOption" : true,
+  "groups" : [ "...", "..." ]
 },
       "description" : ""
     }
@@ -377,33 +484,33 @@
 "description" : "",
 "type" : "string"
             },
-            "message" : {
+            "objectId" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "number"
             },
-            "name" : {
+            "rbKey" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "rbKey" : {
+            "message" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "objectId" : {
+            "name" : {
             "readOnly" : false,
 "description" : "",
-"type" : "number"
+"type" : "string"
             }
           },
       "example" : {
   "fieldName" : "...",
-  "message" : "...",
-  "name" : "...",
+  "objectId" : 12345,
   "rbKey" : "...",
-  "objectId" : 12345
+  "message" : "...",
+  "name" : "..."
 },
       "description" : ""
     }
@@ -412,15 +519,13 @@
       "type" : "object",
       "title" : "RESTResponse",
           "properties" : {
-            "messageList" : {
+            "statusCode" : {
             "readOnly" : false,
 "description" : "",
-"type" : "array",
-"items" : {
-  "$ref" : "#/definitions/json_Message"
-}
+"type" : "integer",
+"format" : "int32"
             },
-            "statusCode" : {
+            "httpStatusCode" : {
             "readOnly" : false,
 "description" : "",
 "type" : "integer",
@@ -431,36 +536,38 @@
 "description" : "",
 "type" : "string"
             },
-            "httpStatusCode" : {
+            "msgDesc" : {
             "readOnly" : false,
 "description" : "",
-"type" : "integer",
-"format" : "int32"
+"type" : "string"
             },
-            "msgDesc" : {
+            "messageList" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "array",
+"items" : {
+  "$ref" : "#/definitions/json_Message"
+}
             }
           },
       "example" : {
+  "statusCode" : 12345,
+  "httpStatusCode" : 12345,
+  "message" : "...",
+  "msgDesc" : "...",
   "messageList" : [ {
     "fieldName" : "...",
-    "message" : "...",
-    "name" : "...",
+    "objectId" : 12345,
     "rbKey" : "...",
-    "objectId" : 12345
+    "message" : "...",
+    "name" : "..."
   }, {
     "fieldName" : "...",
-    "message" : "...",
-    "name" : "...",
+    "objectId" : 12345,
     "rbKey" : "...",
-    "objectId" : 12345
-  } ],
-  "statusCode" : 12345,
-  "message" : "...",
-  "httpStatusCode" : 12345,
-  "msgDesc" : "..."
+    "message" : "...",
+    "name" : "..."
+  } ]
 },
       "description" : ""
     }
@@ -469,41 +576,36 @@
       "type" : "object",
       "title" : "RangerAccessResource",
           "properties" : {
-            "serviceDef" : {
+            "readOnlyCopy" : {
             "readOnly" : false,
-"$ref" : "#/definitions/json_RangerServiceDef"
+"$ref" : "#/definitions/json_RangerAccessResource"
             },
-            "ownerUser" : {
+            "asMap" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "object",
+"additionalProperties" : {
+  "type" : "object"
+}
             },
-            "cacheKey" : {
+            "ownerUser" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "leafName" : {
+            "serviceDef" : {
             "readOnly" : false,
-"description" : "",
-"type" : "string"
+"$ref" : "#/definitions/json_RangerServiceDef"
             },
             "asString" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "asMap" : {
+            "leafName" : {
             "readOnly" : false,
 "description" : "",
-"type" : "object",
-"additionalProperties" : {
-  "type" : "object"
-}
-            },
-            "readOnlyCopy" : {
-            "readOnly" : false,
-"$ref" : "#/definitions/json_RangerAccessResource"
+"type" : "string"
             },
             "keys" : {
             "readOnly" : false,
@@ -512,148 +614,144 @@
 "items" : {
   "type" : "string"
 }
+            },
+            "cacheKey" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "string"
             }
           },
       "example" : {
+  "readOnlyCopy" : {
+    "readOnlyCopy" : { },
+    "asMap" : {
+      "property1" : { },
+      "property2" : { }
+    },
+    "ownerUser" : "...",
+    "serviceDef" : {
+      "enums" : [ { }, { } ],
+      "rbKeyLabel" : "...",
+      "dataMaskDef" : { },
+      "label" : "...",
+      "description" : "...",
+      "name" : "...",
+      "rbKeyDescription" : "...",
+      "contextEnrichers" : [ { }, { } ],
+      "implClass" : "...",
+      "policyConditions" : [ { }, { } ],
+      "accessTypes" : [ { }, { } ],
+      "rowFilterDef" : { },
+      "configs" : [ { }, { } ],
+      "resources" : [ { }, { } ],
+      "options" : {
+        "property1" : "...",
+        "property2" : "..."
+      },
+      "version" : 12345,
+      "createTime" : 12345,
+      "isEnabled" : true,
+      "createdBy" : "...",
+      "guid" : "...",
+      "id" : 12345,
+      "updatedBy" : "...",
+      "updateTime" : 12345
+    },
+    "asString" : "...",
+    "leafName" : "...",
+    "keys" : [ "...", "..." ],
+    "cacheKey" : "..."
+  },
+  "asMap" : {
+    "property1" : { },
+    "property2" : { }
+  },
+  "ownerUser" : "...",
   "serviceDef" : {
     "enums" : [ {
+      "name" : "...",
       "defaultIndex" : 12345,
-      "elements" : [ { }, { } ],
       "itemId" : 12345,
-      "name" : "..."
+      "elements" : [ { }, { } ]
     }, {
+      "name" : "...",
       "defaultIndex" : 12345,
-      "elements" : [ { }, { } ],
       "itemId" : 12345,
-      "name" : "..."
+      "elements" : [ { }, { } ]
     } ],
+    "rbKeyLabel" : "...",
+    "dataMaskDef" : {
+      "resources" : [ { }, { } ],
+      "accessTypes" : [ { }, { } ],
+      "maskTypes" : [ { }, { } ]
+    },
+    "label" : "...",
+    "description" : "...",
     "name" : "...",
+    "rbKeyDescription" : "...",
     "contextEnrichers" : [ {
       "enricherOptions" : {
         "property1" : "...",
         "property2" : "..."
       },
-      "itemId" : 12345,
       "enricher" : "...",
-      "name" : "..."
+      "name" : "...",
+      "itemId" : 12345
     }, {
       "enricherOptions" : {
         "property1" : "...",
         "property2" : "..."
       },
-      "itemId" : 12345,
       "enricher" : "...",
-      "name" : "..."
+      "name" : "...",
+      "itemId" : 12345
     } ],
-    "options" : {
-      "property1" : "...",
-      "property2" : "..."
-    },
-    "resources" : [ {
+    "implClass" : "...",
+    "policyConditions" : [ {
+      "name" : "...",
+      "description" : "...",
+      "evaluatorOptions" : {
+        "property1" : "...",
+        "property2" : "..."
+      },
       "validationMessage" : "...",
+      "rbKeyValidationMessage" : "...",
+      "validationRegEx" : "...",
       "label" : "...",
-      "excludesSupported" : true,
       "uiHint" : "...",
-      "isValidLeaf" : true,
-      "type" : "...",
-      "level" : 12345,
-      "description" : "...",
-      "rbKeyDescription" : "...",
-      "recursiveSupported" : true,
-      "lookupSupported" : true,
+      "itemId" : 12345,
       "rbKeyLabel" : "...",
-      "matcher" : "...",
-      "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
-      "mandatory" : true,
-      "parent" : "...",
+      "rbKeyDescription" : "...",
+      "evaluator" : "..."
+    }, {
       "name" : "...",
-      "accessTypeRestrictions" : [ "...", "..." ],
-      "itemId" : 12345,
-      "matcherOptions" : {
+      "description" : "...",
+      "evaluatorOptions" : {
         "property1" : "...",
         "property2" : "..."
-      }
-    }, {
+      },
       "validationMessage" : "...",
-      "label" : "...",
-      "excludesSupported" : true,
-      "uiHint" : "...",
-      "isValidLeaf" : true,
-      "type" : "...",
-      "level" : 12345,
-      "description" : "...",
-      "rbKeyDescription" : "...",
-      "recursiveSupported" : true,
-      "lookupSupported" : true,
-      "rbKeyLabel" : "...",
-      "matcher" : "...",
       "rbKeyValidationMessage" : "...",
       "validationRegEx" : "...",
-      "mandatory" : true,
-      "parent" : "...",
-      "name" : "...",
-      "accessTypeRestrictions" : [ "...", "..." ],
-      "itemId" : 12345,
-      "matcherOptions" : {
-        "property1" : "...",
-        "property2" : "..."
-      }
-    } ],
-    "accessTypes" : [ {
-      "name" : "...",
-      "label" : "...",
-      "itemId" : 12345,
-      "rbKeyLabel" : "...",
-      "impliedGrants" : [ "...", "..." ]
-    }, {
-      "name" : "...",
       "label" : "...",
+      "uiHint" : "...",
       "itemId" : 12345,
       "rbKeyLabel" : "...",
-      "impliedGrants" : [ "...", "..." ]
+      "rbKeyDescription" : "...",
+      "evaluator" : "..."
     } ],
-    "rbKeyDescription" : "...",
-    "description" : "...",
-    "rbKeyLabel" : "...",
-    "label" : "...",
-    "dataMaskDef" : {
-      "accessTypes" : [ { }, { } ],
-      "resources" : [ { }, { } ],
-      "maskTypes" : [ { }, { } ]
-    },
-    "policyConditions" : [ {
-      "label" : "...",
-      "uiHint" : "...",
+    "accessTypes" : [ {
       "name" : "...",
-      "evaluatorOptions" : {
-        "property1" : "...",
-        "property2" : "..."
-      },
-      "description" : "...",
-      "itemId" : 12345,
-      "rbKeyDescription" : "...",
-      "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
       "rbKeyLabel" : "...",
-      "evaluator" : "...",
-      "validationMessage" : "..."
-    }, {
       "label" : "...",
-      "uiHint" : "...",
+      "impliedGrants" : [ "...", "..." ],
+      "itemId" : 12345
+    }, {
       "name" : "...",
-      "evaluatorOptions" : {
-        "property1" : "...",
-        "property2" : "..."
-      },
-      "description" : "...",
-      "itemId" : 12345,
-      "rbKeyDescription" : "...",
-      "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
       "rbKeyLabel" : "...",
-      "evaluator" : "...",
-      "validationMessage" : "..."
+      "label" : "...",
+      "impliedGrants" : [ "...", "..." ],
+      "itemId" : 12345
     } ],
     "rowFilterDef" : {
       "resources" : [ { }, { } ],
@@ -661,94 +759,103 @@
     },
     "configs" : [ {
       "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
-      "mandatory" : true,
+      "rbKeyDescription" : "...",
+      "description" : "...",
+      "itemId" : 12345,
+      "validationMessage" : "...",
       "label" : "...",
-      "rbKeyLabel" : "...",
+      "name" : "...",
       "type" : "...",
-      "subType" : "...",
-      "rbKeyDescription" : "...",
+      "mandatory" : true,
       "defaultValue" : "...",
-      "description" : "...",
+      "rbKeyLabel" : "...",
+      "subType" : "...",
       "uiHint" : "...",
-      "name" : "...",
-      "itemId" : 12345,
-      "validationMessage" : "..."
+      "validationRegEx" : "..."
     }, {
       "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
-      "mandatory" : true,
+      "rbKeyDescription" : "...",
+      "description" : "...",
+      "itemId" : 12345,
+      "validationMessage" : "...",
       "label" : "...",
-      "rbKeyLabel" : "...",
+      "name" : "...",
       "type" : "...",
-      "subType" : "...",
-      "rbKeyDescription" : "...",
+      "mandatory" : true,
       "defaultValue" : "...",
-      "description" : "...",
+      "rbKeyLabel" : "...",
+      "subType" : "...",
       "uiHint" : "...",
-      "name" : "...",
-      "itemId" : 12345,
-      "validationMessage" : "..."
+      "validationRegEx" : "..."
     } ],
-    "implClass" : "...",
-    "version" : 12345,
-    "createdBy" : "...",
-    "updatedBy" : "...",
-    "id" : 12345,
-    "guid" : "...",
-    "updateTime" : 12345,
-    "isEnabled" : true,
-    "createTime" : 12345
-  },
-  "ownerUser" : "...",
-  "cacheKey" : "...",
-  "leafName" : "...",
-  "asString" : "...",
-  "asMap" : {
-    "property1" : { },
-    "property2" : { }
-  },
-  "readOnlyCopy" : {
-    "serviceDef" : {
-      "enums" : [ { }, { } ],
+    "resources" : [ {
+      "lookupSupported" : true,
+      "rbKeyValidationMessage" : "...",
+      "validationMessage" : "...",
+      "itemId" : 12345,
+      "isValidLeaf" : true,
+      "matcher" : "...",
+      "excludesSupported" : true,
       "name" : "...",
-      "contextEnrichers" : [ { }, { } ],
-      "options" : {
+      "rbKeyLabel" : "...",
+      "recursiveSupported" : true,
+      "description" : "...",
+      "level" : 12345,
+      "uiHint" : "...",
+      "label" : "...",
+      "accessTypeRestrictions" : [ "...", "..." ],
+      "matcherOptions" : {
         "property1" : "...",
         "property2" : "..."
       },
-      "resources" : [ { }, { } ],
-      "accessTypes" : [ { }, { } ],
+      "parent" : "...",
+      "validationRegEx" : "...",
       "rbKeyDescription" : "...",
-      "description" : "...",
+      "type" : "...",
+      "mandatory" : true
+    }, {
+      "lookupSupported" : true,
+      "rbKeyValidationMessage" : "...",
+      "validationMessage" : "...",
+      "itemId" : 12345,
+      "isValidLeaf" : true,
+      "matcher" : "...",
+      "excludesSupported" : true,
+      "name" : "...",
       "rbKeyLabel" : "...",
+      "recursiveSupported" : true,
+      "description" : "...",
+      "level" : 12345,
+      "uiHint" : "...",
       "label" : "...",
-      "dataMaskDef" : { },
-      "policyConditions" : [ { }, { } ],
-      "rowFilterDef" : { },
-      "configs" : [ { }, { } ],
-      "implClass" : "...",
-      "version" : 12345,
-      "createdBy" : "...",
-      "updatedBy" : "...",
-      "id" : 12345,
-      "guid" : "...",
-      "updateTime" : 12345,
-      "isEnabled" : true,
-      "createTime" : 12345
-    },
-    "ownerUser" : "...",
-    "cacheKey" : "...",
-    "leafName" : "...",
-    "asString" : "...",
-    "asMap" : {
-      "property1" : { },
-      "property2" : { }
+      "accessTypeRestrictions" : [ "...", "..." ],
+      "matcherOptions" : {
+        "property1" : "...",
+        "property2" : "..."
+      },
+      "parent" : "...",
+      "validationRegEx" : "...",
+      "rbKeyDescription" : "...",
+      "type" : "...",
+      "mandatory" : true
+    } ],
+    "options" : {
+      "property1" : "...",
+      "property2" : "..."
     },
-    "readOnlyCopy" : { },
-    "keys" : [ "...", "..." ]
+    "version" : 12345,
+    "createTime" : 12345,
+    "isEnabled" : true,
+    "createdBy" : "...",
+    "guid" : "...",
+    "id" : 12345,
+    "updatedBy" : "...",
+    "updateTime" : 12345
   },
-  "keys" : [ "...", "..." ]
+  "asString" : "...",
+  "leafName" : "...",
+  "keys" : [ "...", "..." ],
+  "cacheKey" : "..."
 },
       "description" : ""
     }
@@ -757,10 +864,17 @@
       "type" : "object",
       "title" : "RangerAccessResourceImpl",
           "properties" : {
-            "asString" : {
+            "asMap" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "object",
+"additionalProperties" : {
+  "type" : "object"
+}
+            },
+            "readOnlyCopy" : {
+            "readOnly" : false,
+"$ref" : "#/definitions/json_RangerAccessResource"
             },
             "keys" : {
             "readOnly" : false,
@@ -770,181 +884,164 @@
   "type" : "string"
 }
             },
-            "ownerUser" : {
+            "cacheKey" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "serviceDef" : {
-            "readOnly" : false,
-"$ref" : "#/definitions/json_RangerServiceDef"
-            },
-            "readOnlyCopy" : {
-            "readOnly" : false,
-"$ref" : "#/definitions/json_RangerAccessResource"
-            },
             "leafName" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "cacheKey" : {
+            "serviceDef" : {
+            "readOnly" : false,
+"$ref" : "#/definitions/json_RangerServiceDef"
+            },
+            "ownerUser" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "asMap" : {
+            "asString" : {
             "readOnly" : false,
 "description" : "",
-"type" : "object",
-"additionalProperties" : {
-  "type" : "object"
-}
+"type" : "string"
             }
           },
       "example" : {
-  "asString" : "...",
+  "asMap" : {
+    "property1" : { },
+    "property2" : { }
+  },
+  "readOnlyCopy" : {
+    "readOnlyCopy" : { },
+    "asMap" : {
+      "property1" : { },
+      "property2" : { }
+    },
+    "ownerUser" : "...",
+    "serviceDef" : {
+      "enums" : [ { }, { } ],
+      "rbKeyLabel" : "...",
+      "dataMaskDef" : { },
+      "label" : "...",
+      "description" : "...",
+      "name" : "...",
+      "rbKeyDescription" : "...",
+      "contextEnrichers" : [ { }, { } ],
+      "implClass" : "...",
+      "policyConditions" : [ { }, { } ],
+      "accessTypes" : [ { }, { } ],
+      "rowFilterDef" : { },
+      "configs" : [ { }, { } ],
+      "resources" : [ { }, { } ],
+      "options" : {
+        "property1" : "...",
+        "property2" : "..."
+      },
+      "version" : 12345,
+      "createTime" : 12345,
+      "isEnabled" : true,
+      "createdBy" : "...",
+      "guid" : "...",
+      "id" : 12345,
+      "updatedBy" : "...",
+      "updateTime" : 12345
+    },
+    "asString" : "...",
+    "leafName" : "...",
+    "keys" : [ "...", "..." ],
+    "cacheKey" : "..."
+  },
   "keys" : [ "...", "..." ],
-  "ownerUser" : "...",
+  "cacheKey" : "...",
+  "leafName" : "...",
   "serviceDef" : {
     "enums" : [ {
+      "name" : "...",
       "defaultIndex" : 12345,
-      "elements" : [ { }, { } ],
       "itemId" : 12345,
-      "name" : "..."
+      "elements" : [ { }, { } ]
     }, {
+      "name" : "...",
       "defaultIndex" : 12345,
-      "elements" : [ { }, { } ],
       "itemId" : 12345,
-      "name" : "..."
+      "elements" : [ { }, { } ]
     } ],
+    "rbKeyLabel" : "...",
+    "dataMaskDef" : {
+      "resources" : [ { }, { } ],
+      "accessTypes" : [ { }, { } ],
+      "maskTypes" : [ { }, { } ]
+    },
+    "label" : "...",
+    "description" : "...",
     "name" : "...",
+    "rbKeyDescription" : "...",
     "contextEnrichers" : [ {
       "enricherOptions" : {
         "property1" : "...",
         "property2" : "..."
       },
-      "itemId" : 12345,
       "enricher" : "...",
-      "name" : "..."
+      "name" : "...",
+      "itemId" : 12345
     }, {
       "enricherOptions" : {
         "property1" : "...",
         "property2" : "..."
       },
-      "itemId" : 12345,
       "enricher" : "...",
-      "name" : "..."
+      "name" : "...",
+      "itemId" : 12345
     } ],
-    "options" : {
-      "property1" : "...",
-      "property2" : "..."
-    },
-    "resources" : [ {
-      "validationMessage" : "...",
-      "label" : "...",
-      "excludesSupported" : true,
-      "uiHint" : "...",
-      "isValidLeaf" : true,
-      "type" : "...",
-      "level" : 12345,
-      "description" : "...",
-      "rbKeyDescription" : "...",
-      "recursiveSupported" : true,
-      "lookupSupported" : true,
-      "rbKeyLabel" : "...",
-      "matcher" : "...",
-      "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
-      "mandatory" : true,
-      "parent" : "...",
+    "implClass" : "...",
+    "policyConditions" : [ {
       "name" : "...",
-      "accessTypeRestrictions" : [ "...", "..." ],
-      "itemId" : 12345,
-      "matcherOptions" : {
+      "description" : "...",
+      "evaluatorOptions" : {
         "property1" : "...",
         "property2" : "..."
-      }
-    }, {
+      },
       "validationMessage" : "...",
-      "label" : "...",
-      "excludesSupported" : true,
-      "uiHint" : "...",
-      "isValidLeaf" : true,
-      "type" : "...",
-      "level" : 12345,
-      "description" : "...",
-      "rbKeyDescription" : "...",
-      "recursiveSupported" : true,
-      "lookupSupported" : true,
-      "rbKeyLabel" : "...",
-      "matcher" : "...",
       "rbKeyValidationMessage" : "...",
       "validationRegEx" : "...",
-      "mandatory" : true,
-      "parent" : "...",
-      "name" : "...",
-      "accessTypeRestrictions" : [ "...", "..." ],
-      "itemId" : 12345,
-      "matcherOptions" : {
-        "property1" : "...",
-        "property2" : "..."
-      }
-    } ],
-    "accessTypes" : [ {
-      "name" : "...",
       "label" : "...",
+      "uiHint" : "...",
       "itemId" : 12345,
       "rbKeyLabel" : "...",
-      "impliedGrants" : [ "...", "..." ]
+      "rbKeyDescription" : "...",
+      "evaluator" : "..."
     }, {
       "name" : "...",
-      "label" : "...",
-      "itemId" : 12345,
-      "rbKeyLabel" : "...",
-      "impliedGrants" : [ "...", "..." ]
-    } ],
-    "rbKeyDescription" : "...",
-    "description" : "...",
-    "rbKeyLabel" : "...",
-    "label" : "...",
-    "dataMaskDef" : {
-      "accessTypes" : [ { }, { } ],
-      "resources" : [ { }, { } ],
-      "maskTypes" : [ { }, { } ]
-    },
-    "policyConditions" : [ {
-      "label" : "...",
-      "uiHint" : "...",
-      "name" : "...",
+      "description" : "...",
       "evaluatorOptions" : {
         "property1" : "...",
         "property2" : "..."
       },
-      "description" : "...",
-      "itemId" : 12345,
-      "rbKeyDescription" : "...",
+      "validationMessage" : "...",
       "rbKeyValidationMessage" : "...",
       "validationRegEx" : "...",
-      "rbKeyLabel" : "...",
-      "evaluator" : "...",
-      "validationMessage" : "..."
-    }, {
       "label" : "...",
       "uiHint" : "...",
-      "name" : "...",
-      "evaluatorOptions" : {
-        "property1" : "...",
-        "property2" : "..."
-      },
-      "description" : "...",
       "itemId" : 12345,
+      "rbKeyLabel" : "...",
       "rbKeyDescription" : "...",
-      "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
+      "evaluator" : "..."
+    } ],
+    "accessTypes" : [ {
+      "name" : "...",
+      "rbKeyLabel" : "...",
+      "label" : "...",
+      "impliedGrants" : [ "...", "..." ],
+      "itemId" : 12345
+    }, {
+      "name" : "...",
       "rbKeyLabel" : "...",
-      "evaluator" : "...",
-      "validationMessage" : "..."
+      "label" : "...",
+      "impliedGrants" : [ "...", "..." ],
+      "itemId" : 12345
     } ],
     "rowFilterDef" : {
       "resources" : [ { }, { } ],
@@ -952,91 +1049,101 @@
     },
     "configs" : [ {
       "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
-      "mandatory" : true,
+      "rbKeyDescription" : "...",
+      "description" : "...",
+      "itemId" : 12345,
+      "validationMessage" : "...",
       "label" : "...",
-      "rbKeyLabel" : "...",
+      "name" : "...",
       "type" : "...",
-      "subType" : "...",
-      "rbKeyDescription" : "...",
+      "mandatory" : true,
       "defaultValue" : "...",
-      "description" : "...",
+      "rbKeyLabel" : "...",
+      "subType" : "...",
       "uiHint" : "...",
-      "name" : "...",
-      "itemId" : 12345,
-      "validationMessage" : "..."
+      "validationRegEx" : "..."
     }, {
       "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
-      "mandatory" : true,
+      "rbKeyDescription" : "...",
+      "description" : "...",
+      "itemId" : 12345,
+      "validationMessage" : "...",
       "label" : "...",
-      "rbKeyLabel" : "...",
+      "name" : "...",
       "type" : "...",
-      "subType" : "...",
-      "rbKeyDescription" : "...",
+      "mandatory" : true,
       "defaultValue" : "...",
-      "description" : "...",
+      "rbKeyLabel" : "...",
+      "subType" : "...",
       "uiHint" : "...",
-      "name" : "...",
-      "itemId" : 12345,
-      "validationMessage" : "..."
+      "validationRegEx" : "..."
     } ],
-    "implClass" : "...",
-    "version" : 12345,
-    "createdBy" : "...",
-    "updatedBy" : "...",
-    "id" : 12345,
-    "guid" : "...",
-    "updateTime" : 12345,
-    "isEnabled" : true,
-    "createTime" : 12345
-  },
-  "readOnlyCopy" : {
-    "serviceDef" : {
-      "enums" : [ { }, { } ],
+    "resources" : [ {
+      "lookupSupported" : true,
+      "rbKeyValidationMessage" : "...",
+      "validationMessage" : "...",
+      "itemId" : 12345,
+      "isValidLeaf" : true,
+      "matcher" : "...",
+      "excludesSupported" : true,
       "name" : "...",
-      "contextEnrichers" : [ { }, { } ],
-      "options" : {
+      "rbKeyLabel" : "...",
+      "recursiveSupported" : true,
+      "description" : "...",
+      "level" : 12345,
+      "uiHint" : "...",
+      "label" : "...",
+      "accessTypeRestrictions" : [ "...", "..." ],
+      "matcherOptions" : {
         "property1" : "...",
         "property2" : "..."
       },
-      "resources" : [ { }, { } ],
-      "accessTypes" : [ { }, { } ],
+      "parent" : "...",
+      "validationRegEx" : "...",
       "rbKeyDescription" : "...",
-      "description" : "...",
+      "type" : "...",
+      "mandatory" : true
+    }, {
+      "lookupSupported" : true,
+      "rbKeyValidationMessage" : "...",
+      "validationMessage" : "...",
+      "itemId" : 12345,
+      "isValidLeaf" : true,
+      "matcher" : "...",
+      "excludesSupported" : true,
+      "name" : "...",
       "rbKeyLabel" : "...",
+      "recursiveSupported" : true,
+      "description" : "...",
+      "level" : 12345,
+      "uiHint" : "...",
       "label" : "...",
-      "dataMaskDef" : { },
-      "policyConditions" : [ { }, { } ],
-      "rowFilterDef" : { },
-      "configs" : [ { }, { } ],
-      "implClass" : "...",
-      "version" : 12345,
-      "createdBy" : "...",
-      "updatedBy" : "...",
-      "id" : 12345,
-      "guid" : "...",
-      "updateTime" : 12345,
-      "isEnabled" : true,
-      "createTime" : 12345
-    },
-    "ownerUser" : "...",
-    "cacheKey" : "...",
-    "leafName" : "...",
-    "asString" : "...",
-    "asMap" : {
-      "property1" : { },
-      "property2" : { }
+      "accessTypeRestrictions" : [ "...", "..." ],
+      "matcherOptions" : {
+        "property1" : "...",
+        "property2" : "..."
+      },
+      "parent" : "...",
+      "validationRegEx" : "...",
+      "rbKeyDescription" : "...",
+      "type" : "...",
+      "mandatory" : true
+    } ],
+    "options" : {
+      "property1" : "...",
+      "property2" : "..."
     },
-    "readOnlyCopy" : { },
-    "keys" : [ "...", "..." ]
-  },
-  "leafName" : "...",
-  "cacheKey" : "...",
-  "asMap" : {
-    "property1" : { },
-    "property2" : { }
-  }
+    "version" : 12345,
+    "createTime" : 12345,
+    "isEnabled" : true,
+    "createdBy" : "...",
+    "guid" : "...",
+    "id" : 12345,
+    "updatedBy" : "...",
+    "updateTime" : 12345
+  },
+  "ownerUser" : "...",
+  "asString" : "..."
 },
       "description" : ""
     }
@@ -1045,239 +1152,138 @@
       "type" : "object",
       "title" : "RangerAccessResourceReadOnly",
           "properties" : {
-            "asMap" : {
-            "readOnly" : false,
-"description" : "",
-"type" : "object",
-"additionalProperties" : {
-  "type" : "object"
-}
-            },
             "cacheKey" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "asString" : {
+            "serviceDef" : {
             "readOnly" : false,
-"description" : "",
-"type" : "string"
+"$ref" : "#/definitions/json_RangerServiceDef"
             },
             "readOnlyCopy" : {
             "readOnly" : false,
 "$ref" : "#/definitions/json_RangerAccessResource"
             },
+            "leafName" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "string"
+            },
             "ownerUser" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "keys" : {
+            "asString" : {
             "readOnly" : false,
 "description" : "",
-"type" : "array",
-"items" : {
-  "type" : "string"
-}
+"type" : "string"
             },
-            "serviceDef" : {
+            "asMap" : {
             "readOnly" : false,
-"$ref" : "#/definitions/json_RangerServiceDef"
+"description" : "",
+"type" : "object",
+"additionalProperties" : {
+  "type" : "object"
+}
             },
-            "leafName" : {
+            "keys" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "array",
+"items" : {
+  "type" : "string"
+}
             }
           },
       "example" : {
-  "asMap" : {
-    "property1" : { },
-    "property2" : { }
-  },
   "cacheKey" : "...",
-  "asString" : "...",
-  "readOnlyCopy" : {
-    "serviceDef" : {
-      "enums" : [ { }, { } ],
-      "name" : "...",
-      "contextEnrichers" : [ { }, { } ],
-      "options" : {
-        "property1" : "...",
-        "property2" : "..."
-      },
-      "resources" : [ { }, { } ],
-      "accessTypes" : [ { }, { } ],
-      "rbKeyDescription" : "...",
-      "description" : "...",
-      "rbKeyLabel" : "...",
-      "label" : "...",
-      "dataMaskDef" : { },
-      "policyConditions" : [ { }, { } ],
-      "rowFilterDef" : { },
-      "configs" : [ { }, { } ],
-      "implClass" : "...",
-      "version" : 12345,
-      "createdBy" : "...",
-      "updatedBy" : "...",
-      "id" : 12345,
-      "guid" : "...",
-      "updateTime" : 12345,
-      "isEnabled" : true,
-      "createTime" : 12345
-    },
-    "ownerUser" : "...",
-    "cacheKey" : "...",
-    "leafName" : "...",
-    "asString" : "...",
-    "asMap" : {
-      "property1" : { },
-      "property2" : { }
-    },
-    "readOnlyCopy" : { },
-    "keys" : [ "...", "..." ]
-  },
-  "ownerUser" : "...",
-  "keys" : [ "...", "..." ],
   "serviceDef" : {
     "enums" : [ {
+      "name" : "...",
       "defaultIndex" : 12345,
-      "elements" : [ { }, { } ],
       "itemId" : 12345,
-      "name" : "..."
+      "elements" : [ { }, { } ]
     }, {
+      "name" : "...",
       "defaultIndex" : 12345,
-      "elements" : [ { }, { } ],
       "itemId" : 12345,
-      "name" : "..."
+      "elements" : [ { }, { } ]
     } ],
+    "rbKeyLabel" : "...",
+    "dataMaskDef" : {
+      "resources" : [ { }, { } ],
+      "accessTypes" : [ { }, { } ],
+      "maskTypes" : [ { }, { } ]
+    },
+    "label" : "...",
+    "description" : "...",
     "name" : "...",
+    "rbKeyDescription" : "...",
     "contextEnrichers" : [ {
       "enricherOptions" : {
         "property1" : "...",
         "property2" : "..."
       },
-      "itemId" : 12345,
       "enricher" : "...",
-      "name" : "..."
+      "name" : "...",
+      "itemId" : 12345
     }, {
       "enricherOptions" : {
         "property1" : "...",
         "property2" : "..."
       },
-      "itemId" : 12345,
       "enricher" : "...",
-      "name" : "..."
+      "name" : "...",
+      "itemId" : 12345
     } ],
-    "options" : {
-      "property1" : "...",
-      "property2" : "..."
-    },
-    "resources" : [ {
-      "validationMessage" : "...",
-      "label" : "...",
-      "excludesSupported" : true,
-      "uiHint" : "...",
-      "isValidLeaf" : true,
-      "type" : "...",
-      "level" : 12345,
-      "description" : "...",
-      "rbKeyDescription" : "...",
-      "recursiveSupported" : true,
-      "lookupSupported" : true,
-      "rbKeyLabel" : "...",
-      "matcher" : "...",
-      "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
-      "mandatory" : true,
-      "parent" : "...",
+    "implClass" : "...",
+    "policyConditions" : [ {
       "name" : "...",
-      "accessTypeRestrictions" : [ "...", "..." ],
-      "itemId" : 12345,
-      "matcherOptions" : {
+      "description" : "...",
+      "evaluatorOptions" : {
         "property1" : "...",
         "property2" : "..."
-      }
-    }, {
+      },
       "validationMessage" : "...",
-      "label" : "...",
-      "excludesSupported" : true,
-      "uiHint" : "...",
-      "isValidLeaf" : true,
-      "type" : "...",
-      "level" : 12345,
-      "description" : "...",
-      "rbKeyDescription" : "...",
-      "recursiveSupported" : true,
-      "lookupSupported" : true,
-      "rbKeyLabel" : "...",
-      "matcher" : "...",
       "rbKeyValidationMessage" : "...",
       "validationRegEx" : "...",
-      "mandatory" : true,
-      "parent" : "...",
-      "name" : "...",
-      "accessTypeRestrictions" : [ "...", "..." ],
-      "itemId" : 12345,
-      "matcherOptions" : {
-        "property1" : "...",
-        "property2" : "..."
-      }
-    } ],
-    "accessTypes" : [ {
-      "name" : "...",
       "label" : "...",
+      "uiHint" : "...",
       "itemId" : 12345,
       "rbKeyLabel" : "...",
-      "impliedGrants" : [ "...", "..." ]
+      "rbKeyDescription" : "...",
+      "evaluator" : "..."
     }, {
       "name" : "...",
-      "label" : "...",
-      "itemId" : 12345,
-      "rbKeyLabel" : "...",
-      "impliedGrants" : [ "...", "..." ]
-    } ],
-    "rbKeyDescription" : "...",
-    "description" : "...",
-    "rbKeyLabel" : "...",
-    "label" : "...",
-    "dataMaskDef" : {
-      "accessTypes" : [ { }, { } ],
-      "resources" : [ { }, { } ],
-      "maskTypes" : [ { }, { } ]
-    },
-    "policyConditions" : [ {
-      "label" : "...",
-      "uiHint" : "...",
-      "name" : "...",
+      "description" : "...",
       "evaluatorOptions" : {
         "property1" : "...",
         "property2" : "..."
       },
-      "description" : "...",
-      "itemId" : 12345,
-      "rbKeyDescription" : "...",
+      "validationMessage" : "...",
       "rbKeyValidationMessage" : "...",
       "validationRegEx" : "...",
-      "rbKeyLabel" : "...",
-      "evaluator" : "...",
-      "validationMessage" : "..."
-    }, {
       "label" : "...",
       "uiHint" : "...",
-      "name" : "...",
-      "evaluatorOptions" : {
-        "property1" : "...",
-        "property2" : "..."
-      },
-      "description" : "...",
       "itemId" : 12345,
+      "rbKeyLabel" : "...",
       "rbKeyDescription" : "...",
-      "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
+      "evaluator" : "..."
+    } ],
+    "accessTypes" : [ {
+      "name" : "...",
+      "rbKeyLabel" : "...",
+      "label" : "...",
+      "impliedGrants" : [ "...", "..." ],
+      "itemId" : 12345
+    }, {
+      "name" : "...",
       "rbKeyLabel" : "...",
-      "evaluator" : "...",
-      "validationMessage" : "..."
+      "label" : "...",
+      "impliedGrants" : [ "...", "..." ],
+      "itemId" : 12345
     } ],
     "rowFilterDef" : {
       "resources" : [ { }, { } ],
@@ -1285,46 +1291,147 @@
     },
     "configs" : [ {
       "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
-      "mandatory" : true,
+      "rbKeyDescription" : "...",
+      "description" : "...",
+      "itemId" : 12345,
+      "validationMessage" : "...",
       "label" : "...",
-      "rbKeyLabel" : "...",
+      "name" : "...",
       "type" : "...",
-      "subType" : "...",
-      "rbKeyDescription" : "...",
+      "mandatory" : true,
       "defaultValue" : "...",
-      "description" : "...",
+      "rbKeyLabel" : "...",
+      "subType" : "...",
       "uiHint" : "...",
-      "name" : "...",
-      "itemId" : 12345,
-      "validationMessage" : "..."
+      "validationRegEx" : "..."
     }, {
       "rbKeyValidationMessage" : "...",
-      "validationRegEx" : "...",
-      "mandatory" : true,
+      "rbKeyDescription" : "...",
+      "description" : "...",
+      "itemId" : 12345,
+      "validationMessage" : "...",
       "label" : "...",
-      "rbKeyLabel" : "...",
+      "name" : "...",
       "type" : "...",
-      "subType" : "...",
-      "rbKeyDescription" : "...",
+      "mandatory" : true,
       "defaultValue" : "...",
-      "description" : "...",
+      "rbKeyLabel" : "...",
+      "subType" : "...",
       "uiHint" : "...",
+      "validationRegEx" : "..."
+    } ],
+    "resources" : [ {
+      "lookupSupported" : true,
+      "rbKeyValidationMessage" : "...",
+      "validationMessage" : "...",
+      "itemId" : 12345,
+      "isValidLeaf" : true,
+      "matcher" : "...",
+      "excludesSupported" : true,
       "name" : "...",
+      "rbKeyLabel" : "...",
+      "recursiveSupported" : true,
+      "description" : "...",
+      "level" : 12345,
+      "uiHint" : "...",
+      "label" : "...",
+      "accessTypeRestrictions" : [ "...", "..." ],
+      "matcherOptions" : {
+        "property1" : "...",
+        "property2" : "..."
+      },
+      "parent" : "...",
+      "validationRegEx" : "...",
+      "rbKeyDescription" : "...",
+      "type" : "...",
+      "mandatory" : true
+    }, {
+      "lookupSupported" : true,
+      "rbKeyValidationMessage" : "...",
+      "validationMessage" : "...",
       "itemId" : 12345,
-      "validationMessage" : "..."
+      "isValidLeaf" : true,
+      "matcher" : "...",
+      "excludesSupported" : true,
+      "name" : "...",
+      "rbKeyLabel" : "...",
+      "recursiveSupported" : true,
+      "description" : "...",
+      "level" : 12345,
+      "uiHint" : "...",
+      "label" : "...",
+      "accessTypeRestrictions" : [ "...", "..." ],
+      "matcherOptions" : {
+        "property1" : "...",
+        "property2" : "..."
+      },
+      "parent" : "...",
+      "validationRegEx" : "...",
+      "rbKeyDescription" : "...",
+      "type" : "...",
+      "mandatory" : true
     } ],
-    "implClass" : "...",
+    "options" : {
+      "property1" : "...",
+      "property2" : "..."
+    },
     "version" : 12345,
+    "createTime" : 12345,
+    "isEnabled" : true,
     "createdBy" : "...",
-    "updatedBy" : "...",
-    "id" : 12345,
     "guid" : "...",
-    "updateTime" : 12345,
-    "isEnabled" : true,
-    "createTime" : 12345
+    "id" : 12345,
+    "updatedBy" : "...",
+    "updateTime" : 12345
+  },
+  "readOnlyCopy" : {
+    "readOnlyCopy" : { },
+    "asMap" : {
+      "property1" : { },
+      "property2" : { }
+    },
+    "ownerUser" : "...",
+    "serviceDef" : {
+      "enums" : [ { }, { } ],
+      "rbKeyLabel" : "...",
+      "dataMaskDef" : { },
+      "label" : "...",
+      "description" : "...",
+      "name" : "...",
+      "rbKeyDescription" : "...",
+      "contextEnrichers" : [ { }, { } ],
+      "implClass" : "...",
+      "policyConditions" : [ { }, { } ],
+      "accessTypes" : [ { }, { } ],
+      "rowFilterDef" : { },
+      "configs" : [ { }, { } ],
+      "resources" : [ { }, { } ],
+      "options" : {
+        "property1" : "...",
+        "property2" : "..."
+      },
+      "version" : 12345,
+      "createTime" : 12345,
+      "isEnabled" : true,
+      "createdBy" : "...",
+      "guid" : "...",
+      "id" : 12345,
+      "updatedBy" : "...",
+      "updateTime" : 12345
+    },
+    "asString" : "...",
+    "leafName" : "...",
+    "keys" : [ "...", "..." ],
+    "cacheKey" : "..."
+  },
+  "leafName" : "...",
+  "ownerUser" : "...",
+  "asString" : "...",
+  "asMap" : {
+    "property1" : { },
+    "property2" : { }
   },
-  "leafName" : "..."
+  "keys" : [ "...", "..." ]
 },
       "description" : ""
     }
@@ -1338,17 +1445,12 @@
 "description" : "",
 "type" : "string"
             },
-            "label" : {
+            "rbKeyLabel" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "itemId" : {
-            "readOnly" : false,
-"description" : "",
-"type" : "number"
-            },
-            "rbKeyLabel" : {
+            "label" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
@@ -1360,14 +1462,19 @@
 "items" : {
   "type" : "string"
 }
+            },
+            "itemId" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "number"
             }
           },
       "example" : {
   "name" : "...",
-  "label" : "...",
-  "itemId" : 12345,
   "rbKeyLabel" : "...",
-  "impliedGrants" : [ "...", "..." ]
+  "label" : "...",
+  "impliedGrants" : [ "...", "..." ],
+  "itemId" : 12345
 },
       "description" : ""
     }
@@ -1381,37 +1488,37 @@
 "description" : "",
 "type" : "number"
             },
-            "createdBy" : {
+            "createTime" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "number"
             },
-            "updatedBy" : {
+            "isEnabled" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "boolean"
             },
-            "id" : {
+            "createdBy" : {
             "readOnly" : false,
 "description" : "",
-"type" : "number"
+"type" : "string"
             },
             "guid" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "updateTime" : {
+            "id" : {
             "readOnly" : false,
 "description" : "",
 "type" : "number"
             },
-            "isEnabled" : {
+            "updatedBy" : {
             "readOnly" : false,
 "description" : "",
-"type" : "boolean"
+"type" : "string"
             },
-            "createTime" : {
+            "updateTime" : {
             "readOnly" : false,
 "description" : "",
 "type" : "number"
@@ -1419,13 +1526,13 @@
           },
       "example" : {
   "version" : 12345,
+  "createTime" : 12345,
+  "isEnabled" : true,
   "createdBy" : "...",
-  "updatedBy" : "...",
-  "id" : 12345,
   "guid" : "...",
-  "updateTime" : 12345,
-  "isEnabled" : true,
-  "createTime" : 12345
+  "id" : 12345,
+  "updatedBy" : "...",
+  "updateTime" : 12345
 },
       "description" : ""
     }
@@ -1442,11 +1549,6 @@
   "type" : "string"
 }
             },
-            "itemId" : {
-            "readOnly" : false,
-"description" : "",
-"type" : "number"
-            },
             "enricher" : {
             "readOnly" : false,
 "description" : "",
@@ -1456,6 +1558,11 @@
             "readOnly" : false,
 "description" : "",
 "type" : "string"
+            },
+            "itemId" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "number"
             }
           },
       "example" : {
@@ -1463,9 +1570,9 @@
     "property1" : "...",
     "property2" : "..."
   },
-  "itemId" : 12345,
   "enricher" : "...",
-  "name" : "..."
+  "name" : "...",
+  "itemId" : 12345
 },
       "description" : ""
     }
@@ -1474,20 +1581,20 @@
       "type" : "object",
       "title" : "RangerDataMaskDef",
           "properties" : {
-            "accessTypes" : {
+            "resources" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
 "items" : {
-  "$ref" : "#/definitions/json_RangerAccessTypeDef"
+  "$ref" : "#/definitions/json_RangerResourceDef"
 }
             },
-            "resources" : {
+            "accessTypes" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
 "items" : {
-  "$ref" : "#/definitions/json_RangerResourceDef"
+  "$ref" : "#/definitions/json_RangerAccessTypeDef"
 }
             },
             "maskTypes" : {
@@ -1500,94 +1607,94 @@
             }
           },
       "example" : {
-  "accessTypes" : [ {
-    "name" : "...",
-    "label" : "...",
-    "itemId" : 12345,
-    "rbKeyLabel" : "...",
-    "impliedGrants" : [ "...", "..." ]
-  }, {
-    "name" : "...",
-    "label" : "...",
-    "itemId" : 12345,
-    "rbKeyLabel" : "...",
-    "impliedGrants" : [ "...", "..." ]
-  } ],
   "resources" : [ {
+    "lookupSupported" : true,
+    "rbKeyValidationMessage" : "...",
     "validationMessage" : "...",
-    "label" : "...",
-    "excludesSupported" : true,
-    "uiHint" : "...",
+    "itemId" : 12345,
     "isValidLeaf" : true,
-    "type" : "...",
-    "level" : 12345,
-    "description" : "...",
-    "rbKeyDescription" : "...",
-    "recursiveSupported" : true,
-    "lookupSupported" : true,
-    "rbKeyLabel" : "...",
     "matcher" : "...",
-    "rbKeyValidationMessage" : "...",
-    "validationRegEx" : "...",
-    "mandatory" : true,
-    "parent" : "...",
+    "excludesSupported" : true,
     "name" : "...",
+    "rbKeyLabel" : "...",
+    "recursiveSupported" : true,
+    "description" : "...",
+    "level" : 12345,
+    "uiHint" : "...",
+    "label" : "...",
     "accessTypeRestrictions" : [ "...", "..." ],
-    "itemId" : 12345,
     "matcherOptions" : {
       "property1" : "...",
       "property2" : "..."
-    }
+    },
+    "parent" : "...",
+    "validationRegEx" : "...",
+    "rbKeyDescription" : "...",
+    "type" : "...",
+    "mandatory" : true
   }, {
+    "lookupSupported" : true,
+    "rbKeyValidationMessage" : "...",
     "validationMessage" : "...",
-    "label" : "...",
-    "excludesSupported" : true,
-    "uiHint" : "...",
+    "itemId" : 12345,
     "isValidLeaf" : true,
-    "type" : "...",
-    "level" : 12345,
-    "description" : "...",
-    "rbKeyDescription" : "...",
-    "recursiveSupported" : true,
-    "lookupSupported" : true,
-    "rbKeyLabel" : "...",
     "matcher" : "...",
-    "rbKeyValidationMessage" : "...",
-    "validationRegEx" : "...",
-    "mandatory" : true,
-    "parent" : "...",
+    "excludesSupported" : true,
     "name" : "...",
+    "rbKeyLabel" : "...",
+    "recursiveSupported" : true,
+    "description" : "...",
+    "level" : 12345,
+    "uiHint" : "...",
+    "label" : "...",
     "accessTypeRestrictions" : [ "...", "..." ],
-    "itemId" : 12345,
     "matcherOptions" : {
       "property1" : "...",
       "property2" : "..."
-    }
-  } ],
-  "maskTypes" : [ {
-    "itemId" : 12345,
-    "transformer" : "...",
-    "dataMaskOptions" : {
-      "property1" : "...",
-      "property2" : "..."
     },
-    "name" : "...",
-    "description" : "...",
+    "parent" : "...",
+    "validationRegEx" : "...",
     "rbKeyDescription" : "...",
+    "type" : "...",
+    "mandatory" : true
+  } ],
+  "accessTypes" : [ {
+    "name" : "...",
+    "rbKeyLabel" : "...",
     "label" : "...",
-    "rbKeyLabel" : "..."
+    "impliedGrants" : [ "...", "..." ],
+    "itemId" : 12345
   }, {
-    "itemId" : 12345,
-    "transformer" : "...",
+    "name" : "...",
+    "rbKeyLabel" : "...",
+    "label" : "...",
+    "impliedGrants" : [ "...", "..." ],
+    "itemId" : 12345
+  } ],
+  "maskTypes" : [ {
+    "description" : "...",
     "dataMaskOptions" : {
       "property1" : "...",
       "property2" : "..."
     },
-    "name" : "...",
-    "description" : "...",
+    "label" : "...",
     "rbKeyDescription" : "...",
+    "itemId" : 12345,
+    "rbKeyLabel" : "...",
+    "name" : "...",
+    "transformer" : "..."
+  }, {
+    "description" : "...",
+    "dataMaskOptions" : {
+      "property1" : "...",
+      "property2" : "..."
+    },
     "label" : "...",
-    "rbKeyLabel" : "..."
+    "rbKeyDescription" : "...",
+    "itemId" : 12345,
+    "rbKeyLabel" : "...",
+    "name" : "...",
+    "transformer" : "..."
   } ]
 },
       "description" : ""
@@ -1611,11 +1718,10 @@
       ],
       "example" : {
   "dataMaskInfo" : {
-    "dataMaskType" : "...",
+    "valueExpr" : "...",
     "conditionExpr" : "...",
-    "valueExpr" : "..."
+    "dataMaskType" : "..."
   },
-  "users" : [ "...", "..." ],
   "accesses" : [ {
     "type" : "...",
     "isAllowed" : true
@@ -1623,16 +1729,17 @@
     "type" : "...",
     "isAllowed" : true
   } ],
-  "groups" : [ "...", "..." ],
-  "roles" : [ "...", "..." ],
+  "users" : [ "...", "..." ],
   "delegateAdmin" : true,
   "conditions" : [ {
-    "type" : "...",
-    "values" : [ "...", "..." ]
+    "values" : [ "...", "..." ],
+    "type" : "..."
   }, {
-    "type" : "...",
-    "values" : [ "...", "..." ]
-  } ]
+    "values" : [ "...", "..." ],
+    "type" : "..."
+  } ],
+  "roles" : [ "...", "..." ],
+  "groups" : [ "...", "..." ]
 },
       "description" : ""
     }
@@ -1641,12 +1748,7 @@
       "type" : "object",
       "title" : "RangerDataMaskTypeDef",
           "properties" : {
-            "itemId" : {
-            "readOnly" : false,
-"description" : "",
-"type" : "number"
-            },
-            "transformer" : {
+            "description" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
@@ -1659,44 +1761,49 @@
   "type" : "string"
 }
             },
-            "name" : {
+            "label" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "description" : {
+            "rbKeyDescription" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "rbKeyDescription" : {
+            "itemId" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "number"
+            },
+            "rbKeyLabel" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "label" : {
+            "name" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "rbKeyLabel" : {
+            "transformer" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             }
           },
       "example" : {
-  "itemId" : 12345,
-  "transformer" : "...",
+  "description" : "...",
   "dataMaskOptions" : {
     "property1" : "...",
     "property2" : "..."
   },
-  "name" : "...",
-  "description" : "...",
-  "rbKeyDescription" : "...",
   "label" : "...",
-  "rbKeyLabel" : "..."
+  "rbKeyDescription" : "...",
+  "itemId" : 12345,
+  "rbKeyLabel" : "...",
+  "name" : "...",
+  "transformer" : "..."
 },
       "description" : ""
     }
@@ -1705,45 +1812,45 @@
       "type" : "object",
       "title" : "RangerEnumDef",
           "properties" : {
-            "defaultIndex" : {
+            "name" : {
             "readOnly" : false,
 "description" : "",
-"type" : "number"
+"type" : "string"
             },
-            "elements" : {
+            "defaultIndex" : {
             "readOnly" : false,
 "description" : "",
-"type" : "array",
-"items" : {
-  "$ref" : "#/definitions/json_RangerEnumElementDef"
-}
+"type" : "number"
             },
             "itemId" : {
             "readOnly" : false,
 "description" : "",
 "type" : "number"
             },
-            "name" : {
+            "elements" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "array",
+"items" : {
+  "$ref" : "#/definitions/json_RangerEnumElementDef"
+}
             }
           },
       "example" : {
+  "name" : "...",
   "defaultIndex" : 12345,
+  "itemId" : 12345,
   "elements" : [ {
-    "rbKeyLabel" : "...",
-    "label" : "...",
+    "itemId" : 12345,
     "name" : "...",
-    "itemId" : 12345
-  }, {
-    "rbKeyLabel" : "...",
     "label" : "...",
+    "rbKeyLabel" : "..."
+  }, {
+    "itemId" : 12345,
     "name" : "...",
-    "itemId" : 12345
-  } ],
-  "itemId" : 12345,
-  "name" : "..."
+    "label" : "...",
+    "rbKeyLabel" : "..."
+  } ]
 },
       "description" : ""
     }
@@ -1752,32 +1859,32 @@
       "type" : "object",
       "title" : "RangerEnumElementDef",
           "properties" : {
-            "rbKeyLabel" : {
+            "itemId" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "number"
             },
-            "label" : {
+            "name" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "name" : {
+            "label" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "itemId" : {
+            "rbKeyLabel" : {
             "readOnly" : false,
 "description" : "",
-"type" : "number"
+"type" : "string"
             }
           },
       "example" : {
-  "rbKeyLabel" : "...",
-  "label" : "...",
+  "itemId" : 12345,
   "name" : "...",
-  "itemId" : 12345
+  "label" : "...",
+  "rbKeyLabel" : "..."
 },
       "description" : ""
     }
@@ -1808,299 +1915,301 @@
     "property2" : { }
   },
   "policies" : [ {
-    "zoneName" : "...",
-    "policyLabels" : [ "...", "..." ],
-    "denyPolicyItems" : [ {
-      "users" : [ "...", "..." ],
+    "resourceSignature" : "...",
+    "description" : "...",
+    "rowFilterPolicyItems" : [ {
+      "rowFilterInfo" : { },
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
-      "users" : [ "...", "..." ],
+      "rowFilterInfo" : { },
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
-    "resources" : {
-      "property1" : {
-        "isRecursive" : true,
-        "values" : [ "...", "..." ],
-        "isExcludes" : true
-      },
-      "property2" : {
-        "isRecursive" : true,
-        "values" : [ "...", "..." ],
-        "isExcludes" : true
-      }
-    },
-    "description" : "...",
     "policyItems" : [ {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    } ],
-    "validitySchedules" : [ {
-      "timeZone" : "...",
-      "endTime" : "...",
-      "recurrences" : [ { }, { } ],
-      "startTime" : "..."
-    }, {
-      "timeZone" : "...",
-      "endTime" : "...",
-      "recurrences" : [ { }, { } ],
-      "startTime" : "..."
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
-    "isAuditEnabled" : true,
-    "policyPriority" : 12345,
-    "service" : "...",
+    "policyType" : 12345,
     "allowExceptions" : [ {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    } ],
-    "conditions" : [ {
-      "type" : "...",
-      "values" : [ "...", "..." ]
-    }, {
-      "type" : "...",
-      "values" : [ "...", "..." ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
+    "service" : "...",
     "denyExceptions" : [ {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
-      "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    }, {
       "users" : [ "...", "..." ],
-      "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    } ],
-    "rowFilterPolicyItems" : [ {
-      "rowFilterInfo" : { },
-      "users" : [ "...", "..." ],
-      "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
+      "conditions" : [ { }, { } ],
       "roles" : [ "...", "..." ],
-      "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "groups" : [ "...", "..." ]
     }, {
-      "rowFilterInfo" : { },
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
-    "name" : "...",
-    "resourceSignature" : "...",
+    "conditions" : [ {
+      "values" : [ "...", "..." ],
+      "type" : "..."
+    }, {
+      "values" : [ "...", "..." ],
+      "type" : "..."
+    } ],
+    "policyPriority" : 12345,
+    "serviceType" : "...",
+    "policyLabels" : [ "...", "..." ],
+    "isDenyAllElse" : true,
     "dataMaskPolicyItems" : [ {
       "dataMaskInfo" : { },
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
       "dataMaskInfo" : { },
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
-      "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    } ],
-    "options" : {
-      "property1" : { },
-      "property2" : { }
-    },
-    "policyType" : 12345,
-    "serviceType" : "...",
-    "version" : 12345,
-    "createdBy" : "...",
-    "updatedBy" : "...",
-    "id" : 12345,
-    "guid" : "...",
-    "updateTime" : 12345,
-    "isEnabled" : true,
-    "createTime" : 12345
-  }, {
-    "zoneName" : "...",
-    "policyLabels" : [ "...", "..." ],
-    "denyPolicyItems" : [ {
       "users" : [ "...", "..." ],
-      "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    }, {
-      "users" : [ "...", "..." ],
-      "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
+      "conditions" : [ { }, { } ],
       "roles" : [ "...", "..." ],
-      "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "groups" : [ "...", "..." ]
+    } ],
+    "validitySchedules" : [ {
+      "recurrences" : [ { }, { } ],
+      "timeZone" : "...",
+      "endTime" : "...",
+      "startTime" : "..."
+    }, {
+      "recurrences" : [ { }, { } ],
+      "timeZone" : "...",
+      "endTime" : "...",
+      "startTime" : "..."
     } ],
     "resources" : {
       "property1" : {
-        "isRecursive" : true,
         "values" : [ "...", "..." ],
+        "isRecursive" : true,
         "isExcludes" : true
       },
       "property2" : {
-        "isRecursive" : true,
         "values" : [ "...", "..." ],
+        "isRecursive" : true,
         "isExcludes" : true
       }
     },
-    "description" : "...",
-    "policyItems" : [ {
-      "users" : [ "...", "..." ],
+    "denyPolicyItems" : [ {
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    } ],
-    "validitySchedules" : [ {
-      "timeZone" : "...",
-      "endTime" : "...",
-      "recurrences" : [ { }, { } ],
-      "startTime" : "..."
-    }, {
-      "timeZone" : "...",
-      "endTime" : "...",
-      "recurrences" : [ { }, { } ],
-      "startTime" : "..."
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
+    "zoneName" : "...",
+    "options" : {
+      "property1" : { },
+      "property2" : { }
+    },
+    "name" : "...",
     "isAuditEnabled" : true,
-    "policyPriority" : 12345,
-    "service" : "...",
-    "allowExceptions" : [ {
-      "users" : [ "...", "..." ],
+    "version" : 12345,
+    "createTime" : 12345,
+    "isEnabled" : true,
+    "createdBy" : "...",
+    "guid" : "...",
+    "id" : 12345,
+    "updatedBy" : "...",
+    "updateTime" : 12345
+  }, {
+    "resourceSignature" : "...",
+    "description" : "...",
+    "rowFilterPolicyItems" : [ {
+      "rowFilterInfo" : { },
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
-      "users" : [ "...", "..." ],
+      "rowFilterInfo" : { },
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
-    } ],
-    "conditions" : [ {
-      "type" : "...",
-      "values" : [ "...", "..." ]
-    }, {
-      "type" : "...",
-      "values" : [ "...", "..." ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
-    "denyExceptions" : [ {
-      "users" : [ "...", "..." ],
+    "policyItems" : [ {
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
-    "rowFilterPolicyItems" : [ {
-      "rowFilterInfo" : { },
-      "users" : [ "...", "..." ],
+    "policyType" : 12345,
+    "allowExceptions" : [ {
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
-      "rowFilterInfo" : { },
+      "accesses" : [ { }, { } ],
       "users" : [ "...", "..." ],
+      "delegateAdmin" : true,
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
+    } ],
+    "service" : "...",
+    "denyExceptions" : [ {
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
+      "delegateAdmin" : true,
+      "conditions" : [ { }, { } ],
       "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
+    }, {
+      "accesses" : [ { }, { } ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
-    "name" : "...",
-    "resourceSignature" : "...",
+    "conditions" : [ {
+      "values" : [ "...", "..." ],
+      "type" : "..."
+    }, {
+      "values" : [ "...", "..." ],
+      "type" : "..."
+    } ],
+    "policyPriority" : 12345,
+    "serviceType" : "...",
+    "policyLabels" : [ "...", "..." ],
+    "isDenyAllElse" : true,
     "dataMaskPolicyItems" : [ {
       "dataMaskInfo" : { },
-      "users" : [ "...", "..." ],
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
-      "roles" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     }, {
       "dataMaskInfo" : { },
+      "accesses" : [ { }, { } ],
       "users" : [ "...", "..." ],
+      "delegateAdmin" : true,
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
+    } ],
+    "validitySchedules" : [ {
+      "recurrences" : [ { }, { } ],
+      "timeZone" : "...",
+      "endTime" : "...",
+      "startTime" : "..."
+    }, {
+      "recurrences" : [ { }, { } ],
+      "timeZone" : "...",
+      "endTime" : "...",
+      "startTime" : "..."
+    } ],
+    "resources" : {
+      "property1" : {
+        "values" : [ "...", "..." ],
+        "isRecursive" : true,
+        "isExcludes" : true
+      },
+      "property2" : {
+        "values" : [ "...", "..." ],
+        "isRecursive" : true,
+        "isExcludes" : true
+      }
+    },
+    "denyPolicyItems" : [ {
       "accesses" : [ { }, { } ],
-      "groups" : [ "...", "..." ],
+      "users" : [ "...", "..." ],
+      "delegateAdmin" : true,
+      "conditions" : [ { }, { } ],
       "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
+    }, {
+      "accesses" : [ { }, { } ],
+      "users" : [ "...", "..." ],
       "delegateAdmin" : true,
-      "conditions" : [ { }, { } ]
+      "conditions" : [ { }, { } ],
+      "roles" : [ "...", "..." ],
+      "groups" : [ "...", "..." ]
     } ],
+    "zoneName" : "...",
     "options" : {
       "property1" : { },
       "property2" : { }
     },
-    "policyType" : 12345,
-    "serviceType" : "...",
+    "name" : "...",
+    "isAuditEnabled" : true,
     "version" : 12345,
+    "createTime" : 12345,
+    "isEnabled" : true,
     "createdBy" : "...",
-    "updatedBy" : "...",
-    "id" : 12345,
     "guid" : "...",
-    "updateTime" : 12345,
-    "isEnabled" : true,
-    "createTime" : 12345
+    "id" : 12345,
+    "updatedBy" : "...",
+    "updateTime" : 12345
   } ],
   "listSize" : 12345,
   "list" : [ { }, { } ],
@@ -2125,21 +2234,26 @@
       "type" : "object",
       "title" : "RangerPluginInfo",
           "properties" : {
-            "createTime" : {
+            "ipAddress" : {
             "readOnly" : false,
 "description" : "",
-"type" : "number"
+"type" : "string"
             },
-            "serviceName" : {
+            "id" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "number"
             },
             "updateTime" : {
             "readOnly" : false,
 "description" : "",
 "type" : "number"
             },
+            "appType" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "string"
+            },
             "info" : {
             "readOnly" : false,
 "description" : "",
@@ -2148,39 +2262,40 @@
   "type" : "string"
 }
             },
-            "appType" : {
+            "hostName" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "ipAddress" : {
+            "createTime" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "number"
             },
-            "hostName" : {
+            "serviceName" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "id" : {
+            "serviceType" : {
             "readOnly" : false,
 "description" : "",
-"type" : "number"
+"type" : "string"
             }
           },
       "example" : {
-  "createTime" : 12345,
-  "serviceName" : "...",
+  "ipAddress" : "...",
+  "id" : 12345,
   "updateTime" : 12345,
+  "appType" : "...",
   "info" : {
     "property1" : "...",
     "property2" : "..."
   },
-  "appType" : "...",
-  "ipAddress" : "...",
   "hostName" : "...",
-  "id" : 12345
+  "createTime" : 12345,
+  "serviceName" : "...",
+  "serviceType" : "..."
 },
       "description" : ""
     }
@@ -2207,29 +2322,31 @@
       ],
       "example" : {
   "pluginInfoList" : [ {
-    "createTime" : 12345,
-    "serviceName" : "...",
+    "ipAddress" : "...",
+    "id" : 12345,
     "updateTime" : 12345,
+    "appType" : "...",
     "info" : {
       "property1" : "...",
       "property2" : "..."
     },
-    "appType" : "...",
-    "ipAddress" : "...",
     "hostName" : "...",
-    "id" : 12345
-  }, {
     "createTime" : 12345,
     "serviceName" : "...",
+    "serviceType" : "..."
+  }, {
+    "ipAddress" : "...",
+    "id" : 12345,
     "updateTime" : 12345,
+    "appType" : "...",
     "info" : {
       "property1" : "...",
       "property2" : "..."
     },
-    "appType" : "...",
-    "ipAddress" : "...",
     "hostName" : "...",
-    "id" : 12345
+    "createTime" : 12345,
+    "serviceName" : "...",
+    "serviceType" : "..."
   } ],
   "listSize" : 12345,
   "list" : [ { }, { } ],
@@ -2252,20 +2369,25 @@
         },
         {
           "properties" : {
-            "zoneName" : {
+            "resourceSignature" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "policyLabels" : {
+            "description" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "string"
+            },
+            "rowFilterPolicyItems" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
 "items" : {
-  "type" : "string"
+  "$ref" : "#/definitions/json_RangerRowFilterPolicyItem"
 }
             },
-            "denyPolicyItems" : {
+            "policyItems" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
@@ -2273,20 +2395,25 @@
   "$ref" : "#/definitions/json_RangerPolicyItem"
 }
             },
-            "resources" : {
+            "policyType" : {
             "readOnly" : false,
 "description" : "",
-"type" : "object",
-"additionalProperties" : {
-  "$ref" : "#/definitions/json_RangerPolicyResource"
+"type" : "number"
+            },
+            "allowExceptions" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "array",
+"items" : {
+  "$ref" : "#/definitions/json_RangerPolicyItem"
 }
             },
-            "description" : {
+            "service" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "policyItems" : {
+            "denyExceptions" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
@@ -2294,79 +2421,74 @@
   "$ref" : "#/definitions/json_RangerPolicyItem"
 }
             },
-            "validitySchedules" : {
+            "conditions" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
 "items" : {
-  "$ref" : "#/definitions/json_RangerValiditySchedule"
+  "$ref" : "#/definitions/json_RangerPolicyItemCondition"
 }
             },
-            "isAuditEnabled" : {
+            "policyPriority" : {
             "readOnly" : false,
 "description" : "",
-"type" : "boolean"
+"type" : "number"
             },
-            "policyPriority" : {
-            "readOnly" : false,
-"description" : "",
-"type" : "number"
-            },
-            "service" : {
+            "serviceType" : {
             "readOnly" : false,
 "description" : "",
 "type" : "string"
             },
-            "allowExceptions" : {
+            "policyLabels" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
 "items" : {
-  "$ref" : "#/definitions/json_RangerPolicyItem"
+  "type" : "string"
 }
             },
-            "conditions" : {
+            "isDenyAllElse" : {
             "readOnly" : false,
 "description" : "",
-"type" : "array",
-"items" : {
-  "$ref" : "#/definitions/json_RangerPolicyItemCondition"
-}
+"type" : "boolean"
             },
-            "denyExceptions" : {
+            "dataMaskPolicyItems" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
 "items" : {
-  "$ref" : "#/definitions/json_RangerPolicyItem"
+  "$ref" : "#/definitions/json_RangerDataMaskPolicyItem"
 }
             },
-            "rowFilterPolicyItems" : {
+            "validitySchedules" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
 "items" : {
-  "$ref" : "#/definitions/json_RangerRowFilterPolicyItem"
+  "$ref" : "#/definitions/json_RangerValiditySchedule"
 }
             },
-            "name" : {
-            "readOnly" : false,
-"description" : "",
-"type" : "string"
-            },
-            "resourceSignature" : {
+            "resources" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "object",
+"additionalProperties" : {
+  "$ref" : "#/definitions/json_RangerPolicyResource"
+}
             },
-            "dataMaskPolicyItems" : {
+            "denyPolicyItems" : {
             "readOnly" : false,
 "description" : "",
 "type" : "array",
 "items" : {
-  "$ref" : "#/definitions/json_RangerDataMaskPolicyItem"
+  "$ref" : "#/definitions/json_RangerPolicyItem"
 }
             },
+            "zoneName" : {
+            "readOnly" : false,
+"description" : "",
+"type" : "string"
+            },
             "options" : {
             "readOnly" : false,
 "description" : "",
@@ -2375,24 +2497,26 @@
   "type" : "object"
 }
             },
-            "policyType" : {
+            "name" : {
             "readOnly" : false,
 "description" : "",
-"type" : "number"
+"type" : "string"
             },
-            "serviceType" : {
+            "isAuditEnabled" : {
             "readOnly" : false,
 "description" : "",
-"type" : "string"
+"type" : "boolean"
             }
           }
         }
       ],
       "example" : {
-  "zoneName" : "...",
-  "policyLabels" : [ "...", "..." ],
-  "denyPolicyItems" : [ {
-    "users" : [ "...", "..." ],
+  "resourceSignature" : "...",
+  "description" : "...",
+  "rowFilterPolicyItems" : [ {
+    "rowFilterInfo" : {
+      "filterExpr" : "..."
+    },
     "accesses" : [ {
       "type" : "...",
       "isAllowed" : true
@@ -2400,18 +2524,21 @@
       "type" : "...",
       "isAllowed" : true
     } ],
-    "groups" : [ "...", "..." ],
-    "roles" : [ "...", "..." ],
+    "users" : [ "...", "..." ],
     "delegateAdmin" : true,
     "conditions" : [ {
-      "type" : "...",
-      "values" : [ "...", "..." ]
+      "values" : [ "...", "..." ],
+      "type" : "..."
     }, {
-      "type" : "...",
-      "values" : [ "...", "..." ]
-    } ]
+      "values" : [ "...", "..." ],
+      "type" : "..."
+    } ],
+    "roles" : [ "...", "..." ],
+    "groups" : [ "...", "..." ]
   }, {
-    "users" : [ "...", "..." ],
+    "rowFilterInfo" : {
+      "filterExpr" : "..."
+    },
     "accesses" : [ {
       "type" : "...",
       "isAllowed" : true
@@ -2419,32 +2546,19 @@
       "type" : "...",
       "isAllowed" : true
     } ],
-    "groups" : [ "...", "..." ],
-    "roles" : [ "...", "..." ],
+    "users" : [ "...", "..." ],
     "delegateAdmin" : true,
     "conditions" : [ {
-      "type" : "...",
-      "values" : [ "...", "..." ]
-    }, {
-      "type" : "...",
-      "values" : [ "...", "..." ]
-    } ]
-  } ],
-  "resources" : {
-    "property1" : {
-      "isRecursive" : true,
       "values" : [ "...", "..." ],

[... 32013 lines stripped ...]