Add back support for List.of() and Collections.emptyList() as initialisation for OneToMany etc

The thinking is that many folks are not reading the JPA spec, and there are some folks "suggesting" to initialise OneToMany collections with Collections.emptyList() ... even though it isn't as per JPA spec. Hmmm.

Author: rbygrave

ebean-agent/src/main/java/io/ebean/enhance/entity/ConstructorDeferredCode.java

@@ -132,24 +132,24 @@ boolean deferVisitMethodInsn(int opcode, String owner, String name, String desc,
       return true;
     }
     if (opcode == INVOKESTATIC && stateAload()) {
-      if (kotlinEmptyList(owner, name, desc)) { // emptyList(owner, name, desc) ||
+      if (kotlinEmptyList(owner, name, desc) || emptyList(owner, name, desc)) {
         codes.add(new NoArgInit(opcode, owner, name, desc, itf));
         state = State.EMPTY;
         stateInitialiseType = "java/util/ArrayList";
         return true;
       }
-//      if (emptySet(owner, name, desc)) {
-//        codes.add(new NoArgInit(opcode, owner, name, desc, itf));
-//        state = State.EMPTY;
-//        stateInitialiseType = "java/util/LinkedHashSet";
-//        return true;
-//      }
-//      if (emptyMap(owner, name, desc)) {
-//        codes.add(new NoArgInit(opcode, owner, name, desc, itf));
-//        state = State.EMPTY;
-//        stateInitialiseType = "java/util/LinkedHashMap";
-//        return true;
-//      }
+      if (emptySet(owner, name, desc)) {
+        codes.add(new NoArgInit(opcode, owner, name, desc, itf));
+        state = State.EMPTY;
+        stateInitialiseType = "java/util/LinkedHashSet";
+        return true;
+      }
+      if (emptyMap(owner, name, desc)) {
+        codes.add(new NoArgInit(opcode, owner, name, desc, itf));
+        state = State.EMPTY;
+        stateInitialiseType = "java/util/LinkedHashMap";
+        return true;
+      }
     }
     flush();
     state = State.MAYBE_UNSUPPORTED;
@@ -160,23 +160,23 @@ private boolean isNoArgInit(String name, String desc) {
     return name.equals(INIT) && desc.equals(NOARG_VOID);
   }
 
-//  private boolean emptyList(String owner, String name, String desc) {
-//    return desc.equals("()Ljava/util/List;")
-//      && ((owner.equals("java/util/List") && name.equals("of"))
-//      || (owner.equals("java/util/Collections") && name.equals("emptyList")));
-//  }
-//
-//  private boolean emptySet(String owner, String name, String desc) {
-//    return desc.equals("()Ljava/util/Set;")
-//      && ((owner.equals("java/util/Set") && name.equals("of"))
-//      || (owner.equals("java/util/Collections") && name.equals("emptySet")));
-//  }
-//
-//  private boolean emptyMap(String owner, String name, String desc) {
-//    return desc.equals("()Ljava/util/Map;")
-//      && ((owner.equals("java/util/Map") && name.equals("of"))
-//      || (owner.equals("java/util/Collections") && name.equals("emptyMap")));
-//  }
+  private boolean emptyList(String owner, String name, String desc) {
+    return desc.equals("()Ljava/util/List;")
+      && ((owner.equals("java/util/List") && name.equals("of"))
+      || (owner.equals("java/util/Collections") && name.equals("emptyList")));
+  }
+
+  private boolean emptySet(String owner, String name, String desc) {
+    return desc.equals("()Ljava/util/Set;")
+      && ((owner.equals("java/util/Set") && name.equals("of"))
+      || (owner.equals("java/util/Collections") && name.equals("emptySet")));
+  }
+
+  private boolean emptyMap(String owner, String name, String desc) {
+    return desc.equals("()Ljava/util/Map;")
+      && ((owner.equals("java/util/Map") && name.equals("of"))
+      || (owner.equals("java/util/Collections") && name.equals("emptyMap")));
+  }
 
   private boolean kotlinEmptyList(String owner, String name, String desc) {
     return owner.equals("kotlin/collections/CollectionsKt")
@@ -189,19 +189,20 @@ 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)) {
+        // a OneToMany/ManyToMany is initialised in an unsupported manor
+        meta.addUnsupportedInitMany(name);
+        flush();
+        return false;
+      }
       if (stateConsumeDeferred()) {
-        if (meta.isConsumeInitMany(name)) {
-          if (isConsumeManyType()) {
-            if (meta.isLog(3)) {
-              meta.log("... consumed init of many: " + name);
-            }
-            state = State.UNSET;
-            codes.clear();
-            return true;
-          } else {
-            // a OneToMany/ManyToMany is initialised in an unsupported manor
-            meta.addUnsupportedInitMany(name);
+        if (meta.isConsumeInitMany(name) && isConsumeManyType()) {
+          if (meta.isLog(3)) {
+            meta.log("... consumed init of many: " + name);
           }
+          state = State.UNSET;
+          codes.clear();
+          return true;
         } else if (meta.isInitTransient(name)) {
           // keep the initialisation code for transient to 'replay'
           // it when adding a default constructor if needed
@@ -271,7 +272,7 @@ private boolean stateInvokeSpecial() {
   }
 
   private boolean stateConsumeDeferred() {
-    return state == State.INVOKE_SPECIAL || state == State.KT_CHECKCAST || state == State.EMPTY || state == State.MAYBE_UNSUPPORTED;
+    return state == State.INVOKE_SPECIAL || state == State.KT_CHECKCAST || state == State.EMPTY;
   }
 
   /**