Skip to content

For #220, detect unexpected OneToMany initialisation cases #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbygrave merged 1 commit into from
Mar 8, 2025
Merged

For #220, detect unexpected OneToMany initialisation cases #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ebean-agent/src/main/java/io/ebean/enhance/entity/ConstructorDeferredCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ private boolean kotlinEmptyList(String owner, String name, String desc) {
*/
boolean consumeVisitFieldInsn(int opcode, String owner, String name, String desc) {
if (opcode == PUTFIELD) {
if (state == State.MAYBE_UNSUPPORTED && meta.isConsumeInitMany(name)) {
if (meta.isConsumeInitMany(name) && unsupportedInitialisation()) {
// a OneToMany/ManyToMany is initialised in an unsupported manor
meta.addUnsupportedInitMany(name);
flush();
Expand Down Expand Up @@ -221,6 +221,15 @@ boolean consumeVisitFieldInsn(int opcode, String owner, String name, String desc
return false;
}

/**
* Return true when a OneToMany or ManyToMany is not initialised in a supported manor.
*/
private boolean unsupportedInitialisation() {
return state == State.MAYBE_UNSUPPORTED
|| state == State.UNSET // proceeded by GETSTATIC field bytecode like Collections.EMPTY_LIST
|| state == State.INVOKE_SPECIAL && !isConsumeManyType(); // e.g. new BeanList()
}

boolean consumeVisitLabel(Label label) {
if (state == State.KT_CHECKCAST) {
codes.add(new DeferredLabel(label));
Expand Down
5 changes: 5 additions & 0 deletions test/src/test/java/test/model/WithInitialisedCollections2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ public class WithInitialisedCollections2 extends BaseEntity {
@OneToMany(cascade = CascadeType.PERSIST)
Map<Long,Contact> mapCollEmpty = Collections.emptyMap();

// @OneToMany final List<Contact> listCollNotValidInitialisation0 = new io.ebean.common.BeanList<>();
// @OneToMany final List<Contact> listCollNotValidInitialisation1 = Collections.EMPTY_LIST;
// @OneToMany final List<Contact> listCollNotValidInitialisation2 = List.of(new Contact("junk"));
// @OneToMany final List<Contact> listCollNotValidInitialisation3 = Collections.unmodifiableList(Collections.emptyList());

@Transient
List<String> transientList = List.of();
@Transient
Expand Down