diff --git a/.gitignore b/.gitignore
index fd45b12..e133b7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,16 @@
/build
/captures
.externalNativeBuild
+app
+appbase
+dbapp
+modelapp
+netapp
+modelapp
+promise
+promisedb
+promisemodel
+promisenet
+promiseui
+uiapp
+
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6a22d2f..3a92786 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,14 +8,8 @@
diff --git a/app/build.gradle b/app/build.gradle
index 8cbbe9c..d841078 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,7 +43,7 @@ android {
multiDexEnabled = true
}
}
- buildToolsVersion = '29.0.0 rc3'
+ buildToolsVersion = '29.0.1'
}
dependencies {
@@ -56,7 +56,11 @@ dependencies {
testImplementation 'junit:junit:4.13-beta-3'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
- implementation project(path: ':promise')
+ implementation project(path: ':promisecommons')
+ implementation project(path: ':promisedb')
+ implementation project(path: ':promisemodel')
+ implementation project(path: ':promisenet')
+ implementation project(path: ':promiseui')
/* implementation 'com.google.dagger:dagger:2.23'
kapt 'com.google.dagger:dagger-compiler:2.23'*/
}
diff --git a/app/src/main/java/promise/app/App.java b/app/src/main/java/promise/app/App.java
index 22f8dc1..13ff2fe 100644
--- a/app/src/main/java/promise/app/App.java
+++ b/app/src/main/java/promise/app/App.java
@@ -10,7 +10,5 @@ public class App extends Application {
public void onCreate() {
super.onCreate();
Promise.init(this).threads(100);
-
}
-
}
diff --git a/build.gradle b/build.gradle
index 53c7c20..8141dcd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,7 @@
buildscript {
ext.kotlin_version = '1.3.41'
+ ext.supportLibVersion = "28.0.0"
repositories {
google()
diff --git a/promisepref/.gitignore b/commonsapp/.gitignore
similarity index 100%
rename from promisepref/.gitignore
rename to commonsapp/.gitignore
diff --git a/commonsapp/build.gradle b/commonsapp/build.gradle
new file mode 100644
index 0000000..98a7332
--- /dev/null
+++ b/commonsapp/build.gradle
@@ -0,0 +1,45 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+android {
+ compileSdkVersion 29
+ buildToolsVersion "29.0.1"
+
+
+ defaultConfig {
+ applicationId "promise.commonsapp"
+ minSdkVersion 17
+ targetSdkVersion 29
+ versionCode 1
+ versionName "1.0"
+
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+ }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+
+}
+
+dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation project(path: ':promisecommons')
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.core:core-ktx:1.0.2'
+ implementation 'io.reactivex.rxjava2:rxjava:2.2.7'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'androidx.test:runner:1.2.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
diff --git a/promisepref/proguard-rules.pro b/commonsapp/proguard-rules.pro
similarity index 100%
rename from promisepref/proguard-rules.pro
rename to commonsapp/proguard-rules.pro
diff --git a/commonsapp/src/androidTest/java/promise/commonsapp/ExampleInstrumentedTest.kt b/commonsapp/src/androidTest/java/promise/commonsapp/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..e2ac35f
--- /dev/null
+++ b/commonsapp/src/androidTest/java/promise/commonsapp/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package promise.commonsapp
+
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getTargetContext()
+ assertEquals("promise.commonsapp", appContext.packageName)
+ }
+}
diff --git a/commonsapp/src/main/AndroidManifest.xml b/commonsapp/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..74cbdd3
--- /dev/null
+++ b/commonsapp/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonsapp/src/main/java/promise/commonsapp/MainActivity.kt b/commonsapp/src/main/java/promise/commonsapp/MainActivity.kt
new file mode 100644
index 0000000..cc7f614
--- /dev/null
+++ b/commonsapp/src/main/java/promise/commonsapp/MainActivity.kt
@@ -0,0 +1,31 @@
+package promise.commonsapp
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.collection.ArrayMap
+import kotlinx.android.synthetic.main.activity_main.*
+import promise.pref.Preferences
+
+class MainActivity : AppCompatActivity() {
+
+ private val preferences: Preferences = Preferences(PREFERENCE_NAMR)
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_main)
+ preferences.save(ArrayMap().apply {
+ put("somekey", "key")
+ put("somekey1", "key1")
+ put("somekey2", "key3")
+ })
+ }
+
+ override fun onPostCreate(savedInstanceState: Bundle?) {
+ super.onPostCreate(savedInstanceState)
+ preferences_textview.text = preferences.all.toString()
+ }
+
+ companion object {
+ const val PREFERENCE_NAMR = "pref_name"
+ }
+}
diff --git a/commonsapp/src/main/res/drawable-v24/ic_launcher_foreground.xml b/commonsapp/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..1f6bb29
--- /dev/null
+++ b/commonsapp/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+
+
+
+
+ The type of the items in the table
+ */
private abstract class QueryExtras
implements Extras, DoubleConverter {
-
+ /**
+ * the database instance to read fromm
+ */
private SQLiteDatabase database;
QueryExtras(SQLiteDatabase database) {
@@ -330,16 +507,23 @@ public SQLiteDatabase database() {
return database;
}
+ /**
+ * get a record pre populated with id and timestamps from each read
+ * @param cursor serialized version of Q
+ * @return Q the de-serialized output of reading the cursor
+ */
Q getWithId(Cursor cursor) {
- Q t = from(cursor);
+ Q t = deserialize(cursor);
t.id(cursor.getInt(id.getIndex()));
- if (createdAt == null) createdAt = new Column<>("CREATED_AT", Column.Type.INTEGER.NULLABLE());
- if (updatedAt == null) updatedAt = new Column<>("UPDATED_AT", Column.Type.INTEGER.NULLABLE());
t.createdAt(cursor.getInt(createdAt.getIndex(cursor)));
t.updatedAt(cursor.getInt(updatedAt.getIndex(cursor)));
return t;
}
+ /**
+ * get the first record in the table
+ * @return the first records or null if theirs none in the table
+ */
@Nullable
@Override
public Q first() {
@@ -354,6 +538,10 @@ public Q first() {
}
}
+ /**
+ * get the last record in the table
+ * @return an item or null if theirs none stored in the table
+ */
@Nullable
@Override
public Q last() {
@@ -368,25 +556,34 @@ public Q last() {
}
}
+ /**
+ * get all the items in the table
+ * @return the items or an empty list if theirs none
+ */
@Override
public SList all() {
Cursor cursor;
try {
QueryBuilder builder = new QueryBuilder().from(Model.this).takeAll();
cursor = database.rawQuery(builder.build(), builder.buildParameters());
+ SList ts = new SList<>();
+ while (cursor.moveToNext() && !cursor.isClosed()) ts.add(getWithId(cursor));
+ return ts;
} catch (SQLiteException e) {
return new SList<>();
}
- SList ts = new SList<>();
- while (cursor.moveToNext() && !cursor.isClosed()) ts.add(getWithId(cursor));
- return ts;
}
+ /**
+ * read the top items in the table
+ * @param limit the number of records to read
+ * @return a list of the items
+ */
@Override
public SList limit(int limit) {
Cursor cursor;
try {
- QueryBuilder builder = new QueryBuilder().from(Model.this).take(1);
+ QueryBuilder builder = new QueryBuilder().from(Model.this).take(limit);
cursor = database.rawQuery(builder.build(), builder.buildParameters());
SList ts = new SList<>();
while (cursor.moveToNext() && !cursor.isClosed()) ts.add(getWithId(cursor));
@@ -397,11 +594,17 @@ public SList limit(int limit) {
}
}
+ /**
+ * reads the records between the skip and limit in the table
+ * @param skip of set from the top to not read
+ * @param limit items to load after skip
+ * @return a list of records
+ */
@Override
- public SList between(Column column, Integer a, Integer b) {
+ public SList paginate(int skip, int limit) {
Cursor cursor;
try {
- QueryBuilder builder = new QueryBuilder().from(Model.this).whereAnd(Criteria.between(column, a, b));
+ QueryBuilder builder = new QueryBuilder().from(Model.this).take(limit).skip(skip);
cursor = database.rawQuery(builder.build(), builder.buildParameters());
SList ts = new SList<>();
while (cursor.moveToNext() && !cursor.isClosed()) ts.add(getWithId(cursor));
@@ -412,26 +615,66 @@ public SList between(Column column, Integer a, Integer b) {
}
}
+ /**
+ * gets all items that match in between the int left and right
+ * @param column column to match between
+ * @param a lower between bound
+ * @param b upper between bound
+ * @return a list of items
+ */
+ @Override
+ public SList between(Column column, N a, N b) {
+ Cursor cursor;
+ try {
+ QueryBuilder builder = new QueryBuilder().from(Model.this).takeAll().whereAnd(Criteria.between(column, a, b));
+ cursor = database.rawQuery(builder.build(), builder.buildParameters());
+ SList ts = new SList<>();
+ while (cursor.moveToNext() && !cursor.isClosed()) ts.add(getWithId(cursor));
+ return ts;
+ } catch (SQLiteException e) {
+ LogUtil.e(TAG, e);
+ return new SList<>();
+ }
+ }
+
+ /**
+ * gets all items matching the multiple columns
+ * @param column fields to match their values
+ * @return a list of items
+ */
@Override
public SList where(Column[] column) {
- return null;
+ Cursor cursor;
+ try {
+ QueryBuilder builder = new QueryBuilder().from(Model.this).takeAll();
+ for (Column column1 : column)
+ if (column1.value() != null) builder.whereAnd(Criteria.equals(column1, column1.value()));
+ cursor = database.rawQuery(builder.build(), builder.buildParameters());
+ SList ts = new SList<>();
+ while (cursor.moveToNext() && !cursor.isClosed()) ts.add(getWithId(cursor));
+ return ts;
+ } catch (SQLiteException e) {
+ LogUtil.e(TAG, e);
+ return new SList<>();
+ }
}
+ /**
+ * gets all the items matching not in any of the columns
+ * @param column field to match
+ * @param bounds not in bounds
+ * @return a list of items
+ */
+ @SafeVarargs
@Override
- public SList notIn(Column column, Integer a, Integer b) {
+ public final SList notIn(Column column, N... bounds) {
Cursor cursor;
+ Object[] items = new Object[bounds.length];
+ System.arraycopy(bounds, 0, items, 0, bounds.length);
+ QueryBuilder builder = new QueryBuilder().from(Model.this).takeAll()
+ .whereAnd(Criteria.notIn(column, items));
try {
- String sql =
- SELECT_PREFIX
- + name
- + " WHERE "
- + column.getName()
- + " NOT BETWEEN "
- + a
- + " AND "
- + b
- + ";";
- cursor = database.rawQuery(sql, null);
+ cursor = database.rawQuery(builder.build(), builder.buildParameters());
SList ts = new SList<>();
while (cursor.moveToNext() && !cursor.isClosed()) {
Q t = getWithId(cursor);
@@ -446,18 +689,47 @@ public SList notIn(Column column, Integer a, Integer b) {
}
}
+ /**
+ * get all the rows where the column is like the columns values
+ * @param column the fields to compute like from
+ * @return a list of columns
+ */
@Override
public SList like(Column[] column) {
- return null;
+ Cursor cursor;
+ QueryBuilder builder = new QueryBuilder().from(Model.this).takeAll();
+ for (Column column1 : column)
+ builder.whereAnd(Criteria.contains(column1, String.valueOf(column1.value())));
+ try {
+ cursor = database.rawQuery(builder.build(), builder.buildParameters());
+ SList ts = new SList<>();
+ while (cursor.moveToNext() && !cursor.isClosed()) {
+ Q t = getWithId(cursor);
+ ts.add(t);
+ }
+ cursor.close();
+ /*database.close();*/
+ return ts;
+ } catch (SQLiteException e) {
+ LogUtil.e(TAG, e);
+ return new SList<>();
+ }
}
+ /**
+ * get all the rows in the oder specified by the column
+ * @param column field to order by
+ * @return a list of ordered items
+ */
@Override
public SList orderBy(Column column) {
Cursor cursor;
+ QueryBuilder builder = new QueryBuilder().from(Model.this).takeAll();
+ if (column.order().equals(Column.DESCENDING)) {
+ builder.orderByDescending(column);
+ } else builder.orderByAscending(column);
try {
- String sql =
- SELECT_PREFIX + name + " ORDER BY " + column.getName() + " " + column.order() + ";";
- cursor = database.rawQuery(sql, null);
+ cursor = database.rawQuery(builder.build(), builder.buildParameters());
SList ts = new SList<>();
while (cursor.moveToNext() && !cursor.isClosed()) {
Q t = getWithId(cursor);
@@ -472,13 +744,17 @@ public SList orderBy(Column column) {
}
}
+ /**
+ * gets all the items grouped by the column
+ * @param column field to group by
+ * @return a list of grouped items
+ */
@Override
public SList groupBy(Column column) {
Cursor cursor;
+ QueryBuilder builder = new QueryBuilder().from(Model.this).takeAll().groupBy(column);
try {
- String sql =
- SELECT_PREFIX + name + " GROUP BY " + column.getName() + " " + column.order() + ";";
- cursor = database.rawQuery(sql, null);
+ cursor = database.rawQuery(builder.build(), builder.buildParameters());
SList ts = new SList<>();
while (cursor.moveToNext() && !cursor.isClosed()) {
Q t = getWithId(cursor);
@@ -493,23 +769,21 @@ public SList groupBy(Column column) {
}
}
+ /**
+ * gets all the items grouped and ordered by the two columns
+ * @param column group by field
+ * @param column1 order by fields
+ * @return a list of items
+ */
@Override
public SList groupAndOrderBy(Column column, Column column1) {
Cursor cursor;
+ QueryBuilder builder = new QueryBuilder().from(Model.this).takeAll().groupBy(column);
+ if (column1.order().equals(Column.DESCENDING)) {
+ builder.orderByDescending(column1);
+ } else builder.orderByAscending(column1);
try {
- String sql =
- SELECT_PREFIX
- + name
- + " GROUP BY "
- + column.getName()
- + " "
- + column.order()
- + " ORDER BY "
- + column.getName()
- + " "
- + column.order()
- + ";";
- cursor = database.rawQuery(sql, null);
+ cursor = database.rawQuery(builder.build(), builder.buildParameters());
SList ts = new SList<>();
while (cursor.moveToNext() && !cursor.isClosed()) {
Q t = getWithId(cursor);
@@ -524,94 +798,4 @@ public SList groupAndOrderBy(Column column, Column column1) {
}
}
}
-
- private abstract class QueryExtras2 extends QueryExtras {
- private Column[] columns;
-
- QueryExtras2(SQLiteDatabase database, Column[] columns) {
- super(database);
- this.columns = columns;
- }
-
- @Nullable
- @Override
- public U first() {
- SList list = all();
- if (!list.isEmpty()) return list.get(0);
- return null;
- }
-
- @Nullable
- @Override
- public U last() {
- SList list = all();
- if (!list.isEmpty()) return list.get(list.size() - 1);
- return null;
- }
-
- @Override
- public SList all() {
- if (columns == null || columns.length == 0) return super.all();
- String[] args = new String[columns.length];
- String selection = "";
- for (int i = 0; i < args.length; i++) {
- Column column = columns[i];
- String where = column.getName() + column.getOperand();
- selection = selection.concat(where);
- if (column.value() instanceof String) args[i] = "\"" + column.value() + "\"";
- else args[i] = column.value().toString();
- selection = selection.concat(args[i]);
- if (i < args.length - 1) selection = selection.concat(" AND ");
- }
- Cursor cursor = database().query(name, null, selection, null, null, null, null);
- SList ts = new SList<>();
- while (cursor.moveToNext() && !cursor.isClosed()) {
- U t = getWithId(cursor);
- ts.add(t);
- }
- cursor.close();
- /*database().close();*/
- return ts;
- }
-
- @Override
- public SList limit(int limit) {
- return null;
- }
-
- @Override
- public SList between(Column column, Integer a, Integer b) {
- return super.between(column, a, b);
- }
-
- @Override
- public SList where(Column[] column) {
- return null;
- }
-
- @Override
- public SList notIn(Column column, Integer a, Integer b) {
- return super.notIn(column, a, b);
- }
-
- @Override
- public SList like(Column[] column) {
- return null;
- }
-
- @Override
- public SList orderBy(Column column) {
- return null;
- }
-
- @Override
- public SList groupBy(Column column) {
- return null;
- }
-
- @Override
- public SList groupAndOrderBy(Column column, Column column1) {
- return null;
- }
- }
}
diff --git a/promisedb/src/main/java/promise/promisedb/ModelError.java b/promisedb/src/main/java/promise/promisedb/ModelError.java
index 5068c1a..5ab16be 100644
--- a/promisedb/src/main/java/promise/promisedb/ModelError.java
+++ b/promisedb/src/main/java/promise/promisedb/ModelError.java
@@ -20,7 +20,10 @@
*/
public final class ModelError extends Exception {
- public ModelError(Throwable cause) {
+ ModelError(Throwable cause) {
+ super(cause);
+ }
+ ModelError(String cause) {
super(cause);
}
}
diff --git a/promisedb/src/main/java/promise/promisedb/ReactiveCrud.java b/promisedb/src/main/java/promise/promisedb/ReactiveCrud.java
index 6c09ab3..ea48a63 100644
--- a/promisedb/src/main/java/promise/promisedb/ReactiveCrud.java
+++ b/promisedb/src/main/java/promise/promisedb/ReactiveCrud.java
@@ -21,36 +21,33 @@
import promise.model.List;
import promise.model.S;
import promise.model.SList;
+import promise.model.SModel;
interface ReactiveCrud {
- ReactiveTable.Extras read(Table table) throws ModelError;
+ ReactiveTable.Extras read(Table table) throws ModelError;
- Maybe> readAll(Table table);
+ Maybe> readAll(Table table);
- Maybe> readAll(Table table, Column column);
+ Maybe> readAll(Table table, Column... column);
- Maybe update(T t, Table table, Column column);
+ Maybe update(T t, Table table, Column column);
- Maybe update(T t, Table table);
+ Maybe update(T t, Table table);
- Maybe> readAll(Table table, Column[] columns);
+ Maybe delete(Table table, Column column);
- ReactiveTable.Extras read(Table table, Column... columns) throws ModelError;
-
- Maybe delete(Table table, Column column);
-
- Maybe delete(Table table, T t);
+ Maybe delete(Table table, T t);
Maybe delete(Table table);
- Maybe delete(Table table, Column column, List list);
+