Skip to content
This repository was archived by the owner on Jul 12, 2021. It is now read-only.

Commit 041b84b

Browse files
author
Pan
committed
delete async
1 parent 2619113 commit 041b84b

File tree

2 files changed

+5
-94
lines changed

2 files changed

+5
-94
lines changed

‎lib/src/main/java/com/intathep/rxrealm/Classes.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44

55
public class Classes {
66

7-
protected static final ClassName NULLABLE = ClassName.get("android.support.annotation", "Nullable");
8-
protected static final ClassName DEPRECATED = ClassName.get("java.lang", "Deprecated");
9-
107
protected static final ClassName THROWABLE = ClassName.get("java.lang", "Throwable");
118
protected static final ClassName EXCEPTION = ClassName.get("java.lang", "Exception");
129

‎lib/src/main/java/com/intathep/rxrealm/RxRealmFactory.java‎

Lines changed: 5 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ private TypeSpec generateGetter(String packageName, String className) throws Cla
486486
.addCode("$N.executeTransactionAsync(new $T.Transaction() {", "temp", Classes.REALM)
487487
.addCode("\n@Override")
488488
.addCode("\npublic void execute($T realm) {", Classes.REALM)
489-
.addStatement("\n$N.onNext(get(applyCommandsToRealmQuery($N)).deleteAllFromRealm())", "asyncSubject", "realm")
489+
.addStatement("\n$N.onNext(applyCommandsToRealmQuery($N).findAll().deleteAllFromRealm())", "asyncSubject", "realm")
490490
.addCode("}")
491491
.addCode("\n}, new $T.Transaction.OnSuccess() {", Classes.REALM)
492492
.addCode("\n@Override")
@@ -508,7 +508,7 @@ private TypeSpec generateGetter(String packageName, String className) throws Cla
508508
.addCode("\n$T.executeTransaction(new $T.BetterTransaction() {", Classes.REALMS, Classes.REALMS)
509509
.addCode("\n@Override")
510510
.addCode("\npublic void execute($T realm) throws $T {", Classes.REALM, Classes.EXCEPTION)
511-
.addStatement("\n$N.onNext(get(applyCommandsToRealmQuery($N)).deleteAllFromRealm())", "asyncSubject", "realm")
511+
.addStatement("\n$N.onNext(applyCommandsToRealmQuery($N).findAll().deleteAllFromRealm())", "asyncSubject", "realm")
512512
.addStatement("$N.onCompleted()", "asyncSubject")
513513
.addCode("}")
514514
.addStatement("\n})")
@@ -549,55 +549,6 @@ private TypeSpec generateGetter(String packageName, String className) throws Cla
549549
.addStatement("return $N.count()", "realmQuery")
550550
.build());
551551

552-
methodSpecs.add(MethodSpec.methodBuilder("get")
553-
.addModifiers(Modifier.PRIVATE)
554-
.addAnnotation(Classes.DEPRECATED)
555-
.returns(ParameterizedTypeName.get(Classes.LIST, annotatedClass))
556-
.addStatement("$T temp = null", Classes.REALM)
557-
.addCode("try {")
558-
.addStatement("\n$N = $T.get()", "temp", Classes.REALMS)
559-
.addStatement("$T realmResults = get(applyCommandsToRealmQuery($N))",
560-
ParameterizedTypeName.get(Classes.REALM_RESULTS, annotatedClass),
561-
"temp")
562-
.addStatement("$T copied = $T.newArrayList()",
563-
ParameterizedTypeName.get(Classes.LIST, annotatedClass),
564-
Classes.LISTS)
565-
.addCode("if ($N.size() > 0) {", "realmResults")
566-
.addStatement("\n$N.addAll($N.copyFromRealm($N))", "copied", "temp", "realmResults")
567-
.addCode("}")
568-
.addStatement("\nreturn $N", "copied")
569-
.addCode("} catch ($T e) {", Classes.EXCEPTION)
570-
.addStatement("\nreturn $T.newArrayList()", Classes.LISTS)
571-
.addCode("} finally {")
572-
.addStatement("\n$T.close($N)", Classes.REALMS, "temp")
573-
.addCode("}\n")
574-
.build());
575-
576-
methodSpecs.add(MethodSpec.methodBuilder("get")
577-
.addModifiers(Modifier.PRIVATE)
578-
.addAnnotation(Classes.DEPRECATED)
579-
.addParameter(Classes.REALM, "realm")
580-
.returns(ParameterizedTypeName.get(Classes.REALM_RESULTS, annotatedClass))
581-
.addStatement("return get(applyCommandsToRealmQuery($N))", "realm")
582-
.build());
583-
584-
methodSpecs.add(MethodSpec.methodBuilder("get")
585-
.addModifiers(Modifier.PRIVATE)
586-
.addAnnotation(Classes.DEPRECATED)
587-
.addParameter(ParameterizedTypeName.get(Classes.REALM_QUERY, annotatedClass), "realmQuery")
588-
.returns(ParameterizedTypeName.get(Classes.REALM_RESULTS, annotatedClass))
589-
.addCode("if ($N.size() > 0) {", "sortFields")
590-
.addStatement("\nreturn $N.findAllSorted($N.keySet().toArray(new String[$N.size()]), $N.values().toArray(new Sort[$N.size()]))",
591-
"realmQuery",
592-
"sortFields",
593-
"sortFields",
594-
"sortFields",
595-
"sortFields")
596-
.addCode("} else {")
597-
.addStatement("\nreturn $N.findAll()", "realmQuery")
598-
.addCode("}\n")
599-
.build());
600-
601552
methodSpecs.add(MethodSpec.methodBuilder("getAsync")
602553
.addModifiers(Modifier.PUBLIC)
603554
.addParameter(Classes.REALM, "realm")
@@ -869,7 +820,7 @@ private TypeSpec generateSingleGetter(String packageName, String className) thro
869820
.addStatement("\nreturn realmQuery")
870821
.build());
871822

872-
methodSpecs.add(MethodSpec.methodBuilder("delete")
823+
methodSpecs.add(MethodSpec.methodBuilder("deleteAsync")
873824
.addModifiers(Modifier.PUBLIC)
874825
.returns(ParameterizedTypeName.get(Classes.OBSERVABLE, ClassName.get(Boolean.class)))
875826
.addStatement("final $T asyncSubject = $T.create()",
@@ -882,8 +833,7 @@ private TypeSpec generateSingleGetter(String packageName, String className) thro
882833
.addCode("$N.executeTransactionAsync(new $T.Transaction() {", "temp", Classes.REALM)
883834
.addCode("\n@Override")
884835
.addCode("\npublic void execute($T realm) {", Classes.REALM)
885-
.addStatement("\nget(applyCommandsToRealmQuery($N)).deleteFromRealm()", "realm")
886-
.addStatement("$N.onNext(true)", "asyncSubject")
836+
.addStatement("\n$N.onNext(applyCommandsToRealmQuery($N).findAll().deleteAllFromRealm())", "asyncSubject", "realm")
887837
.addCode("}")
888838
.addCode("\n}, new $T.Transaction.OnSuccess() {", Classes.REALM)
889839
.addCode("\n@Override")
@@ -905,50 +855,14 @@ private TypeSpec generateSingleGetter(String packageName, String className) thro
905855
.addCode("\n$T.executeTransaction(new $T.BetterTransaction() {", Classes.REALMS, Classes.REALMS)
906856
.addCode("\n@Override")
907857
.addCode("\npublic void execute($T realm) throws $T {", Classes.REALM, Classes.EXCEPTION)
908-
.addStatement("\nget(applyCommandsToRealmQuery($N)).deleteFromRealm()", "realm")
909-
.addStatement("$N.onNext(true)", "asyncSubject")
858+
.addStatement("\n$N.onNext(applyCommandsToRealmQuery($N).findAll().deleteAllFromRealm())", "asyncSubject", "realm")
910859
.addStatement("$N.onCompleted()", "asyncSubject")
911860
.addCode("}")
912861
.addStatement("\n})")
913862
.addCode("}")
914863
.addStatement("\nreturn $N", "asyncSubject")
915864
.build());
916865

917-
methodSpecs.add(MethodSpec.methodBuilder("get")
918-
.addAnnotation(Classes.NULLABLE)
919-
.addModifiers(Modifier.PUBLIC)
920-
.returns(annotatedClass)
921-
.addStatement("$T temp = null", Classes.REALM)
922-
.addCode("try {")
923-
.addStatement("\n$N = $T.get()", "temp", Classes.REALMS)
924-
.addStatement("$T realmObject = get(applyCommandsToRealmQuery($N))", annotatedClass, "temp")
925-
.addStatement("$T copied = null", annotatedClass)
926-
.addCode("if ($N != null) {", "realmObject")
927-
.addStatement("\n$N = $N.copyFromRealm($N)", "copied", "temp", "realmObject")
928-
.addCode("}")
929-
.addStatement("\nreturn $N", "copied")
930-
.addCode("} catch ($T e) {", Classes.EXCEPTION)
931-
.addStatement("\nreturn null")
932-
.addCode("} finally {")
933-
.addStatement("\n$T.close($N)", Classes.REALMS, "temp")
934-
.addCode("}\n")
935-
.build());
936-
937-
methodSpecs.add(MethodSpec.methodBuilder("get")
938-
.addAnnotation(Classes.NULLABLE)
939-
.addModifiers(Modifier.PUBLIC)
940-
.addParameter(Classes.REALM, "realm")
941-
.returns(annotatedClass)
942-
.addStatement("return get(applyCommandsToRealmQuery($N))", "realm")
943-
.build());
944-
945-
methodSpecs.add(MethodSpec.methodBuilder("get")
946-
.addModifiers(Modifier.PRIVATE)
947-
.addParameter(ParameterizedTypeName.get(Classes.REALM_QUERY, annotatedClass), "realmQuery")
948-
.returns(annotatedClass)
949-
.addStatement("return $N.findFirst()", "realmQuery")
950-
.build());
951-
952866
methodSpecs.add(MethodSpec.methodBuilder("getAsync")
953867
.addModifiers(Modifier.PUBLIC)
954868
.addParameter(Classes.REALM, "realm")

0 commit comments

Comments
 (0)