From ada444b7cc048c2d2ceeaa5d7e88d6aea716a24d Mon Sep 17 00:00:00 2001
From: Kajetan Fuchsberger <K.Fuchsberger@gsi.de>
Date: Fri, 19 Mar 2021 14:51:43 +0100
Subject: [PATCH] fixing travis errors (java 8)

---
 src/java/org/tensorics/core/tensor/Positions.java      | 10 +++-------
 .../tensorbacked/ProxiedInterfaceTensorbackeds.java    |  9 ++++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/java/org/tensorics/core/tensor/Positions.java b/src/java/org/tensorics/core/tensor/Positions.java
index 937a5ec52..f11181b7d 100644
--- a/src/java/org/tensorics/core/tensor/Positions.java
+++ b/src/java/org/tensorics/core/tensor/Positions.java
@@ -33,11 +33,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.mockito.internal.util.collections.Iterables;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -389,12 +386,11 @@ public static Set<Position> cartesianProduct(Iterable<Set<?>> coordinateSets) {
     public static <T> Set<Position> from(Collection<T> coordinates) {
         return coordinates.stream().map(t -> Position.of(t)).collect(toSet());
     }
-    
-    public static <T> Set<Position> from(T ... coordinates) {
+
+    public static <T> Set<Position> from(T... coordinates) {
         return from(ImmutableSet.copyOf(coordinates));
     }
-    
-    
+
     /**
      * Returns a position which contains the coordinates which are contained in the left position but not in the right
      * position. The right position might also contain coordinates not contained in the left position, which are simply
diff --git a/src/java/org/tensorics/core/tensorbacked/ProxiedInterfaceTensorbackeds.java b/src/java/org/tensorics/core/tensorbacked/ProxiedInterfaceTensorbackeds.java
index a4a4c15cf..fc05f1d93 100644
--- a/src/java/org/tensorics/core/tensorbacked/ProxiedInterfaceTensorbackeds.java
+++ b/src/java/org/tensorics/core/tensorbacked/ProxiedInterfaceTensorbackeds.java
@@ -32,11 +32,10 @@ public static <V, T extends Tensorbacked<V>> T create(Class<T> tensorbackedType,
     }
 
     public static <V, T extends Tensorbacked<V>> Optional<Class<T>> tensorbackedInterfaceFrom(T object) {
-        return invokationHandlerFrom(object).map(h -> h.intfc);
+        return invokationHandlerFrom(object).map(h -> (Class<T>) h.intfc);
     }
 
-    private static <V, T extends Tensorbacked<V>> Optional<DelegatingInvocationHandler<V, T>> invokationHandlerFrom(
-            T object) {
+    private static Optional<DelegatingInvocationHandler<?, ?>> invokationHandlerFrom(Object object) {
         if (!(object instanceof Proxy)) {
             return Optional.empty();
         }
@@ -46,7 +45,7 @@ private static <V, T extends Tensorbacked<V>> Optional<DelegatingInvocationHandl
             return Optional.empty();
         }
 
-        return Optional.of((DelegatingInvocationHandler<V, T>) handler);
+        return Optional.of((DelegatingInvocationHandler<?, ?>) handler);
     }
 
     private final static class DelegatingInvocationHandler<V, T extends Tensorbacked<V>> implements InvocationHandler {
@@ -100,7 +99,7 @@ public boolean equals(Object obj) {
             if (!(obj instanceof Tensorbacked)) {
                 return false;
             }
-            Optional<DelegatingInvocationHandler<?, ?>> otherIh = invokationHandlerFrom((Tensorbacked) obj);
+            Optional<DelegatingInvocationHandler<?, ?>> otherIh = invokationHandlerFrom(obj);
             if (!otherIh.isPresent()) {
                 return false;
             }