Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-501 6a39add92 -> 32cb153d1
change all application observable Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/32cb153d Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/32cb153d Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/32cb153d Branch: refs/heads/USERGRID-501 Commit: 32cb153d1712d112c9ca0eafb775b42b92413c9d Parents: 6a39add Author: Shawn Feldman <[email protected]> Authored: Mon Mar 30 09:41:02 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Mon Mar 30 09:41:02 2015 -0600 ---------------------------------------------------------------------- .../usergrid/corepersistence/AllApplicationsObservable.java | 5 ----- .../corepersistence/rx/impl/AbstractGraphVisitorImpl.java | 2 +- .../rx/impl/AllApplicationsObservableImpl.java | 7 ++----- .../corepersistence/rx/ApplicationObservableTestIT.java | 2 +- .../src/main/java/org/apache/usergrid/rest/RootResource.java | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/32cb153d/stack/core/src/main/java/org/apache/usergrid/corepersistence/AllApplicationsObservable.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/AllApplicationsObservable.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/AllApplicationsObservable.java index 055223e..24f32f3 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/AllApplicationsObservable.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/AllApplicationsObservable.java @@ -32,9 +32,4 @@ import rx.Observable; */ public interface AllApplicationsObservable extends MigrationDataProvider<ApplicationScope>{ - /** - * Return all applications in our system - * @return - */ - public Observable<ApplicationScope> getAllApplications(); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/32cb153d/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AbstractGraphVisitorImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AbstractGraphVisitorImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AbstractGraphVisitorImpl.java index b8cb80b..ef66481 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AbstractGraphVisitorImpl.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AbstractGraphVisitorImpl.java @@ -58,7 +58,7 @@ public abstract class AbstractGraphVisitorImpl<T> implements MigrationDataProvid @Override public Observable<T> getData() { - return applicationObservable.getAllApplications().flatMap( new Func1<ApplicationScope, Observable<T>>() { + return applicationObservable.getData().flatMap( new Func1<ApplicationScope, Observable<T>>() { @Override public Observable<T> call( final ApplicationScope applicationScope ) { return getAllEntities( applicationScope ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/32cb153d/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservableImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservableImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservableImpl.java index aa5b5dc..b57f088 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservableImpl.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservableImpl.java @@ -69,7 +69,7 @@ public class AllApplicationsObservableImpl implements AllApplicationsObservable @Override - public Observable<ApplicationScope> getAllApplications() { + public Observable<ApplicationScope> getData() { //emit our 3 hard coded applications that are used the manage the system first. //this way consumers can perform whatever work they need to on the root system first @@ -138,8 +138,5 @@ public class AllApplicationsObservableImpl implements AllApplicationsObservable } - @Override - public Observable<ApplicationScope> getData() { - return getAllApplications(); - } + } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/32cb153d/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/ApplicationObservableTestIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/ApplicationObservableTestIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/ApplicationObservableTestIT.java index 649f518..9572079 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/ApplicationObservableTestIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/ApplicationObservableTestIT.java @@ -67,7 +67,7 @@ public class ApplicationObservableTestIT extends AbstractCoreIT { //clean up our wiring ManagerCache managerCache = SpringResource.getInstance().getBean( Injector.class ).getInstance( ManagerCache.class ); - Observable<ApplicationScope> appObservable = applicationObservable.getAllApplications(); + Observable<ApplicationScope> appObservable = applicationObservable.getData(); appObservable.doOnNext( new Action1<ApplicationScope>() { @Override http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/32cb153d/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java index e4086f9..3fa4f74 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java @@ -114,7 +114,7 @@ public class RootResource extends AbstractContextResource implements MetricProce @QueryParam("deleted") @DefaultValue("false") Boolean deleted, @QueryParam("callback") @DefaultValue("callback") String callback ) throws URISyntaxException { - logger.info( "RootResource.getAllApplications" ); + logger.info( "RootResource.getData" ); ApiResponse response = createApiResponse(); response.setAction( "get applications" );
