refactor(http): use shared code from public 'angular2/angular2' namespace

pkozlowski-opensource · pkozlowski-opensource · commit 0c1f9dab548d · 2015-10-11T11:38:19.000Z
Closes angular#4648
diff --git a/modules/angular2/http.ts b/modules/angular2/http.ts
@@ -4,7 +4,7 @@
  * The http module provides services to perform http requests. To get started, see the {@link Http}
  * class.
  */
-import {provide, Provider} from 'angular2/core';
+import {provide, Provider} from 'angular2/angular2';
 import {Http, Jsonp} from './src/http/http';
 import {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend';
 import {JSONPBackend, JSONPBackend_, JSONPConnection} from './src/http/backends/jsonp_backend';
@@ -291,4 +291,4 @@ export const JSONP_PROVIDERS: any[] = [
 /**
  * @deprecated
  */
-export const JSON_BINDINGS = JSONP_PROVIDERS;
+export const JSON_BINDINGS = JSONP_PROVIDERS;
diff --git a/modules/angular2/src/http/backends/browser_jsonp.ts b/modules/angular2/src/http/backends/browser_jsonp.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/src/core/di';
+import {Injectable} from 'angular2/angular2';
 import {global} from 'angular2/src/core/facade/lang';
 
 let _nextRequestId = 0;
diff --git a/modules/angular2/src/http/backends/browser_xhr.ts b/modules/angular2/src/http/backends/browser_xhr.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/src/core/di';
+import {Injectable} from 'angular2/angular2';
 
 // Make sure not to evaluate this in a non-browser environment!
 @Injectable()
diff --git a/modules/angular2/src/http/backends/jsonp_backend.ts b/modules/angular2/src/http/backends/jsonp_backend.ts
@@ -3,7 +3,7 @@ import {ReadyStates, RequestMethods} from '../enums';
 import {Request} from '../static_request';
 import {Response} from '../static_response';
 import {ResponseOptions, BaseResponseOptions} from '../base_response_options';
-import {Injectable} from 'angular2/src/core/di';
+import {Injectable} from 'angular2/angular2';
 import {BrowserJsonp} from './browser_jsonp';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {makeTypeError} from 'angular2/src/core/facade/exceptions';
diff --git a/modules/angular2/src/http/backends/mock_backend.ts b/modules/angular2/src/http/backends/mock_backend.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/src/core/di';
+import {Injectable} from 'angular2/angular2';
 import {Request} from '../static_request';
 import {Response} from '../static_response';
 import {ReadyStates} from '../enums';
diff --git a/modules/angular2/src/http/backends/xhr_backend.ts b/modules/angular2/src/http/backends/xhr_backend.ts
@@ -3,7 +3,7 @@ import {ReadyStates, RequestMethods, ResponseTypes} from '../enums';
 import {Request} from '../static_request';
 import {Response} from '../static_response';
 import {ResponseOptions, BaseResponseOptions} from '../base_response_options';
-import {Injectable} from 'angular2/src/core/di';
+import {Injectable} from 'angular2/angular2';
 import {BrowserXhr} from './browser_xhr';
 import {isPresent} from 'angular2/src/core/facade/lang';
 // todo(robwormald): temporary until https://github.com/angular/angular/issues/4390 decided
diff --git a/modules/angular2/src/http/base_request_options.ts b/modules/angular2/src/http/base_request_options.ts
@@ -2,7 +2,7 @@ import {isPresent, isString} from 'angular2/src/core/facade/lang';
 import {Headers} from './headers';
 import {RequestMethods} from './enums';
 import {RequestOptionsArgs} from './interfaces';
-import {Injectable} from 'angular2/src/core/di';
+import {Injectable} from 'angular2/angular2';
 import {URLSearchParams} from './url_search_params';
 import {normalizeMethodName} from './http_utils';
 
diff --git a/modules/angular2/src/http/base_response_options.ts b/modules/angular2/src/http/base_response_options.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/src/core/di';
+import {Injectable} from 'angular2/angular2';
 import {isPresent, isJsObject} from 'angular2/src/core/facade/lang';
 import {Headers} from './headers';
 import {ResponseTypes} from './enums';
diff --git a/modules/angular2/src/http/http.ts b/modules/angular2/src/http/http.ts
@@ -1,6 +1,6 @@
 import {isString, isPresent, isBlank} from 'angular2/src/core/facade/lang';
 import {makeTypeError} from 'angular2/src/core/facade/exceptions';
-import {Injectable} from 'angular2/src/core/di/decorators';
+import {Injectable} from 'angular2/angular2';
 import {RequestOptionsArgs, Connection, ConnectionBackend} from './interfaces';
 import {Request} from './static_request';
 import {BaseRequestOptions, RequestOptions} from './base_request_options';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {Injectable} from 'angular2/src/core/di';`
	`1`	`+import {Injectable} from 'angular2/angular2';`
`2`	`2`	`import {global} from 'angular2/src/core/facade/lang';`
`3`	`3`
`4`	`4`	`let _nextRequestId = 0;`