- Reverted annotations on overridden methods because it provoked

BoD · BoD · commit a66a4fa9fb48 · 2015-02-15T16:41:11.000+01:00
compilation errors
- Re generated the sample with the latest version
- Updated CHANGELOG
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Android ContentProvider Generator Changelog
 ===========================================
 
-v1.9.0 (2015-02-??)
+v1.9.0 (2015-02-15)
 ------
 - The config `syntaxVersion` for this release is **3**.  This means you **must** update your `_config.json` file.
 - Generation of new "Model" interfaces (one per entity)
@@ -11,6 +11,6 @@ v1.9.0 (2015-02-??)
 - New `contains`, `startsWith`, `endsWitdh` methods on Selection objects (issue #55)
 - The `CREATE_TABLE and CREATE_INDEX` constants are now public to make upgrades easier (issue #59)
 - The "id" (single column primary key) can now be specified to be an arbitrary column, instead of automatically being generated as "_id" (issue #56)
-- Ability to specify a LIMIT clause in queries, via a query parameter (issue #62)
+- Ability to specify a LIMIT and HAVING clause in queries, via a query parameter (issues #62 and #70)
 - Better handling of default values (issue #67)
-- Ability to call `notify`, `groupBy` and `limit` on Selection objects.
+- Ability to call `notify`, `groupBy`, `limit` and `having` on Selection objects.
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
@@ -31,6 +31,7 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.net.Uri;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import org.jraf.androidcontentprovidergenerator.sample.BuildConfig;
@@ -166,7 +167,7 @@ public int delete(Uri uri, String selection, String[] selectionArgs) {
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
         if (DEBUG)
             Log.d(TAG, "query uri=" + uri + " selection=" + selection + " selectionArgs=" + Arrays.toString(selectionArgs) + " sortOrder=" + sortOrder
-                    + " groupBy=" + uri.getQueryParameter(QUERY_GROUP_BY) + " limit=" + uri.getQueryParameter(QUERY_LIMIT));
+                    + " groupBy=" + uri.getQueryParameter(QUERY_GROUP_BY) + " having=" + uri.getQueryParameter(QUERY_HAVING) + " limit=" + uri.getQueryParameter(QUERY_LIMIT));
         return super.query(uri, projection, selection, selectionArgs, sortOrder);
     }
 
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleSQLiteOpenHelper.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleSQLiteOpenHelper.java
@@ -29,7 +29,6 @@
 import android.database.DatabaseErrorHandler;
 import android.database.DefaultDatabaseErrorHandler;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDatabase.CursorFactory;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
 import android.util.Log;
@@ -142,13 +141,12 @@ private static SampleSQLiteOpenHelper newInstance(Context context) {
     /*
      * Pre Honeycomb.
      */
-
     private static SampleSQLiteOpenHelper newInstancePreHoneycomb(Context context) {
-        return new SampleSQLiteOpenHelper(context, DATABASE_FILE_NAME, null, DATABASE_VERSION);
+        return new SampleSQLiteOpenHelper(context);
     }
 
-    private SampleSQLiteOpenHelper(Context context, String name, CursorFactory factory, int version) {
-        super(context, name, factory, version);
+    private SampleSQLiteOpenHelper(Context context) {
+        super(context, DATABASE_FILE_NAME, null, DATABASE_VERSION);
         mContext = context;
         mOpenHelperCallbacks = new SampleSQLiteOpenHelperCallbacks();
     }
@@ -157,15 +155,14 @@ private SampleSQLiteOpenHelper(Context context, String name, CursorFactory facto
     /*
      * Post Honeycomb.
      */
-
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     private static SampleSQLiteOpenHelper newInstancePostHoneycomb(Context context) {
-        return new SampleSQLiteOpenHelper(context, DATABASE_FILE_NAME, null, DATABASE_VERSION, new DefaultDatabaseErrorHandler());
+        return new SampleSQLiteOpenHelper(context, new DefaultDatabaseErrorHandler());
     }
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    private SampleSQLiteOpenHelper(Context context, String name, CursorFactory factory, int version, DatabaseErrorHandler errorHandler) {
-        super(context, name, factory, version, errorHandler);
+    private SampleSQLiteOpenHelper(Context context, DatabaseErrorHandler errorHandler) {
+        super(context, DATABASE_FILE_NAME, null, DATABASE_VERSION, errorHandler);
         mContext = context;
         mOpenHelperCallbacks = new SampleSQLiteOpenHelperCallbacks();
     }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractContentValues.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractContentValues.java
@@ -29,7 +29,7 @@
 import android.net.Uri;
 
 public abstract class AbstractContentValues {
-    protected ContentValues mContentValues = new ContentValues();
+    protected final ContentValues mContentValues = new ContentValues();
 
     /**
      * Returns the {@code uri} argument to pass to the {@code ContentResolver} methods.
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractSelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractSelection.java
@@ -55,9 +55,10 @@ public abstract class AbstractSelection<T extends AbstractSelection<?>> {
     private final StringBuilder mSelection = new StringBuilder();
     private final List<String> mSelectionArgs = new ArrayList<String>(5);
 
-    private Boolean mNotify;
-    private String mGroupBy;
-    private Integer mLimit;
+    Boolean mNotify;
+    String mGroupBy;
+    String mHaving;
+    Integer mLimit;
 
     protected void addEquals(String column, Object[] value) {
         mSelection.append(column);
@@ -301,6 +302,7 @@ public Uri uri() {
         Uri uri = baseUri();
         if (mNotify != null) uri = BaseContentProvider.notify(uri, mNotify);
         if (mGroupBy != null) uri = BaseContentProvider.groupBy(uri, mGroupBy);
+        if (mHaving != null) uri = BaseContentProvider.having(uri, mHaving);
         if (mLimit != null) uri = BaseContentProvider.limit(uri, String.valueOf(mLimit));
         return uri;
     }
@@ -329,6 +331,12 @@ public T groupBy(String groupBy) {
         return (T) this;
     }
 
+    @SuppressWarnings("unchecked")
+    public T having(String having) {
+        mHaving = having;
+        return (T) this;
+    }
+
     @SuppressWarnings("unchecked")
     public T limit(int limit) {
         mLimit = limit;
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/BaseContentProvider.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/BaseContentProvider.java
@@ -38,11 +38,13 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.net.Uri;
 import android.provider.BaseColumns;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 public abstract class BaseContentProvider extends ContentProvider {
     public static final String QUERY_NOTIFY = "QUERY_NOTIFY";
     public static final String QUERY_GROUP_BY = "QUERY_GROUP_BY";
+    public static final String QUERY_HAVING = "QUERY_HAVING";
     public static final String QUERY_LIMIT = "QUERY_LIMIT";
 
     public static class QueryParams {
@@ -147,11 +149,12 @@ public int delete(Uri uri, String selection, String[] selectionArgs) {
     @Override
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
         String groupBy = uri.getQueryParameter(QUERY_GROUP_BY);
+        String having = uri.getQueryParameter(QUERY_HAVING);
         String limit = uri.getQueryParameter(QUERY_LIMIT);
         QueryParams queryParams = getQueryParams(uri, selection, projection);
         projection = ensureIdIsFullyQualified(projection, queryParams.table, queryParams.idColumn);
         Cursor res = mSqLiteOpenHelper.getReadableDatabase().query(queryParams.tablesWithJoins, projection, queryParams.selection, selectionArgs, groupBy,
-                null, sortOrder == null ? queryParams.orderBy : sortOrder, limit);
+                having, sortOrder == null ? queryParams.orderBy : sortOrder, limit);
         res.setNotificationUri(getContext().getContentResolver(), uri);
         return res;
     }
@@ -207,6 +210,10 @@ public static Uri groupBy(Uri uri, String groupBy) {
         return uri.buildUpon().appendQueryParameter(QUERY_GROUP_BY, groupBy).build();
     }
 
+    public static Uri having(Uri uri, String having) {
+        return uri.buildUpon().appendQueryParameter(QUERY_HAVING, having).build();
+    }
+
     public static Uri limit(Uri uri, String limit) {
         return uri.buildUpon().appendQueryParameter(QUERY_LIMIT, limit).build();
     }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanySelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanySelection.java
@@ -58,14 +58,14 @@ public CompanyCursor query(ContentResolver contentResolver, String[] projection,
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null)}.
      */
     public CompanyCursor query(ContentResolver contentResolver, String[] projection) {
         return query(contentResolver, projection, null);
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null, null)}.
      */
     public CompanyCursor query(ContentResolver contentResolver) {
         return query(contentResolver, null, null);
@@ -77,7 +77,6 @@ public CompanySelection id(long... value) {
         return this;
     }
 
-
     public CompanySelection name(String... value) {
         addEquals(CompanyColumns.NAME, value);
         return this;
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonSelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonSelection.java
@@ -57,14 +57,14 @@ public PersonCursor query(ContentResolver contentResolver, String[] projection,
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null)}.
      */
     public PersonCursor query(ContentResolver contentResolver, String[] projection) {
         return query(contentResolver, projection, null);
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null, null)}.
      */
     public PersonCursor query(ContentResolver contentResolver) {
         return query(contentResolver, null, null);
@@ -76,7 +76,6 @@ public PersonSelection id(long... value) {
         return this;
     }
 
-
     public PersonSelection firstName(String... value) {
         addEquals(PersonColumns.FIRST_NAME, value);
         return this;
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamSelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamSelection.java
@@ -62,14 +62,14 @@ public PersonTeamCursor query(ContentResolver contentResolver, String[] projecti
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null)}.
      */
     public PersonTeamCursor query(ContentResolver contentResolver, String[] projection) {
         return query(contentResolver, projection, null);
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null, null)}.
      */
     public PersonTeamCursor query(ContentResolver contentResolver) {
         return query(contentResolver, null, null);
@@ -81,7 +81,6 @@ public PersonTeamSelection id(long... value) {
         return this;
     }
 
-
     public PersonTeamSelection personId(long... value) {
         addEquals(PersonTeamColumns.PERSON_ID, toObjectArray(value));
         return this;
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/product/ProductSelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/product/ProductSelection.java
@@ -57,14 +57,14 @@ public ProductCursor query(ContentResolver contentResolver, String[] projection,
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null)}.
      */
     public ProductCursor query(ContentResolver contentResolver, String[] projection) {
         return query(contentResolver, projection, null);
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null, null)}.
      */
     public ProductCursor query(ContentResolver contentResolver) {
         return query(contentResolver, null, null);
@@ -76,7 +76,6 @@ public ProductSelection id(long... value) {
         return this;
     }
 
-
     public ProductSelection productId(long... value) {
         addEquals(ProductColumns.PRODUCT_ID, toObjectArray(value));
         return this;
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/serialnumber/SerialNumberSelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/serialnumber/SerialNumberSelection.java
@@ -57,14 +57,14 @@ public SerialNumberCursor query(ContentResolver contentResolver, String[] projec
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null)}.
      */
     public SerialNumberCursor query(ContentResolver contentResolver, String[] projection) {
         return query(contentResolver, projection, null);
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null, null)}.
      */
     public SerialNumberCursor query(ContentResolver contentResolver) {
         return query(contentResolver, null, null);
@@ -76,7 +76,6 @@ public SerialNumberSelection id(long... value) {
         return this;
     }
 
-
     public SerialNumberSelection part0(String... value) {
         addEquals(SerialNumberColumns.PART0, value);
         return this;
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamSelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamSelection.java
@@ -60,14 +60,14 @@ public TeamCursor query(ContentResolver contentResolver, String[] projection, St
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null)}.
      */
     public TeamCursor query(ContentResolver contentResolver, String[] projection) {
         return query(contentResolver, projection, null);
     }
 
     /**
-     * Equivalent of calling {@code query(contentResolver, projection, null, null}.
+     * Equivalent of calling {@code query(contentResolver, projection, null, null)}.
      */
     public TeamCursor query(ContentResolver contentResolver) {
         return query(contentResolver, null, null);
@@ -79,7 +79,6 @@ public TeamSelection id(long... value) {
         return this;
     }
 
-
     public TeamSelection companyId(long... value) {
         addEquals(TeamColumns.COMPANY_ID, toObjectArray(value));
         return this;
diff --git a/src/main/resources/org/jraf/androidcontentprovidergenerator/basecontentprovider.ftl b/src/main/resources/org/jraf/androidcontentprovidergenerator/basecontentprovider.ftl
@@ -80,7 +80,7 @@ public abstract class BaseContentProvider extends ContentProvider {
     }
 
     @Override
-    public int bulkInsert(Uri uri, <#if config.useAnnotations>@NonNull </#if>ContentValues[] values) {
+    public int bulkInsert(Uri uri, ContentValues[] values) {
         String table = uri.getLastPathSegment();
         SQLiteDatabase db = mSqLiteOpenHelper.getWritableDatabase();
         int res = 0;
@@ -154,7 +154,7 @@ public abstract class BaseContentProvider extends ContentProvider {
     }
 
     @Override
-    public ContentProviderResult[] applyBatch(<#if config.useAnnotations>@NonNull </#if>ArrayList<ContentProviderOperation> operations) throws OperationApplicationException {
+    public ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations) throws OperationApplicationException {
         HashSet<Uri> urisToNotify = new HashSet<Uri>(operations.size());
         for (ContentProviderOperation operation : operations) {
             urisToNotify.add(operation.getUri());
diff --git a/src/main/resources/org/jraf/androidcontentprovidergenerator/contentprovider.ftl b/src/main/resources/org/jraf/androidcontentprovidergenerator/contentprovider.ftl
@@ -83,7 +83,7 @@ public class ${config.providerClassName} extends BaseContentProvider {
     }
 
     @Override
-    public int bulkInsert(Uri uri, <#if config.useAnnotations>@NonNull </#if>ContentValues[] values) {
+    public int bulkInsert(Uri uri, ContentValues[] values) {
         if (DEBUG) Log.d(TAG, "bulkInsert uri=" + uri + " values.length=" + values.length);
         return super.bulkInsert(uri, values);
     }
