Skip to content

Commit

Permalink
Merge pull request #11 from zalando/feature/no-nullable
Browse files Browse the repository at this point in the history
Removed @nullable
  • Loading branch information
whiskeysierra authored Sep 19, 2016
2 parents 789b84e + 99d0a80 commit e7aadaa
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 29 deletions.
4 changes: 2 additions & 2 deletions src/main/java/org/zalando/fauxpas/IgnoreStrategy.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public <T, R, X extends Throwable> Function<T, R> adapt(final ThrowingFunction<T

@Override
public <T, X extends Throwable> UnaryOperator<T> adapt(final ThrowingUnaryOperator<T, X> operator) {
return t -> apply(operator::tryApply, t);
return t -> apply(operator, t);
}

private <T, R, X extends Throwable> R apply(final ThrowingFunction<T, R, X> function, final T t) {
Expand Down Expand Up @@ -98,7 +98,7 @@ public <T, U, R, X extends Throwable> BiFunction<T, U, R> adapt(final ThrowingBi

@Override
public <T, X extends Throwable> BinaryOperator<T> adapt(final ThrowingBinaryOperator<T,X> function) {
return (t, u) -> apply(function::tryApply, t, u);
return (t, u) -> apply(function, t, u);
}

private <T, U, R, X extends Throwable> R apply(final ThrowingBiFunction<T, U, R, X> function, final T t, final U u) {
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/zalando/fauxpas/ThrowingBiConsumer.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

import lombok.SneakyThrows;

import javax.annotation.Nullable;
import java.util.function.BiConsumer;

@FunctionalInterface
public interface ThrowingBiConsumer<T, U, X extends Throwable> extends BiConsumer<T, U> {

void tryAccept(@Nullable T t, @Nullable U u) throws X;
void tryAccept(T t, U u) throws X;

@Override
@SneakyThrows
default void accept(@Nullable final T t, @Nullable final U u) {
default void accept(final T t, final U u) {
tryAccept(t, u);
}

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/zalando/fauxpas/ThrowingBiFunction.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

import lombok.SneakyThrows;

import javax.annotation.Nullable;
import java.util.function.BiFunction;

@FunctionalInterface
public interface ThrowingBiFunction<T, U, R, X extends Throwable> extends BiFunction<T, U, R> {

R tryApply(@Nullable T t, @Nullable U u) throws X;
R tryApply(T t, U u) throws X;

@Override
@SneakyThrows
default R apply(@Nullable final T t, @Nullable final U u) {
default R apply(final T t, final U u) {
return tryApply(t, u);
}

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/zalando/fauxpas/ThrowingBiPredicate.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

import lombok.SneakyThrows;

import javax.annotation.Nullable;
import java.util.function.BiPredicate;

@FunctionalInterface
public interface ThrowingBiPredicate<T, U, X extends Throwable> extends BiPredicate<T, U> {

boolean tryTest(@Nullable T t, @Nullable U u) throws X;
boolean tryTest(T t, U u) throws X;

@Override
@SneakyThrows
default boolean test(@Nullable final T t, @Nullable final U u) {
default boolean test(final T t, final U u) {
return tryTest(t, u);
}

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/zalando/fauxpas/ThrowingConsumer.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

import lombok.SneakyThrows;

import javax.annotation.Nullable;
import java.util.function.Consumer;

@FunctionalInterface
public interface ThrowingConsumer<T, X extends Throwable> extends Consumer<T> {

void tryAccept(@Nullable T t) throws X;
void tryAccept(T t) throws X;

@Override
@SneakyThrows
default void accept(@Nullable final T t) {
default void accept(final T t) {
tryAccept(t);
}

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/zalando/fauxpas/ThrowingFunction.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

import lombok.SneakyThrows;

import javax.annotation.Nullable;
import java.util.function.Function;

@FunctionalInterface
public interface ThrowingFunction<T, R, X extends Throwable> extends Function<T, R> {

R tryApply(@Nullable T t) throws X;
R tryApply(T t) throws X;

@Override
@SneakyThrows
default R apply(@Nullable final T t) {
default R apply(final T t) {
return tryApply(t);
}

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/zalando/fauxpas/ThrowingPredicate.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

import lombok.SneakyThrows;

import javax.annotation.Nullable;
import java.util.function.Predicate;

@FunctionalInterface
public interface ThrowingPredicate<T, X extends Throwable> extends Predicate<T> {

boolean tryTest(@Nullable T t) throws X;
boolean tryTest(T t) throws X;

@Override
@SneakyThrows
default boolean test(@Nullable final T t) {
default boolean test(final T t) {
return tryTest(t);
}

Expand Down
9 changes: 4 additions & 5 deletions src/main/java/org/zalando/fauxpas/TryWith.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@ public static <O extends AutoCloseable, I extends AutoCloseable, T, X extends Th
@Nullable final O outer, @Nullable final I inner, final ThrowingBiFunction<O, I, T, X> function) throws X {

// not exactly sure why those explicit type parameters are needed
return TryWith.<O, T, X>tryWith(outer, (ಠ_ಠ) -> {
return tryWith(inner, () -> {
return function.tryApply(outer, inner);
});
});
return TryWith.<O, T, X>tryWith(outer, (ಠ_ಠ) ->
tryWith(inner, () -> {
return function.tryApply(outer, inner);
}));
}

public static <R extends AutoCloseable, T, X extends Throwable> T tryWith(@Nullable final R resource,
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/org/zalando/fauxpas/package-info.java

This file was deleted.

0 comments on commit e7aadaa

Please sign in to comment.