Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/9250a81e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/9250a81e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/9250a81e Branch: refs/heads/asf-site Commit: 9250a81e734bd886e13d23d897c6acbc0e3fda87 Parents: 8c16d6a 337c94c Author: Dave Johnson <snoopd...@apache.org> Authored: Mon May 23 10:15:50 2016 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Mon May 23 10:15:50 2016 -0400 ---------------------------------------------------------------------- UsergridSDK.podspec | 18 + sdks/java/README.md | 598 +++++- sdks/java/pom.xml | 73 +- .../org/apache/usergrid/java/client/Client.java | 1292 ------------- .../apache/usergrid/java/client/Usergrid.java | 285 +++ .../usergrid/java/client/UsergridClient.java | 427 +++++ .../java/client/UsergridClientConfig.java | 60 + .../usergrid/java/client/UsergridEnums.java | 170 ++ .../usergrid/java/client/UsergridRequest.java | 205 +++ .../java/client/UsergridRequestManager.java | 86 + .../java/client/auth/UsergridAppAuth.java | 55 + .../usergrid/java/client/auth/UsergridAuth.java | 75 + .../java/client/auth/UsergridUserAuth.java | 56 + .../usergrid/java/client/entities/Activity.java | 625 ------- .../usergrid/java/client/entities/Device.java | 68 - .../usergrid/java/client/entities/Entity.java | 191 -- .../usergrid/java/client/entities/Group.java | 79 - .../usergrid/java/client/entities/Message.java | 148 -- .../usergrid/java/client/entities/User.java | 158 -- .../java/client/exception/ClientException.java | 41 - .../client/exception/UsergridException.java | 50 + .../java/client/model/UsergridDevice.java | 60 + .../java/client/model/UsergridEntity.java | 487 +++++ .../java/client/model/UsergridUser.java | 198 ++ .../java/client/query/UsergridQuery.java | 434 +++++ .../java/client/response/AggregateCounter.java | 52 - .../client/response/AggregateCounterSet.java | 111 -- .../java/client/response/ApiResponse.java | 421 ----- .../client/response/ClientCredentialsInfo.java | 58 - .../java/client/response/QueueInfo.java | 44 - .../java/client/response/UsergridResponse.java | 230 +++ .../client/response/UsergridResponseError.java | 98 + .../usergrid/java/client/utils/JsonUtils.java | 262 ++- .../usergrid/java/client/utils/MapUtils.java | 27 +- .../usergrid/java/client/utils/ObjectUtils.java | 28 +- .../usergrid/java/client/utils/UrlUtils.java | 124 -- .../utils/UsergridEntityDeserializer.java | 41 + .../client/ClientAuthFallBackTestCase.java | 72 + .../usergrid/client/ClientAuthTestCase.java | 85 + .../client/ClientConnectionsTestCase.java | 171 ++ .../usergrid/client/ClientRestTestCase.java | 90 + .../apache/usergrid/client/EntityTestCase.java | 676 +++++++ .../apache/usergrid/client/QueryTestCase.java | 194 ++ .../usergrid/client/SDKTestConfiguration.java | 38 + .../apache/usergrid/client/SDKTestUtils.java | 108 ++ .../client/UsergridClientAuthTestCase.java | 73 + .../usergrid/client/UsergridInitTestCase.java | 48 + .../client/UsergridResponseErrorTestCase.java | 62 + .../client/UsergridResponseTestCase.java | 85 + .../usergrid/client/UsergridTestCase.java | 30 + sdks/java/usergrid-java-client-2.1.0.jar | Bin 0 -> 1992232 bytes sdks/swift/README.md | 2 +- .../Source/Base.lproj/Main.storyboard | 26 +- .../ActivityFeed/Source/FormTextField.swift | 2 +- .../Source/MessageViewController.swift | 26 +- .../Samples/Push/Source/UsergridManager.swift | 2 +- sdks/swift/Source/Usergrid.swift | 32 +- sdks/swift/Source/UsergridAsset.swift | 18 +- sdks/swift/Source/UsergridAuth.swift | 6 +- sdks/swift/Source/UsergridClient.swift | 89 +- sdks/swift/Source/UsergridClientConfig.swift | 14 +- sdks/swift/Source/UsergridDevice.swift | 41 +- sdks/swift/Source/UsergridEntity.swift | 104 +- sdks/swift/Source/UsergridEnums.swift | 22 +- sdks/swift/Source/UsergridExtensions.swift | 82 +- sdks/swift/Source/UsergridFileMetaData.swift | 4 +- sdks/swift/Source/UsergridQuery.swift | 3 +- sdks/swift/Source/UsergridRequest.swift | 2 +- sdks/swift/Source/UsergridRequestManager.swift | 72 +- sdks/swift/Source/UsergridResponse.swift | 6 +- sdks/swift/Source/UsergridUser.swift | 62 +- sdks/swift/Tests/ASSET_Tests.swift | 218 ++- sdks/swift/Tests/AUTH_Tests.swift | 92 +- sdks/swift/Tests/CONNECTION_Tests.swift | 42 +- sdks/swift/Tests/ClientCreationTests.swift | 44 +- sdks/swift/Tests/GET_Tests.swift | 38 +- sdks/swift/Tests/PUT_Tests.swift | 38 +- sdks/swift/Tests/TestAssets/UsergridGuy.jpg | Bin 0 -> 12981 bytes sdks/swift/Tests/User_Tests.swift | 310 +++- sdks/swift/UsergridSDK.podspec | 18 - .../swift/UsergridSDK.xcodeproj/project.pbxproj | 4 +- sdks/swift/docs/Classes.html | 16 +- sdks/swift/docs/Classes/Usergrid.html | 290 ++- sdks/swift/docs/Classes/UsergridAppAuth.html | 30 +- sdks/swift/docs/Classes/UsergridAsset.html | 44 +- .../Classes/UsergridAssetUploadRequest.html | 20 +- sdks/swift/docs/Classes/UsergridAuth.html | 34 +- sdks/swift/docs/Classes/UsergridClient.html | 275 ++- .../docs/Classes/UsergridClientConfig.html | 54 +- sdks/swift/docs/Classes/UsergridDevice.html | 205 ++- sdks/swift/docs/Classes/UsergridEntity.html | 215 ++- .../docs/Classes/UsergridFileMetaData.html | 30 +- sdks/swift/docs/Classes/UsergridQuery.html | 156 +- sdks/swift/docs/Classes/UsergridRequest.html | 36 +- sdks/swift/docs/Classes/UsergridResponse.html | 42 +- .../docs/Classes/UsergridResponseError.html | 24 +- sdks/swift/docs/Classes/UsergridUser.html | 231 ++- sdks/swift/docs/Classes/UsergridUserAuth.html | 30 +- sdks/swift/docs/Enums.html | 28 +- sdks/swift/docs/Enums/UsergridAuthMode.html | 283 +++ .../docs/Enums/UsergridDeviceProperties.html | 20 +- sdks/swift/docs/Enums/UsergridDirection.html | 16 +- .../docs/Enums/UsergridEntityProperties.html | 24 +- sdks/swift/docs/Enums/UsergridHttpMethod.html | 16 +- .../docs/Enums/UsergridImageContentType.html | 16 +- .../swift/docs/Enums/UsergridQueryOperator.html | 20 +- .../docs/Enums/UsergridQuerySortOrder.html | 20 +- .../docs/Enums/UsergridUserProperties.html | 20 +- sdks/swift/docs/Extensions.html | 72 +- sdks/swift/docs/Extensions/NSDate.html | 448 +++++ sdks/swift/docs/Global Variables.html | 18 +- sdks/swift/docs/Typealiases.html | 36 +- .../Contents/Resources/Documents/Classes.html | 209 ++- .../Resources/Documents/Classes/Usergrid.html | 1086 ++++++++--- .../Documents/Classes/UsergridAppAuth.html | 183 +- .../Documents/Classes/UsergridAsset.html | 265 ++- .../Classes/UsergridAssetUploadRequest.html | 356 ++++ .../Documents/Classes/UsergridAuth.html | 274 ++- .../Documents/Classes/UsergridClient.html | 1310 +++++++++---- .../Documents/Classes/UsergridClientConfig.html | 345 +++- .../Documents/Classes/UsergridDevice.html | 519 +++++- .../Documents/Classes/UsergridEntity.html | 809 +++++--- .../Documents/Classes/UsergridFileMetaData.html | 217 ++- .../Documents/Classes/UsergridQuery.html | 540 ++++-- .../Documents/Classes/UsergridRequest.html | 619 +++++++ .../Documents/Classes/UsergridResponse.html | 309 ++-- .../Classes/UsergridResponseError.html | 473 +++++ .../Documents/Classes/UsergridUser.html | 1734 ++++++++++++++++-- .../Documents/Classes/UsergridUserAuth.html | 169 +- .../Contents/Resources/Documents/Enums.html | 115 +- .../Documents/Enums/UsergridAuthFallback.html | 53 +- .../Documents/Enums/UsergridAuthMode.html | 283 +++ .../Enums/UsergridDeviceProperties.html | 83 +- .../Documents/Enums/UsergridDirection.html | 71 +- .../Enums/UsergridEntityProperties.html | 101 +- .../Documents/Enums/UsergridHttpMethod.html | 341 ++++ .../Enums/UsergridImageContentType.html | 73 +- .../Documents/Enums/UsergridQueryOperator.html | 89 +- .../Documents/Enums/UsergridQuerySortOrder.html | 83 +- .../Documents/Enums/UsergridUserProperties.html | 95 +- .../Resources/Documents/Extensions.html | 72 +- .../Resources/Documents/Extensions/NSDate.html | 448 +++++ .../Resources/Documents/Global Variables.html | 210 +++ .../Resources/Documents/Typealiases.html | 159 +- .../Resources/Documents/css/highlight.css | 6 +- .../Contents/Resources/Documents/css/jazzy.css | 65 +- .../Contents/Resources/Documents/index.html | 741 +++++++- .../Contents/Resources/Documents/js/jazzy.js | 11 +- .../Resources/Documents/undocumented.txt | 11 - .../.docset/Contents/Resources/docSet.dsidx | Bin 114688 -> 147456 bytes sdks/swift/docs/docsets/.tgz | Bin 111866 -> 148251 bytes sdks/swift/docs/index.html | 24 +- .../main/resources/usergrid-default.properties | 10 +- .../corepersistence/ApplicationIdCacheImpl.java | 9 +- .../corepersistence/CpEntityManager.java | 4 +- .../index/IndexSchemaCacheFig.java | 2 +- .../index/IndexSchemaCacheImpl.java | 3 +- .../corepersistence/index/IndexServiceImpl.java | 1 + .../org/apache/usergrid/utils/StringUtils.java | 8 + .../main/resources/usergrid-core-context.xml | 6 + .../shard/impl/NodeShardAllocationImpl.java | 7 +- .../shard/impl/ShardGroupCompactionImpl.java | 18 +- .../usergrid/persistence/queue/QueueFig.java | 4 +- .../queue/impl/QueueManagerFactoryImpl.java | 27 +- .../org/apache/usergrid/rest/RootResource.java | 25 + .../rest/applications/CollectionResource.java | 8 +- .../apache/usergrid/rest/NotificationsIT.java | 11 + .../collection/CollectionsResourceIT.java | 147 +- .../events/ApplicationRequestCounterIT.java | 48 + .../cassandra/ManagementServiceImpl.java | 93 +- .../ApplicationQueueManagerCache.java | 143 ++ .../notifications/NotificationsService.java | 11 +- .../services/notifications/QueueListener.java | 58 +- .../services/notifications/TaskManager.java | 117 +- .../impl/ApplicationQueueManagerImpl.java | 151 +- .../services/notifiers/NotifiersService.java | 6 + .../gcm/NotificationsServiceIT.java | 77 + 177 files changed, 20005 insertions(+), 6895 deletions(-) ----------------------------------------------------------------------