[android][database] cleanup & format

This commit is contained in:
Salakar
2019-06-05 02:12:02 +01:00
parent 912574c185
commit 554c4b4035
13 changed files with 18 additions and 66 deletions

View File

@@ -17,8 +17,6 @@ package io.invertase.firebase.database;
*
*/
import android.util.Log;
import com.google.firebase.database.DatabaseError;
public class UniversalDatabaseException extends Exception {

View File

@@ -21,11 +21,10 @@ import com.google.firebase.FirebaseApp;
import com.google.firebase.database.DatabaseException;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.Logger;
import io.invertase.firebase.common.UniversalFirebasePreferences;
import java.util.HashMap;
import io.invertase.firebase.common.UniversalFirebasePreferences;
public class UniversalFirebaseDatabaseCommon {
private static HashMap<String, Boolean> configSettingsLock = new HashMap<>();
@@ -73,7 +72,7 @@ public class UniversalFirebaseDatabaseCommon {
if (preferences.contains(UniversalDatabaseStatics.DATABASE_PERSISTENCE_CACHE_SIZE)) {
firebaseDatabase.setPersistenceCacheSizeBytes(preferences.getLongValue(
UniversalDatabaseStatics.DATABASE_PERSISTENCE_CACHE_SIZE, 1048576L)
UniversalDatabaseStatics.DATABASE_PERSISTENCE_CACHE_SIZE, 10485760L)
);
}
} catch (DatabaseException exception) {

View File

@@ -18,10 +18,8 @@ package io.invertase.firebase.database;
*/
import android.content.Context;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.Tasks;
import io.invertase.firebase.common.UniversalFirebaseModule;
import static io.invertase.firebase.database.UniversalFirebaseDatabaseCommon.getDatabaseForApp;

View File

@@ -18,14 +18,12 @@ package io.invertase.firebase.database;
*/
import android.content.Context;
import com.google.android.gms.tasks.Task;
import com.google.firebase.database.OnDisconnect;
import io.invertase.firebase.common.UniversalFirebaseModule;
import java.util.Map;
import io.invertase.firebase.common.UniversalFirebaseModule;
import static io.invertase.firebase.database.UniversalFirebaseDatabaseCommon.getDatabaseForApp;
public class UniversalFirebaseDatabaseOnDisconnectModule extends UniversalFirebaseModule {

View File

@@ -19,15 +19,13 @@ package io.invertase.firebase.database;
import android.content.Context;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.TaskCompletionSource;
import com.google.firebase.database.DatabaseReference;
import io.invertase.firebase.common.UniversalFirebaseModule;
import java.util.Map;
import io.invertase.firebase.common.UniversalFirebaseModule;
import static io.invertase.firebase.database.UniversalFirebaseDatabaseCommon.getDatabaseForApp;
public class UniversalFirebaseDatabaseReferenceModule extends UniversalFirebaseModule {

View File

@@ -19,12 +19,7 @@ package io.invertase.firebase.database;
import android.util.Log;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.WritableArray;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.bridge.WritableNativeArray;
import com.facebook.react.bridge.*;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.MutableData;

View File

@@ -20,7 +20,6 @@ package io.invertase.firebase.database;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import io.invertase.firebase.interfaces.NativeEvent;
public class ReactNativeFirebaseDatabaseEvent implements NativeEvent {

View File

@@ -21,11 +21,10 @@ import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.ReadableMap;
import io.invertase.firebase.common.ReactNativeFirebaseModule;
import java.util.Map;
import io.invertase.firebase.common.ReactNativeFirebaseModule;
import static io.invertase.firebase.common.RCTConvertFirebase.toHashMap;
public class ReactNativeFirebaseDatabaseOnDisconnectModule extends ReactNativeFirebaseModule {

View File

@@ -18,7 +18,6 @@ package io.invertase.firebase.database;
*/
import android.support.annotation.NonNull;
import com.facebook.react.bridge.ReadableArray;
import com.google.firebase.database.ChildEventListener;
import com.google.firebase.database.DatabaseReference;

View File

@@ -17,35 +17,21 @@ package io.invertase.firebase.database;
*
*/
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.bridge.*;
import com.google.android.gms.tasks.Tasks;
import com.google.firebase.database.ChildEventListener;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.ValueEventListener;
import com.google.firebase.database.*;
import io.invertase.firebase.common.ReactNativeFirebaseEventEmitter;
import io.invertase.firebase.common.ReactNativeFirebaseModule;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import io.invertase.firebase.common.ReactNativeFirebaseEventEmitter;
import io.invertase.firebase.common.ReactNativeFirebaseModule;
import static io.invertase.firebase.common.RCTConvertFirebase.readableMapToWritableMap;
import static io.invertase.firebase.database.ReactNativeFirebaseDatabaseCommon.rejectPromiseDatabaseException;
import static io.invertase.firebase.database.ReactNativeFirebaseDatabaseCommon.snapshotToMap;
import static io.invertase.firebase.database.ReactNativeFirebaseDatabaseCommon.snapshotWithPreviousChildToMap;
import static io.invertase.firebase.database.ReactNativeFirebaseDatabaseCommon.*;
import static io.invertase.firebase.database.UniversalFirebaseDatabaseCommon.getDatabaseForApp;
public class ReactNativeFirebaseDatabaseQueryModule extends ReactNativeFirebaseModule {

View File

@@ -18,24 +18,17 @@ package io.invertase.firebase.database;
*/
import android.util.Log;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.WritableArray;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.bridge.WritableNativeArray;
import com.facebook.react.bridge.*;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.MutableData;
import javax.annotation.Nullable;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
import javax.annotation.Nullable;
import static io.invertase.firebase.common.RCTConvertFirebase.mapPutValue;
import static io.invertase.firebase.common.RCTConvertFirebase.toHashMap;
import static io.invertase.firebase.database.ReactNativeFirebaseDatabaseCommon.castValue;
@@ -89,7 +82,6 @@ public class ReactNativeFirebaseDatabaseTransactionHandler {
/**
* Wait for signalUpdateReceived to signal condition
*
*/
void await() throws InterruptedException {
lock.lock();

View File

@@ -18,24 +18,17 @@ package io.invertase.firebase.database;
*/
import android.os.AsyncTask;
import android.util.Log;
import android.util.SparseArray;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.WritableMap;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.MutableData;
import com.google.firebase.database.Transaction;
import javax.annotation.Nonnull;
import com.google.firebase.database.*;
import io.invertase.firebase.common.ReactNativeFirebaseEventEmitter;
import io.invertase.firebase.common.ReactNativeFirebaseModule;
import javax.annotation.Nonnull;
import static io.invertase.firebase.database.UniversalFirebaseDatabaseCommon.getDatabaseForApp;
public class ReactNativeFirebaseDatabaseTransactionModule extends ReactNativeFirebaseModule {
@@ -110,7 +103,6 @@ public class ReactNativeFirebaseDatabaseTransactionModule extends ReactNativeFir
transactionId
));
transactionHandlers.delete(transactionId);
}

View File

@@ -20,7 +20,6 @@ package io.invertase.firebase.database;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import io.invertase.firebase.interfaces.NativeEvent;
public class ReactNativeFirebaseTransactionEvent implements NativeEvent {