Skip to content

/storio

Browse files

New packages naming convention

  • Loading branch information...
1 parent 5c8e50e commit a7d5a9f6c21a0ccb7b3d86694ffeff8d0ee14d2a @artem-zinnatullin artem-zinnatullin committed
Unified Split
Showing with 544 additions and 541 deletions.
  1. +2 −2 build.gradle
  2. +6 −3 settings.gradle
  3. +1 −1 storio-common/src/main/java/com/pushtorefresh/storio/{operation → operations}/PreparedOperation.java
  4. +2 −2 .../src/main/java/com/pushtorefresh/storio/{operation → operations}/group/GroupOperationResults.java
  5. +3 −3 ...src/main/java/com/pushtorefresh/storio/{operation → operations}/group/PreparedGroupOperation.java
  6. +2 −2 ...a/com/pushtorefresh/storio/{operation → operations}/internal/MapSomethingToExecuteAsBlocking.java
  7. +2 −2 ...java/com/pushtorefresh/storio/{operation → operations}/internal/OnSubscribeExecuteAsBlocking.java
  8. +2 −2 .../test/java/com/pushtorefresh/storio/{operation → operations}/group/GroupOperationResultsTest.java
  9. +2 −2 ...mon/src/test/java/com/pushtorefresh/storio/{operation → operations}/group/GroupOperationStub.java
  10. +2 −2 ...m/pushtorefresh/storio/{operation → operations}/internal/MapSomethingToExecuteAsBlockingTest.java
  11. +2 −2 .../com/pushtorefresh/storio/{operation → operations}/internal/OnSubscribeExecuteAsBlockingTest.java
  12. +5 −5 ...ontent-resolver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/BaseTest.java
  13. +1 −1 ...tent-resolver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/DeleteTest.java
  14. +2 −2 ...tent-resolver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/InsertTest.java
  15. +2 −2 ...ntent-resolver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/QueryTest.java
  16. +10 −10 ...ntent-resolver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/TweetMeta.java
  17. +2 −2 ...tent-resolver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/UpdateTest.java
  18. +10 −10 ...ontent-resolver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/UserMeta.java
  19. +3 −3 ...t-resolver/src/main/java/com/pushtorefresh/storio/contentresolver/ContentResolverTypeMapping.java
  20. +7 −7 ...ontent-resolver/src/main/java/com/pushtorefresh/storio/contentresolver/StorIOContentResolver.java
  21. +4 −4 ...ver/src/main/java/com/pushtorefresh/storio/contentresolver/impl/DefaultStorIOContentResolver.java
  22. +2 −2 ...m/pushtorefresh/storio/contentresolver/{operation → operations}/delete/DefaultDeleteResolver.java
  23. +1 −1 ...java/com/pushtorefresh/storio/contentresolver/{operation → operations}/delete/DeleteResolver.java
  24. +1 −1 ...n/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/delete/DeleteResult.java
  25. +1 −1 .../java/com/pushtorefresh/storio/contentresolver/{operation → operations}/delete/DeleteResults.java
  26. +3 −3 ...java/com/pushtorefresh/storio/contentresolver/{operation → operations}/delete/PreparedDelete.java
  27. +3 −3 ...m/pushtorefresh/storio/contentresolver/{operation → operations}/delete/PreparedDeleteByQuery.java
  28. +2 −2 ...esh/storio/contentresolver/{operation → operations}/delete/PreparedDeleteCollectionOfObjects.java
  29. +2 −2 ...om/pushtorefresh/storio/contentresolver/{operation → operations}/delete/PreparedDeleteObject.java
  30. +2 −2 ...ava/com/pushtorefresh/storio/contentresolver/{operation → operations}/get/DefaultGetResolver.java
  31. +2 −2 .../main/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/get/GetResolver.java
  32. +2 −2 .../main/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/get/PreparedGet.java
  33. +4 −4 ...java/com/pushtorefresh/storio/contentresolver/{operation → operations}/get/PreparedGetCursor.java
  34. +4 −4 ...m/pushtorefresh/storio/contentresolver/{operation → operations}/get/PreparedGetListOfObjects.java
  35. +4 −4 ...ava/com/pushtorefresh/storio/contentresolver/{operation → operations}/put/DefaultPutResolver.java
  36. +2 −2 .../main/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/put/PreparedPut.java
  37. +2 −2 ...torefresh/storio/contentresolver/{operation → operations}/put/PreparedPutCollectionOfObjects.java
  38. +2 −2 ...m/pushtorefresh/storio/contentresolver/{operation → operations}/put/PreparedPutContentValues.java
  39. +2 −2 ...refresh/storio/contentresolver/{operation → operations}/put/PreparedPutContentValuesIterable.java
  40. +2 −2 ...java/com/pushtorefresh/storio/contentresolver/{operation → operations}/put/PreparedPutObject.java
  41. +1 −1 .../main/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/put/PutResolver.java
  42. +1 −1 ...rc/main/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/put/PutResult.java
  43. +1 −1 ...c/main/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/put/PutResults.java
  44. +2 −2 ...esolver/src/main/java/com/pushtorefresh/storio/contentresolver/{query → queries}/DeleteQuery.java
  45. +2 −2 ...esolver/src/main/java/com/pushtorefresh/storio/contentresolver/{query → queries}/InsertQuery.java
  46. +2 −2 ...tent-resolver/src/main/java/com/pushtorefresh/storio/contentresolver/{query → queries}/Query.java
  47. +2 −2 ...esolver/src/main/java/com/pushtorefresh/storio/contentresolver/{query → queries}/UpdateQuery.java
  48. +3 −3 ...solver/src/test/java/com/pushtorefresh/storio/contentresolver/ContentResolverTypeMappingTest.java
  49. +9 −9 ...o-content-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/design/ArticleMeta.java
  50. +3 −3 ...lver/src/test/java/com/pushtorefresh/storio/contentresolver/design/DeleteOperationDesignTest.java
  51. +4 −4 ...rc/test/java/com/pushtorefresh/storio/contentresolver/design/DesignTestStorIOContentResolver.java
  52. +2 −2 ...esolver/src/test/java/com/pushtorefresh/storio/contentresolver/design/GetOperationDesignTest.java
  53. +6 −6 ...esolver/src/test/java/com/pushtorefresh/storio/contentresolver/design/PutOperationDesignTest.java
  54. +3 −3 ...src/test/java/com/pushtorefresh/storio/contentresolver/impl/DefaultStorIOContentResolverTest.java
  55. +2 −2 ...shtorefresh/storio/contentresolver/{operation → operations}/delete/DefaultDeleteResolverTest.java
  56. +2 −2 ...a/com/pushtorefresh/storio/contentresolver/{operation → operations}/delete/DeleteByQueryStub.java
  57. +1 −1 ...a/com/pushtorefresh/storio/contentresolver/{operation → operations}/delete/DeleteObjectsStub.java
  58. +1 −1 ...va/com/pushtorefresh/storio/contentresolver/{operation → operations}/delete/DeleteResultTest.java
  59. +1 −1 ...a/com/pushtorefresh/storio/contentresolver/{operation → operations}/delete/DeleteResultsTest.java
  60. +1 −1 ...shtorefresh/storio/contentresolver/{operation → operations}/delete/PreparedDeleteByQueryTest.java
  61. +2 −2 ...storio/contentresolver/{operation → operations}/delete/PreparedDeleteCollectionOfObjectsTest.java
  62. +2 −2 ...ushtorefresh/storio/contentresolver/{operation → operations}/delete/PreparedDeleteObjectTest.java
  63. +1 −1 .../test/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/delete/TestItem.java
  64. +2 −2 ...com/pushtorefresh/storio/contentresolver/{operation → operations}/get/DefaultGetResolverTest.java
  65. +2 −2 ...est/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/get/GetCursorStub.java
  66. +2 −2 ...st/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/get/GetObjectsStub.java
  67. +1 −1 .../com/pushtorefresh/storio/contentresolver/{operation → operations}/get/PreparedGetCursorTest.java
  68. +2 −2 ...shtorefresh/storio/contentresolver/{operation → operations}/get/PreparedGetListOfObjectsTest.java
  69. +1 −1 ...src/test/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/get/TestItem.java
  70. +4 −4 ...com/pushtorefresh/storio/contentresolver/{operation → operations}/put/DefaultPutResolverTest.java
  71. +3 −3 ...fresh/storio/contentresolver/{operation → operations}/put/PreparedPutCollectionOfObjectsTest.java
  72. +1 −1 ...esh/storio/contentresolver/{operation → operations}/put/PreparedPutContentValuesIterableTest.java
  73. +1 −1 ...shtorefresh/storio/contentresolver/{operation → operations}/put/PreparedPutContentValuesTest.java
  74. +3 −3 .../com/pushtorefresh/storio/contentresolver/{operation → operations}/put/PreparedPutObjectTest.java
  75. +1 −1 ...a/com/pushtorefresh/storio/contentresolver/{operation → operations}/put/PutContentValuesStub.java
  76. +1 −1 ...st/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/put/PutObjectsStub.java
  77. +1 −1 ...src/test/java/com/pushtorefresh/storio/contentresolver/{operation → operations}/put/TestItem.java
  78. +1 −1 ...ver/src/test/java/com/pushtorefresh/storio/contentresolver/{query → queries}/DeleteQueryTest.java
  79. +1 −1 ...ver/src/test/java/com/pushtorefresh/storio/contentresolver/{query → queries}/InsertQueryTest.java
  80. +1 −1 ...-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/{query → queries}/QueryTest.java
  81. +1 −1 ...ver/src/test/java/com/pushtorefresh/storio/contentresolver/{query → queries}/UpdateQueryTest.java
  82. +1 −1 storio-sample-app/src/androidTest/java/com/pushtorefresh/storio/contentresolver/test/BaseTest.java
  83. +2 −2 ...le-app/src/androidTest/java/com/pushtorefresh/storio/contentresolver/test/ObserveChangesTest.java
  84. +3 −3 ...io-sample-app/src/androidTest/java/com/pushtorefresh/storio/contentresolver/test/RxQueryTest.java
  85. +2 −2 storio-sample-app/src/main/java/com/pushtorefresh/storio/sample/db/entity/Tweet.java
  86. +10 −10 storio-sample-app/src/main/java/com/pushtorefresh/storio/sample/db/table/TweetTableMeta.java
  87. +9 −9 storio-sample-app/src/main/java/com/pushtorefresh/storio/sample/provider/meta/TweetMeta.java
  88. +1 −1 storio-sample-app/src/main/java/com/pushtorefresh/storio/sample/ui/fragment/TweetsFragment.java
  89. +0 −3 storio-sqlite-annotation-processor/gradle.properties
  90. +0 −3 storio-sqlite-annotation/gradle.properties
  91. 0 {storio-sqlite-annotation-processor → storio-sqlite-annotations-processor}/build.gradle
  92. +3 −0 storio-sqlite-annotations-processor/gradle.properties
  93. +1 −1 ...sor/src/main/java/com/pushtorefresh/storio/sqlite/annotations}/processor/ProcessingException.java
  94. +9 −9 ...r/src/main/java/com/pushtorefresh/storio/sqlite/annotations}/processor/StorIOSQLiteProcessor.java
  95. +1 −1 ...ocessor/src/main/java/com/pushtorefresh/storio/sqlite/annotations}/processor/generate/Common.java
  96. +6 −6 ...java/com/pushtorefresh/storio/sqlite/annotations}/processor/generate/DeleteResolverGenerator.java
  97. +21 −21 ...in/java/com/pushtorefresh/storio/sqlite/annotations}/processor/generate/GetResolverGenerator.java
  98. +8 −8 ...in/java/com/pushtorefresh/storio/sqlite/annotations}/processor/generate/PutResolverGenerator.java
  99. +3 −3 ...src/main/java/com/pushtorefresh/storio/sqlite/annotations}/processor/generate/QueryGenerator.java
  100. +1 −1 .../src/main/java/com/pushtorefresh/storio/sqlite/annotations}/processor/introspection/JavaType.java
  101. +2 −2 .../com/pushtorefresh/storio/sqlite/annotations}/processor/introspection/StorIOSQLiteColumnMeta.java
  102. +2 −2 ...va/com/pushtorefresh/storio/sqlite/annotations}/processor/introspection/StorIOSQLiteTypeMeta.java
  103. +7 −7 .../com/pushtorefresh/storio/sqlite/annotations}/processor/generate/DeleteResolverGeneratorTest.java
  104. +7 −7 ...ava/com/pushtorefresh/storio/sqlite/annotations}/processor/generate/GetResolverGeneratorTest.java
  105. +8 −8 ...ava/com/pushtorefresh/storio/sqlite/annotations}/processor/generate/PutResolverGeneratorTest.java
  106. +4 −4 ...test/java/com/pushtorefresh/storio/sqlite/annotations}/processor/generate/QueryGeneratorTest.java
  107. +14 −14 .../test/java/com/pushtorefresh/storio/sqlite/annotations}/processor/introspection/JavaTypeTest.java
  108. 0 {storio-sqlite-annotation → storio-sqlite-annotations}/build.gradle
  109. +3 −0 storio-sqlite-annotations/gradle.properties
  110. +1 −1 ...te-annotations/src/main/java/com/pushtorefresh/storio/sqlite/annotations}/StorIOSQLiteColumn.java
  111. +1 −1 ...lite-annotations/src/main/java/com/pushtorefresh/storio/sqlite/annotations}/StorIOSQLiteType.java
  112. +4 −4 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/BaseTest.java
  113. +1 −1 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/DeleteTest.java
  114. +4 −4 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/QueryTest.java
  115. +9 −9 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/TweetTableMeta.java
  116. +2 −2 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/UpdateTest.java
  117. +11 −11 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/UserTableMeta.java
  118. +4 −4 ...-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/auto_parcel/AutoParcelTest.java
  119. +9 −9 ...o-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/auto_parcel/BookTableMeta.java
  120. +3 −3 storio-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/SQLiteTypeMapping.java
  121. +9 −9 storio-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/StorIOSQLite.java
  122. +5 −5 storio-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/impl/DefaultStorIOSQLite.java
  123. +2 −2 ...n/java/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/DefaultDeleteResolver.java
  124. +1 −1 ...src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/DeleteResolver.java
  125. +1 −1 ...e/src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/DeleteResult.java
  126. +1 −1 .../src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/DeleteResults.java
  127. +4 −4 ...src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/PreparedDelete.java
  128. +3 −3 ...n/java/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/PreparedDeleteByQuery.java
  129. +2 −2 ...ushtorefresh/storio/sqlite/{operation → operations}/delete/PreparedDeleteCollectionOfObjects.java
  130. +2 −2 ...in/java/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/PreparedDeleteObject.java
  131. +4 −4 ...ain/java/com/pushtorefresh/storio/sqlite/{operation → operations}/execute/PreparedExecuteSQL.java
  132. +3 −3 ...rc/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/get/DefaultGetResolver.java
  133. +3 −3 ...qlite/src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/get/GetResolver.java
  134. +4 −4 ...qlite/src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/get/PreparedGet.java
  135. +5 −5 ...src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/get/PreparedGetCursor.java
  136. +5 −5 ...n/java/com/pushtorefresh/storio/sqlite/{operation → operations}/get/PreparedGetListOfObjects.java
  137. +4 −4 ...rc/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/DefaultPutResolver.java
  138. +2 −2 ...qlite/src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/PreparedPut.java
  139. +2 −2 .../com/pushtorefresh/storio/sqlite/{operation → operations}/put/PreparedPutCollectionOfObjects.java
  140. +2 −2 ...n/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/PreparedPutContentValues.java
  141. +2 −2 ...om/pushtorefresh/storio/sqlite/{operation → operations}/put/PreparedPutContentValuesIterable.java
  142. +2 −2 ...src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/PreparedPutObject.java
  143. +1 −1 ...qlite/src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/PutResolver.java
  144. +1 −1 ...-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/PutResult.java
  145. +1 −1 ...sqlite/src/main/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/PutResults.java
  146. +2 −2 storio-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/{query → queries}/DeleteQuery.java
  147. +2 −2 storio-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/{query → queries}/InsertQuery.java
  148. +2 −2 storio-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/{query → queries}/Query.java
  149. +2 −2 storio-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/{query → queries}/RawQuery.java
  150. +2 −2 storio-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/{query → queries}/UpdateQuery.java
  151. +3 −3 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/SQLiteTypeMappingTest.java
  152. +3 −3 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/design/DeleteOperationDesignTest.java
  153. +9 −9 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/design/DesignTestStorIOSQLite.java
  154. +1 −1 ...io-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/design/ExecuteSQLOperationDesignTest.java
  155. +2 −2 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/design/GetOperationDesignTest.java
  156. +6 −6 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/design/PutOperationDesignTest.java
  157. +9 −9 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/design/UserTableMeta.java
  158. +3 −3 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/impl/DefaultStorIOSQLiteTest.java
  159. +2 −2 ...va/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/DefaultDeleteResolverTest.java
  160. +1 −1 ...c/test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/DeleteResultTest.java
  161. +1 −1 .../test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/DeleteResultsTest.java
  162. +1 −1 ...ite/src/test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/DeleteStub.java
  163. +2 −2 ...orefresh/storio/sqlite/{operation → operations}/delete/PreparedDeleteCollectionOfObjectsTest.java
  164. +2 −2 ...ava/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/PreparedDeleteObjectTest.java
  165. +1 −1 ...qlite/src/test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/delete/TestItem.java
  166. +2 −2 ...java/com/pushtorefresh/storio/sqlite/{operation → operations}/execute/PreparedExecuteSQLTest.java
  167. +3 −3 ...est/java/com/pushtorefresh/storio/sqlite/{operation → operations}/get/DefaultGetResolverTest.java
  168. +3 −3 ...ite/src/test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/get/GetCursorStub.java
  169. +3 −3 ...te/src/test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/get/GetObjectsStub.java
  170. +1 −1 ...test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/get/PreparedGetCursorTest.java
  171. +3 −3 ...va/com/pushtorefresh/storio/sqlite/{operation → operations}/get/PreparedGetListOfObjectsTest.java
  172. +1 −1 ...o-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/get/TestItem.java
  173. +4 −4 ...est/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/DefaultPutResolverTest.java
  174. +3 −3 .../pushtorefresh/storio/sqlite/{operation → operations}/put/PreparedPutCollectionOfObjectsTest.java
  175. +1 −1 ...ushtorefresh/storio/sqlite/{operation → operations}/put/PreparedPutContentValuesIterableTest.java
  176. +1 −1 ...va/com/pushtorefresh/storio/sqlite/{operation → operations}/put/PreparedPutContentValuesTest.java
  177. +1 −1 ...test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/PreparedPutObjectTest.java
  178. +1 −1 .../test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/PutContentValuesStub.java
  179. +1 −1 ...te/src/test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/PutObjectsStub.java
  180. +1 −1 ...o-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/{operation → operations}/put/TestItem.java
  181. +1 −1 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/{query → queries}/DeleteQueryTest.java
  182. +1 −1 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/{query → queries}/InsertQueryTest.java
  183. +1 −1 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/{query → queries}/QueryTest.java
  184. +1 −1 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/{query → queries}/RawQueryTest.java
  185. +1 −1 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/{query → queries}/UpdateQueryTest.java
  186. +5 −5 ...om/pushtorefresh/storio/test_without_rxjava/contentresolver/DefaultStorIOContentResolverTest.java
  187. +3 −3 ...va/src/test/java/com/pushtorefresh/storio/test_without_rxjava/sqlite/DefaultStorIOSQLiteTest.java
View
4 build.gradle
@@ -45,8 +45,8 @@ ext.libraries = [
storIOCommon : project(':storio-common'),
storIOSQLite : project(':storio-sqlite'),
storIOContentResolver : project(':storio-content-resolver'),
- storIOSQLiteAnnotation : project(':storio-sqlite-annotation'),
- storIOSQLiteAnnotationProcessor: project('storio-sqlite-annotation-processor'),
+ storIOSQLiteAnnotation : project(':storio-sqlite-annotations'),
+ storIOSQLiteAnnotationProcessor: project(':storio-sqlite-annotations-processor'),
storIOTestCommon : project(':storio-test-common'),
// Libraries for tests and sample app
View
9 settings.gradle
@@ -2,7 +2,10 @@ include ':storio-common'
include ':storio-test-common'
include ':storio-sqlite'
include ':storio-content-resolver'
-include ':storio-sample-app'
+
+include ':storio-sqlite-annotations'
+include ':storio-sqlite-annotations-processor'
+
include ':storio-test-without-rxjava'
-include ':storio-sqlite-annotation'
-include ':storio-sqlite-annotation-processor'
+
+include ':storio-sample-app'
View
2 ...h/storio/operation/PreparedOperation.java → .../storio/operations/PreparedOperation.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.operation;
+package com.pushtorefresh.storio.operations;
import android.support.annotation.NonNull;
import android.support.annotation.WorkerThread;
View
4 ...peration/group/GroupOperationResults.java → ...erations/group/GroupOperationResults.java
@@ -1,8 +1,8 @@
-package com.pushtorefresh.storio.operation.group;
+package com.pushtorefresh.storio.operations.group;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import java.util.Collections;
import java.util.Map;
View
6 ...eration/group/PreparedGroupOperation.java → ...rations/group/PreparedGroupOperation.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.operation.group;
+package com.pushtorefresh.storio.operations.group;
import android.support.annotation.NonNull;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.operation.PreparedOperation;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.PreparedOperation;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import java.util.HashMap;
import java.util.List;
View
4 ...rnal/MapSomethingToExecuteAsBlocking.java → ...rnal/MapSomethingToExecuteAsBlocking.java
@@ -1,8 +1,8 @@
-package com.pushtorefresh.storio.operation.internal;
+package com.pushtorefresh.storio.operations.internal;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import rx.functions.Func1;
View
4 ...nternal/OnSubscribeExecuteAsBlocking.java → ...nternal/OnSubscribeExecuteAsBlocking.java
@@ -1,8 +1,8 @@
-package com.pushtorefresh.storio.operation.internal;
+package com.pushtorefresh.storio.operations.internal;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import rx.Observable;
import rx.Subscriber;
View
4 ...tion/group/GroupOperationResultsTest.java → ...ions/group/GroupOperationResultsTest.java
@@ -1,6 +1,6 @@
-package com.pushtorefresh.storio.operation.group;
+package com.pushtorefresh.storio.operations.group;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import org.junit.Test;
View
4 ...o/operation/group/GroupOperationStub.java → .../operations/group/GroupOperationStub.java
@@ -1,8 +1,8 @@
-package com.pushtorefresh.storio.operation.group;
+package com.pushtorefresh.storio.operations.group;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import com.pushtorefresh.storio.test.ObservableBehaviorChecker;
import java.util.ArrayList;
View
4 .../MapSomethingToExecuteAsBlockingTest.java → .../MapSomethingToExecuteAsBlockingTest.java
@@ -1,6 +1,6 @@
-package com.pushtorefresh.storio.operation.internal;
+package com.pushtorefresh.storio.operations.internal;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import org.junit.Test;
View
4 ...nal/OnSubscribeExecuteAsBlockingTest.java → ...nal/OnSubscribeExecuteAsBlockingTest.java
@@ -1,6 +1,6 @@
-package com.pushtorefresh.storio.operation.internal;
+package com.pushtorefresh.storio.operations.internal;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import org.junit.Test;
View
10 ...esolver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/BaseTest.java
@@ -7,11 +7,11 @@
import com.pushtorefresh.storio.contentresolver.ContentResolverTypeMapping;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
import com.pushtorefresh.storio.contentresolver.impl.DefaultStorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResult;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResults;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResult;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResults;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResult;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResults;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResult;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResults;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
import org.junit.Before;
View
2 ...olver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/DeleteTest.java
@@ -2,7 +2,7 @@
import android.support.test.runner.AndroidJUnit4;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResults;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResults;
import org.junit.Test;
import org.junit.runner.RunWith;
View
4 ...olver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/InsertTest.java
@@ -2,8 +2,8 @@
import android.support.test.runner.AndroidJUnit4;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResult;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResult;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
import org.junit.Test;
import org.junit.runner.RunWith;
View
4 ...solver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/QueryTest.java
@@ -4,8 +4,8 @@
import android.support.annotation.NonNull;
import android.support.test.runner.AndroidJUnit4;
-import com.pushtorefresh.storio.contentresolver.operation.get.DefaultGetResolver;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.operations.get.DefaultGetResolver;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
import org.junit.Test;
import org.junit.runner.RunWith;
View
20 ...solver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/TweetMeta.java
@@ -7,16 +7,16 @@
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DefaultDeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.DefaultGetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.GetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.DefaultPutResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResult;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DefaultDeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.DefaultGetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.GetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.DefaultPutResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResult;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
class TweetMeta {
View
4 ...olver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/UpdateTest.java
@@ -2,8 +2,8 @@
import android.support.test.runner.AndroidJUnit4;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResult;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResults;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResult;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResults;
import org.junit.Test;
import org.junit.runner.RunWith;
View
20 ...esolver/src/androidTest/java/com/pushtorefresh/storio/content_resolver/impl/UserMeta.java
@@ -7,16 +7,16 @@
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DefaultDeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.DefaultGetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.GetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.DefaultPutResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResult;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DefaultDeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.DefaultGetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.GetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.DefaultPutResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResult;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
class UserMeta {
View
6 ...er/src/main/java/com/pushtorefresh/storio/contentresolver/ContentResolverTypeMapping.java
@@ -2,9 +2,9 @@
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.GetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResolver;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.GetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResolver;
import static com.pushtorefresh.storio.internal.Checks.checkNotNull;
View
14 ...esolver/src/main/java/com/pushtorefresh/storio/contentresolver/StorIOContentResolver.java
@@ -7,13 +7,13 @@
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.contentresolver.operation.delete.PreparedDelete;
-import com.pushtorefresh.storio.contentresolver.operation.get.PreparedGet;
-import com.pushtorefresh.storio.contentresolver.operation.put.PreparedPut;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.Query;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.operations.delete.PreparedDelete;
+import com.pushtorefresh.storio.contentresolver.operations.get.PreparedGet;
+import com.pushtorefresh.storio.contentresolver.operations.put.PreparedPut;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
import java.util.Collections;
import java.util.Set;
View
8 ...main/java/com/pushtorefresh/storio/contentresolver/impl/DefaultStorIOContentResolver.java
@@ -15,10 +15,10 @@
import com.pushtorefresh.storio.contentresolver.Changes;
import com.pushtorefresh.storio.contentresolver.ContentResolverTypeMapping;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.Query;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
import java.util.HashMap;
import java.util.Map;
View
4 ...eration/delete/DefaultDeleteResolver.java → ...rations/delete/DefaultDeleteResolver.java
@@ -1,9 +1,9 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
/**
* Default implementation of {@link DeleteResolver}.
View
2 ...lver/operation/delete/DeleteResolver.java → ...ver/operations/delete/DeleteResolver.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.support.annotation.NonNull;
View
2 ...solver/operation/delete/DeleteResult.java → ...olver/operations/delete/DeleteResult.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.net.Uri;
import android.support.annotation.NonNull;
View
2 ...olver/operation/delete/DeleteResults.java → ...lver/operations/delete/DeleteResults.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.support.annotation.NonNull;
View
6 ...lver/operation/delete/PreparedDelete.java → ...ver/operations/delete/PreparedDelete.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import java.util.Collection;
View
6 ...eration/delete/PreparedDeleteByQuery.java → ...rations/delete/PreparedDeleteByQuery.java
@@ -1,12 +1,12 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import rx.Observable;
import rx.schedulers.Schedulers;
View
4 ...te/PreparedDeleteCollectionOfObjects.java → ...te/PreparedDeleteCollectionOfObjects.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -6,7 +6,7 @@
import com.pushtorefresh.storio.contentresolver.ContentResolverTypeMapping;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.ArrayList;
View
4 ...peration/delete/PreparedDeleteObject.java → ...erations/delete/PreparedDeleteObject.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -6,7 +6,7 @@
import com.pushtorefresh.storio.contentresolver.ContentResolverTypeMapping;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import rx.Observable;
import rx.schedulers.Schedulers;
View
4 ...ver/operation/get/DefaultGetResolver.java → ...er/operations/get/DefaultGetResolver.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.contentresolver.operation.get;
+package com.pushtorefresh.storio.contentresolver.operations.get;
import android.database.Cursor;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
/**
* Default implementation of {@link GetResolver}, thread-safe.
View
4 ...ntresolver/operation/get/GetResolver.java → ...tresolver/operations/get/GetResolver.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.contentresolver.operation.get;
+package com.pushtorefresh.storio.contentresolver.operations.get;
import android.database.Cursor;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
/**
* Defines behavior of Get Operation.
View
4 ...ntresolver/operation/get/PreparedGet.java → ...tresolver/operations/get/PreparedGet.java
@@ -1,9 +1,9 @@
-package com.pushtorefresh.storio.contentresolver.operation.get;
+package com.pushtorefresh.storio.contentresolver.operations.get;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
/**
* Represents Get Operation for {@link StorIOContentResolver}.
View
8 ...lver/operation/get/PreparedGetCursor.java → ...ver/operations/get/PreparedGetCursor.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.get;
+package com.pushtorefresh.storio.contentresolver.operations.get;
import android.database.Cursor;
import android.support.annotation.NonNull;
@@ -6,9 +6,9 @@
import android.support.annotation.WorkerThread;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.Query;
-import com.pushtorefresh.storio.operation.internal.MapSomethingToExecuteAsBlocking;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
+import com.pushtorefresh.storio.operations.internal.MapSomethingToExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import rx.Observable;
import rx.schedulers.Schedulers;
View
8 ...eration/get/PreparedGetListOfObjects.java → ...rations/get/PreparedGetListOfObjects.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.get;
+package com.pushtorefresh.storio.contentresolver.operations.get;
import android.database.Cursor;
import android.support.annotation.NonNull;
@@ -7,9 +7,9 @@
import com.pushtorefresh.storio.contentresolver.ContentResolverTypeMapping;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.Query;
-import com.pushtorefresh.storio.operation.internal.MapSomethingToExecuteAsBlocking;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
+import com.pushtorefresh.storio.operations.internal.MapSomethingToExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import java.util.ArrayList;
import java.util.List;
View
8 ...ver/operation/put/DefaultPutResolver.java → ...er/operations/put/DefaultPutResolver.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.content.ContentValues;
import android.database.Cursor;
@@ -6,9 +6,9 @@
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.Query;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
import static com.pushtorefresh.storio.internal.Queries.nullableArrayOfStrings;
import static com.pushtorefresh.storio.internal.Queries.nullableString;
View
4 ...ntresolver/operation/put/PreparedPut.java → ...tresolver/operations/put/PreparedPut.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.content.ContentValues;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import java.util.Collection;
View
4 ...n/put/PreparedPutCollectionOfObjects.java → ...s/put/PreparedPutCollectionOfObjects.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -6,7 +6,7 @@
import com.pushtorefresh.storio.contentresolver.ContentResolverTypeMapping;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.ArrayList;
View
4 ...eration/put/PreparedPutContentValues.java → ...rations/put/PreparedPutContentValues.java
@@ -1,11 +1,11 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.content.ContentValues;
import android.support.annotation.NonNull;
import android.support.annotation.WorkerThread;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import rx.Observable;
import rx.schedulers.Schedulers;
View
4 ...put/PreparedPutContentValuesIterable.java → ...put/PreparedPutContentValuesIterable.java
@@ -1,11 +1,11 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.content.ContentValues;
import android.support.annotation.NonNull;
import android.support.annotation.WorkerThread;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import java.util.HashMap;
import java.util.Map;
View
4 ...lver/operation/put/PreparedPutObject.java → ...ver/operations/put/PreparedPutObject.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -6,7 +6,7 @@
import com.pushtorefresh.storio.contentresolver.ContentResolverTypeMapping;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import rx.Observable;
import rx.schedulers.Schedulers;
View
2 ...ntresolver/operation/put/PutResolver.java → ...tresolver/operations/put/PutResolver.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.support.annotation.NonNull;
View
2 ...tentresolver/operation/put/PutResult.java → ...entresolver/operations/put/PutResult.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.net.Uri;
import android.support.annotation.NonNull;
View
2 ...entresolver/operation/put/PutResults.java → ...ntresolver/operations/put/PutResults.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
View
4 ...io/contentresolver/query/DeleteQuery.java → .../contentresolver/queries/DeleteQuery.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.query;
+package com.pushtorefresh.storio.contentresolver.queries;
import android.net.Uri;
import android.support.annotation.NonNull;
@@ -28,7 +28,7 @@
private final List<String> whereArgs;
/**
- * Please use {@link com.pushtorefresh.storio.contentresolver.query.DeleteQuery.Builder}
+ * Please use {@link com.pushtorefresh.storio.contentresolver.queries.DeleteQuery.Builder}
* instead of constructor.
*/
private DeleteQuery(@NonNull Uri uri, @Nullable String where, @Nullable List<String> whereArgs) {
View
4 ...io/contentresolver/query/InsertQuery.java → .../contentresolver/queries/InsertQuery.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.query;
+package com.pushtorefresh.storio.contentresolver.queries;
import android.net.Uri;
import android.support.annotation.NonNull;
@@ -16,7 +16,7 @@
private final Uri uri;
/**
- * Please use {@link com.pushtorefresh.storio.contentresolver.query.InsertQuery.Builder}
+ * Please use {@link com.pushtorefresh.storio.contentresolver.queries.InsertQuery.Builder}
* instead of constructor.
*/
private InsertQuery(@NonNull Uri uri) {
View
4 ...h/storio/contentresolver/query/Query.java → ...storio/contentresolver/queries/Query.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.query;
+package com.pushtorefresh.storio.contentresolver.queries;
import android.net.Uri;
import android.support.annotation.NonNull;
@@ -34,7 +34,7 @@
private final String sortOrder;
/**
- * Please use {@link com.pushtorefresh.storio.contentresolver.query.Query.Builder}
+ * Please use {@link com.pushtorefresh.storio.contentresolver.queries.Query.Builder}
* instead of constructor.
*/
private Query(@NonNull Uri uri, @Nullable List<String> columns, @Nullable String where, @Nullable List<String> whereArgs, @Nullable String sortOrder) {
View
4 ...io/contentresolver/query/UpdateQuery.java → .../contentresolver/queries/UpdateQuery.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.query;
+package com.pushtorefresh.storio.contentresolver.queries;
import android.net.Uri;
import android.support.annotation.NonNull;
@@ -28,7 +28,7 @@
private final List<String> whereArgs;
/**
- * Please use {@link com.pushtorefresh.storio.contentresolver.query.UpdateQuery.Builder}
+ * Please use {@link com.pushtorefresh.storio.contentresolver.queries.UpdateQuery.Builder}
* instead of constructor.
*/
private UpdateQuery(@NonNull Uri uri, @Nullable String where, @Nullable List<String> whereArgs) {
View
6 ...rc/test/java/com/pushtorefresh/storio/contentresolver/ContentResolverTypeMappingTest.java
@@ -1,8 +1,8 @@
package com.pushtorefresh.storio.contentresolver;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.GetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResolver;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.GetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResolver;
import org.junit.Test;
View
18 ...t-resolver/src/test/java/com/pushtorefresh/storio/contentresolver/design/ArticleMeta.java
@@ -6,15 +6,15 @@
import android.provider.BaseColumns;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DefaultDeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.DefaultGetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.GetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.DefaultPutResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DefaultDeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.DefaultGetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.GetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.DefaultPutResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResolver;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
import static org.mockito.Mockito.mock;
View
6 .../test/java/com/pushtorefresh/storio/contentresolver/design/DeleteOperationDesignTest.java
@@ -2,9 +2,9 @@
import android.net.Uri;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResult;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResults;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResult;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResults;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
import org.junit.Test;
View
8 ...java/com/pushtorefresh/storio/contentresolver/design/DesignTestStorIOContentResolver.java
@@ -9,10 +9,10 @@
import com.pushtorefresh.storio.contentresolver.Changes;
import com.pushtorefresh.storio.contentresolver.ContentResolverTypeMapping;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.Query;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
import java.util.Set;
View
4 ...src/test/java/com/pushtorefresh/storio/contentresolver/design/GetOperationDesignTest.java
@@ -3,8 +3,8 @@
import android.database.Cursor;
import android.net.Uri;
-import com.pushtorefresh.storio.contentresolver.operation.get.GetResolver;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.operations.get.GetResolver;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
import org.junit.Test;
View
12 ...src/test/java/com/pushtorefresh/storio/contentresolver/design/PutOperationDesignTest.java
@@ -4,12 +4,12 @@
import android.net.Uri;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.contentresolver.operation.put.DefaultPutResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResult;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResults;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.operations.put.DefaultPutResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResult;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResults;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
import org.junit.Test;
View
6 .../java/com/pushtorefresh/storio/contentresolver/impl/DefaultStorIOContentResolverTest.java
@@ -4,9 +4,9 @@
import com.pushtorefresh.storio.contentresolver.ContentResolverTypeMapping;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.GetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResolver;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.GetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResolver;
import org.junit.Test;
View
4 ...ion/delete/DefaultDeleteResolverTest.java → ...ons/delete/DefaultDeleteResolverTest.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.net.Uri;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
import org.junit.Test;
View
4 ...r/operation/delete/DeleteByQueryStub.java → .../operations/delete/DeleteByQueryStub.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.net.Uri;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
import com.pushtorefresh.storio.test.ObservableBehaviorChecker;
import rx.Observable;
View
2 ...r/operation/delete/DeleteObjectsStub.java → .../operations/delete/DeleteObjectsStub.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.net.Uri;
import android.support.annotation.NonNull;
View
2 ...er/operation/delete/DeleteResultTest.java → ...r/operations/delete/DeleteResultTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.net.Uri;
View
2 ...r/operation/delete/DeleteResultsTest.java → .../operations/delete/DeleteResultsTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.net.Uri;
View
2 ...ion/delete/PreparedDeleteByQueryTest.java → ...ons/delete/PreparedDeleteByQueryTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import org.junit.Test;
View
4 ...reparedDeleteCollectionOfObjectsTest.java → ...reparedDeleteCollectionOfObjectsTest.java
@@ -1,7 +1,7 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
View
4 ...tion/delete/PreparedDeleteObjectTest.java → ...ions/delete/PreparedDeleteObjectTest.java
@@ -1,7 +1,7 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
View
2 ...ntresolver/operation/delete/TestItem.java → ...tresolver/operations/delete/TestItem.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.delete;
+package com.pushtorefresh.storio.contentresolver.operations.delete;
import android.support.annotation.NonNull;
View
4 ...operation/get/DefaultGetResolverTest.java → ...perations/get/DefaultGetResolverTest.java
@@ -1,11 +1,11 @@
-package com.pushtorefresh.storio.contentresolver.operation.get;
+package com.pushtorefresh.storio.contentresolver.operations.get;
import android.database.Cursor;
import android.net.Uri;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
import org.junit.Test;
View
4 ...resolver/operation/get/GetCursorStub.java → ...esolver/operations/get/GetCursorStub.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.get;
+package com.pushtorefresh.storio.contentresolver.operations.get;
import android.database.Cursor;
import android.net.Uri;
@@ -6,7 +6,7 @@
import com.pushtorefresh.storio.contentresolver.Changes;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
import com.pushtorefresh.storio.test.ObservableBehaviorChecker;
import rx.Observable;
View
4 ...esolver/operation/get/GetObjectsStub.java → ...solver/operations/get/GetObjectsStub.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.get;
+package com.pushtorefresh.storio.contentresolver.operations.get;
import android.database.Cursor;
import android.net.Uri;
@@ -7,7 +7,7 @@
import com.pushtorefresh.storio.contentresolver.Changes;
import com.pushtorefresh.storio.contentresolver.ContentResolverTypeMapping;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
import com.pushtorefresh.storio.test.ObservableBehaviorChecker;
import org.mockito.invocation.InvocationOnMock;
View
2 .../operation/get/PreparedGetCursorTest.java → ...operations/get/PreparedGetCursorTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.get;
+package com.pushtorefresh.storio.contentresolver.operations.get;
import android.database.Cursor;
View
4 ...ion/get/PreparedGetListOfObjectsTest.java → ...ons/get/PreparedGetListOfObjectsTest.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.contentresolver.operation.get;
+package com.pushtorefresh.storio.contentresolver.operations.get;
import android.net.Uri;
import com.pushtorefresh.storio.contentresolver.Changes;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
View
2 ...ntentresolver/operation/get/TestItem.java → ...tentresolver/operations/get/TestItem.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.get;
+package com.pushtorefresh.storio.contentresolver.operations.get;
import java.util.concurrent.atomic.AtomicLong;
View
8 ...operation/put/DefaultPutResolverTest.java → ...perations/put/DefaultPutResolverTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.content.ContentValues;
import android.database.Cursor;
@@ -7,9 +7,9 @@
import android.support.annotation.Nullable;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.Query;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
import org.junit.Test;
View
6 ...t/PreparedPutCollectionOfObjectsTest.java → ...t/PreparedPutCollectionOfObjectsTest.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.content.ContentValues;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
View
2 ...PreparedPutContentValuesIterableTest.java → ...PreparedPutContentValuesIterableTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.content.ContentValues;
View
2 ...ion/put/PreparedPutContentValuesTest.java → ...ons/put/PreparedPutContentValuesTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import org.junit.Test;
View
6 .../operation/put/PreparedPutObjectTest.java → ...operations/put/PreparedPutObjectTest.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.content.ContentValues;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
View
2 ...r/operation/put/PutContentValuesStub.java → .../operations/put/PutContentValuesStub.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.content.ContentValues;
import android.net.Uri;
View
2 ...esolver/operation/put/PutObjectsStub.java → ...solver/operations/put/PutObjectsStub.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.net.Uri;
import android.support.annotation.NonNull;
View
2 ...ntentresolver/operation/put/TestItem.java → ...tentresolver/operations/put/TestItem.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.operation.put;
+package com.pushtorefresh.storio.contentresolver.operations.put;
import android.net.Uri;
import android.support.annotation.NonNull;
View
2 ...ontentresolver/query/DeleteQueryTest.java → ...tentresolver/queries/DeleteQueryTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.query;
+package com.pushtorefresh.storio.contentresolver.queries;
import android.net.Uri;
View
2 ...ontentresolver/query/InsertQueryTest.java → ...tentresolver/queries/InsertQueryTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.query;
+package com.pushtorefresh.storio.contentresolver.queries;
import android.net.Uri;
View
2 ...orio/contentresolver/query/QueryTest.java → ...io/contentresolver/queries/QueryTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.query;
+package com.pushtorefresh.storio.contentresolver.queries;
import android.net.Uri;
View
2 ...ontentresolver/query/UpdateQueryTest.java → ...tentresolver/queries/UpdateQueryTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.contentresolver.query;
+package com.pushtorefresh.storio.contentresolver.queries;
import android.net.Uri;
View
2 ...mple-app/src/androidTest/java/com/pushtorefresh/storio/contentresolver/test/BaseTest.java
@@ -6,7 +6,7 @@
import com.pushtorefresh.storio.contentresolver.ContentResolverTypeMapping;
import com.pushtorefresh.storio.contentresolver.StorIOContentResolver;
import com.pushtorefresh.storio.contentresolver.impl.DefaultStorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
import com.pushtorefresh.storio.sample.db.entity.Tweet;
import com.pushtorefresh.storio.sample.provider.meta.TweetMeta;
View
4 ...rc/androidTest/java/com/pushtorefresh/storio/contentresolver/test/ObserveChangesTest.java
@@ -4,8 +4,8 @@
import android.support.test.runner.AndroidJUnit4;
import com.pushtorefresh.storio.contentresolver.Changes;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResult;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResult;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResult;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResult;
import com.pushtorefresh.storio.sample.db.entity.Tweet;
import com.pushtorefresh.storio.sample.provider.meta.TweetMeta;
import com.pushtorefresh.storio.test.AbstractEmissionChecker;
View
6 ...e-app/src/androidTest/java/com/pushtorefresh/storio/contentresolver/test/RxQueryTest.java
@@ -3,9 +3,9 @@
import android.support.annotation.NonNull;
import android.support.test.runner.AndroidJUnit4;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResult;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResult;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResult;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResult;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
import com.pushtorefresh.storio.sample.db.entity.Tweet;
import com.pushtorefresh.storio.sample.provider.meta.TweetMeta;
import com.pushtorefresh.storio.test.AbstractEmissionChecker;
View
4 storio-sample-app/src/main/java/com/pushtorefresh/storio/sample/db/entity/Tweet.java
@@ -3,8 +3,8 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteColumn;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteType;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;
/**
* Just for demonstration, real Tweet structure is more complex
View
20 storio-sample-app/src/main/java/com/pushtorefresh/storio/sample/db/table/TweetTableMeta.java
@@ -5,16 +5,16 @@
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.sample.db.entity.Tweet;
-import com.pushtorefresh.storio.sqlite.operation.delete.DefaultDeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.DefaultGetResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.GetResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.DefaultPutResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResolver;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.GetResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
public class TweetTableMeta {
View
18 storio-sample-app/src/main/java/com/pushtorefresh/storio/sample/provider/meta/TweetMeta.java
@@ -5,15 +5,15 @@
import android.net.Uri;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DefaultDeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.DefaultGetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.GetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.DefaultPutResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
-import com.pushtorefresh.storio.contentresolver.query.InsertQuery;
-import com.pushtorefresh.storio.contentresolver.query.UpdateQuery;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DefaultDeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.DefaultGetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.GetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.DefaultPutResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResolver;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.InsertQuery;
+import com.pushtorefresh.storio.contentresolver.queries.UpdateQuery;
import com.pushtorefresh.storio.sample.db.entity.Tweet;
import com.pushtorefresh.storio.sample.db.table.TweetTableMeta;
import com.pushtorefresh.storio.sample.provider.SampleContentProvider;
View
2 ...-sample-app/src/main/java/com/pushtorefresh/storio/sample/ui/fragment/TweetsFragment.java
@@ -19,7 +19,7 @@
import com.pushtorefresh.storio.sample.ui.UiStateController;
import com.pushtorefresh.storio.sample.ui.adapter.TweetsAdapter;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResults;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResults;
import java.util.ArrayList;
import java.util.List;
View
3 storio-sqlite-annotation-processor/gradle.properties
@@ -1,3 +0,0 @@
-POM_NAME=sqlite-annotation-processor
-POM_ARTIFACT_ID=sqlite-annotation-processor
-POM_PACKAGING=jar
View
3 storio-sqlite-annotation/gradle.properties
@@ -1,3 +0,0 @@
-POM_NAME=sqlite-annotation
-POM_ARTIFACT_ID=sqlite-annotation
-POM_PACKAGING=jar
View
0 ...-sqlite-annotation-processor/build.gradle → ...sqlite-annotations-processor/build.gradle
File renamed without changes.
View
3 storio-sqlite-annotations-processor/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=sqlite-annotations-processor
+POM_ARTIFACT_ID=sqlite-annotations-processor
+POM_PACKAGING=jar
View
2 ...sqlite/processor/ProcessingException.java → ...ations/processor/ProcessingException.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.processor;
+package com.pushtorefresh.storio.sqlite.annotations.processor;
import org.jetbrains.annotations.NotNull;
View
18 ...lite/processor/StorIOSQLiteProcessor.java → ...ions/processor/StorIOSQLiteProcessor.java
@@ -1,14 +1,14 @@
-package com.pushtorefresh.storio.sqlite.processor;
+package com.pushtorefresh.storio.sqlite.annotations.processor;
import com.google.auto.service.AutoService;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteColumn;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteType;
-import com.pushtorefresh.storio.sqlite.processor.generate.DeleteResolverGenerator;
-import com.pushtorefresh.storio.sqlite.processor.generate.GetResolverGenerator;
-import com.pushtorefresh.storio.sqlite.processor.generate.PutResolverGenerator;
-import com.pushtorefresh.storio.sqlite.processor.introspection.JavaType;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteColumnMeta;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteTypeMeta;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;
+import com.pushtorefresh.storio.sqlite.annotations.processor.generate.DeleteResolverGenerator;
+import com.pushtorefresh.storio.sqlite.annotations.processor.generate.GetResolverGenerator;
+import com.pushtorefresh.storio.sqlite.annotations.processor.generate.PutResolverGenerator;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteColumnMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteTypeMeta;
import org.jetbrains.annotations.NotNull;
View
2 ...rio/sqlite/processor/generate/Common.java → ...nnotations/processor/generate/Common.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.processor.generate;
+package com.pushtorefresh.storio.sqlite.annotations.processor.generate;
import com.squareup.javapoet.ClassName;
View
12 ...sor/generate/DeleteResolverGenerator.java → ...sor/generate/DeleteResolverGenerator.java
@@ -1,6 +1,6 @@
-package com.pushtorefresh.storio.sqlite.processor.generate;
+package com.pushtorefresh.storio.sqlite.annotations.processor.generate;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteTypeMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteTypeMeta;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.MethodSpec;
@@ -12,8 +12,8 @@
import java.util.Map;
-import static com.pushtorefresh.storio.sqlite.processor.generate.Common.ANDROID_NON_NULL_ANNOTATION_CLASS_NAME;
-import static com.pushtorefresh.storio.sqlite.processor.generate.Common.INDENT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.generate.Common.ANDROID_NON_NULL_ANNOTATION_CLASS_NAME;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.generate.Common.INDENT;
import static javax.lang.model.element.Modifier.PROTECTED;
import static javax.lang.model.element.Modifier.PUBLIC;
@@ -26,7 +26,7 @@ public JavaFile generateJavaFile(@NotNull StorIOSQLiteTypeMeta storIOSQLiteTypeM
final TypeSpec deleteResolver = TypeSpec.classBuilder(storIOSQLiteTypeMeta.simpleName + "StorIOSQLiteDeleteResolver")
.addJavadoc("Generated resolver for Delete Operation\n")
.addModifiers(PUBLIC)
- .superclass(ParameterizedTypeName.get(ClassName.get("com.pushtorefresh.storio.sqlite.operation.delete", "DefaultDeleteResolver"), storIOSQLiteTypeClassName))
+ .superclass(ParameterizedTypeName.get(ClassName.get("com.pushtorefresh.storio.sqlite.operations.delete", "DefaultDeleteResolver"), storIOSQLiteTypeClassName))
.addMethod(createMapToDeleteQueryMethodSpec(storIOSQLiteTypeMeta, storIOSQLiteTypeClassName))
.build();
@@ -45,7 +45,7 @@ MethodSpec createMapToDeleteQueryMethodSpec(@NotNull StorIOSQLiteTypeMeta storIO
.addAnnotation(Override.class)
.addAnnotation(ANDROID_NON_NULL_ANNOTATION_CLASS_NAME)
.addModifiers(PROTECTED)
- .returns(ClassName.get("com.pushtorefresh.storio.sqlite.query", "DeleteQuery"))
+ .returns(ClassName.get("com.pushtorefresh.storio.sqlite.queries", "DeleteQuery"))
.addParameter(ParameterSpec.builder(storIOSQLiteTypeClassName, "object")
.addAnnotation(ANDROID_NON_NULL_ANNOTATION_CLASS_NAME)
.build())
View
42 ...cessor/generate/GetResolverGenerator.java → ...cessor/generate/GetResolverGenerator.java
@@ -1,9 +1,9 @@
-package com.pushtorefresh.storio.sqlite.processor.generate;
+package com.pushtorefresh.storio.sqlite.annotations.processor.generate;
-import com.pushtorefresh.storio.sqlite.processor.ProcessingException;
-import com.pushtorefresh.storio.sqlite.processor.introspection.JavaType;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteColumnMeta;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteTypeMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.ProcessingException;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteColumnMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteTypeMeta;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.MethodSpec;
@@ -13,21 +13,21 @@
import org.jetbrains.annotations.NotNull;
-import static com.pushtorefresh.storio.sqlite.processor.generate.Common.ANDROID_NON_NULL_ANNOTATION_CLASS_NAME;
-import static com.pushtorefresh.storio.sqlite.processor.generate.Common.INDENT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.BOOLEAN;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.BOOLEAN_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.DOUBLE;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.DOUBLE_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.FLOAT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.FLOAT_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.INTEGER;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.INTEGER_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.LONG;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.LONG_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.SHORT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.SHORT_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.STRING;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.generate.Common.ANDROID_NON_NULL_ANNOTATION_CLASS_NAME;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.generate.Common.INDENT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.BOOLEAN;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.BOOLEAN_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.DOUBLE;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.DOUBLE_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.FLOAT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.FLOAT_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.INTEGER;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.INTEGER_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.LONG;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.LONG_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.SHORT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.SHORT_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.STRING;
import static javax.lang.model.element.Modifier.PUBLIC;
public class GetResolverGenerator {
@@ -39,7 +39,7 @@ public JavaFile generateJavaFile(@NotNull StorIOSQLiteTypeMeta storIOSQLiteTypeM
final TypeSpec getResolver = TypeSpec.classBuilder(storIOSQLiteTypeMeta.simpleName + "StorIOSQLiteGetResolver")
.addJavadoc("Generated resolver for Get Operation\n")
.addModifiers(PUBLIC)
- .superclass(ParameterizedTypeName.get(ClassName.get("com.pushtorefresh.storio.sqlite.operation.get", "DefaultGetResolver"), storIOSQLiteTypeClassName))
+ .superclass(ParameterizedTypeName.get(ClassName.get("com.pushtorefresh.storio.sqlite.operations.get", "DefaultGetResolver"), storIOSQLiteTypeClassName))
.addMethod(createMapFromCursorMethodSpec(storIOSQLiteTypeMeta, storIOSQLiteTypeClassName))
.build();
View
16 ...cessor/generate/PutResolverGenerator.java → ...cessor/generate/PutResolverGenerator.java
@@ -1,7 +1,7 @@
-package com.pushtorefresh.storio.sqlite.processor.generate;
+package com.pushtorefresh.storio.sqlite.annotations.processor.generate;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteColumnMeta;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteTypeMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteColumnMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteTypeMeta;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.MethodSpec;
@@ -13,8 +13,8 @@
import java.util.Map;
-import static com.pushtorefresh.storio.sqlite.processor.generate.Common.ANDROID_NON_NULL_ANNOTATION_CLASS_NAME;
-import static com.pushtorefresh.storio.sqlite.processor.generate.Common.INDENT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.generate.Common.ANDROID_NON_NULL_ANNOTATION_CLASS_NAME;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.generate.Common.INDENT;
import static javax.lang.model.element.Modifier.PROTECTED;
import static javax.lang.model.element.Modifier.PUBLIC;
@@ -27,7 +27,7 @@ public JavaFile generateJavaFile(@NotNull StorIOSQLiteTypeMeta storIOSQLiteTypeM
final TypeSpec putResolver = TypeSpec.classBuilder(storIOSQLiteTypeMeta.simpleName + "StorIOSQLitePutResolver")
.addJavadoc("Generated resolver for Put Operation\n")
.addModifiers(PUBLIC)
- .superclass(ParameterizedTypeName.get(ClassName.get("com.pushtorefresh.storio.sqlite.operation.put", "DefaultPutResolver"), storIOSQLiteTypeClassName))
+ .superclass(ParameterizedTypeName.get(ClassName.get("com.pushtorefresh.storio.sqlite.operations.put", "DefaultPutResolver"), storIOSQLiteTypeClassName))
.addMethod(createMapToInsertQueryMethodSpec(storIOSQLiteTypeMeta, storIOSQLiteTypeClassName))
.addMethod(createMapToUpdateQueryMethodSpec(storIOSQLiteTypeMeta, storIOSQLiteTypeClassName))
.addMethod(createMapToContentValuesMethodSpec(storIOSQLiteTypeMeta, storIOSQLiteTypeClassName))
@@ -46,7 +46,7 @@ MethodSpec createMapToInsertQueryMethodSpec(@NotNull StorIOSQLiteTypeMeta storIO
.addAnnotation(Override.class)
.addAnnotation(ANDROID_NON_NULL_ANNOTATION_CLASS_NAME)
.addModifiers(PROTECTED)
- .returns(ClassName.get("com.pushtorefresh.storio.sqlite.query", "InsertQuery"))
+ .returns(ClassName.get("com.pushtorefresh.storio.sqlite.queries", "InsertQuery"))
.addParameter(ParameterSpec.builder(storIOSQLiteTypeClassName, "object")
.addAnnotation(ANDROID_NON_NULL_ANNOTATION_CLASS_NAME)
.build())
@@ -66,7 +66,7 @@ MethodSpec createMapToUpdateQueryMethodSpec(@NotNull StorIOSQLiteTypeMeta storIO
.addAnnotation(Override.class)
.addAnnotation(ANDROID_NON_NULL_ANNOTATION_CLASS_NAME)
.addModifiers(PROTECTED)
- .returns(ClassName.get("com.pushtorefresh.storio.sqlite.query", "UpdateQuery"))
+ .returns(ClassName.get("com.pushtorefresh.storio.sqlite.queries", "UpdateQuery"))
.addParameter(ParameterSpec.builder(storIOSQLiteTypeClassName, "object")
.addAnnotation(ANDROID_NON_NULL_ANNOTATION_CLASS_NAME)
.build())
View
6 ...te/processor/generate/QueryGenerator.java → ...ns/processor/generate/QueryGenerator.java
@@ -1,7 +1,7 @@
-package com.pushtorefresh.storio.sqlite.processor.generate;
+package com.pushtorefresh.storio.sqlite.annotations.processor.generate;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteColumnMeta;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteTypeMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteColumnMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteTypeMeta;
import org.jetbrains.annotations.NotNull;
View
2 ...ite/processor/introspection/JavaType.java → ...ons/processor/introspection/JavaType.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.processor.introspection;
+package com.pushtorefresh.storio.sqlite.annotations.processor.introspection;
import org.jetbrains.annotations.NotNull;
View
4 ...introspection/StorIOSQLiteColumnMeta.java → ...introspection/StorIOSQLiteColumnMeta.java
@@ -1,6 +1,6 @@
-package com.pushtorefresh.storio.sqlite.processor.introspection;
+package com.pushtorefresh.storio.sqlite.annotations.processor.introspection;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
import org.jetbrains.annotations.NotNull;
View
4 ...r/introspection/StorIOSQLiteTypeMeta.java → ...r/introspection/StorIOSQLiteTypeMeta.java
@@ -1,6 +1,6 @@
-package com.pushtorefresh.storio.sqlite.processor.introspection;
+package com.pushtorefresh.storio.sqlite.annotations.processor.introspection;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteType;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;
import org.jetbrains.annotations.NotNull;
View
14 ...generate/DeleteResolverGeneratorTest.java → ...generate/DeleteResolverGeneratorTest.java
@@ -1,9 +1,9 @@
-package com.pushtorefresh.storio.sqlite.processor.generate;
+package com.pushtorefresh.storio.sqlite.annotations.processor.generate;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteColumn;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteType;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteColumnMeta;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteTypeMeta;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteColumnMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteTypeMeta;
import com.squareup.javapoet.JavaFile;
import org.junit.Test;
@@ -57,8 +57,8 @@ public void generateJavaFile() throws IOException {
assertEquals("package com.test;\n" +
"\n" +
"import android.support.annotation.NonNull;\n" +
- "import com.pushtorefresh.storio.sqlite.operation.delete.DefaultDeleteResolver;\n" +
- "import com.pushtorefresh.storio.sqlite.query.DeleteQuery;\n" +
+ "import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver;\n" +
+ "import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;\n" +
"import java.lang.Override;\n" +
"\n" +
"/**\n" +
View
14 ...or/generate/GetResolverGeneratorTest.java → ...or/generate/GetResolverGeneratorTest.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.sqlite.processor.generate;
+package com.pushtorefresh.storio.sqlite.annotations.processor.generate;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteColumn;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteType;
-import com.pushtorefresh.storio.sqlite.processor.introspection.JavaType;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteColumnMeta;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteTypeMeta;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteColumnMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteTypeMeta;
import com.squareup.javapoet.JavaFile;
import org.junit.Test;
@@ -59,7 +59,7 @@ public void generateJavaFileTest() throws IOException {
"\n" +
"import android.database.Cursor;\n" +
"import android.support.annotation.NonNull;\n" +
- "import com.pushtorefresh.storio.sqlite.operation.get.DefaultGetResolver;\n" +
+ "import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver;\n" +
"import java.lang.Override;\n" +
"\n" +
"/**\n" +
View
16 ...or/generate/PutResolverGeneratorTest.java → ...or/generate/PutResolverGeneratorTest.java
@@ -1,9 +1,9 @@
-package com.pushtorefresh.storio.sqlite.processor.generate;
+package com.pushtorefresh.storio.sqlite.annotations.processor.generate;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteColumn;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteType;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteColumnMeta;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteTypeMeta;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteColumnMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteTypeMeta;
import com.squareup.javapoet.JavaFile;
import org.junit.Test;
@@ -58,9 +58,9 @@ public void generateJavaFile() throws IOException {
"\n" +
"import android.content.ContentValues;\n" +
"import android.support.annotation.NonNull;\n" +
- "import com.pushtorefresh.storio.sqlite.operation.put.DefaultPutResolver;\n" +
- "import com.pushtorefresh.storio.sqlite.query.InsertQuery;\n" +
- "import com.pushtorefresh.storio.sqlite.query.UpdateQuery;\n" +
+ "import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver;\n" +
+ "import com.pushtorefresh.storio.sqlite.queries.InsertQuery;\n" +
+ "import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;\n" +
"import java.lang.Override;\n" +
"\n" +
"/**\n" +
View
8 ...rocessor/generate/QueryGeneratorTest.java → ...rocessor/generate/QueryGeneratorTest.java
@@ -1,8 +1,8 @@
-package com.pushtorefresh.storio.sqlite.processor.generate;
+package com.pushtorefresh.storio.sqlite.annotations.processor.generate;
-import com.pushtorefresh.storio.sqlite.annotation.StorIOSQLiteColumn;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteColumnMeta;
-import com.pushtorefresh.storio.sqlite.processor.introspection.StorIOSQLiteTypeMeta;
+import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteColumnMeta;
+import com.pushtorefresh.storio.sqlite.annotations.processor.introspection.StorIOSQLiteTypeMeta;
import org.junit.Test;
View
28 ...processor/introspection/JavaTypeTest.java → ...processor/introspection/JavaTypeTest.java
@@ -1,23 +1,23 @@
-package com.pushtorefresh.storio.sqlite.processor.introspection;
+package com.pushtorefresh.storio.sqlite.annotations.processor.introspection;
import org.junit.Test;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.BOOLEAN;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.BOOLEAN_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.DOUBLE;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.DOUBLE_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.FLOAT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.FLOAT_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.INTEGER;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.INTEGER_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.LONG;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.LONG_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.SHORT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.SHORT_OBJECT;
-import static com.pushtorefresh.storio.sqlite.processor.introspection.JavaType.STRING;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.BOOLEAN;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.BOOLEAN_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.DOUBLE;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.DOUBLE_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.FLOAT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.FLOAT_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.INTEGER;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.INTEGER_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.LONG;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.LONG_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.SHORT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.SHORT_OBJECT;
+import static com.pushtorefresh.storio.sqlite.annotations.processor.introspection.JavaType.STRING;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
View
0 storio-sqlite-annotation/build.gradle → storio-sqlite-annotations/build.gradle
File renamed without changes.
View
3 storio-sqlite-annotations/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=sqlite-annotations
+POM_ARTIFACT_ID=sqlite-annotations
+POM_PACKAGING=jar
View
2 ...sqlite/annotation/StorIOSQLiteColumn.java → ...qlite/annotations/StorIOSQLiteColumn.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.annotation;
+package com.pushtorefresh.storio.sqlite.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
View
2 ...o/sqlite/annotation/StorIOSQLiteType.java → .../sqlite/annotations/StorIOSQLiteType.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.annotation;
+package com.pushtorefresh.storio.sqlite.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
View
8 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/BaseTest.java
@@ -7,10 +7,10 @@
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResult;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResults;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResult;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResults;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResult;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResults;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResult;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResults;
import org.junit.Before;
View
2 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/DeleteTest.java
@@ -3,7 +3,7 @@
import android.database.Cursor;
import android.support.test.runner.AndroidJUnit4;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResults;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResults;
import org.junit.Test;
import org.junit.runner.RunWith;
View
8 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/QueryTest.java
@@ -4,10 +4,10 @@
import android.support.annotation.NonNull;
import android.support.test.runner.AndroidJUnit4;
-import com.pushtorefresh.storio.sqlite.operation.get.DefaultGetResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.GetResolver;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.GetResolver;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
import org.junit.Test;
import org.junit.runner.RunWith;
View
18 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/TweetTableMeta.java
@@ -4,15 +4,15 @@
import android.database.Cursor;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.sqlite.operation.delete.DefaultDeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.DefaultGetResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.GetResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.DefaultPutResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResolver;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.GetResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
public class TweetTableMeta {
View
4 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/UpdateTest.java
@@ -3,8 +3,8 @@
import android.database.Cursor;
import android.support.test.runner.AndroidJUnit4;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResult;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResults;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResult;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResults;
import org.junit.Test;
import org.junit.runner.RunWith;
View
22 storio-sqlite/src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/UserTableMeta.java
@@ -5,17 +5,17 @@
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.operation.delete.DefaultDeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.DefaultGetResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.GetResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.DefaultPutResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResult;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.GetResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResult;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
public class UserTableMeta {
View
8 ...src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/auto_parcel/AutoParcelTest.java
@@ -7,10 +7,10 @@
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
import com.pushtorefresh.storio.sqlite.impl.DefaultStorIOSQLite;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResult;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResult;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
-import com.pushtorefresh.storio.sqlite.query.Query;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResult;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResult;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
import org.junit.Before;
import org.junit.Test;
View
18 .../src/androidTest/java/com/pushtorefresh/storio/sqlite/impl/auto_parcel/BookTableMeta.java
@@ -4,15 +4,15 @@
import android.database.Cursor;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.sqlite.operation.delete.DefaultDeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.DefaultGetResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.GetResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.DefaultPutResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResolver;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.GetResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
final class BookTableMeta {
View
6 storio-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/SQLiteTypeMapping.java
@@ -2,9 +2,9 @@
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.GetResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResolver;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.GetResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver;
import static com.pushtorefresh.storio.internal.Checks.checkNotNull;
View
18 storio-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/StorIOSQLite.java
@@ -6,15 +6,15 @@
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.sqlite.operation.delete.PreparedDelete;
-import com.pushtorefresh.storio.sqlite.operation.execute.PreparedExecuteSQL;
-import com.pushtorefresh.storio.sqlite.operation.get.PreparedGet;
-import com.pushtorefresh.storio.sqlite.operation.put.PreparedPut;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.operations.delete.PreparedDelete;
+import com.pushtorefresh.storio.sqlite.operations.execute.PreparedExecuteSQL;
+import com.pushtorefresh.storio.sqlite.operations.get.PreparedGet;
+import com.pushtorefresh.storio.sqlite.operations.put.PreparedPut;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
import java.io.Closeable;
import java.util.Collections;
View
10 storio-sqlite/src/main/java/com/pushtorefresh/storio/sqlite/impl/DefaultStorIOSQLite.java
@@ -11,11 +11,11 @@
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
import java.io.IOException;
import java.util.HashMap;
View
4 ...eration/delete/DefaultDeleteResolver.java → ...rations/delete/DefaultDeleteResolver.java
@@ -1,9 +1,9 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
/**
* Default implementation of {@link DeleteResolver}.
View
2 ...lite/operation/delete/DeleteResolver.java → ...ite/operations/delete/DeleteResolver.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import android.support.annotation.NonNull;
View
2 ...sqlite/operation/delete/DeleteResult.java → ...qlite/operations/delete/DeleteResult.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import android.support.annotation.NonNull;
View
2 ...qlite/operation/delete/DeleteResults.java → ...lite/operations/delete/DeleteResults.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import android.support.annotation.NonNull;
View
8 ...lite/operation/delete/PreparedDelete.java → ...ite/operations/delete/PreparedDelete.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
import java.util.Collection;
@@ -35,7 +35,7 @@ public Builder(@NonNull StorIOSQLite storIOSQLite) {
}
/**
- * Prepares Delete Operation by {@link com.pushtorefresh.storio.sqlite.query.DeleteQuery}.
+ * Prepares Delete Operation by {@link com.pushtorefresh.storio.sqlite.queries.DeleteQuery}.
*
* @param deleteQuery query that specifies which rows should be deleted.
* @return builder.
View
6 ...eration/delete/PreparedDeleteByQuery.java → ...rations/delete/PreparedDeleteByQuery.java
@@ -1,13 +1,13 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
import rx.Observable;
import rx.schedulers.Schedulers;
View
4 ...te/PreparedDeleteCollectionOfObjects.java → ...te/PreparedDeleteCollectionOfObjects.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
View
4 ...peration/delete/PreparedDeleteObject.java → ...erations/delete/PreparedDeleteObject.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
View
8 ...operation/execute/PreparedExecuteSQL.java → ...perations/execute/PreparedExecuteSQL.java
@@ -1,13 +1,13 @@
-package com.pushtorefresh.storio.sqlite.operation.execute;
+package com.pushtorefresh.storio.sqlite.operations.execute;
import android.support.annotation.NonNull;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.operation.PreparedOperation;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.PreparedOperation;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
import java.util.Set;
View
6 ...ite/operation/get/DefaultGetResolver.java → ...te/operations/get/DefaultGetResolver.java
@@ -1,11 +1,11 @@
-package com.pushtorefresh.storio.sqlite.operation.get;
+package com.pushtorefresh.storio.sqlite.operations.get;
import android.database.Cursor;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
/**
* Default implementation of {@link GetResolver}.
View
6 ...rio/sqlite/operation/get/GetResolver.java → ...io/sqlite/operations/get/GetResolver.java
@@ -1,11 +1,11 @@
-package com.pushtorefresh.storio.sqlite.operation.get;
+package com.pushtorefresh.storio.sqlite.operations.get;
import android.database.Cursor;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
/**
* Defines behavior of Get Operation.
View
8 ...rio/sqlite/operation/get/PreparedGet.java → ...io/sqlite/operations/get/PreparedGet.java
@@ -1,12 +1,12 @@
-package com.pushtorefresh.storio.sqlite.operation.get;
+package com.pushtorefresh.storio.sqlite.operations.get;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
/**
* Prepared Get Operation for {@link StorIOSQLite}.
View
10 ...lite/operation/get/PreparedGetCursor.java → ...ite/operations/get/PreparedGetCursor.java
@@ -1,15 +1,15 @@
-package com.pushtorefresh.storio.sqlite.operation.get;
+package com.pushtorefresh.storio.sqlite.operations.get;
import android.database.Cursor;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.operation.internal.MapSomethingToExecuteAsBlocking;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.MapSomethingToExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
import java.util.HashSet;
import java.util.Set;
View
10 ...eration/get/PreparedGetListOfObjects.java → ...rations/get/PreparedGetListOfObjects.java
@@ -1,16 +1,16 @@
-package com.pushtorefresh.storio.sqlite.operation.get;
+package com.pushtorefresh.storio.sqlite.operations.get;
import android.database.Cursor;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.operation.internal.MapSomethingToExecuteAsBlocking;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.MapSomethingToExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
import java.util.ArrayList;
import java.util.Collections;
View
8 ...ite/operation/put/DefaultPutResolver.java → ...te/operations/put/DefaultPutResolver.java
@@ -1,13 +1,13 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.content.ContentValues;
import android.database.Cursor;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
import static com.pushtorefresh.storio.internal.Queries.nullableArrayOfStrings;
import static com.pushtorefresh.storio.internal.Queries.nullableString;
View
4 ...rio/sqlite/operation/put/PreparedPut.java → ...io/sqlite/operations/put/PreparedPut.java
@@ -1,9 +1,9 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.content.ContentValues;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.operation.PreparedOperation;
+import com.pushtorefresh.storio.operations.PreparedOperation;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
import java.util.Arrays;
View
4 ...n/put/PreparedPutCollectionOfObjects.java → ...s/put/PreparedPutCollectionOfObjects.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
View
4 ...eration/put/PreparedPutContentValues.java → ...rations/put/PreparedPutContentValues.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.content.ContentValues;
import android.support.annotation.NonNull;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
View
4 ...put/PreparedPutContentValuesIterable.java → ...put/PreparedPutContentValuesIterable.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.content.ContentValues;
import android.support.annotation.NonNull;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
View
4 ...lite/operation/put/PreparedPutObject.java → ...ite/operations/put/PreparedPutObject.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
-import com.pushtorefresh.storio.operation.internal.OnSubscribeExecuteAsBlocking;
+import com.pushtorefresh.storio.operations.internal.OnSubscribeExecuteAsBlocking;
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
View
2 ...rio/sqlite/operation/put/PutResolver.java → ...io/sqlite/operations/put/PutResolver.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.support.annotation.NonNull;
View
2 ...torio/sqlite/operation/put/PutResult.java → ...orio/sqlite/operations/put/PutResult.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
View
2 ...orio/sqlite/operation/put/PutResults.java → ...rio/sqlite/operations/put/PutResults.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
View
4 ...resh/storio/sqlite/query/DeleteQuery.java → ...sh/storio/sqlite/queries/DeleteQuery.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.query;
+package com.pushtorefresh.storio.sqlite.queries;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -26,7 +26,7 @@
private final List<String> whereArgs;
/**
- * Please use {@link com.pushtorefresh.storio.sqlite.query.DeleteQuery.Builder}
+ * Please use {@link com.pushtorefresh.storio.sqlite.queries.DeleteQuery.Builder}
* instead of constructor.
*/
private DeleteQuery(@NonNull String table, @Nullable String where, @Nullable List<String> whereArgs) {
View
4 ...resh/storio/sqlite/query/InsertQuery.java → ...sh/storio/sqlite/queries/InsertQuery.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.query;
+package com.pushtorefresh.storio.sqlite.queries;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -19,7 +19,7 @@
private final String nullColumnHack;
/**
- * Please use {@link com.pushtorefresh.storio.sqlite.query.InsertQuery.Builder}
+ * Please use {@link com.pushtorefresh.storio.sqlite.queries.InsertQuery.Builder}
* instead of constructor.
*/
private InsertQuery(@NonNull String table, @Nullable String nullColumnHack) {
View
4 ...htorefresh/storio/sqlite/query/Query.java → ...orefresh/storio/sqlite/queries/Query.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.query;
+package com.pushtorefresh.storio.sqlite.queries;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -43,7 +43,7 @@
private final String limit;
/**
- * Please use {@link com.pushtorefresh.storio.sqlite.query.Query.Builder}
+ * Please use {@link com.pushtorefresh.storio.sqlite.queries.Query.Builder}
* instead of constructor.
*/
private Query(boolean distinct, @NonNull String table, @Nullable List<String> columns,
View
4 ...refresh/storio/sqlite/query/RawQuery.java → ...fresh/storio/sqlite/queries/RawQuery.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.query;
+package com.pushtorefresh.storio.sqlite.queries;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -32,7 +32,7 @@
private final Set<String> observesTables;
/**
- * Please use {@link com.pushtorefresh.storio.sqlite.query.RawQuery.Builder}
+ * Please use {@link com.pushtorefresh.storio.sqlite.queries.RawQuery.Builder}
* instead of constructor.
*/
private RawQuery(@NonNull String query, @Nullable List<String> args,
View
4 ...resh/storio/sqlite/query/UpdateQuery.java → ...sh/storio/sqlite/queries/UpdateQuery.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.query;
+package com.pushtorefresh.storio.sqlite.queries;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -26,7 +26,7 @@
private final List<String> whereArgs;
/**
- * Please use {@link com.pushtorefresh.storio.sqlite.query.UpdateQuery.Builder}
+ * Please use {@link com.pushtorefresh.storio.sqlite.queries.UpdateQuery.Builder}
* instead of constructor.
*/
private UpdateQuery(@NonNull String table, @Nullable String where, @Nullable List<String> whereArgs) {
View
6 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/SQLiteTypeMappingTest.java
@@ -1,8 +1,8 @@
package com.pushtorefresh.storio.sqlite;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.GetResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResolver;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.GetResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver;
import org.junit.Test;
View
6 ...qlite/src/test/java/com/pushtorefresh/storio/sqlite/design/DeleteOperationDesignTest.java
@@ -1,8 +1,8 @@
package com.pushtorefresh.storio.sqlite.design;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResult;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResults;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResult;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResults;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
import org.junit.Test;
View
18 ...o-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/design/DesignTestStorIOSQLite.java
@@ -8,15 +8,15 @@
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.operation.delete.PreparedDelete;
-import com.pushtorefresh.storio.sqlite.operation.execute.PreparedExecuteSQL;
-import com.pushtorefresh.storio.sqlite.operation.get.PreparedGet;
-import com.pushtorefresh.storio.sqlite.operation.put.PreparedPut;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.operations.delete.PreparedDelete;
+import com.pushtorefresh.storio.sqlite.operations.execute.PreparedExecuteSQL;
+import com.pushtorefresh.storio.sqlite.operations.get.PreparedGet;
+import com.pushtorefresh.storio.sqlite.operations.put.PreparedPut;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
import java.io.IOException;
import java.util.Set;
View
2 ...e/src/test/java/com/pushtorefresh/storio/sqlite/design/ExecuteSQLOperationDesignTest.java
@@ -1,6 +1,6 @@
package com.pushtorefresh.storio.sqlite.design;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
import org.junit.Test;
View
4 ...o-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/design/GetOperationDesignTest.java
@@ -2,8 +2,8 @@
import android.database.Cursor;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
import org.junit.Test;
View
12 ...o-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/design/PutOperationDesignTest.java
@@ -3,12 +3,12 @@
import android.content.ContentValues;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.sqlite.operation.put.DefaultPutResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResult;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResults;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResult;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResults;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
import org.junit.Test;
View
18 storio-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/design/UserTableMeta.java
@@ -4,15 +4,15 @@
import android.database.Cursor;
import android.support.annotation.NonNull;
-import com.pushtorefresh.storio.sqlite.operation.delete.DefaultDeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.DefaultGetResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.GetResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.DefaultPutResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResolver;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.operations.delete.DefaultDeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.GetResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.DefaultPutResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
import static org.mockito.Mockito.mock;
View
6 ...io-sqlite/src/test/java/com/pushtorefresh/storio/sqlite/impl/DefaultStorIOSQLiteTest.java
@@ -4,9 +4,9 @@
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.sqlite.operation.get.GetResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResolver;
+import com.pushtorefresh.storio.sqlite.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.sqlite.operations.get.GetResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver;
import org.junit.Test;
View
4 ...ion/delete/DefaultDeleteResolverTest.java → ...ons/delete/DefaultDeleteResolverTest.java
@@ -1,9 +1,9 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
import org.junit.Test;
View
2 ...te/operation/delete/DeleteResultTest.java → ...e/operations/delete/DeleteResultTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import org.junit.Test;
View
2 ...e/operation/delete/DeleteResultsTest.java → .../operations/delete/DeleteResultsTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import org.junit.Test;
View
2 ...o/sqlite/operation/delete/DeleteStub.java → .../sqlite/operations/delete/DeleteStub.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import android.support.annotation.NonNull;
View
4 ...reparedDeleteCollectionOfObjectsTest.java → ...reparedDeleteCollectionOfObjectsTest.java
@@ -1,7 +1,7 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
View
4 ...tion/delete/PreparedDeleteObjectTest.java → ...ions/delete/PreparedDeleteObjectTest.java
@@ -1,7 +1,7 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.DeleteQuery;
+import com.pushtorefresh.storio.sqlite.queries.DeleteQuery;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
View
2 ...rio/sqlite/operation/delete/TestItem.java → ...io/sqlite/operations/delete/TestItem.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.delete;
+package com.pushtorefresh.storio.sqlite.operations.delete;
import android.support.annotation.NonNull;
View
4 ...ation/execute/PreparedExecuteSQLTest.java → ...tions/execute/PreparedExecuteSQLTest.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.sqlite.operation.execute;
+package com.pushtorefresh.storio.sqlite.operations.execute;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
import com.pushtorefresh.storio.test.ObservableBehaviorChecker;
import org.junit.Test;
View
6 ...operation/get/DefaultGetResolverTest.java → ...perations/get/DefaultGetResolverTest.java
@@ -1,11 +1,11 @@
-package com.pushtorefresh.storio.sqlite.operation.get;
+package com.pushtorefresh.storio.sqlite.operations.get;
import android.database.Cursor;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
import org.junit.Test;
View
6 ...o/sqlite/operation/get/GetCursorStub.java → .../sqlite/operations/get/GetCursorStub.java
@@ -1,12 +1,12 @@
-package com.pushtorefresh.storio.sqlite.operation.get;
+package com.pushtorefresh.storio.sqlite.operations.get;
import android.database.Cursor;
import android.support.annotation.NonNull;
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
import com.pushtorefresh.storio.test.ObservableBehaviorChecker;
import rx.Observable;
View
6 .../sqlite/operation/get/GetObjectsStub.java → ...sqlite/operations/get/GetObjectsStub.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.get;
+package com.pushtorefresh.storio.sqlite.operations.get;
import android.database.Cursor;
import android.support.annotation.NonNull;
@@ -6,8 +6,8 @@
import com.pushtorefresh.storio.sqlite.Changes;
import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
import com.pushtorefresh.storio.test.ObservableBehaviorChecker;
import org.mockito.invocation.InvocationOnMock;
View
2 .../operation/get/PreparedGetCursorTest.java → ...operations/get/PreparedGetCursorTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.get;
+package com.pushtorefresh.storio.sqlite.operations.get;
import android.database.Cursor;
View
6 ...ion/get/PreparedGetListOfObjectsTest.java → ...ons/get/PreparedGetListOfObjectsTest.java
@@ -1,8 +1,8 @@
-package com.pushtorefresh.storio.sqlite.operation.get;
+package com.pushtorefresh.storio.sqlite.operations.get;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.RawQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.RawQuery;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
View
2 ...storio/sqlite/operation/get/TestItem.java → ...torio/sqlite/operations/get/TestItem.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.get;
+package com.pushtorefresh.storio.sqlite.operations.get;
import java.util.concurrent.atomic.AtomicLong;
View
8 ...operation/put/DefaultPutResolverTest.java → ...perations/put/DefaultPutResolverTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.content.ContentValues;
import android.database.Cursor;
@@ -6,9 +6,9 @@
import android.support.annotation.Nullable;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.Query;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.Query;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
import org.junit.Test;
View
6 ...t/PreparedPutCollectionOfObjectsTest.java → ...t/PreparedPutCollectionOfObjectsTest.java
@@ -1,10 +1,10 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.content.ContentValues;
import com.pushtorefresh.storio.sqlite.StorIOSQLite;
-import com.pushtorefresh.storio.sqlite.query.InsertQuery;
-import com.pushtorefresh.storio.sqlite.query.UpdateQuery;
+import com.pushtorefresh.storio.sqlite.queries.InsertQuery;
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
View
2 ...PreparedPutContentValuesIterableTest.java → ...PreparedPutContentValuesIterableTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.content.ContentValues;
View
2 ...ion/put/PreparedPutContentValuesTest.java → ...ons/put/PreparedPutContentValuesTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import org.junit.Test;
View
2 .../operation/put/PreparedPutObjectTest.java → ...operations/put/PreparedPutObjectTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
View
2 ...e/operation/put/PutContentValuesStub.java → .../operations/put/PutContentValuesStub.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.content.ContentValues;
import android.support.annotation.NonNull;
View
2 .../sqlite/operation/put/PutObjectsStub.java → ...sqlite/operations/put/PutObjectsStub.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.support.annotation.NonNull;
View
2 ...storio/sqlite/operation/put/TestItem.java → ...torio/sqlite/operations/put/TestItem.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.operation.put;
+package com.pushtorefresh.storio.sqlite.operations.put;
import android.support.annotation.NonNull;
View
2 .../storio/sqlite/query/DeleteQueryTest.java → ...torio/sqlite/queries/DeleteQueryTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.query;
+package com.pushtorefresh.storio.sqlite.queries;
import org.junit.Test;
View
2 .../storio/sqlite/query/InsertQueryTest.java → ...torio/sqlite/queries/InsertQueryTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.query;
+package com.pushtorefresh.storio.sqlite.queries;
import org.junit.Test;
View
2 ...efresh/storio/sqlite/query/QueryTest.java → ...resh/storio/sqlite/queries/QueryTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.query;
+package com.pushtorefresh.storio.sqlite.queries;
import org.junit.Test;
View
2 ...esh/storio/sqlite/query/RawQueryTest.java → ...h/storio/sqlite/queries/RawQueryTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.query;
+package com.pushtorefresh.storio.sqlite.queries;
import com.google.common.collect.HashMultiset;
View
2 .../storio/sqlite/query/UpdateQueryTest.java → ...torio/sqlite/queries/UpdateQueryTest.java
@@ -1,4 +1,4 @@
-package com.pushtorefresh.storio.sqlite.query;
+package com.pushtorefresh.storio.sqlite.queries;
import org.junit.Test;
View
10 ...orefresh/storio/test_without_rxjava/contentresolver/DefaultStorIOContentResolverTest.java
@@ -5,11 +5,11 @@
import android.net.Uri;
import com.pushtorefresh.storio.contentresolver.impl.DefaultStorIOContentResolver;
-import com.pushtorefresh.storio.contentresolver.operation.delete.DeleteResolver;
-import com.pushtorefresh.storio.contentresolver.operation.get.GetResolver;
-import com.pushtorefresh.storio.contentresolver.operation.put.PutResolver;
-import com.pushtorefresh.storio.contentresolver.query.DeleteQuery;
-import com.pushtorefresh.storio.contentresolver.query.Query;
+import com.pushtorefresh.storio.contentresolver.operations.delete.DeleteResolver;
+import com.pushtorefresh.storio.contentresolver.operations.get.GetResolver;
+import com.pushtorefresh.storio.contentresolver.operations.put.PutResolver;
+import com.pushtorefresh.storio.contentresolver.queries.DeleteQuery;
+import com.pushtorefresh.storio.contentresolver.queries.Query;
import org.junit.Test;
View
6 ...est/java/com/pushtorefresh/storio/test_without_rxjava/sqlite/DefaultStorIOSQLiteTest.java
@@ -4,9 +4,9 @@
import android.database.sqlite.SQLiteOpenHelper;
import com.pushtorefresh.storio.sqlite.impl.DefaultStorIOSQLite;
-import com.pushtorefresh.storio.sqlite.operation.get.GetResolver;
-import com.pushtorefresh.storio.sqlite.operation.put.PutResolver;
-import com.pushtorefresh.storio.sqlite.query.Query;
+import com.pushtorefresh.storio.sqlite.operations.get.GetResolver;
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver;
+import com.pushtorefresh.storio.sqlite.queries.Query;
import org.junit.Test;

0 comments on commit a7d5a9f

Please sign in to comment.
Something went wrong with that request. Please try again.