@IntDef not enforced when declared in Kotlin sources [217951311]

Fixed

Bug

Status Update

No update yet.

Description

da...@google.com

created issue #1

Feb 4, 2022 07:55PM

Room recently moved some of its APIs and source from Java to Kotlin and int def enforcement seems to have been lost with the move.

Given the IntDef in Room OnConflictStrategy, wrong usage of it in Kotlin gives no warning:

@Dao
interface MyDao {
    @Insert(onConflict = 20)  // Error should be here due to bad constant used.
    fun insert(e: MyEntity)
}

the enforcement is also lost in Java sources:

@Dao
public interface MyJavaDao {
    @Insert(onConflict = 20) // Error should be here due to bad constant used.
    void insert(MyEntity e);
}

However, if I make a new @IntDef along with an annotation in Java, the enforcement works fine.

@IntDef({MyIntDef.VALUE1, MyIntDef.VALUE2})
public @interface MyIntDef {
    int VALUE1 = 1;
    int VALUE2 = 2;
}

public @interface MyJavaAnnotation {
    @MyIntDef int value();
}

@MyJavaAnnotation(20) // Fails with 'Must be one of: MyIntDef.VALUE1, MyIntDef.VALUE2'
fun aFunction() {
}

Let me know if you need more information!

Comments

da...@google.com <da...@google.com> #2Feb 4, 2022 08:05PM

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

tn...@google.com <tn...@google.com> #3Feb 4, 2022 10:52PM

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

tn...@google.com <tn...@google.com> #4Feb 4, 2022 10:54PM

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

da...@google.com <da...@google.com> #5Feb 4, 2022 11:41PM

Marked as fixed.

Ah default use sites! Not the first time it has bitten me! Thank you sooo much for the clarification. I didn't even consider it since @Insert being an annotation does not have fields, only getters, so I thought maybe Kotlin would place it in the right spot since it doesn't have to do the gymnastics to figure out whether to put it in a synthetic method, in the backing field, setter or getter. Anyway, I'll close this now, thanks again!

Issue 217951311

Description

Issue summary

Comments

da...@google.com <da...@google.com> #2Feb 4, 2022 08:05PM

tn...@google.com <tn...@google.com> #3Feb 4, 2022 10:52PM

tn...@google.com <tn...@google.com> #4Feb 4, 2022 10:54PM

da...@google.com <da...@google.com> #5Feb 4, 2022 11:41PM

Add comment

Issue metadata