Merge pull request #1161 from akarnokd/RemoveOnSubscribeFuncRefs

Removed use of deprecated API from tests & operators, fixed year in head...

Author: benjchristensen

language-adaptors/rxjava-clojure/src/main/java/rx/lang/clojure/interop/DummyObservable.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyActionWrapper.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyCreateWrapper.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyFunctionWrapper.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyOnSubscribeFuncWrapper.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/RxGroovyExtensionModule.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -167,7 +167,7 @@ public String getName() {
             }
 
             @Override
-            public Class getReturnType() {
+            public Class<?> getReturnType() {
                 return m.getReturnType();
             }
 
@@ -177,6 +177,7 @@ public CachedClass getDeclaringClass() {
             }
 
             @Override
+            @SuppressWarnings("unchecked")
             public Object invoke(Object object, final Object[] arguments) {
                 return Observable.create(new GroovyCreateWrapper((Closure) arguments[0]));
             }

language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/RxGroovyPropertiesModuleFactory.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyActionWrapper.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyFunctionWrapper.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,11 @@
  * @param <T2>
  * @param <T3>
  * @param <T4>
+ * @param <T5>
+ * @param <T6>
+ * @param <T7>
+ * @param <T8>
+ * @param <T9>
  * @param <R>
  */
 public class JRubyFunctionWrapper<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> implements
@@ -67,25 +72,29 @@ public JRubyFunctionWrapper(ThreadContext context, RubyProc proc) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public R call() {
         IRubyObject[] array = new IRubyObject[0];
         return (R) proc.call(context, array);
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public R call(T1 t1) {
         IRubyObject[] array = {JavaUtil.convertJavaToRuby(runtime, t1)};
         return (R) proc.call(context, array);
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public R call(T1 t1, T2 t2) {
         IRubyObject[] array = {JavaUtil.convertJavaToRuby(runtime, t1),
                                JavaUtil.convertJavaToRuby(runtime, t2)};
         return (R) proc.call(context, array);
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public R call(T1 t1, T2 t2, T3 t3) {
         IRubyObject[] array = {JavaUtil.convertJavaToRuby(runtime, t1),
                                JavaUtil.convertJavaToRuby(runtime, t2),
@@ -94,6 +103,7 @@ public R call(T1 t1, T2 t2, T3 t3) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public R call(T1 t1, T2 t2, T3 t3, T4 t4) {
         IRubyObject[] array = {JavaUtil.convertJavaToRuby(runtime, t1),
                                JavaUtil.convertJavaToRuby(runtime, t2),
@@ -103,6 +113,7 @@ public R call(T1 t1, T2 t2, T3 t3, T4 t4) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) {
         IRubyObject[] array = {JavaUtil.convertJavaToRuby(runtime, t1),
                                JavaUtil.convertJavaToRuby(runtime, t2),
@@ -113,6 +124,7 @@ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) {
         IRubyObject[] array = {JavaUtil.convertJavaToRuby(runtime, t1),
                                JavaUtil.convertJavaToRuby(runtime, t2),
@@ -124,6 +136,7 @@ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) {
         IRubyObject[] array = {JavaUtil.convertJavaToRuby(runtime, t1),
                                JavaUtil.convertJavaToRuby(runtime, t2),
@@ -136,6 +149,7 @@ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) {
         IRubyObject[] array = {JavaUtil.convertJavaToRuby(runtime, t1),
                                JavaUtil.convertJavaToRuby(runtime, t2),
@@ -149,6 +163,7 @@ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9) {
         IRubyObject[] array = {JavaUtil.convertJavaToRuby(runtime, t1),
                                JavaUtil.convertJavaToRuby(runtime, t2),
@@ -163,6 +178,7 @@ public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public R call(Object... args) {
         IRubyObject[] array = new IRubyObject[args.length];
         for (int i = 0; i < args.length; i++) {

language-adaptors/rxjava-scala/src/examples/java/rx/lang/scala/examples/MovieLibUsage.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rxjava-contrib/rxjava-android/src/main/java/rx/android/concurrency/AndroidSchedulers.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rxjava-contrib/rxjava-android/src/main/java/rx/android/concurrency/HandlerThreadScheduler.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rxjava-contrib/rxjava-android/src/main/java/rx/android/observables/AndroidObservable.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rxjava-contrib/rxjava-android/src/main/java/rx/android/observables/Assertions.java

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2014 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package rx.android.observables;
 
 import android.os.Looper;

rxjava-contrib/rxjava-android/src/main/java/rx/android/observables/ViewObservable.java

@@ -27,7 +27,7 @@
 public class ViewObservable {
 
     public static <T extends View> Observable<T> clicks(final T view, final boolean emitInitialValue) {
-        return Observable.create(new OperatorViewClick(view, emitInitialValue));
+        return Observable.create(new OperatorViewClick<T>(view, emitInitialValue));
     }
 
     public static Observable<String> input(final EditText input, final boolean emitInitialValue) {

rxjava-contrib/rxjava-android/src/main/java/rx/android/schedulers/AndroidSchedulers.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rxjava-contrib/rxjava-android/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorConditionalBinding.java

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2014 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package rx.operators;
 
 import rx.Observable;

rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorObserveFromAndroidComponent.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rxjava-contrib/rxjava-android/src/test/java/rx/android/observables/AndroidObservableTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rxjava-contrib/rxjava-android/src/test/java/rx/android/operators/OperatorObserveFromAndroidComponentTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rxjava-contrib/rxjava-android/src/test/java/rx/android/schedulers/HandlerThreadSchedulerTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Netflix, Inc.
+ * Copyright 2014 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

rxjava-contrib/rxjava-android/src/test/java/rx/operators/OperatorConditionalBindingTest.java

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2014 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package rx.operators;
 
 import static org.junit.Assert.assertEquals;