Skip to content

Commit ada444b

Browse files
Kajetan FuchsbergerKajetan Fuchsberger
Kajetan Fuchsberger
authored and
Kajetan Fuchsberger
committed
fixing travis errors (java 8)
1 parent f257380 commit ada444b

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

src/java/org/tensorics/core/tensor/Positions.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@
3333
import java.util.function.Function;
3434
import java.util.stream.Collectors;
3535

36-
import org.mockito.internal.util.collections.Iterables;
37-
3836
import com.google.common.base.MoreObjects;
3937
import com.google.common.base.Objects;
40-
import com.google.common.base.Preconditions;
4138
import com.google.common.collect.ImmutableList;
4239
import com.google.common.collect.ImmutableMultimap;
4340
import com.google.common.collect.ImmutableSet;
@@ -389,12 +386,11 @@ public static Set<Position> cartesianProduct(Iterable<Set<?>> coordinateSets) {
389386
public static <T> Set<Position> from(Collection<T> coordinates) {
390387
return coordinates.stream().map(t -> Position.of(t)).collect(toSet());
391388
}
392-
393-
public static <T> Set<Position> from(T ... coordinates) {
389+
390+
public static <T> Set<Position> from(T... coordinates) {
394391
return from(ImmutableSet.copyOf(coordinates));
395392
}
396-
397-
393+
398394
/**
399395
* Returns a position which contains the coordinates which are contained in the left position but not in the right
400396
* position. The right position might also contain coordinates not contained in the left position, which are simply

src/java/org/tensorics/core/tensorbacked/ProxiedInterfaceTensorbackeds.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@ public static <V, T extends Tensorbacked<V>> T create(Class<T> tensorbackedType,
3232
}
3333

3434
public static <V, T extends Tensorbacked<V>> Optional<Class<T>> tensorbackedInterfaceFrom(T object) {
35-
return invokationHandlerFrom(object).map(h -> h.intfc);
35+
return invokationHandlerFrom(object).map(h -> (Class<T>) h.intfc);
3636
}
3737

38-
private static <V, T extends Tensorbacked<V>> Optional<DelegatingInvocationHandler<V, T>> invokationHandlerFrom(
39-
T object) {
38+
private static Optional<DelegatingInvocationHandler<?, ?>> invokationHandlerFrom(Object object) {
4039
if (!(object instanceof Proxy)) {
4140
return Optional.empty();
4241
}
@@ -46,7 +45,7 @@ private static <V, T extends Tensorbacked<V>> Optional<DelegatingInvocationHandl
4645
return Optional.empty();
4746
}
4847

49-
return Optional.of((DelegatingInvocationHandler<V, T>) handler);
48+
return Optional.of((DelegatingInvocationHandler<?, ?>) handler);
5049
}
5150

5251
private final static class DelegatingInvocationHandler<V, T extends Tensorbacked<V>> implements InvocationHandler {
@@ -100,7 +99,7 @@ public boolean equals(Object obj) {
10099
if (!(obj instanceof Tensorbacked)) {
101100
return false;
102101
}
103-
Optional<DelegatingInvocationHandler<?, ?>> otherIh = invokationHandlerFrom((Tensorbacked) obj);
102+
Optional<DelegatingInvocationHandler<?, ?>> otherIh = invokationHandlerFrom(obj);
104103
if (!otherIh.isPresent()) {
105104
return false;
106105
}

0 commit comments

Comments
 (0)