Convert `room-runtime` [206859668]

Fixed

Feature Request

Status Update

No update yet.

Description

el...@google.com

created issue #1

Nov 17, 2021 11:20PM

Converting files in `room-runtime` from Java to Kotlin.

Comments

ap...@google.com <ap...@google.com> #2Feb 4, 2022 12:03PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit b90079595f33f58fece04026a97faa0d243acdb1
Author: Yuichi Araki <yaraki@google.com>
Date: Wed Sep 18 16:55:49 2019

Change the way to detect mismatch between POJO and query

This fixes cursor mismatch warnings with expandProjection.

Bug: 140759491
Test: QueryMethodProcessorTest
Change-Id: I7659002e5e0d1ef60fc1af2a625c0c36da0664d8

M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
M room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
M room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt

https://android-review.googlesource.com/1123258

https://goto.google.com/android-sha1/b90079595f33f58fece04026a97faa0d243acdb1

ap...@google.com <ap...@google.com> #3Feb 15, 2022 12:47AM

The following changes were cherrypicked through Coastguard (

https://android-build.googleplex.com/coastguard/)
Release Track: (

https://android-build.googleplex.com/coastguard/dashboard/6093116828680192/#/cherrypickHistory/all)
Created: 2019-10-14 17:23:42.610596+00:00
Changes: aosp/1123258

ap...@google.com <ap...@google.com> #4Mar 7, 2022 08:33PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit bdde5a1a970ddc9007b28de4aa29d60ffa588f08
Author: Yigit Boyar <yboyar@google.com>
Date: Thu Apr 16 16:47:05 2020

Re-factor how errors are dismissed when query is re-written

This CL changes how we handle errors/warnings if query is
re-written.
There was a bug in expandProjection where we would report warnings
for things that Room already fixes automatically (

b/140759491

).
The solution to that problem (I7659002e5e0d1ef60fc1af2a625c0c36da0664d8)
solved it by deferring validating of columns until after re-write
decision is made. Unfortunately, this required changing PojoRowAdapter
to have a dummy mapping until it is validating, make it hard to use
as it does have a non-null mapping which is not useful.

This CL partially reverts that change and instead rely on the log
deferring logic we have in Context. This way, we don't need to break
the stability of PojoRowAdapter while still having the ability to
drop warnings that room fixes. This will also play nicer when we
have different query re-writing options that can use more information
about the query results.

Bug: 153387066
Bug: 140759491
Test: existing tests pass
Change-Id: I2ec967c763d33d7a3ff02c1a13c6953b460d1e5f

M room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt

https://android-review.googlesource.com/1288456

ap...@google.com <ap...@google.com> #5Apr 27, 2022 05:16PM

Project: platform/frameworks/support
Branch: androidx-main

commit 9e87eb671143418ff2f2412dc43516582c1e775f
Author: Elif Bilgin <elifbilgin@google.com>
Date: Mon Feb 07 22:00:47 2022

Converting `invalidation tracker` related files in `room-runtime` from Java to Kotlin.

Test: BuilderTest.kt, InvalidationTrackerTest.kt, InvalidationLiveDataContainerTest.kt, ObservedTableTrackerTest.kt
Bug: 206859668
Relnote: Converting `invalidation tracker` related files in `room-runtime` from Java to Kotlin. This includes a source incompatible change for Kotlin users, which will require them to declare their `onInvalidate()` in their `Observer` to have a param of type `Set` and not `MutableSet`.
Change-Id: If2069426a29fffe312a58fcd3e116551090c0b4e

M room/room-paging/src/androidTest/kotlin/androidx/room/InvalidationTrackerExtRoomPaging.kt
M room/integration-tests/testapp/src/androidTest/java/androidx/room/InvalidationTrackerTrojan.java
M room/room-paging/src/androidTest/kotlin/androidx/room/paging/LimitOffsetPagingSourceTest.kt
M room/room-runtime/api/restricted_current.txt
M room/room-common/build.gradle
M room/room-ktx/src/androidTest/java/androidx/room/CoroutineRoomCancellationTest.kt
M room/room-runtime/api/current.txt
M room/room-runtime/src/main/java/androidx/room/MultiInstanceInvalidationService.kt
M room/benchmark/src/androidTest/java/androidx/room/benchmark/InvalidationTrackerBenchmark.kt
M room/room-ktx/src/main/java/androidx/room/CoroutinesRoom.kt
M room/room-runtime/api/public_plus_experimental_current.txt
A room/room-runtime/api/current.ignore
M room/room-runtime/api/restricted_current.ignore
M room/room-paging/src/main/java/androidx/room/paging/util/ThreadSafeInvalidationObserver.kt
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/PagingSourceTest.kt
M room/room-runtime/src/test/java/androidx/room/InvalidationTrackerTest.java
M room/room-runtime/src/test/java/androidx/room/BuilderTest.java
M room/room-runtime/src/main/java/androidx/room/InvalidationLiveDataContainer.kt
M room/room-runtime/src/main/java/androidx/room/MultiInstanceInvalidationClient.kt
M room/integration-tests/kotlintestapp/src/androidTest/java/InvalidationTrackerExt.kt
M room/room-runtime/src/main/java/androidx/room/Room.kt
M room/room-runtime/src/test/java/androidx/room/InvalidationLiveDataContainerTest.kt
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/SyncTriggersConcurrencyTest.kt
M room/room-runtime/src/main/java/androidx/room/RoomTrackingLiveData.kt
M sqlite/integration-tests/inspection-room-testapp/src/androidTest/java/androidx/sqlite/inspection/RoomInvalidationHookTest.kt
M room/room-runtime/src/main/java/androidx/room/AutoCloser.java
M room/room-runtime/src/main/java/androidx/room/InvalidationTracker.kt
M room/room-runtime/src/test/java/androidx/room/BuilderTest_TestDatabase_Impl.java

https://android-review.googlesource.com/1976130

ap...@google.com <ap...@google.com> #6Apr 28, 2022 08:08PM

Project: platform/frameworks/support
Branch: androidx-main

commit 3267211f72168a905ff880a4e34558185dc6c313
Author: Elif Bilgin <elifbilgin@google.com>
Date: Wed Apr 27 14:28:44 2022

Converting `auto closer` related files in `room-runtime` from Java to Kotlin.

Test: Existing tests
Bug: 206859668
Relnote: Converting `auto closer` related files in `room-runtime` from Java to Kotlin.
Change-Id: I6ee76590c1d110a4bb46219c126ef79177e3c975

M room/room-runtime/src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt
M room/room-runtime/src/main/java/androidx/room/RoomDatabase.java
M room/room-runtime/src/main/java/androidx/room/AutoClosingRoomOpenHelper.kt
M room/room-runtime/src/main/java/androidx/room/AutoClosingRoomOpenHelperFactory.kt
M room/room-runtime/src/main/java/androidx/room/AutoCloser.kt

https://android-review.googlesource.com/2043166

ap...@google.com <ap...@google.com> #7May 17, 2022 05:35PM

Project: platform/frameworks/support
Branch: androidx-main

commit a6f3b46c1dd9f4f1b419462c50451a120a863232
Author: Elif Bilgin <elifbilgin@google.com>
Date: Thu Apr 14 16:25:45 2022

Converting the final set of Java files in `room-runtime` from Java to Kotlin.

Test: Existing tests
Bug: 206859668
Relnote: Converting the final set of Java files in `room-runtime` from Java to Kotlin.
Change-Id: I96c25112c3ab32f8df71c1408c8006bdae1b3b7f

M room/room-runtime/src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt
M room/room-runtime/src/main/java/androidx/room/RoomDatabase.java
M room/room-runtime/src/main/java/androidx/room/AutoClosingRoomOpenHelper.kt
M room/room-runtime/src/main/java/androidx/room/SQLiteCopyOpenHelperFactory.kt
M room/room-runtime/api/restricted_current.txt
M room/room-runtime/src/test/java/androidx/room/SQLiteCopyOpenHelperTest.kt
M room/room-runtime/src/main/java/androidx/room/DatabaseConfiguration.kt
M room/room-runtime/src/main/java/androidx/room/EntityInsertionAdapter.kt
M room/room-runtime/src/main/java/androidx/room/EntityDeletionOrUpdateAdapter.kt
M room/room-runtime/src/main/java/androidx/room/SQLiteCopyOpenHelper.kt
M room/room-runtime/src/main/java/androidx/room/SharedSQLiteStatement.kt
M room/room-runtime/api/current.txt
M room/room-runtime/api/public_plus_experimental_current.txt
M room/room-runtime/api/current.ignore
M room/room-runtime/src/main/java/androidx/room/ExperimentalRoomApi.kt
M room/room-runtime/src/main/java/androidx/room/QueryInterceptorOpenHelper.kt
M room/room-testing/src/main/java/androidx/room/testing/MigrationTestHelper.java
M room/room-runtime/api/restricted_current.ignore
M room/room-runtime/src/main/java/androidx/room/DelegatingOpenHelper.kt

https://android-review.googlesource.com/2065333

ap...@google.com <ap...@google.com> #8May 25, 2022 04:34PM

Project: platform/frameworks/support
Branch: androidx-main

commit 3e34c01fd2679c1deb0d5ef4cdd76823f425a3ec
Author: Elif Bilgin <elifbilgin@google.com>
Date: Tue Jan 25 15:58:34 2022

Converting all RoomDatabase related files in `room-runtime` from Java to Kotlin.

Test: Existing tests
Bug: 206859668
Relnote: Converting all RoomDatabase related files in `room-runtime` from Java to Kotlin.
Change-Id: Ie4b55827902c6ddcc4cc004de8bb5286823e9ab5

M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/MultiTypedPagingSourceTest.kt
M room/room-paging-rxjava3/src/main/java/androidx/room/paging/rxjava3/LimitOffsetRxPagingSource.kt
M room/room-runtime/src/main/java/androidx/room/TransactionExecutor.kt
M room/room-paging/src/androidTest/kotlin/androidx/room/paging/LimitOffsetPagingSourceTest.kt
M room/room-runtime/api/restricted_current.txt
M room/room-runtime/src/test/java/androidx/room/RoomSQLiteQueryTest.java
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/ListenableFuturePagingSourceTest.kt
M room/room-runtime/src/main/java/androidx/room/RoomDatabase.kt
M room/room-ktx/src/androidTest/java/androidx/room/CoroutineRoomCancellationTest.kt
M room/room-paging-guava/src/main/java/androidx/room/paging/guava/LimitOffsetListenableFuturePagingSource.kt
M room/room-compiler/src/test/data/databasewriter/output/ComplexDatabase.java
M room/room-ktx/src/main/java/androidx/room/RoomDatabaseExt.kt
M room/room-runtime/src/main/java/androidx/room/RoomSQLiteQuery.kt
M room/room-runtime/api/current.txt
M room/room-runtime/src/main/java/androidx/room/RoomOpenHelper.kt
M room/room-ktx/src/main/java/androidx/room/CoroutinesRoom.kt
M room/room-runtime/api/public_plus_experimental_current.txt
M room/room-runtime/api/current.ignore
M room/room-runtime/api/restricted_current.ignore
M development/build_log_simplifier/messages.ignore
M room/room-runtime/src/test/java/androidx/room/InvalidationTrackerTest.java
M room/room-runtime/src/main/java/androidx/room/AutoCloser.kt
M room/room-compiler/src/main/kotlin/androidx/room/writer/SQLiteOpenHelperWriter.kt
M room/room-ktx/src/test/java/androidx/room/CoroutinesRoomTest.kt
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/AlteredTableColumnOrderTest.kt
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/Rx3PagingSourceTest.kt
M room/room-runtime/src/main/java/androidx/room/RoomTrackingLiveData.kt
M room/integration-tests/testapp/src/main/java/androidx/room/integration/testapp/SampleDatabaseService.java
M room/room-testing/src/main/java/androidx/room/testing/MigrationTestHelper.java
M sqlite/integration-tests/inspection-room-testapp/src/androidTest/java/androidx/sqlite/inspection/RoomInvalidationHookTest.kt
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/Rx2PagingSourceTest.kt
M room/room-paging-rxjava2/src/main/java/androidx/room/paging/rxjava2/LimitOffsetRxPagingSource.kt
M room/room-runtime/src/main/java/androidx/room/InvalidationTracker.kt
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/QueryInterceptorTest.kt

https://android-review.googlesource.com/1961019

el...@google.com <el...@google.com> Jun 11, 2022 12:26AM

Marked as fixed.