Remove getBinaryFileLevel from the public API

Clean up some ResultSet code

common/jni_android.ld

@@ -110,7 +110,6 @@ CBL {
  Java_com_couchbase_lite_internal_core_impl_NativeC4Listener_shareDbCollections;
  Java_com_couchbase_lite_internal_core_impl_NativeC4Listener_startHttp;
  Java_com_couchbase_lite_internal_core_impl_NativeC4Listener_startTls;
- Java_com_couchbase_lite_internal_core_impl_NativeC4Log_getBinaryFileLevel;
  Java_com_couchbase_lite_internal_core_impl_NativeC4Log_log;
  Java_com_couchbase_lite_internal_core_impl_NativeC4Log_setBinaryFileLevel;
  Java_com_couchbase_lite_internal_core_impl_NativeC4Log_setCallbackLevel;

common/main/java/com/couchbase/lite/AbstractQuery.java

@@ -171,7 +171,7 @@ public ResultSet execute() throws CouchbaseLiteException {
  }
  }
 
- return new ResultSet(this, c4enum, new HashMap<>(colNames));
+ return new ResultSet(getDatabase(), c4enum, new HashMap<>(colNames));
  }
  catch (LiteCoreException e) {
  throw CouchbaseLiteException.convertException(e);
@@ -338,7 +338,7 @@ private void onQueryChanged(
  @NonNull ChangeListenerToken<QueryChange> token,
  @Nullable C4QueryEnumerator results,
  @Nullable LiteCoreException err) {
- token.postChange(new QueryChange(this, new ResultSet(this, results, columnNames), err));
+ token.postChange(new QueryChange(this, new ResultSet(getDatabase(), results, columnNames), err));
  }
 
  @NonNull

common/main/java/com/couchbase/lite/ResultSet.java

@@ -62,8 +62,6 @@ public class ResultSet implements Iterable<Result>, AutoCloseable {
  @NonNull
  private final Object lock = new Object();
 
- @NonNull
- private final AbstractQuery query;
  @NonNull
  private final Map<String, Integer> columnNames;
  @NonNull
@@ -82,12 +80,11 @@ public class ResultSet implements Iterable<Result>, AutoCloseable {
 
  // This object is the sole owner of the c4enum passed as the second argument.
  ResultSet(
- @NonNull AbstractQuery query,
+ @Nullable AbstractDatabase database,
  @Nullable C4QueryEnumerator c4enum,
  @NonNull Map<String, Integer> cols) {
- this.query = Preconditions.assertNotNull(query, "query");
  this.columnNames = Preconditions.assertNotNull(cols, "columns");
- this.context = new ResultContext(query.getDatabase(), this);
+ this.context = new ResultContext(database, this);
  this.c4enum = c4enum;
  }
 
@@ -142,10 +139,6 @@ public List<Result> allResults() {
  return results;
  }
 
- //---------------------------------------------
- // Iterable implementation
- //---------------------------------------------
-
  /**
  * Return Iterator of Results.
  * <p>Caution: {@link ResultSet#next}, {@link ResultSet#allResults} and {@link ResultSet#iterator}
@@ -157,6 +150,10 @@ public List<Result> allResults() {
  @Override
  public Iterator<Result> iterator() { return allResults().iterator(); }
 
+ public boolean isClosed() {
+ synchronized (lock) { return c4enum == null; }
+ }
+
  @Override
  public void close() {
  final C4QueryEnumerator qEnum;
@@ -172,6 +169,10 @@ public void close() {
  synchronized (db.getDbLock()) { qEnum.close(); }
  }
 
+ //---------------------------------------------
+ // Protected access
+ //---------------------------------------------
+
  @Override
  protected void finalize() throws Throwable {
  try {
@@ -188,12 +189,9 @@ protected void finalize() throws Throwable {
  }
 
  //---------------------------------------------
- // Package level access
+ // Package access
  //---------------------------------------------
 
- @NonNull
- AbstractQuery getQuery() { return query; }
-
  int getColumnCount() { return columnNames.size(); }
 
  @NonNull
@@ -203,10 +201,6 @@ int getColumnIndex(@NonNull String name) {
  final Integer idx = columnNames.get(name);
  return (idx == null) ? -1 : idx;
  }
-
- boolean isClosed() {
- synchronized (lock) { return c4enum == null; }
- }
 }