From 2d86d6b2d4410d74b8e8c55317ea03d0138a1a79 Mon Sep 17 00:00:00 2001
From: liqiangqiang <liqiangqiang@youzan.com>
Date: Fri, 13 Apr 2018 16:20:53 +0800
Subject: [PATCH] =?UTF-8?q?Spring=20Boot=20WebFlux=20=E5=AE=9E=E7=8E=B0=20?=
 =?UTF-8?q?Restful=20=E6=9C=8D=E5=8A=A1=EF=BC=8C=E5=9F=BA=E4=BA=8E=20HTTP?=
 =?UTF-8?q?=20/=20JSON=20=E4=BC=A0=E8=BE=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/spring/springboot/domain/City.java   | 1 -
 .../java/org/spring/springboot/handler/CityHandler.java    | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/springboot-webflux-2-restful/src/main/java/org/spring/springboot/domain/City.java b/springboot-webflux-2-restful/src/main/java/org/spring/springboot/domain/City.java
index 598af6d..fa3b410 100644
--- a/springboot-webflux-2-restful/src/main/java/org/spring/springboot/domain/City.java
+++ b/springboot-webflux-2-restful/src/main/java/org/spring/springboot/domain/City.java
@@ -3,7 +3,6 @@ package org.spring.springboot.domain;
 /**
  * 城市实体类
  *
- * Created by bysocket on 09/29/2017.
  */
 public class City {
 
diff --git a/springboot-webflux-2-restful/src/main/java/org/spring/springboot/handler/CityHandler.java b/springboot-webflux-2-restful/src/main/java/org/spring/springboot/handler/CityHandler.java
index 38bb8d2..08e91f2 100644
--- a/springboot-webflux-2-restful/src/main/java/org/spring/springboot/handler/CityHandler.java
+++ b/springboot-webflux-2-restful/src/main/java/org/spring/springboot/handler/CityHandler.java
@@ -22,14 +22,11 @@ public class CityHandler {
     }
 
     public Mono<City> findCityById(Long id) {
-        return Mono.create(cityMonoSink -> cityMonoSink.success(cityRepository.findCityById(id)));
+        return Mono.justOrEmpty(cityRepository.findCityById(id));
     }
 
     public Flux<City> findAllCity() {
-        return Flux.create(cityFluxSink -> {
-            cityRepository.findAll().forEach(city -> cityFluxSink.next(city));
-            cityFluxSink.complete();
-        });
+        return Flux.fromIterable(cityRepository.findAll());
     }
 
     public Mono<Long> modifyCity(City city) {