Cleanup unnecessary usages of DaoWritter.dbField
Bug: n/a
Test: ./gradlew room:room-compiler:test \
room:integration-tests:room-testapp-kotlin:cC \
room:integration-tests:room-testapp:cC
Change-Id: I79b9c3d45be7b1e6eb3194ae2246f1bcff8c0083
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/BaseObservableQueryResultBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/BaseObservableQueryResultBinder.kt
index de2fe26f..7b91fc1 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/BaseObservableQueryResultBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/BaseObservableQueryResultBinder.kt
@@ -22,7 +22,6 @@
import androidx.room.ext.RoomTypeNames
import androidx.room.ext.T
import androidx.room.solver.CodeGenScope
-import androidx.room.writer.DaoWriter
import com.squareup.javapoet.FieldSpec
import com.squareup.javapoet.MethodSpec
import javax.lang.model.element.Modifier
@@ -63,7 +62,7 @@
AndroidTypeNames.CURSOR,
cursorVar,
RoomTypeNames.DB_UTIL,
- DaoWriter.dbField,
+ dbField,
roomSQLiteQueryVar,
if (shouldCopyCursor) "true" else "false")
beginControlFlow("try").apply {
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/GuavaListenableFutureQueryResultBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/GuavaListenableFutureQueryResultBinder.kt
index 9c64b0a..7141786 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/GuavaListenableFutureQueryResultBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/GuavaListenableFutureQueryResultBinder.kt
@@ -23,7 +23,6 @@
import androidx.room.ext.CallableTypeSpecBuilder
import androidx.room.ext.typeName
import androidx.room.solver.CodeGenScope
-import androidx.room.writer.DaoWriter
import com.squareup.javapoet.FieldSpec
import javax.lang.model.type.TypeMirror
@@ -59,7 +58,7 @@
addStatement(
"return $T.createListenableFuture($N, $L, $L, $L)",
RoomGuavaTypeNames.GUAVA_ROOM,
- DaoWriter.dbField,
+ dbField,
callableImpl,
roomSQLiteQueryVar,
canReleaseQuery
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/InstantQueryResultBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/InstantQueryResultBinder.kt
index eb68477..65b2be9 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/InstantQueryResultBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/InstantQueryResultBinder.kt
@@ -21,7 +21,6 @@
import androidx.room.ext.RoomTypeNames
import androidx.room.ext.T
import androidx.room.solver.CodeGenScope
-import androidx.room.writer.DaoWriter
import com.squareup.javapoet.FieldSpec
/**
@@ -49,7 +48,7 @@
AndroidTypeNames.CURSOR,
cursorVar,
RoomTypeNames.DB_UTIL,
- DaoWriter.dbField,
+ dbField,
roomSQLiteQueryVar,
if (shouldCopyCursor) "true" else "false")
beginControlFlow("try").apply {
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxQueryResultBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxQueryResultBinder.kt
index e2ee084..7b2e54b 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxQueryResultBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxQueryResultBinder.kt
@@ -25,7 +25,6 @@
import androidx.room.ext.arrayTypeName
import androidx.room.ext.typeName
import androidx.room.solver.CodeGenScope
-import androidx.room.writer.DaoWriter
import com.squareup.javapoet.ClassName
import com.squareup.javapoet.FieldSpec
import javax.lang.model.type.TypeMirror
@@ -60,7 +59,7 @@
scope.builder().apply {
val tableNamesList = queryTableNames.joinToString(",") { "\"$it\"" }
addStatement("return $T.$N($N, new $T{$L}, $L)",
- RoomRxJava2TypeNames.RX_ROOM, rxType.methodName, DaoWriter.dbField,
+ RoomRxJava2TypeNames.RX_ROOM, rxType.methodName, dbField,
String::class.arrayTypeName(), tableNamesList, callableImpl)
}
}
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableDeleteOrUpdateMethodBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableDeleteOrUpdateMethodBinder.kt
index c47150e..3d539ba 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableDeleteOrUpdateMethodBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableDeleteOrUpdateMethodBinder.kt
@@ -58,6 +58,7 @@
adapter?.createDeleteOrUpdateMethodBody(
parameters = parameters,
adapters = adapters,
+ dbField = dbField,
scope = adapterScope
)
addCode(adapterScope.generate())
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableInsertMethodBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableInsertMethodBinder.kt
index 6973024..b0da79e 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableInsertMethodBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableInsertMethodBinder.kt
@@ -58,6 +58,7 @@
adapter?.createInsertionMethodBody(
parameters = parameters,
insertionAdapters = insertionAdapters,
+ dbField = dbField,
scope = adapterScope
)
addCode(adapterScope.generate())
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/InstantDeleteOrUpdateMethodBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/InstantDeleteOrUpdateMethodBinder.kt
index b9e50fb..f48e0fd 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/InstantDeleteOrUpdateMethodBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/InstantDeleteOrUpdateMethodBinder.kt
@@ -38,6 +38,7 @@
adapter?.createDeleteOrUpdateMethodBody(
parameters = parameters,
adapters = adapters,
+ dbField = dbField,
scope = scope
)
}
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/InstantInsertMethodBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/InstantInsertMethodBinder.kt
index 04a8358..00490ef0 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/InstantInsertMethodBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/InstantInsertMethodBinder.kt
@@ -36,6 +36,7 @@
adapter?.createInsertionMethodBody(
parameters = parameters,
insertionAdapters = insertionAdapters,
+ dbField = dbField,
scope = scope
)
}
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/DeleteOrUpdateMethodAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/DeleteOrUpdateMethodAdapter.kt
index 79e22f7..dd925df 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/DeleteOrUpdateMethodAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/DeleteOrUpdateMethodAdapter.kt
@@ -22,7 +22,6 @@
import androidx.room.ext.T
import androidx.room.solver.CodeGenScope
import androidx.room.vo.ShortcutQueryParameter
-import androidx.room.writer.DaoWriter
import com.squareup.javapoet.FieldSpec
import com.squareup.javapoet.TypeName
import com.squareup.javapoet.TypeSpec
@@ -55,6 +54,7 @@
fun createDeleteOrUpdateMethodBody(
parameters: List<ShortcutQueryParameter>,
adapters: Map<String, Pair<FieldSpec, TypeSpec>>,
+ dbField: FieldSpec,
scope: CodeGenScope
) {
val resultVar = if (hasResultValue(returnType)) {
@@ -66,7 +66,7 @@
if (resultVar != null) {
addStatement("$T $L = 0", TypeName.INT, resultVar)
}
- addStatement("$N.beginTransaction()", DaoWriter.dbField)
+ addStatement("$N.beginTransaction()", dbField)
beginControlFlow("try").apply {
parameters.forEach { param ->
val adapter = adapters[param.name]?.first
@@ -74,8 +74,7 @@
if (resultVar == null) "" else "$resultVar +=",
adapter, param.handleMethodName(), param.name)
}
- addStatement("$N.setTransactionSuccessful()",
- DaoWriter.dbField)
+ addStatement("$N.setTransactionSuccessful()", dbField)
if (resultVar != null) {
addStatement("return $L", resultVar)
} else if (hasNullReturn(returnType)) {
@@ -85,8 +84,7 @@
}
}
nextControlFlow("finally").apply {
- addStatement("$N.endTransaction()",
- DaoWriter.dbField)
+ addStatement("$N.endTransaction()", dbField)
}
endControlFlow()
}
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/InsertMethodAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/InsertMethodAdapter.kt
index 9df29cb..fa6b641 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/InsertMethodAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/InsertMethodAdapter.kt
@@ -23,7 +23,6 @@
import androidx.room.ext.typeName
import androidx.room.solver.CodeGenScope
import androidx.room.vo.ShortcutQueryParameter
-import androidx.room.writer.DaoWriter
import com.google.auto.common.MoreTypes
import com.squareup.javapoet.ArrayTypeName
import com.squareup.javapoet.FieldSpec
@@ -122,12 +121,13 @@
fun createInsertionMethodBody(
parameters: List<ShortcutQueryParameter>,
insertionAdapters: Map<String, Pair<FieldSpec, TypeSpec>>,
+ dbField: FieldSpec,
scope: CodeGenScope
) {
scope.builder().apply {
// TODO assert thread
// TODO collect results
- addStatement("$N.beginTransaction()", DaoWriter.dbField)
+ addStatement("$N.beginTransaction()", dbField)
val needsResultVar = insertionType != InsertionType.INSERT_VOID &&
insertionType != InsertionType.INSERT_VOID_OBJECT &&
insertionType != InsertionType.INSERT_UNIT
@@ -152,8 +152,7 @@
param.name)
}
}
- addStatement("$N.setTransactionSuccessful()",
- DaoWriter.dbField)
+ addStatement("$N.setTransactionSuccessful()", dbField)
if (needsResultVar) {
addStatement("return $L", resultVar)
} else if (insertionType == InsertionType.INSERT_VOID_OBJECT) {
@@ -163,8 +162,7 @@
}
}
nextControlFlow("finally").apply {
- addStatement("$N.endTransaction()",
- DaoWriter.dbField)
+ addStatement("$N.endTransaction()", dbField)
}
endControlFlow()
}
