Properly handle java refs in traits returning traits

[ldk-java] / src / main / java / org / ldk / structs / Logger.java

diff --git a/src/main/java/org/ldk/structs/Logger.java b/src/main/java/org/ldk/structs/Logger.java
index d9c71b8858d33d515c3d898a56dad8d43a0aba57..02b5075a86c581fedcb89b39b27b677f7c2668f6 100644 (file)
--- a/src/main/java/org/ldk/structs/Logger.java
+++ b/src/main/java/org/ldk/structs/Logger.java
@@ -1,16 +1,35 @@
 package org.ldk.structs;
 
 import org.ldk.impl.bindings;
+import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class Logger extends CommonBase {
-       Logger(Object _dummy, long ptr) { super(ptr); }
-       public Logger(bindings.LDKLogger arg) {
+       final bindings.LDKLogger bindings_instance;
+       Logger(Object _dummy, long ptr) { super(ptr); bindings_instance = null; }
+       private Logger(bindings.LDKLogger arg) {
                super(bindings.LDKLogger_new(arg));
                this.ptrs_to.add(arg);
+               this.bindings_instance = arg;
        }
        @Override @SuppressWarnings("deprecation")
        protected void finalize() throws Throwable {
-               bindings.Logger_free(ptr); super.finalize();
+               if (ptr != 0) { bindings.Logger_free(ptr); } super.finalize();
        }
 
+       public static interface LoggerInterface {
+               void log(String record);
+       }
+       private static class LDKLoggerHolder { Logger held; }
+       public static Logger new_impl(LoggerInterface arg) {
+               final LDKLoggerHolder impl_holder = new LDKLoggerHolder();
+               impl_holder.held = new Logger(new bindings.LDKLogger() {
+                       @Override public void log(String record) {
+                               arg.log(record);
+                       }
+               });
+               return impl_holder.held;
+       }
 }