From 552ef4437ff53f9c56984fe5b112cc5c7af3cd23 Mon Sep 17 00:00:00 2001
From: George Campbell <gscampbell@netflix.com>
Date: Mon, 1 Dec 2014 14:07:38 -0800
Subject: [PATCH] redefining identity because it was removed from core.

---
 .../java/rx/observables/MathObservable.java   | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/rx/observables/MathObservable.java b/src/main/java/rx/observables/MathObservable.java
index 4e08cae..3cae14d 100644
--- a/src/main/java/rx/observables/MathObservable.java
+++ b/src/main/java/rx/observables/MathObservable.java
@@ -19,7 +19,6 @@
 
 import rx.Observable;
 import rx.functions.Func1;
-import rx.functions.Functions;
 import rx.math.operators.OperatorMinMax;
 import rx.math.operators.OperatorSum;
 import rx.math.operators.OperatorAverageDouble;
@@ -38,6 +37,18 @@ private MathObservable(Observable<T> o) {
     public static <T> MathObservable<T> from(Observable<T> o) {
         return new MathObservable<T>(o);
     }
+    
+    @SuppressWarnings("rawtypes")
+    private static Func1 INDENTITY = new Func1() {
+        @Override
+        public Object call(Object t1) {
+            return t1;
+        }
+    };
+    @SuppressWarnings("unchecked")
+    private static <T> Func1<T, T> identity() {
+        return INDENTITY;
+    }
 
     /**
      * Returns an Observable that emits the average of the Doubles emitted by the source Observable.
@@ -52,7 +63,7 @@ public static <T> MathObservable<T> from(Observable<T> o) {
      * @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
      */
     public final static Observable<Double> averageDouble(Observable<Double> source) {
-        return source.lift(new OperatorAverageDouble<Double>(Functions.<Double>identity()));
+        return source.lift(new OperatorAverageDouble<Double>(MathObservable.<Double>identity()));
     }
 
     /**
@@ -68,7 +79,7 @@ public final static Observable<Double> averageDouble(Observable<Double> source)
      * @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
      */
     public final static Observable<Float> averageFloat(Observable<Float> source) {
-        return source.lift(new OperatorAverageFloat<Float>(Functions.<Float>identity()));
+        return source.lift(new OperatorAverageFloat<Float>(MathObservable.<Float>identity()));
     }
 
     /**
@@ -86,7 +97,7 @@ public final static Observable<Float> averageFloat(Observable<Float> source) {
      * @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
      */
     public final static Observable<Integer> averageInteger(Observable<Integer> source) {
-        return source.lift(new OperatorAverageInteger<Integer>(Functions.<Integer>identity()));
+        return source.lift(new OperatorAverageInteger<Integer>(MathObservable.<Integer>identity()));
     }
 
     /**
@@ -102,7 +113,7 @@ public final static Observable<Integer> averageInteger(Observable<Integer> sourc
      * @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
      */
     public final static Observable<Long> averageLong(Observable<Long> source) {
-        return source.lift(new OperatorAverageLong<Long>(Functions.<Long>identity()));
+        return source.lift(new OperatorAverageLong<Long>(MathObservable.<Long>identity()));
     }
 
     /**