diff --git a/src/array-interface.ts b/src/array-interface.ts index ce896fd..fc665a8 100644 --- a/src/array-interface.ts +++ b/src/array-interface.ts @@ -1,7 +1,7 @@ import {Sort} from './sort'; import {ResourceArray} from './resource-array'; import {Resource} from './resource'; -import {Observable} from 'rxjs/internal/Observable'; +import {Observable} from 'rxjs'; export interface ArrayInterface { totalElements: number; @@ -32,4 +32,4 @@ export interface ArrayInterface { sortElements(type: { new(): T }, ...sort: Sort[]): Observable>; size(type: { new(): T }, size: number): Observable>; -} \ No newline at end of file +} diff --git a/src/resource.service.ts b/src/resource.service.ts index 8689fb5..e549766 100644 --- a/src/resource.service.ts +++ b/src/resource.service.ts @@ -1,4 +1,4 @@ -import {throwError as observableThrowError} from 'rxjs'; +import {throwError as observableThrowError, Observable} from 'rxjs'; import {catchError, map} from 'rxjs/operators'; import {Resource} from './resource'; @@ -10,7 +10,6 @@ import {ResourceArray} from './resource-array'; import {ExternalService} from './external.service'; import {HalOptions, HalParam} from './rest.service'; import {SubTypeBuilder} from './subtype-builder'; -import {Observable} from 'rxjs/internal/Observable'; import {CustomEncoder} from './CustomEncoder'; @Injectable() diff --git a/src/resource.ts b/src/resource.ts index d44a0ea..9c24ded 100644 --- a/src/resource.ts +++ b/src/resource.ts @@ -1,4 +1,4 @@ -import {of as observableOf, throwError as observableThrowError} from 'rxjs'; +import {of as observableOf, throwError as observableThrowError, Observable} from 'rxjs'; import {catchError, map} from 'rxjs/operators'; import {HttpParams} from '@angular/common/http'; @@ -10,7 +10,6 @@ import {SubTypeBuilder} from './subtype-builder'; import {Injectable} from '@angular/core'; import {CustomEncoder} from './CustomEncoder'; import {Utils} from './Utils'; -import {Observable} from 'rxjs/internal/Observable'; import {CacheHelper} from './cache/cache.helper'; export type Link = { href: string, templated?: boolean }; diff --git a/src/rest.service.ts b/src/rest.service.ts index c014b76..23ae663 100644 --- a/src/rest.service.ts +++ b/src/rest.service.ts @@ -1,11 +1,10 @@ -import {of as observableOf, throwError as observableThrowError} from 'rxjs'; +import {of as observableOf, throwError as observableThrowError, Observable} from 'rxjs'; import {map, mergeMap} from 'rxjs/operators'; import {Resource} from './resource'; import {ResourceArray} from './resource-array'; import {Sort} from './sort'; import {ResourceService} from './resource.service'; import {SubTypeBuilder} from './subtype-builder'; -import {Observable} from 'rxjs/internal/Observable'; import {Injector} from '@angular/core'; import {Utils} from './Utils';