So much typing....

Author: Thrameos

native/jpype_module/src/main/java/org/jpype/bridge/Backend.java

@@ -16,6 +16,7 @@
 package org.jpype.bridge;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Future;
@@ -39,8 +40,6 @@
 import python.lang.PyZip;
 import python.lang.PyBuffer;
 import python.lang.PyCallable;
-import python.lang.PyIndex;
-import python.lang.PyMapping;
 import python.lang.PyIter;
 
 /**
@@ -91,12 +90,11 @@ public interface Backend
   boolean contains(Object obj, Object value);
 
   // Delete an item from a Python sequence by index.
-  boolean delByIndex(Object obj, int index);
+  void delitemByIndex(Object obj, int index);
 
-  // Delete an item from a Python mapping object by key.
-  PyObject delByObject(PyMapping obj, Object key);
+  void delitemByObject(Object obj, Object index);
 
-  PyObject delattrReturn(PyObject obj, Object key);
+  PyObject delattrReturn(Object obj, Object key);
 
   // Delete an attribute from a Python object by name.
   void delattrString(Object obj, CharSequence attrName);
@@ -113,9 +111,6 @@ public interface Backend
   // Execute a Python statement with optional global and local variables.
   void exec(CharSequence source, PyDict globals, PyObject locals);
 
-  // Get the type of a Python callable as a string.
-  String getCallableType(PyCallable obj);
-
   // Get the `__dict__` attribute of a Python object.
   PyDict getDict(Object obj);
 
@@ -209,7 +204,7 @@ public interface Backend
   // Create a Python `bytearray` from an iterable.
   PyByteArray newByteArrayFromIterable(Iterable<?> iter);
 
-  public PyByteArray newByteArrayFromIterator(Iterable<PyObject> iterable);
+  PyByteArray newByteArrayFromIterator(Iterable<PyObject> iterable);
 
   // Create a Python `bytearray` with a specified size.
   PyByteArray newByteArrayOfSize(int size);
@@ -265,7 +260,7 @@ public interface Backend
   PyTuple newTuple();
 
   // Create a Python `tuple` from an array of objects.
-  PyTuple newTupleFromArray(Object... elements);
+  PyTuple newTupleFromArray(List<?> elements);
 
   // Create a Python `tuple` from an iterable.
   PyTuple newTupleFromIterator(Iterable<?> iterable);
@@ -317,7 +312,7 @@ public interface Backend
   PyString str(Object obj);
 
   // Create a Python `tee` iterator.
-  PyIter teeIterator(PyIter iterator);
+  <T> PyIter<T> teeIterator(PyIter<T> iterator);
 
   // Get the type of a Python object.
   PyType type(Object obj);
@@ -331,5 +326,5 @@ public interface Backend
   PyZip zipFromArray(Object[] objects);
 
   // Create a Python `zip` object from multiple objects.
-  PyZip zipFromIterable(Object... objects);
+  PyZip zipFromIterable(Iterable<?> objects);
 }

native/jpype_module/src/main/java/org/jpype/bridge/Context.java

@@ -18,7 +18,6 @@
 import python.lang.PyBuiltIn;
 import python.lang.PyDict;
 import python.lang.PyObject;
-import python.lang.PyMapping;
 
 /**
  * Represents an scope of variables in the Python interpreter.

native/jpype_module/src/main/java/python/lang/PyAbstractSet.java

@@ -17,10 +17,7 @@
 
 import java.util.Iterator;
 import java.util.Set;
-import org.jpype.bridge.Interpreter;
-import python.lang.PyBuiltIn;
-import python.lang.PyObject;
-import python.lang.PySet;
+import static python.lang.PyBuiltIn.backend;
 
 /**
  * Represents a protocol for Python classes that act as sets.
@@ -55,7 +52,7 @@ public interface PyAbstractSet<T extends PyObject> extends PyCollection<T>, Set<
   @Override
   default boolean contains(Object obj)
   {
-    return Interpreter.getBackend().contains(this, obj);
+    return backend().contains(this, obj);
   }
 
   /**
@@ -71,7 +68,7 @@ default boolean contains(Object obj)
    */
   static <T> PySet of(Iterable<T> c)
   {
-    return Interpreter.getBackend().newSetFromIterable(c);
+    return backend().newSetFromIterable(c);
   }
 
   /**

native/jpype_module/src/main/java/python/lang/PyAttributes.java

@@ -19,13 +19,7 @@
 import java.util.Map;
 import java.util.Set;
 import org.jpype.bridge.Backend;
-import python.lang.PyBuiltIn;
-import org.jpype.bridge.Interpreter;
-import python.lang.PyDict;
-import python.lang.PyDictItems;
-import python.lang.PyDictKeySet;
-import python.lang.PyList;
-import python.lang.PyObject;
+import static python.lang.PyBuiltIn.backend;
 
 /**
  * A {@link Map}-like implementation for accessing and manipulating Python
@@ -94,7 +88,7 @@ public class PyAttributes implements Map<PyObject, PyObject>
   public PyAttributes(PyObject obj)
   {
     this.obj = obj;
-    this.backend = Interpreter.getBackend();
+    this.backend = backend();
   }
 
   /**

native/jpype_module/src/main/java/python/lang/PyAwaitable.java

@@ -15,8 +15,6 @@
  */
 package python.lang;
 
-import python.lang.PyObject;
-
 /**
  * Protocol for objects that are awaitable.
  */

native/jpype_module/src/main/java/python/lang/PyBuffer.java

@@ -15,8 +15,6 @@
  */
 package python.lang;
 
-import python.lang.PyObject;
-
 /**
  * Protocol for objects that act as a buffer.
  */

native/jpype_module/src/main/java/python/lang/PyBuiltIn.java

@@ -15,6 +15,7 @@
  */
 package python.lang;
 
+import java.util.Arrays;
 import org.jpype.bridge.Backend;
 import org.jpype.bridge.Interpreter;
 
@@ -29,6 +30,10 @@ public class PyBuiltIn
 
   static Backend instance;
 
+  protected PyBuiltIn()
+  {
+  }
+
   /**
    * Creates a new Python float object.
    *
@@ -62,11 +67,6 @@ public class PyBuiltIn
    * be accessed.
    * </p>
    *
-   * <p>
-   * The method also caches the backend instance for future use, avoiding
-   * redundant calls to {@link Interpreter#getBackend()}.
-   * </p>
-   *
    * @return The active {@link Backend} instance.
    * @throws IllegalStateException If the interpreter is not started.
    */
@@ -216,9 +216,9 @@ public static boolean hasattr(PyObject obj, CharSequence key)
    * indices.
    * @return a new {@link PyTuple} instance containing the indices.
    */
-  public static PyTuple indices(PyIndex[] indices)
+  public static PyTuple indices(PyIndex... indices)
   {
-    return backend().newTupleFromArray(indices);
+    return backend().newTupleFromArray(Arrays.asList(indices));
   }
 
   /**
@@ -464,7 +464,7 @@ public static <T> PyTuple tuple()
    */
   public static PyTuple tuple(Object... items)
   {
-    return backend().newTupleFromArray(items);
+    return backend().newTupleFromArray(Arrays.asList(items));
   }
 
   /**
@@ -506,6 +506,6 @@ public static PyDict vars(Object obj)
    */
   public static PyZip zip(Iterable... objects)
   {
-    return backend().zipFromIterable(objects);
+    return backend().zipFromIterable(Arrays.asList(objects));
   }
 }

native/jpype_module/src/main/java/python/lang/PyByteArray.java

@@ -16,6 +16,7 @@
 package python.lang;
 
 import org.jpype.bridge.Interpreter;
+import static python.lang.PyBuiltIn.backend;
 
 /**
  * Java front-end interface for the concrete Python `bytearray` type.
@@ -37,7 +38,7 @@ public interface PyByteArray extends PyObject, PyBuffer, PySequence<PyInt>
    */
   static PyByteArray create(int length)
   {
-    return Interpreter.getBackend().newByteArrayOfSize(length);
+    return backend().newByteArrayOfSize(length);
   }
 
   /**
@@ -50,7 +51,7 @@ static PyByteArray create(int length)
    */
   static PyByteArray fromHex(CharSequence str)
   {
-    return Interpreter.getBackend().bytearrayFromHex(str);
+    return backend().bytearrayFromHex(str);
   }
 
   /**
@@ -64,7 +65,7 @@ static PyByteArray fromHex(CharSequence str)
    */
   static PyByteArray of(Iterable<PyObject> iter)
   {
-    return Interpreter.getBackend().newByteArrayFromIterable(iter);
+    return backend().newByteArrayFromIterable(iter);
   }
 
   /**
@@ -78,7 +79,7 @@ static PyByteArray of(Iterable<PyObject> iter)
    */
   static PyByteArray of(PyBuffer bytes)
   {
-    return Interpreter.getBackend().newByteArrayFromBuffer(bytes);
+    return backend().newByteArrayFromBuffer(bytes);
   }
 
   /**
@@ -157,7 +158,7 @@ default void set(PyIndex index, PyObject values)
   @Override
   default int size()
   {
-    return Interpreter.getBackend().len(this);
+    return backend().len(this);
   }
 
   /**

native/jpype_module/src/main/java/python/lang/PyBytes.java

@@ -15,7 +15,7 @@
  */
 package python.lang;
 
-import org.jpype.bridge.Interpreter;
+import static python.lang.PyBuiltIn.backend;
 
 /**
  * Java front-end interface for the concrete Python `bytes` type.
@@ -35,7 +35,7 @@ public interface PyBytes extends PyObject, PyBuffer, PySequence<PyInt>
    */
   static PyBytes create(int length)
   {
-    return Interpreter.getBackend().newBytesOfSize(length);
+    return backend().newBytesOfSize(length);
   }
 
   /**
@@ -50,7 +50,7 @@ static PyBytes create(int length)
    */
   static PyBytes fromHex(CharSequence str)
   {
-    return Interpreter.getBackend().bytesFromHex(str);
+    return backend().bytesFromHex(str);
   }
 
   /**
@@ -65,7 +65,7 @@ static PyBytes fromHex(CharSequence str)
    */
   static PyByteArray of(Iterable<PyObject> iterable)
   {
-    return Interpreter.getBackend().newByteArrayFromIterator(iterable);
+    return backend().newByteArrayFromIterator(iterable);
   }
 
   /**
@@ -80,7 +80,7 @@ static PyByteArray of(Iterable<PyObject> iterable)
    */
   static PyByteArray of(PyBuffer buffer)
   {
-    return Interpreter.getBackend().newByteArrayFromBuffer(buffer);
+    return backend().newByteArrayFromBuffer(buffer);
   }
 
   /**
@@ -148,7 +148,7 @@ default PyInt set(int index, PyInt value)
   @Override
   default int size()
   {
-    return Interpreter.getBackend().len(this);
+    return backend().len(this);
   }
 
   /**