- Removing unecessary revision checking.

- Fixing error message when checking user, group, and policy revision.
mcgilman · Jun 28, 2016 · d8edda4 · d8edda4
1 parent 4bfcf71
commit d8edda4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/...rk/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/...rk/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -215,7 +215,6 @@
  */
 public class StandardNiFiServiceFacade implements NiFiServiceFacade {
     private static final Logger logger = LoggerFactory.getLogger(StandardNiFiServiceFacade.class);
-    private static final String NON_ZERO_STARTING_REVISION = "The revision must start at 0.";
 
     // nifi core components
     private ControllerFacade controllerFacade;
@@ -1273,9 +1272,6 @@ public AccessPolicyEntity createAccessPolicy(final Revision revision, final Acce
         // TODO read lock on users and groups (and resource+action?) while the policy is being created?
         final Authorizable tenantAuthorizable = authorizableLookup.getTenantAuthorizable();
         final String creator = NiFiUserUtils.getNiFiUserName();
-        if (revision.getVersion() != 0) {
-            throw new IllegalArgumentException(NON_ZERO_STARTING_REVISION);
-        }
         final AccessPolicy newAccessPolicy = accessPolicyDAO.createAccessPolicy(accessPolicyDTO);
         final AccessPolicyDTO newAccessPolicyDto = dtoFactory.createAccessPolicyDto(newAccessPolicy,
                 newAccessPolicy.getGroups().stream().map(mapUserGroupIdToTenantEntity()).collect(Collectors.toSet()),
@@ -1293,9 +1289,6 @@ public AccessPolicyEntity createAccessPolicy(final Revision revision, final Acce
     public UserEntity createUser(final Revision revision, final UserDTO userDTO) {
         final Authorizable tenantAuthorizable = authorizableLookup.getTenantAuthorizable();
         final String creator = NiFiUserUtils.getNiFiUserName();
-        if (revision.getVersion() != 0) {
-            throw new IllegalArgumentException(NON_ZERO_STARTING_REVISION);
-        }
         final User newUser = userDAO.createUser(userDTO);
         final UserDTO newUserDto = dtoFactory.createUserDto(newUser, newUser.getGroups().stream()
                 .map(mapUserGroupIdToTenantEntity()).collect(Collectors.toSet()));
@@ -1308,9 +1301,6 @@ public UserEntity createUser(final Revision revision, final UserDTO userDTO) {
     public UserGroupEntity createUserGroup(final Revision revision, final UserGroupDTO userGroupDTO) {
         final Authorizable tenantAuthorizable = authorizableLookup.getTenantAuthorizable();
         final String creator = NiFiUserUtils.getNiFiUserName();
-        if (revision.getVersion() != 0) {
-            throw new IllegalArgumentException(NON_ZERO_STARTING_REVISION);
-        }
         final Group newUserGroup = userGroupDAO.createUserGroup(userGroupDTO);
         final UserGroupDTO newUserGroupDto = dtoFactory.createUserGroupDto(newUserGroup, newUserGroup.getUsers().stream()
                 .map(userId -> {

diff --git a/...ork/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java b/...ork/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java
@@ -188,7 +188,7 @@ public Response createAccessPolicy(
         }
 
         if (accessPolicyEntity.getRevision() == null || (accessPolicyEntity.getRevision().getVersion() == null || accessPolicyEntity.getRevision().getVersion() != 0)) {
-            throw new IllegalArgumentException("A revision of 0 must be specified when creating a new Processor.");
+            throw new IllegalArgumentException("A revision of 0 must be specified when creating a new Policy.");
         }
 
         if (accessPolicyEntity.getComponent().getId() != null) {

diff --git a/...ramework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java b/...ramework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java
@@ -165,7 +165,7 @@ public Response createUser(
         }
 
         if (userEntity.getRevision() == null || (userEntity.getRevision().getVersion() == null || userEntity.getRevision().getVersion() != 0)) {
-            throw new IllegalArgumentException("A revision of 0 must be specified when creating a new Processor.");
+            throw new IllegalArgumentException("A revision of 0 must be specified when creating a new User.");
         }
 
         if (userEntity.getComponent().getId() != null) {
@@ -550,7 +550,7 @@ public Response createUserGroup(
         }
 
         if (userGroupEntity.getRevision() == null || (userGroupEntity.getRevision().getVersion() == null || userGroupEntity.getRevision().getVersion() != 0)) {
-            throw new IllegalArgumentException("A revision of 0 must be specified when creating a new Processor.");
+            throw new IllegalArgumentException("A revision of 0 must be specified when creating a new User Group.");
         }
 
         if (userGroupEntity.getComponent().getId() != null) {