From 65e18dc1bf1c4390e3c61af1e63c04c37b6c107d Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 20 Jul 2018 14:31:54 +0200 Subject: [PATCH] docs: refactor style guide example 03-06 (#24996) PR Close #24996 --- .../app/heroes/shared/hero.service.avoid.ts | 12 ++++++------ .../src/03-06/app/heroes/shared/hero.service.ts | 17 +++++++++-------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts index 3b983f5bda..9f125bbf0e 100644 --- a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts +++ b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts @@ -3,7 +3,7 @@ /* avoid */ import { ExceptionService, SpinnerService, ToastService } from '../../core'; -import { Http } from '@angular/http'; +import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { map } from 'rxjs/operators'; import { Hero } from './hero.model'; @@ -16,17 +16,17 @@ export class HeroService { private exceptionService: ExceptionService, private spinnerService: SpinnerService, private toastService: ToastService, - private http: Http + private http: HttpClient ) { } getHero(id: number) { - return this.http.get(`api/heroes/${id}`).pipe( - map(response => response.json().data as Hero)); + return this.http.get(`api/heroes/${id}`).pipe( + map(response => response.data as Hero)); } getHeroes() { - return this.http.get(`api/heroes`).pipe( - map(response => response.json().data as Hero[])); + return this.http.get(`api/heroes`).pipe( + map(response => response.data as Hero[])); } } diff --git a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts index 0a50c11bb4..573e847091 100644 --- a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts +++ b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts @@ -1,11 +1,12 @@ // #docregion // #docregion example +import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Http } from '@angular/http'; -import { map } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; -import { Hero } from './hero.model'; import { ExceptionService, SpinnerService, ToastService } from '../../core'; +import { Hero } from './hero.model'; + // #enddocregion example @Injectable() @@ -16,17 +17,17 @@ export class HeroService { private exceptionService: ExceptionService, private spinnerService: SpinnerService, private toastService: ToastService, - private http: Http + private http: HttpClient ) { } getHero(id: number) { - return this.http.get(`api/heroes/${id}`).pipe( - map(response => response.json() as Hero)); + return this.http.get(`api/heroes/${id}`).pipe( + map(response => response as Hero)); } getHeroes() { - return this.http.get(`api/heroes`).pipe( - map(response => response.json() as Hero[])); + return this.http.get(`api/heroes`).pipe( + map(response => response as Hero[])); } }