Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,11 @@ private boolean stateConsumeDeferred() {
*/
private boolean isConsumeManyType() {
return "java/util/ArrayList".equals(stateInitialiseType)
|| "java/util/LinkedList".equals(stateInitialiseType)
|| "java/util/LinkedHashSet".equals(stateInitialiseType)
|| "java/util/HashSet".equals(stateInitialiseType)
|| "java/util/LinkedHashMap".equals(stateInitialiseType);
//|| "java/util/HashMap".equals(stateInitialiseType));
|| "java/util/LinkedHashMap".equals(stateInitialiseType)
|| "java/util/HashMap".equals(stateInitialiseType);
}

private static class ALoad implements DeferredCode {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,22 @@ void oneToMany_initialisationCode_expect_removed() {

assertThat(bean.listOf()).isInstanceOf(BeanList.class);
assertThat(bean.listCollEmpty()).isInstanceOf(BeanList.class);
assertThat(bean.listCollLinked()).isInstanceOf(BeanList.class);
assertThat(bean.setOf()).isInstanceOf(BeanSet.class);
assertThat(bean.setCollEmpty()).isInstanceOf(BeanSet.class);
assertThat(bean.mapOf()).isInstanceOf(BeanMap.class);
assertThat(bean.mapCollEmpty()).isInstanceOf(BeanMap.class);
assertThat(bean.mapCollHash()).isInstanceOf(BeanMap.class);


assertThat(bean.transientList()).isNotInstanceOf(BeanList.class);
assertThat(bean.transientList2()).isNotInstanceOf(BeanList.class);
assertThat(bean.transientList3()).isNotInstanceOf(BeanList.class);
assertThat(bean.transientSet()).isNotInstanceOf(BeanSet.class);
assertThat(bean.transientSet2()).isNotInstanceOf(BeanSet.class);
assertThat(bean.transientMap()).isNotInstanceOf(BeanMap.class);
assertThat(bean.transientMap2()).isNotInstanceOf(BeanMap.class);
assertThat(bean.transientMap3()).isNotInstanceOf(BeanMap.class);


// these methods work because the underlying collection is a BeanCollection
Expand Down
25 changes: 25 additions & 0 deletions test/src/test/java/test/model/WithInitialisedCollections2.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ public class WithInitialisedCollections2 extends BaseEntity {
final Set<Contact> setCollEmpty = Collections.emptySet();
@OneToMany(cascade = CascadeType.PERSIST)
Map<Long,Contact> mapCollEmpty = Collections.emptyMap();
@OneToMany(cascade = CascadeType.PERSIST)
Map<Long,Contact> mapCollHash = new HashMap<>();

@OneToMany(cascade = CascadeType.PERSIST)
final List<Contact> listCollLinked = new LinkedList<>();

// @OneToMany final List<Contact> listCollNotValidInitialisation0 = new io.ebean.common.BeanList<>();
// @OneToMany final List<Contact> listCollNotValidInitialisation1 = Collections.EMPTY_LIST;
Expand All @@ -38,11 +43,15 @@ public class WithInitialisedCollections2 extends BaseEntity {
@Transient
Map<String,Contact> transientMap = Map.of();
@Transient
List<String> transientList3 = new LinkedList<>();
@Transient
List<String> transientList2 = Collections.emptyList();
@Transient
Set<String> transientSet2 = Collections.emptySet();
@Transient
Map<String,Contact> transientMap2 = Collections.emptyMap();
@Transient
Map<String,Contact> transientMap3 = new HashMap<>();

public String name() {
return name;
Expand Down Expand Up @@ -100,4 +109,20 @@ public Map<String, Contact> transientMap() {
public Map<String, Contact> transientMap2() {
return transientMap2;
}

public List<Contact> listCollLinked() {
return listCollLinked;
}

public List<String> transientList3() {
return transientList3;
}

public Map<Long, Contact> mapCollHash() {
return mapCollHash;
}

public Map<String, Contact> transientMap3() {
return transientMap3;
}
}