v0.2

Author: efraespada

README.md

@@ -1,6 +1,8 @@
 [ ![Download](https://api.bintray.com/packages/efff/maven/RotorKotlinDatabase/images/download.svg) ](https://bintray.com/efff/maven/RotorKotlinDatabase/_latestVersion)
-<p align="center"><img width="10%" vspace="20" src="https://github.com/rotorlab/database-kotlin/raw/develop/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png"></p>
-
+<p align="center"><img width="10%" vspace="20" src="https://github.com/rotorlab/database-kotlin/raw/master/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png"></p>
+ 
+Before use this library, [Rotor Core](https://github.com/rotorlab/core-kotlin) must be initialized. Lastest version is always the same on all Rotor libs.
+ 
 # Rotor Database
 Rotor Database is a complementary module for Rotor Core (kotlin). It allows to work with shared (Java) objects between many devices offering users real time changes and better mobile data consumption. 
 
@@ -10,8 +12,6 @@ Forget things like swipe-to-refresh events, lots of server requests and object s
 
 Rotor Core is connected to Rotor and Redis servers. The first one controls object sharing queues, devices waiting for changes and all data edition on remote database. The second (as you probably know) gives us Pub/Sub messaging pattern for data changes replication.
 
-Before use this lib, check out [Rotor Core repo](https://github.com/rotorlab/core-kotlin) for its initialization.
-
 ## Implementation
 Import libraries:
 
@@ -22,7 +22,7 @@ android {
     }
 }
  
-def rotor_version =  "0.1.2"
+def rotor_version =  "0.2"
  
 dependencies {
     implementation ("com.rotor:core:$rotor_version@aar") {
@@ -35,7 +35,7 @@ dependencies {
 ```
 Initialize database module after Rotor core initialization. Should be invoked on `LoadingActivity` or `SplashActivity`. :
 ```java
-Rotor.initialize(getApplicationContext(), "http://10.0.2.2:1507/", "redis://10.0.2.2", new StatusListener() {
+Rotor.initialize(getApplicationContext(), "http://10.0.2.2:1508/", "redis://10.0.2.2", new StatusListener() {
     @Override
     public void connected() {
          Database.initialize()
@@ -56,7 +56,7 @@ For that we have `Database.listen(...)` method which has a simple **object lifec
 
 ```kotlin
 // kotlin
-Database.listen(path: String, Reference<T>(T::class.java) {
+Database.listen(database: String, path: String, Reference<T>(T::class.java) {
 
     fun onCreate()
 
@@ -128,9 +128,10 @@ Database.remove("myObjects/objectA");
 ```
 Samples:
 ```java
-// java
- 
+
 class ObjectA {
+    @SerializedName("value")
+    @Expose
     String value;
     public ObjectA(String value) {
         this.value = value;
@@ -143,10 +144,11 @@ class ObjectA {
     }
 }
 
-String path = "myObjects/objectA";
+String database = "database";
+String path = "/myObjects/objectA";
 ObjectA objectA = null;
 
-Database.listen(path, new Reference<ObjectA>(ObjectA.class) {
+Database.listen(database, path, new Reference<ObjectA>(ObjectA.class) {
     @Override
     public void onCreate() {
         objectA = new ObjectA("foo");
@@ -177,38 +179,6 @@ Database.listen(path, new Reference<ObjectA>(ObjectA.class) {
 });
 ```
 
-```kotlin
-// kotlin
- 
-data class ObjectA(var value: String)
-var path = "myObjects/objectA"
-var objectA: ObjectA ? = null
-Database.listen(path, object: Reference<ObjectA>(ObjectA::class.java) {
-    override fun onCreate() {
-        this@MainActivity.objectA = ObjectA("foo")
-        Database.sync(path);
-    }
- 
-    override fun onUpdate(): ObjectA ? {
-        return this@MainActivity.objectA
-    }
- 
-    override fun onChanged(ref: ObjectA) {
-        this@MainActivity.objectA = ref
-        // notify change on UI
-    }
-    
-    override fun onDestroy() {
-        this@MainActivity.objectA = null;
-        // UI changes for removed object
-    }
- 
-    override fun progress(value: Int) {
-        Log.e("rotor", "loading " + path + " -> " + value + " %")
-    }
-})
-```
-
 License
 -------
     Copyright 2018 RotorLab Organization

app/build.gradle

@@ -3,15 +3,15 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     defaultConfig {
         applicationId "com.rotor.sample"
-        minSdkVersion 14
-        targetSdkVersion 26
+        minSdkVersion 21
+        targetSdkVersion 27
         versionCode 1
         versionName rotor_version
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        buildConfigField "String", "database_url", "\"http://10.0.2.2:1507/\""
+        buildConfigField "String", "database_url", "\"http://10.0.2.2:1508/\""
         buildConfigField "String", "redis_url", "\"redis://10.0.2.2\""
         multiDexEnabled true
     }
@@ -26,7 +26,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'

app/src/main/java/com/rotor/sample/MainActivity.kt

@@ -31,7 +31,10 @@ class MainActivity : AppCompatActivity() {
 
         Database.initialize()
 
-        Database.listen("chat", object: Reference<Chat>(Chat::class.java) {
+        Database.listen("database", "/chat", object: Reference<Chat>(Chat::class.java) {
+            override fun onDestroy() {
+                TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            }
 
             override fun onCreate() {
 
@@ -51,7 +54,11 @@ class MainActivity : AppCompatActivity() {
 
         })
 
-        Database.listen("", object: Reference<ObjectA>(ObjectA::class.java) {
+        Database.listen("database","/object", object: Reference<ObjectA>(ObjectA::class.java) {
+            override fun onDestroy() {
+                TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            }
+
             override fun onCreate() {
                 objectA = ObjectA("foo")
             }

build.gradle

@@ -1,19 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.30'
-    ext.rotor_version = '0.1.2'
+    ext.kotlin_version = '1.2.41'
+    ext.rotor_version = '0.2'
 
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

database/build.gradle

@@ -6,11 +6,11 @@ apply plugin: 'com.jfrog.bintray'
 version = rotor_version
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 26
+        minSdkVersion 21
+        targetSdkVersion 27
         versionCode 2
         versionName version
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -28,25 +28,29 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    compile 'com.efraespada:jsondiff:1.1.0'
+    implementation 'com.efraespada:jsondiff:1.1.2'
 
-    compile "com.squareup.retrofit2:retrofit:2.3.0"
-    compile "com.squareup.retrofit2:adapter-rxjava2:2.3.0"
-    compile "com.squareup.retrofit2:converter-gson:2.3.0"
-    compile "io.reactivex.rxjava2:rxandroid:2.0.2"
+    implementation "com.squareup.retrofit2:retrofit:2.3.0"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:2.3.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.3.0"
+    implementation "io.reactivex.rxjava2:rxandroid:2.0.2"
+
+    implementation 'cc.duduhuo.util:digest-util:1.0.1'
+    implementation 'org.apache.commons:commons-lang3:3.6'
 
     //noinspection GradleDependency
-    compile 'com.google.code.findbugs:jsr305:2.0.1'
+    implementation 'com.google.code.findbugs:jsr305:2.0.1'
     //noinspection GradleDependency
-    compile 'com.google.guava:guava:22.0-android'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    compile "com.stringcare:library:0.7"
+    implementation 'com.google.guava:guava:22.0-android'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "com.stringcare:library:0.7"
     implementation "com.rotor:core:$rotor_version"
-    compile 'com.google.code.gson:gson:2.8.2'
+    // implementation project(":core")
+    implementation 'com.google.code.gson:gson:2.8.2'
 }
 repositories {
     mavenCentral()