usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [2/2] usergrid git commit: Merge branch '1.x' of https://git-wip-us.apache.org/repos/asf/usergrid into 1.x
Date Thu, 04 Feb 2016 19:20:17 GMT
Merge branch '1.x' of https://git-wip-us.apache.org/repos/asf/usergrid into 1.x

# Via George Reyes (1) and Michael Russo (1)
* '1.x' of https://git-wip-us.apache.org/repos/asf/usergrid:
  Added a test verifying that older properties are patched instead of completely removed.
And that the entity isn't entirely recreated with the new PUT logic. Also removed the redundant
properties delete from the entityManager with no change to functionality.
  Readded previous put by Name logic for the case that the entity ref is null. Also fixed
some of the existing functionality which was included in the null check.
  Removed extra unused imports.
  Added functionality to delete by name and added a test to verify.
  Changed how the put by name method works so that it updates the entity in the exact same
way a PUT by uuid would function. Added a test verifying the change restores access to an
entity without any entity_properties.


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

Branch: refs/heads/1.x
Commit: e0be7dda2013e2b6a0fed8e3bb44d295080c441f
Parents: 8b821c4 f0b108f
Author: George Reyes <grey@apache.org>
Authored: Thu Feb 4 11:20:02 2016 -0800
Committer: George Reyes <grey@apache.org>
Committed: Thu Feb 4 11:20:02 2016 -0800

----------------------------------------------------------------------
 .../cassandra/EntityManagerImpl.java            |   2 +-
 .../java/org/apache/usergrid/rest/ITSetup.java  |   9 +-
 .../users/CollectionsResourceIT.java            | 154 ++++++++++++++++++-
 .../services/AbstractCollectionService.java     |  51 +++---
 4 files changed, 189 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/e0be7dda/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
----------------------------------------------------------------------


Mime
View raw message