Skip to content

Commit a283deb

Browse files
benjchristensenbenjchristensen
committed
Remove use of @SafeVarargs (breaking Java6 build)
1 parent 1f2a92a commit a283deb

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

‎rxjava-core/src/main/java/rx/Observable.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,6 @@ public final static <T> Observable<T> from(Iterable<? extends T> iterable, Sched
12801280
* @return an Observable that emits the item
12811281
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#from">RxJava Wiki: from()</a>
12821282
*/
1283-
@SuppressWarnings("unchecked")
12841283
// suppress unchecked because we are using varargs inside the method
12851284
public final static <T> Observable<T> from(T t1) {
12861285
return from(Arrays.asList(t1));
@@ -1306,7 +1305,6 @@ public final static <T> Observable<T> from(T t1) {
13061305
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}
13071306
*/
13081307
@Deprecated
1309-
@SuppressWarnings("unchecked")
13101308
// suppress unchecked because we are using varargs inside the method
13111309
public final static <T> Observable<T> from(T t1, T t2) {
13121310
return from(Arrays.asList(t1, t2));
@@ -1334,7 +1332,6 @@ public final static <T> Observable<T> from(T t1, T t2) {
13341332
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
13351333
*/
13361334
@Deprecated
1337-
@SuppressWarnings("unchecked")
13381335
// suppress unchecked because we are using varargs inside the method
13391336
public final static <T> Observable<T> from(T t1, T t2, T t3) {
13401337
return from(Arrays.asList(t1, t2, t3));
@@ -1364,7 +1361,6 @@ public final static <T> Observable<T> from(T t1, T t2, T t3) {
13641361
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
13651362
*/
13661363
@Deprecated
1367-
@SuppressWarnings("unchecked")
13681364
// suppress unchecked because we are using varargs inside the method
13691365
public final static <T> Observable<T> from(T t1, T t2, T t3, T t4) {
13701366
return from(Arrays.asList(t1, t2, t3, t4));
@@ -1396,7 +1392,6 @@ public final static <T> Observable<T> from(T t1, T t2, T t3, T t4) {
13961392
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
13971393
*/
13981394
@Deprecated
1399-
@SuppressWarnings("unchecked")
14001395
// suppress unchecked because we are using varargs inside the method
14011396
public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5) {
14021397
return from(Arrays.asList(t1, t2, t3, t4, t5));
@@ -1430,7 +1425,6 @@ public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5) {
14301425
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
14311426
*/
14321427
@Deprecated
1433-
@SuppressWarnings("unchecked")
14341428
// suppress unchecked because we are using varargs inside the method
14351429
public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6) {
14361430
return from(Arrays.asList(t1, t2, t3, t4, t5, t6));
@@ -1466,7 +1460,6 @@ public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6) {
14661460
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
14671461
*/
14681462
@Deprecated
1469-
@SuppressWarnings("unchecked")
14701463
// suppress unchecked because we are using varargs inside the method
14711464
public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T t7) {
14721465
return from(Arrays.asList(t1, t2, t3, t4, t5, t6, t7));
@@ -1504,7 +1497,6 @@ public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T
15041497
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
15051498
*/
15061499
@Deprecated
1507-
@SuppressWarnings("unchecked")
15081500
// suppress unchecked because we are using varargs inside the method
15091501
public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T t7, T t8) {
15101502
return from(Arrays.asList(t1, t2, t3, t4, t5, t6, t7, t8));
@@ -1544,7 +1536,6 @@ public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T
15441536
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
15451537
*/
15461538
@Deprecated
1547-
@SuppressWarnings("unchecked")
15481539
// suppress unchecked because we are using varargs inside the method
15491540
public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T t7, T t8, T t9) {
15501541
return from(Arrays.asList(t1, t2, t3, t4, t5, t6, t7, t8, t9));
@@ -1583,7 +1574,6 @@ public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T
15831574
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
15841575
*/
15851576
@Deprecated
1586-
@SuppressWarnings("unchecked")
15871577
// suppress unchecked because we are using varargs inside the method
15881578
public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T t7, T t8, T t9, T t10) {
15891579
return from(Arrays.asList(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10));
@@ -1606,7 +1596,7 @@ public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T
16061596
* @return an Observable that emits each item in the source Array
16071597
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#from">RxJava Wiki: from()</a>
16081598
*/
1609-
@SafeVarargs
1599+
// @SafeVarargs // commenting out until we figure out if we can do Java7 compilation without breaking Android for just this feature
16101600
public final static <T> Observable<T> from(T... t1) {
16111601
return from(Arrays.asList(t1));
16121602
}

0 commit comments

Comments
 (0)