diff options
Diffstat (limited to 'impl_core/src/main/java/io/opencensus')
-rw-r--r-- | impl_core/src/main/java/io/opencensus/implcore/internal/CheckerFrameworkUtils.java | 17 | ||||
-rw-r--r-- | impl_core/src/main/java/io/opencensus/implcore/stats/MutableAggregation.java | 13 |
2 files changed, 4 insertions, 26 deletions
diff --git a/impl_core/src/main/java/io/opencensus/implcore/internal/CheckerFrameworkUtils.java b/impl_core/src/main/java/io/opencensus/implcore/internal/CheckerFrameworkUtils.java index 7b961978..f08289cf 100644 --- a/impl_core/src/main/java/io/opencensus/implcore/internal/CheckerFrameworkUtils.java +++ b/impl_core/src/main/java/io/opencensus/implcore/internal/CheckerFrameworkUtils.java @@ -16,13 +16,8 @@ package io.opencensus.implcore.internal; -import io.opencensus.common.Function; import javax.annotation.Nullable; -/*>>> -import org.checkerframework.checker.nullness.qual.KeyForBottom; -*/ - /** * Utility methods for suppressing nullness warnings and working around Checker Framework issues. */ @@ -35,16 +30,4 @@ public final class CheckerFrameworkUtils { public static <T> T castNonNull(@Nullable T arg) { return arg; } - - /** - * Works around https://github.com/typetools/checker-framework/issues/1712 by removing {@code ? - * super} from a {@code Function}'s argument type. - */ - // TODO(sebright): Remove this method once the issue is fixed. - public static <A, B> Function<A, B> removeSuperFromFunctionParameterType( - Function<? super /*@KeyForBottom*/ A, B> function) { - @SuppressWarnings("unchecked") - Function<A, B> castFunction = (Function<A, B>) function; - return castFunction; - } } diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableAggregation.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableAggregation.java index 49124b00..deabdce7 100644 --- a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableAggregation.java +++ b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableAggregation.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import io.opencensus.common.Function; -import io.opencensus.implcore.internal.CheckerFrameworkUtils; import io.opencensus.stats.Aggregation; import io.opencensus.stats.BucketBoundaries; @@ -100,8 +99,7 @@ abstract class MutableAggregation { Function<? super MutableCount, T> p1, Function<? super MutableMean, T> p2, Function<? super MutableDistribution, T> p3) { - return CheckerFrameworkUtils.<MutableSum, T>removeSuperFromFunctionParameterType(p0) - .apply(this); + return p0.apply(this); } } @@ -147,8 +145,7 @@ abstract class MutableAggregation { Function<? super MutableCount, T> p1, Function<? super MutableMean, T> p2, Function<? super MutableDistribution, T> p3) { - return CheckerFrameworkUtils.<MutableCount, T>removeSuperFromFunctionParameterType(p1) - .apply(this); + return p1.apply(this); } } @@ -216,8 +213,7 @@ abstract class MutableAggregation { Function<? super MutableCount, T> p1, Function<? super MutableMean, T> p2, Function<? super MutableDistribution, T> p3) { - return CheckerFrameworkUtils.<MutableMean, T>removeSuperFromFunctionParameterType(p2) - .apply(this); + return p2.apply(this); } } @@ -359,8 +355,7 @@ abstract class MutableAggregation { Function<? super MutableCount, T> p1, Function<? super MutableMean, T> p2, Function<? super MutableDistribution, T> p3) { - return CheckerFrameworkUtils.<MutableDistribution, T>removeSuperFromFunctionParameterType(p3) - .apply(this); + return p3.apply(this); } } } |