diff --git a/pom.xml b/pom.xml index 2ffb4e8..dec7c23 100644 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,30 @@ - 4.0.0 - io.reactivex - learnrxjava - jar - 1.0-SNAPSHOT - learnrxjava - https://github.com/jhusain/learnrxjava - - - io.reactivex - rxjava - 1.0.0-rc.10 - - - junit - junit - 4.11 - test - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + io.reactivex + sinotopia.reactivex + jar + 1.0-SNAPSHOT + sinotopia.reactivex + https://github.com/jhusain/learnrxjava + + + io.reactivex + rxjava + 1.3.0 + + + io.reactivex + rxjava-reactive-streams + 1.2.1 + + + junit + junit + 4.11 + test + + diff --git a/rxjava-essentials.pdf b/rxjava-essentials.pdf new file mode 100644 index 0000000..646f723 Binary files /dev/null and b/rxjava-essentials.pdf differ diff --git a/src/main/java/learnrxjava/ComposableListExercises.java b/src/main/java/reactivex/ComposableListExercises.java similarity index 99% rename from src/main/java/learnrxjava/ComposableListExercises.java rename to src/main/java/reactivex/ComposableListExercises.java index a13940c..39b3d90 100644 --- a/src/main/java/learnrxjava/ComposableListExercises.java +++ b/src/main/java/reactivex/ComposableListExercises.java @@ -1,4 +1,4 @@ -package learnrxjava; +package reactivex; import java.util.ArrayList; import java.util.HashMap; @@ -8,13 +8,13 @@ import java.util.function.Function; import java.util.function.Predicate; -import learnrxjava.types.Bookmark; -import learnrxjava.types.BoxArt; -import learnrxjava.types.ComposableList; -import learnrxjava.types.InterestingMoment; -import learnrxjava.types.JSON; -import learnrxjava.types.MovieList; -import learnrxjava.types.Video; +import reactivex.models.Bookmark; +import reactivex.models.BoxArt; +import reactivex.models.ComposableList; +import reactivex.models.InterestingMoment; +import reactivex.models.JSON; +import reactivex.models.MovieList; +import reactivex.models.Video; /** * Mastering concurrency is challenging, But we can make it much easier by simply choosing the right diff --git a/src/main/java/learnrxjava/ComposableListSolutions.java b/src/main/java/reactivex/ComposableListSolutions.java similarity index 99% rename from src/main/java/learnrxjava/ComposableListSolutions.java rename to src/main/java/reactivex/ComposableListSolutions.java index c2256d2..89d1f85 100644 --- a/src/main/java/learnrxjava/ComposableListSolutions.java +++ b/src/main/java/reactivex/ComposableListSolutions.java @@ -1,4 +1,4 @@ -package learnrxjava; +package reactivex; import java.util.ArrayList; import java.util.HashMap; @@ -8,13 +8,13 @@ import java.util.function.Function; import java.util.function.Predicate; -import learnrxjava.types.Bookmark; -import learnrxjava.types.BoxArt; -import learnrxjava.types.ComposableList; -import learnrxjava.types.InterestingMoment; -import learnrxjava.types.JSON; -import learnrxjava.types.MovieList; -import learnrxjava.types.Video; +import reactivex.models.Bookmark; +import reactivex.models.BoxArt; +import reactivex.models.ComposableList; +import reactivex.models.InterestingMoment; +import reactivex.models.JSON; +import reactivex.models.MovieList; +import reactivex.models.Video; /** * Mastering concurrency is challenging, But we can make it much easier by simply choosing the right diff --git a/src/main/java/learnrxjava/ObservableExercises.java b/src/main/java/reactivex/ObservableExercises.java similarity index 98% rename from src/main/java/learnrxjava/ObservableExercises.java rename to src/main/java/reactivex/ObservableExercises.java index a7c5d00..55470f7 100644 --- a/src/main/java/learnrxjava/ObservableExercises.java +++ b/src/main/java/reactivex/ObservableExercises.java @@ -1,7 +1,7 @@ -package learnrxjava; +package reactivex; -import learnrxjava.types.JSON; -import learnrxjava.types.Movies; +import reactivex.models.JSON; +import reactivex.models.Movies; import rx.Observable; public class ObservableExercises { diff --git a/src/main/java/learnrxjava/ObservableSolutions.java b/src/main/java/reactivex/ObservableSolutions.java similarity index 98% rename from src/main/java/learnrxjava/ObservableSolutions.java rename to src/main/java/reactivex/ObservableSolutions.java index 405682a..a8cb964 100644 --- a/src/main/java/learnrxjava/ObservableSolutions.java +++ b/src/main/java/reactivex/ObservableSolutions.java @@ -1,7 +1,7 @@ -package learnrxjava; +package reactivex; -import learnrxjava.types.JSON; -import learnrxjava.types.Movies; +import reactivex.models.JSON; +import reactivex.models.Movies; import rx.Observable; public class ObservableSolutions extends ObservableExercises { diff --git a/src/main/java/learnrxjava/examples/ConditionalRetry.java b/src/main/java/reactivex/examples/ConditionalRetry.java similarity index 98% rename from src/main/java/learnrxjava/examples/ConditionalRetry.java rename to src/main/java/reactivex/examples/ConditionalRetry.java index 3c95f2a..9e2c93d 100644 --- a/src/main/java/learnrxjava/examples/ConditionalRetry.java +++ b/src/main/java/reactivex/examples/ConditionalRetry.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/reactivex/examples/CreatingOperation.java b/src/main/java/reactivex/examples/CreatingOperation.java new file mode 100644 index 0000000..c7688cd --- /dev/null +++ b/src/main/java/reactivex/examples/CreatingOperation.java @@ -0,0 +1,86 @@ +package reactivex.examples; + + +import rx.Subscriber; +import rx.Observable; +import rx.Observable.OnSubscribe; + + +/**************************************************** + * + @Deprecated public static Observable create(Observable.OnSubscribe f) + + + public static Observable create(Action1> emitter, + Emitter.BackpressureMode backpressure) + + public static Observable unsafeCreate(Observable.OnSubscribe f) + + public static Observable create(SyncOnSubscribe syncOnSubscribe) + + @Beta public static Observable create(AsyncOnSubscribe asyncOnSubscribe) + * + * + * + * + */ + + +public class CreatingOperation { + + + public static void main(String[] args) { + // +// Observable.create(subscriber -> { +// +// }).subscribe(new Subscriber() { +// @Override +// public void onNext(Integer item) { +// System.out.println("Next: " + item); +// } +// +// @Override +// public void onError(Throwable error) { +// System.err.println("Error: " + error.getMessage()); +// } +// +// @Override +// public void onCompleted() { +// System.out.println("Sequence complete."); +// } +// }); + + Observable.create(new Observable.OnSubscribe() { + @Override + public void call(Subscriber observer) { + try { + if (!observer.isUnsubscribed()) { + for (int i = 1; i < 5; i++) { + observer.onNext(i); + } + observer.onCompleted(); + } + } catch (Exception e) { + observer.onError(e); + } + } + }).subscribe(new Subscriber() { + + @Override + public void onNext(Integer item) { + System.out.println("Next: " + item); + } + + @Override + public void onError(Throwable error) { + System.err.println("Error: " + error.getMessage()); + } + + @Override + public void onCompleted() { + System.out.println("Sequence complete."); + } + }); + } + +} diff --git a/src/main/java/learnrxjava/examples/ErrorHandlingBasics.java b/src/main/java/reactivex/examples/ErrorHandlingBasics.java similarity index 98% rename from src/main/java/learnrxjava/examples/ErrorHandlingBasics.java rename to src/main/java/reactivex/examples/ErrorHandlingBasics.java index 120f53d..adb7146 100644 --- a/src/main/java/learnrxjava/examples/ErrorHandlingBasics.java +++ b/src/main/java/reactivex/examples/ErrorHandlingBasics.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import rx.Observable; diff --git a/src/main/java/learnrxjava/examples/ErrorHandlingRetryWithBackoff.java b/src/main/java/reactivex/examples/ErrorHandlingRetryWithBackoff.java similarity index 97% rename from src/main/java/learnrxjava/examples/ErrorHandlingRetryWithBackoff.java rename to src/main/java/reactivex/examples/ErrorHandlingRetryWithBackoff.java index b6a61a8..8bae21b 100644 --- a/src/main/java/learnrxjava/examples/ErrorHandlingRetryWithBackoff.java +++ b/src/main/java/reactivex/examples/ErrorHandlingRetryWithBackoff.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/learnrxjava/examples/FlowControlDebounceBuffer.java b/src/main/java/reactivex/examples/FlowControlDebounceBuffer.java similarity index 98% rename from src/main/java/learnrxjava/examples/FlowControlDebounceBuffer.java rename to src/main/java/reactivex/examples/FlowControlDebounceBuffer.java index ff92ace..9d337b1 100644 --- a/src/main/java/learnrxjava/examples/FlowControlDebounceBuffer.java +++ b/src/main/java/reactivex/examples/FlowControlDebounceBuffer.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/learnrxjava/examples/FlowControlReactivePullCold.java b/src/main/java/reactivex/examples/FlowControlReactivePullCold.java similarity index 98% rename from src/main/java/learnrxjava/examples/FlowControlReactivePullCold.java rename to src/main/java/reactivex/examples/FlowControlReactivePullCold.java index 4e5ccee..5ed1186 100644 --- a/src/main/java/learnrxjava/examples/FlowControlReactivePullCold.java +++ b/src/main/java/reactivex/examples/FlowControlReactivePullCold.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.ArrayList; import java.util.Iterator; import java.util.concurrent.atomic.AtomicLong; diff --git a/src/main/java/learnrxjava/examples/FlowControlSampleExample.java b/src/main/java/reactivex/examples/FlowControlSampleExample.java similarity index 97% rename from src/main/java/learnrxjava/examples/FlowControlSampleExample.java rename to src/main/java/reactivex/examples/FlowControlSampleExample.java index d97b31e..d904529 100644 --- a/src/main/java/learnrxjava/examples/FlowControlSampleExample.java +++ b/src/main/java/reactivex/examples/FlowControlSampleExample.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.concurrent.TimeUnit; import rx.Observable; diff --git a/src/main/java/learnrxjava/examples/FlowControlThrottleExample.java b/src/main/java/reactivex/examples/FlowControlThrottleExample.java similarity index 97% rename from src/main/java/learnrxjava/examples/FlowControlThrottleExample.java rename to src/main/java/reactivex/examples/FlowControlThrottleExample.java index 31bcb22..31fc815 100644 --- a/src/main/java/learnrxjava/examples/FlowControlThrottleExample.java +++ b/src/main/java/reactivex/examples/FlowControlThrottleExample.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.concurrent.TimeUnit; import rx.Observable; diff --git a/src/main/java/learnrxjava/examples/FlowControlWindowExample.java b/src/main/java/reactivex/examples/FlowControlWindowExample.java similarity index 98% rename from src/main/java/learnrxjava/examples/FlowControlWindowExample.java rename to src/main/java/reactivex/examples/FlowControlWindowExample.java index 418c2f6..928c700 100644 --- a/src/main/java/learnrxjava/examples/FlowControlWindowExample.java +++ b/src/main/java/reactivex/examples/FlowControlWindowExample.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/learnrxjava/examples/GroupByExamples.java b/src/main/java/reactivex/examples/GroupByExamples.java similarity index 99% rename from src/main/java/learnrxjava/examples/GroupByExamples.java rename to src/main/java/reactivex/examples/GroupByExamples.java index 9707f0a..ba8c932 100644 --- a/src/main/java/learnrxjava/examples/GroupByExamples.java +++ b/src/main/java/reactivex/examples/GroupByExamples.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.Arrays; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/learnrxjava/examples/GroupByLogic.java b/src/main/java/reactivex/examples/GroupByLogic.java similarity index 99% rename from src/main/java/learnrxjava/examples/GroupByLogic.java rename to src/main/java/reactivex/examples/GroupByLogic.java index 8d5a018..b0f935c 100644 --- a/src/main/java/learnrxjava/examples/GroupByLogic.java +++ b/src/main/java/reactivex/examples/GroupByLogic.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.concurrent.TimeUnit; import rx.Observable; diff --git a/src/main/java/learnrxjava/examples/HelloWorld.java b/src/main/java/reactivex/examples/HelloWorld.java similarity index 99% rename from src/main/java/learnrxjava/examples/HelloWorld.java rename to src/main/java/reactivex/examples/HelloWorld.java index 6694b9f..914613c 100644 --- a/src/main/java/learnrxjava/examples/HelloWorld.java +++ b/src/main/java/reactivex/examples/HelloWorld.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.concurrent.TimeUnit; import rx.Observable; diff --git a/src/main/java/learnrxjava/examples/ParallelExecution.java b/src/main/java/reactivex/examples/ParallelExecution.java similarity index 99% rename from src/main/java/learnrxjava/examples/ParallelExecution.java rename to src/main/java/reactivex/examples/ParallelExecution.java index 92d710b..0f4c98a 100644 --- a/src/main/java/learnrxjava/examples/ParallelExecution.java +++ b/src/main/java/reactivex/examples/ParallelExecution.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import rx.Observable; import rx.Subscriber; import rx.schedulers.Schedulers; diff --git a/src/main/java/learnrxjava/examples/ParallelExecutionExample.java b/src/main/java/reactivex/examples/ParallelExecutionExample.java similarity index 99% rename from src/main/java/learnrxjava/examples/ParallelExecutionExample.java rename to src/main/java/reactivex/examples/ParallelExecutionExample.java index 4d07949..bcd20a0 100644 --- a/src/main/java/learnrxjava/examples/ParallelExecutionExample.java +++ b/src/main/java/reactivex/examples/ParallelExecutionExample.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.List; import rx.Observable; diff --git a/src/main/java/learnrxjava/examples/ScanVsReduceExample.java b/src/main/java/reactivex/examples/ScanVsReduceExample.java similarity index 94% rename from src/main/java/learnrxjava/examples/ScanVsReduceExample.java rename to src/main/java/reactivex/examples/ScanVsReduceExample.java index 2c2ec65..50be542 100644 --- a/src/main/java/learnrxjava/examples/ScanVsReduceExample.java +++ b/src/main/java/reactivex/examples/ScanVsReduceExample.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.ArrayList; diff --git a/src/main/java/reactivex/examples/SynchronousObservable.java b/src/main/java/reactivex/examples/SynchronousObservable.java new file mode 100644 index 0000000..933b042 --- /dev/null +++ b/src/main/java/reactivex/examples/SynchronousObservable.java @@ -0,0 +1,14 @@ +package reactivex.examples; + +import rx.Observable; + +public class SynchronousObservable { + + + public static void main(String[] args) { + + Observable.create(aSubcriber ->{ + + }); + } +} diff --git a/src/main/java/learnrxjava/examples/UnitTesting.java b/src/main/java/reactivex/examples/UnitTesting.java similarity index 96% rename from src/main/java/learnrxjava/examples/UnitTesting.java rename to src/main/java/reactivex/examples/UnitTesting.java index c8f3221..5b1dbb9 100644 --- a/src/main/java/learnrxjava/examples/UnitTesting.java +++ b/src/main/java/reactivex/examples/UnitTesting.java @@ -1,4 +1,4 @@ -package learnrxjava.examples; +package reactivex.examples; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -11,6 +11,7 @@ public class UnitTesting { public static void main(String... args) { + TestScheduler test = Schedulers.test(); TestSubscriber ts = new TestSubscriber<>(); diff --git a/src/main/java/learnrxjava/examples/ZipInterval.java b/src/main/java/reactivex/examples/ZipInterval.java similarity index 77% rename from src/main/java/learnrxjava/examples/ZipInterval.java rename to src/main/java/reactivex/examples/ZipInterval.java index fd552b1..31afaa7 100644 --- a/src/main/java/learnrxjava/examples/ZipInterval.java +++ b/src/main/java/reactivex/examples/ZipInterval.java @@ -1,4 +1,5 @@ -package learnrxjava.examples; +package reactivex.examples; + import java.util.concurrent.TimeUnit; import rx.Observable; @@ -7,10 +8,13 @@ public class ZipInterval { public static void main(String... args) { + Observable data = Observable.just("one", "two", "three", "four", "five"); Observable.zip(data, Observable.interval(1, TimeUnit.SECONDS), (d, t) -> { return d + " " + t; - }).toBlocking().forEach(System.out::println); - + + }).toBlocking() + .forEach(System.out::println); + } } diff --git a/src/main/java/learnrxjava/types/Bookmark.java b/src/main/java/reactivex/models/Bookmark.java similarity index 91% rename from src/main/java/learnrxjava/types/Bookmark.java rename to src/main/java/reactivex/models/Bookmark.java index 91856cc..f86a466 100644 --- a/src/main/java/learnrxjava/types/Bookmark.java +++ b/src/main/java/reactivex/models/Bookmark.java @@ -1,6 +1,7 @@ -package learnrxjava.types; +package reactivex.models; public class Bookmark { + @Override public String toString() { return "Bookmark{" + "id=" + id + ", offset=" + offset + '}'; diff --git a/src/main/java/learnrxjava/types/BookmarkRow.java b/src/main/java/reactivex/models/BookmarkRow.java similarity index 88% rename from src/main/java/learnrxjava/types/BookmarkRow.java rename to src/main/java/reactivex/models/BookmarkRow.java index 84e9017..87443a2 100644 --- a/src/main/java/learnrxjava/types/BookmarkRow.java +++ b/src/main/java/reactivex/models/BookmarkRow.java @@ -1,6 +1,7 @@ -package learnrxjava.types; +package reactivex.models; public class BookmarkRow { + public int videoId; public int bookmarkId; diff --git a/src/main/java/learnrxjava/types/BoxArt.java b/src/main/java/reactivex/models/BoxArt.java similarity index 97% rename from src/main/java/learnrxjava/types/BoxArt.java rename to src/main/java/reactivex/models/BoxArt.java index 1d757c8..5108f19 100644 --- a/src/main/java/learnrxjava/types/BoxArt.java +++ b/src/main/java/reactivex/models/BoxArt.java @@ -1,4 +1,4 @@ -package learnrxjava.types; +package reactivex.models; public class BoxArt { public int width; diff --git a/src/main/java/learnrxjava/types/BoxArtRow.java b/src/main/java/reactivex/models/BoxArtRow.java similarity index 92% rename from src/main/java/learnrxjava/types/BoxArtRow.java rename to src/main/java/reactivex/models/BoxArtRow.java index b2d027e..f0e92cd 100644 --- a/src/main/java/learnrxjava/types/BoxArtRow.java +++ b/src/main/java/reactivex/models/BoxArtRow.java @@ -1,4 +1,4 @@ -package learnrxjava.types; +package reactivex.models; public class BoxArtRow { diff --git a/src/main/java/learnrxjava/types/ComposableList.java b/src/main/java/reactivex/models/ComposableList.java similarity index 96% rename from src/main/java/learnrxjava/types/ComposableList.java rename to src/main/java/reactivex/models/ComposableList.java index ab2df88..761544b 100644 --- a/src/main/java/learnrxjava/types/ComposableList.java +++ b/src/main/java/reactivex/models/ComposableList.java @@ -1,4 +1,4 @@ -package learnrxjava.types; +package reactivex.models; import java.util.function.BiFunction; import java.util.function.Consumer; diff --git a/src/main/java/learnrxjava/types/InterestingMoment.java b/src/main/java/reactivex/models/InterestingMoment.java similarity index 92% rename from src/main/java/learnrxjava/types/InterestingMoment.java rename to src/main/java/reactivex/models/InterestingMoment.java index e23907f..8496072 100644 --- a/src/main/java/learnrxjava/types/InterestingMoment.java +++ b/src/main/java/reactivex/models/InterestingMoment.java @@ -1,4 +1,4 @@ -package learnrxjava.types; +package reactivex.models; public class InterestingMoment { @Override diff --git a/src/main/java/learnrxjava/types/JSON.java b/src/main/java/reactivex/models/JSON.java similarity index 78% rename from src/main/java/learnrxjava/types/JSON.java rename to src/main/java/reactivex/models/JSON.java index 0a740a2..50ad738 100644 --- a/src/main/java/learnrxjava/types/JSON.java +++ b/src/main/java/reactivex/models/JSON.java @@ -1,4 +1,4 @@ -package learnrxjava.types; +package reactivex.models; import java.util.HashMap; diff --git a/src/main/java/learnrxjava/types/Movie.java b/src/main/java/reactivex/models/Movie.java similarity index 98% rename from src/main/java/learnrxjava/types/Movie.java rename to src/main/java/reactivex/models/Movie.java index 8e7a83e..15d8d65 100644 --- a/src/main/java/learnrxjava/types/Movie.java +++ b/src/main/java/reactivex/models/Movie.java @@ -1,4 +1,4 @@ -package learnrxjava.types; +package reactivex.models; import java.util.List; diff --git a/src/main/java/learnrxjava/types/MovieList.java b/src/main/java/reactivex/models/MovieList.java similarity index 92% rename from src/main/java/learnrxjava/types/MovieList.java rename to src/main/java/reactivex/models/MovieList.java index 91b650a..a4e89b5 100644 --- a/src/main/java/learnrxjava/types/MovieList.java +++ b/src/main/java/reactivex/models/MovieList.java @@ -1,4 +1,4 @@ -package learnrxjava.types; +package reactivex.models; public class MovieList { diff --git a/src/main/java/learnrxjava/types/MovieListRow.java b/src/main/java/reactivex/models/MovieListRow.java similarity index 86% rename from src/main/java/learnrxjava/types/MovieListRow.java rename to src/main/java/reactivex/models/MovieListRow.java index bbf332f..03b3a51 100644 --- a/src/main/java/learnrxjava/types/MovieListRow.java +++ b/src/main/java/reactivex/models/MovieListRow.java @@ -1,4 +1,4 @@ -package learnrxjava.types; +package reactivex.models; public class MovieListRow { diff --git a/src/main/java/learnrxjava/types/Movies.java b/src/main/java/reactivex/models/Movies.java similarity index 94% rename from src/main/java/learnrxjava/types/Movies.java rename to src/main/java/reactivex/models/Movies.java index 7b483b3..2acc54f 100644 --- a/src/main/java/learnrxjava/types/Movies.java +++ b/src/main/java/reactivex/models/Movies.java @@ -1,4 +1,4 @@ -package learnrxjava.types; +package reactivex.models; import java.util.List; diff --git a/src/main/java/learnrxjava/types/Video.java b/src/main/java/reactivex/models/Video.java similarity index 99% rename from src/main/java/learnrxjava/types/Video.java rename to src/main/java/reactivex/models/Video.java index 894dbdf..fec9f86 100644 --- a/src/main/java/learnrxjava/types/Video.java +++ b/src/main/java/reactivex/models/Video.java @@ -1,4 +1,4 @@ -package learnrxjava.types; +package reactivex.models; public class Video { @Override diff --git a/src/main/java/learnrxjava/types/VideoRow.java b/src/main/java/reactivex/models/VideoRow.java similarity index 90% rename from src/main/java/learnrxjava/types/VideoRow.java rename to src/main/java/reactivex/models/VideoRow.java index 78ffbc8..20178b9 100644 --- a/src/main/java/learnrxjava/types/VideoRow.java +++ b/src/main/java/reactivex/models/VideoRow.java @@ -1,4 +1,4 @@ -package learnrxjava.types; +package reactivex.models; public class VideoRow { diff --git a/src/test/java/learnrxjava/ComposableListExercisesTest.java b/src/test/java/learnrxjava/ComposableListExercisesTest.java index d22762a..7540f45 100644 --- a/src/test/java/learnrxjava/ComposableListExercisesTest.java +++ b/src/test/java/learnrxjava/ComposableListExercisesTest.java @@ -5,10 +5,12 @@ import java.util.Arrays; import java.util.Map; -import learnrxjava.types.BoxArt; -import learnrxjava.types.ComposableList; -import learnrxjava.types.JSON; -import learnrxjava.types.Video; +import reactivex.ComposableListExercises; +import reactivex.ComposableListSolutions; +import reactivex.models.BoxArt; +import reactivex.models.ComposableList; +import reactivex.models.JSON; +import reactivex.models.Video; import org.junit.Test; diff --git a/src/test/java/learnrxjava/ComposableListSolutionsTest.java b/src/test/java/learnrxjava/ComposableListSolutionsTest.java index 0f37428..31f230c 100644 --- a/src/test/java/learnrxjava/ComposableListSolutionsTest.java +++ b/src/test/java/learnrxjava/ComposableListSolutionsTest.java @@ -5,10 +5,11 @@ import java.util.Arrays; import java.util.Map; -import learnrxjava.types.BoxArt; -import learnrxjava.types.ComposableList; -import learnrxjava.types.JSON; -import learnrxjava.types.Video; +import reactivex.ComposableListSolutions; +import reactivex.models.BoxArt; +import reactivex.models.ComposableList; +import reactivex.models.JSON; +import reactivex.models.Video; import org.junit.Test; diff --git a/src/test/java/learnrxjava/ObservableExercisesTest.java b/src/test/java/learnrxjava/ObservableExercisesTest.java index c0a6083..486b7d1 100644 --- a/src/test/java/learnrxjava/ObservableExercisesTest.java +++ b/src/test/java/learnrxjava/ObservableExercisesTest.java @@ -1,5 +1,7 @@ package learnrxjava; +import reactivex.ObservableExercises; + public class ObservableExercisesTest extends ObservableSolutionsTest { public ObservableExercises getImpl() { diff --git a/src/test/java/learnrxjava/ObservableSolutionsTest.java b/src/test/java/learnrxjava/ObservableSolutionsTest.java index a7e2fa7..bf55c56 100644 --- a/src/test/java/learnrxjava/ObservableSolutionsTest.java +++ b/src/test/java/learnrxjava/ObservableSolutionsTest.java @@ -11,10 +11,12 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import learnrxjava.types.BoxArt; -import learnrxjava.types.JSON; -import learnrxjava.types.Movie; -import learnrxjava.types.Movies; +import reactivex.ObservableExercises; +import reactivex.ObservableSolutions; +import reactivex.models.BoxArt; +import reactivex.models.JSON; +import reactivex.models.Movie; +import reactivex.models.Movies; import org.junit.Test;