Circumvent AutoClosable in transactional proxies only when the class implements AutoClosable

Author: adrienlauer

core/src/main/java/org/seedstack/seed/core/internal/transaction/TransactionalClassProxy.java

@@ -5,6 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+
 package org.seedstack.seed.core.internal.transaction;
 
 import java.lang.reflect.InvocationTargetException;
@@ -42,7 +43,9 @@ public static <T> T create(Class<T> clazz, final TransactionalLink<T> transactio
         try {
             ProxyFactory factory = new ProxyFactory();
             factory.setSuperclass(clazz);
-            factory.setInterfaces(new Class<?>[]{IgnoreAutoCloseable.class});
+            if (AutoCloseable.class.isAssignableFrom(clazz)) {
+                factory.setInterfaces(new Class<?>[]{IgnoreAutoCloseable.class});
+            }
             factory.setFilter(method -> !method.getDeclaringClass().equals(Object.class));
             return (T) factory.create(new Class<?>[0], new Object[0], new TransactionalClassProxy<>(transactionalLink));
         } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {

core/src/main/java/org/seedstack/seed/core/internal/transaction/TransactionalProxy.java

@@ -5,6 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+
 package org.seedstack.seed.core.internal.transaction;
 
 import java.lang.reflect.InvocationHandler;
@@ -38,8 +39,13 @@ private TransactionalProxy(TransactionalLink<T> transactionalLink) {
      */
     @SuppressWarnings("unchecked")
     public static <T> T create(Class<T> clazz, TransactionalLink<T> transactionalLink) {
-        return (T) Proxy.newProxyInstance(TransactionalProxy.class.getClassLoader(),
-                new Class<?>[]{IgnoreAutoCloseable.class, clazz}, new TransactionalProxy<>(transactionalLink));
+        if (AutoCloseable.class.isAssignableFrom(clazz)) {
+            return (T) Proxy.newProxyInstance(TransactionalProxy.class.getClassLoader(),
+                    new Class<?>[]{IgnoreAutoCloseable.class, clazz}, new TransactionalProxy<>(transactionalLink));
+        } else {
+            return (T) Proxy.newProxyInstance(TransactionalProxy.class.getClassLoader(),
+                    new Class<?>[]{clazz}, new TransactionalProxy<>(transactionalLink));
+        }
     }
 
     @Override