3.2.5 /2017-07-04/

droidparts · Jul 4, 2017 · e4f782f · e4f782f
2 parents 869e2d1 + 8078da9
commit e4f782f
Show file tree

Hide file tree

Showing 18 changed files with 75 additions and 74 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+3.2.5 /2017-07-04/:
+    * Entity .id => ._id.
+    * AsyncTaskResultListener => ResultListener.
+
 3.2.0 /2017-06-07/:
     * droidparts-misc for extras.
     * Removed HTTPException.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.2.0
+3.2.5
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	repositories { jcenter() }
-	dependencies { classpath 'com.android.tools.build:gradle:2.3.2' }
+	dependencies { classpath 'com.android.tools.build:gradle:2.3.3' }
 }
 
 allprojects {

diff --git a/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/FilterEntityManager.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/FilterEntityManager.java
@@ -22,8 +22,7 @@
 import org.droidparts.persist.sql.stmt.Is;
 import org.droidparts.persist.sql.stmt.Select;
 
-import static org.droidparts.contract.DB.Column.ID;
-import static org.droidparts.gram.contract.DB.Column.NAME;
+import org.droidparts.gram.contract.DB.Column;
 
 public class FilterEntityManager extends EntityManager<Filter> {
 
@@ -32,9 +31,9 @@ public FilterEntityManager(Context ctx) {
 	}
 
 	public void setIdOrCreateForName(Filter filter) {
-		Select<Filter> select = select().columns(ID).where(NAME, Is.EQUAL, filter.name);
+		Select<Filter> select = select().columns(Column._ID).where(Column.NAME, Is.EQUAL, filter.name);
 		if (select.count() == 1) {
-			filter.id = readFirst(select).id;
+			filter._id = readFirst(select)._id;
 		} else {
 			create(filter);
 		}

diff --git a/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/ImageEntityManager.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/ImageEntityManager.java
@@ -43,7 +43,7 @@ public boolean update(Image item) {
 	}
 
 	private void setFilterId(Filter filter) {
-		if (filter.id < 1) {
+		if (filter._id < 1) {
 			filterEntityManager.setIdOrCreateForName(filter);
 		}
 	}

diff --git a/droidparts-test/src/org/droidparts/test/persist/sql/AlbumManager.java b/droidparts-test/src/org/droidparts/test/persist/sql/AlbumManager.java
@@ -41,7 +41,7 @@ public AlbumManager(Context ctx) {
 
 	public ArrayList<Tag> getTags(long albumId) {
 		ArrayList<Tag> tags = new ArrayList<Tag>();
-		Select<Tag> select = tagManager.select().where(Column.ID, Is.IN, getTagIds(albumId));
+		Select<Tag> select = tagManager.select().where(Column._ID, Is.IN, getTagIds(albumId));
 		tags = tagManager.readAll(select);
 		return tags;
 	}

diff --git a/droidparts-test/test/org/droidparts/test/testcase/EntityTestCase.java b/droidparts-test/test/org/droidparts/test/testcase/EntityTestCase.java
@@ -87,24 +87,24 @@ public void testUniqueIndex() {
 		assertTrue(albumToTagManager.create(att));
 		assertFalse(albumToTagManager.create(att));
 		album.name = ALBUMS[1];
-		album.id = 0;
+		album._id = 0;
 		assertTrue(albumToTagManager.create(att));
 		assertEquals(2, albumToTagManager.select().count());
 	}
 
 	@Test
 	public void testCRUD() {
 		Album album1 = createFirstAlbum();
-		assertFalse(album1.id == 0);
-		Album album2 = albumManager.read(album1.id);
+		assertFalse(album1._id == 0);
+		Album album2 = albumManager.read(album1._id);
 		assertEquals(album1.name, album2.name);
 		album2.name = ALBUMS[1];
 		albumManager.update(album2);
-		Album album3 = albumManager.read(album2.id);
+		Album album3 = albumManager.read(album2._id);
 		assertEquals(album2.name, album3.name);
-		assertEquals(album1.id, album3.id);
-		albumManager.delete(album1.id);
-		assertNull(albumManager.read(album1.id));
+		assertEquals(album1._id, album3._id);
+		albumManager.delete(album1._id);
+		assertNull(albumManager.read(album1._id));
 	}
 
 	@Test
@@ -126,7 +126,7 @@ public void testUniqueAndNull() {
 		created = albumManager.create(album2);
 		assertTrue(created);
 
-		int count = albumManager.select().whereId(album1.id).count();
+		int count = albumManager.select().whereId(album1._id).count();
 		assertEquals(1, count);
 
 		Cursor cursor = albumManager.select().where(Column.COMMENT, Is.NOT_NULL).execute();
@@ -155,7 +155,7 @@ public void testModel() {
 		}
 		album.nestedArr = album.nestedList.toArray(new Nested[album.nestedList.size()]);
 		albumManager.update(album);
-		album = albumManager.read(album.id);
+		album = albumManager.read(album._id);
 		assertEquals("str", album.nested.str);
 		assertEquals(TRACKS.length, album.nestedList.size());
 		assertEquals(TRACKS.length, album.nestedArr.length);
@@ -168,7 +168,7 @@ public void testDate() {
 		pri.date = new Date(now);
 		pri.dates.add(pri.date);
 		assertTrue(primitivesManager.create(pri));
-		pri = primitivesManager.read(pri.id);
+		pri = primitivesManager.read(pri._id);
 		assertEquals(now, pri.date.getTime());
 		assertEquals(1, pri.dates.size());
 		assertEquals(now, pri.dates.get(0).getTime());
@@ -181,7 +181,7 @@ public void testEnum() {
 		pri.en = En.HI;
 		pri.enArr = new En[]{En.HI, En.THERE};
 		primitivesManager.create(pri);
-		pri = primitivesManager.read(pri.id);
+		pri = primitivesManager.read(pri._id);
 		assertEquals(En.HI, pri.en);
 		assertEquals(En.THERE.id, pri.enArr[1].id);
 	}
@@ -195,7 +195,7 @@ public void testArraysAndCollections() {
 		pri.doubleSet.add(100.500);
 		pri.doubleSet.add(12.5);
 		assertTrue(primitivesManager.create(pri));
-		pri = primitivesManager.read(pri.id);
+		pri = primitivesManager.read(pri._id);
 		assertEquals(2, pri.strArr.length);
 		assertEquals(30, pri.intArr[2]);
 		assertTrue(pri.strList.contains("one"));
@@ -218,9 +218,9 @@ public void testWhereId() {
 	public void testBetween() {
 		createDummyAlbums(20);
 		//
-		int count = albumManager.select().where(Column.ID, Is.BETWEEN, 5, 10).count();
+		int count = albumManager.select().where(Column._ID, Is.BETWEEN, 5, 10).count();
 		assertEquals(6, count);
-		count = albumManager.select().where(Column.ID, Is.NOT_BETWEEN, 5, 10).count();
+		count = albumManager.select().where(Column._ID, Is.NOT_BETWEEN, 5, 10).count();
 		assertEquals(14, count);
 	}
 
@@ -229,9 +229,9 @@ public void testIn() {
 		createDummyAlbums(3);
 		//
 		int[] arr = new int[]{1, 2};
-		int count = albumManager.select().where(Column.ID, Is.IN, arr).count();
+		int count = albumManager.select().where(Column._ID, Is.IN, arr).count();
 		assertEquals(2, count);
-		count = albumManager.select().where(Column.ID, Is.NOT_IN, arr).count();
+		count = albumManager.select().where(Column._ID, Is.NOT_IN, arr).count();
 		assertEquals(1, count);
 	}
 
@@ -259,8 +259,8 @@ public void testForeignKeys() {
 			track.name = name;
 			trackManager.create(track);
 		}
-		assertEquals(TRACKS.length, trackManager.select().where(Column.ALBUM_ID, Is.EQUAL, album.id).count());
-		albumManager.delete(album.id);
+		assertEquals(TRACKS.length, trackManager.select().where(Column.ALBUM_ID, Is.EQUAL, album._id).count());
+		albumManager.delete(album._id);
 		assertEquals(0, trackManager.select().count());
 	}
 
@@ -272,7 +272,7 @@ public void testEagerForeignKeys() {
 		track.album = album;
 		track.nullableAlbum = album;
 		trackManager.create(track);
-		track = trackManager.read(track.id);
+		track = trackManager.read(track._id);
 		assertNotNull(track.album.name);
 		assertNull(track.nullableAlbum.name);
 	}
@@ -295,14 +295,14 @@ public void testUniqueAndNullable() {
 		album2.name = "name2";
 		track.nullableAlbum = album2;
 		assertTrue(trackManager.update(track));
-		assertFalse(track.nullableAlbum.id == 0);
+		assertFalse(track.nullableAlbum._id == 0);
 		//
 		album.name = null;
 		assertFalse(albumManager.update(album));
 		//
 		track.nullableAlbum = null;
 		assertTrue(trackManager.update(track));
-		assertNull(trackManager.read(track.id).nullableAlbum);
+		assertNull(trackManager.read(track._id).nullableAlbum);
 	}
 
 	@Test
@@ -320,15 +320,15 @@ public void testOffsetLimit() {
 	@Test
 	public void testWhere() {
 		Album album = createFirstAlbum();
-		assertEquals(1, albumManager.select().where("_id = ?", album.id).count());
-		assertEquals(1, albumManager.select().where("_id = " + album.id).count());
+		assertEquals(1, albumManager.select().where("_id = ?", album._id).count());
+		assertEquals(1, albumManager.select().where("_id = " + album._id).count());
 	}
 
 	@Test
 	public void testWhereCount() {
 		createDummyAlbums(20);
-		assertEquals(1, albumManager.select().where(Column.ID, Is.EQUAL, 10).count());
-		assertEquals(0, albumManager.select().where(Column.ID, Is.EQUAL, 100).count());
+		assertEquals(1, albumManager.select().where(Column._ID, Is.EQUAL, 10).count());
+		assertEquals(0, albumManager.select().where(Column._ID, Is.EQUAL, 100).count());
 	}
 
 	@Test
@@ -347,14 +347,14 @@ public void testM2M() {
 		for (String name : TAGS) {
 			tags.add(new Tag(name));
 		}
-		albumManager.addTags(album.id, tags);
+		albumManager.addTags(album._id, tags);
 		//
 		assertEquals(TAGS.length, albumToTagManager.select().count());
-		tags = albumManager.getTags(album.id);
+		tags = albumManager.getTags(album._id);
 		assertEquals(TAGS.length, tags.size());
 		//
 		tagManager.deleteAll(tags);
-		tags = albumManager.getTags(album.id);
+		tags = albumManager.getTags(album._id);
 		assertEquals(0, albumToTagManager.select().count());
 		assertEquals(0, tags.size());
 	}

diff --git a/droidparts/src/org/droidparts/concurrent/task/AsyncTask.java b/droidparts/src/org/droidparts/concurrent/task/AsyncTask.java
@@ -25,13 +25,13 @@ public abstract class AsyncTask<Params, Progress, Result>
 		extends android.os.AsyncTask<Params, Progress, Pair<Exception, Result>> {
 
 	private final Context ctx;
-	private final AsyncTaskResultListener<Result> resultListener;
+	private final ResultListener<Result> resultListener;
 
 	public AsyncTask(Context ctx) {
 		this(ctx, null);
 	}
 
-	public AsyncTask(Context ctx, AsyncTaskResultListener<Result> resultListener) {
+	public AsyncTask(Context ctx, ResultListener<Result> resultListener) {
 		Injector.inject(ctx, this);
 		this.ctx = ctx.getApplicationContext();
 		this.resultListener = resultListener;
@@ -61,12 +61,12 @@ protected final void onPostExecute(Pair<Exception, Result> result) {
 		if (result.first != null) {
 			onPostExecuteFailure(result.first);
 			if (resultListener != null) {
-				resultListener.onAsyncTaskFailure(result.first);
+				resultListener.onFailure(result.first);
 			}
 		} else {
 			onPostExecuteSuccess(result.second);
 			if (resultListener != null) {
-				resultListener.onAsyncTaskSuccess(result.second);
+				resultListener.onSuccess(result.second);
 			}
 		}
 	}

diff --git a/...current/task/AsyncTaskResultListener.java → ...parts/concurrent/task/ResultListener.java b/...current/task/AsyncTaskResultListener.java → ...parts/concurrent/task/ResultListener.java
@@ -15,10 +15,10 @@
  */
 package org.droidparts.concurrent.task;
 
-public interface AsyncTaskResultListener<Result> {
+public interface ResultListener<Result> {
 
-	void onAsyncTaskSuccess(Result result);
+	void onSuccess(Result result);
 
-	void onAsyncTaskFailure(Exception e);
+	void onFailure(Exception e);
 
 }
diff --git a/droidparts/src/org/droidparts/concurrent/task/SimpleAsyncTask.java b/droidparts/src/org/droidparts/concurrent/task/SimpleAsyncTask.java
@@ -19,7 +19,7 @@
 
 public abstract class SimpleAsyncTask<Result> extends AsyncTask<Void, Integer, Result> {
 
-	public SimpleAsyncTask(Context ctx, AsyncTaskResultListener<Result> resultListener) {
+	public SimpleAsyncTask(Context ctx, ResultListener<Result> resultListener) {
 		super(ctx, resultListener);
 	}
 

diff --git a/droidparts/src/org/droidparts/contract/DB.java b/droidparts/src/org/droidparts/contract/DB.java
@@ -23,9 +23,7 @@ interface Table {
 
 	}
 
-	interface Column {
-
-		String ID = BaseColumns._ID;
+	interface Column extends BaseColumns {
 
 	}
 

diff --git a/droidparts/src/org/droidparts/contract/SQL.java b/droidparts/src/org/droidparts/contract/SQL.java
@@ -60,7 +60,7 @@ interface DDL {
 		String TEXT = " TEXT";
 		String BLOB = " BLOB";
 
-		String PK = DB.Column.ID + " INTEGER PRIMARY KEY";
+		String PK = DB.Column._ID + " INTEGER PRIMARY KEY";
 		String NOT_NULL = " NOT NULL";
 		String DEFAULT = " DEFAULT ";
 		String UNIQUE = " UNIQUE";

diff --git a/droidparts/src/org/droidparts/inner/PersistUtils.java b/droidparts/src/org/droidparts/inner/PersistUtils.java
@@ -135,7 +135,7 @@ public static String[] toWhereArgs(Object... args) {
 			} else if (arg instanceof Date) {
 				argStr = String.valueOf(((Date) arg).getTime());
 			} else if (arg instanceof Entity) {
-				argStr = String.valueOf(((Entity) arg).id);
+				argStr = String.valueOf(((Entity) arg)._id);
 			} else {
 				argStr = arg.toString();
 			}
@@ -284,7 +284,7 @@ public static String getSQLCreate(String tableName, FieldSpec<ColumnAnn>[] specs
 		sb.append(PK);
 		StringBuilder fkSb = new StringBuilder();
 		for (FieldSpec<ColumnAnn> spec : specs) {
-			if (Column.ID.equals(spec.ann.name)) {
+			if (Column._ID.equals(spec.ann.name)) {
 				// already got it
 				continue;
 			}
@@ -315,7 +315,7 @@ private static void appendForeignKeyDef(FieldSpec<ColumnAnn> spec, StringBuilder
 		sb.append(spec.ann.name);
 		sb.append(") REFERENCES ");
 		sb.append(foreignTableName);
-		sb.append("(").append(Column.ID).append(") ON DELETE CASCADE");
+		sb.append("(").append(Column._ID).append(") ON DELETE CASCADE");
 	}
 
 	private static ArrayList<String> readStrings(SQLiteDatabase db, String query, int colIdx) {

diff --git a/droidparts/src/org/droidparts/inner/converter/EntityConverter.java b/droidparts/src/org/droidparts/inner/converter/EntityConverter.java
@@ -38,15 +38,15 @@ public String getDBColumnType() {
 	@Override
 	public <G1, G2> void putToContentValues(Class<E> valueType, Class<G1> genericArg1, Class<G2> genericArg2,
 	                                        ContentValues cv, String key, E val) {
-		cv.put(key, val.id);
+		cv.put(key, val._id);
 	}
 
 	@Override
 	public <G1, G2> E readFromCursor(Class<E> valType, Class<G1> genericArg1, Class<G2> genericArg2, Cursor cursor,
 	                                 int columnIndex) {
 		long id = cursor.getLong(columnIndex);
 		E entity = newInstance(valType);
-		entity.id = id;
+		entity._id = id;
 		return entity;
 	}
 
@@ -58,7 +58,7 @@ protected <G1, G2> E parseFromString(Class<E> valType, Class<G1> genericArg1, Cl
 			return super.parseFromString(valType, genericArg1, genericArg2, str);
 		} else {
 			E entity = newInstance(valType);
-			entity.id = Long.valueOf(str);
+			entity._id = Long.valueOf(str);
 			return entity;
 		}
 	}

diff --git a/droidparts/src/org/droidparts/model/Entity.java b/droidparts/src/org/droidparts/model/Entity.java
@@ -17,7 +17,7 @@
 
 import org.droidparts.annotation.sql.Column;
 
-import static org.droidparts.contract.DB.Column.ID;
+import static org.droidparts.contract.DB.Column._ID;
 
 public abstract class Entity extends Model {
 	private static final long serialVersionUID = 1L;
@@ -27,12 +27,12 @@ public Entity() {
 		// and should override hashCode() and equals().
 	}
 
-	@Column(name = ID)
-	public long id;
+	@Column(name = _ID)
+	public long _id;
 
 	@Override
 	public int hashCode() {
-		return getClass().hashCode() + (int) id;
+		return getClass().hashCode() + (int) _id;
 	}
 
 }