From f706209ec1d9fba56c813de76b3b31d5dce73ec2 Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Thu, 19 Sep 2019 21:08:36 +0800
Subject: [PATCH] =?UTF-8?q?RestResult=E5=90=88=E5=B9=B6=E8=BF=9BHttpResult?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/org/redkale/net/http/HttpResponse.java |  5 +--
 src/org/redkale/net/http/HttpResult.java   | 17 ++++++++
 src/org/redkale/net/http/RestResult.java   | 49 ----------------------
 3 files changed, 18 insertions(+), 53 deletions(-)
 delete mode 100644 src/org/redkale/net/http/RestResult.java

diff --git a/src/org/redkale/net/http/HttpResponse.java b/src/org/redkale/net/http/HttpResponse.java
index 335e2d6f4..06eedf755 100644
--- a/src/org/redkale/net/http/HttpResponse.java
+++ b/src/org/redkale/net/http/HttpResponse.java
@@ -506,11 +506,8 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
             } else if (result.getResult() instanceof CharSequence) {
                 finish(result.getResult().toString());
             } else {
-                finish(convert, result.getResult());
+                finish(result.getConvert() == null ? convert : result.getConvert(), result.getResult());
             }
-        } else if (obj instanceof RestResult) {
-            RestResult result = (RestResult) obj;
-            finish(result.getConvert() == null ? request.getJsonConvert() : result.getConvert(), type, result.getResult());
         } else {
             if (hasRender) {
                 if (onlyoneHttpRender != null) {
diff --git a/src/org/redkale/net/http/HttpResult.java b/src/org/redkale/net/http/HttpResult.java
index e82d9b019..7bb9f8a90 100644
--- a/src/org/redkale/net/http/HttpResult.java
+++ b/src/org/redkale/net/http/HttpResult.java
@@ -8,6 +8,7 @@ package org.redkale.net.http;
 import java.io.Serializable;
 import java.net.HttpCookie;
 import java.util.*;
+import org.redkale.convert.*;
 import org.redkale.convert.json.JsonConvert;
 
 /**
@@ -34,9 +35,16 @@ public class HttpResult<T> {
 
     protected String message;
 
+    protected Convert convert;
+
     public HttpResult() {
     }
 
+    public HttpResult(Convert convert, T result) {
+        this.convert = convert;
+        this.result = result;
+    }
+
     public HttpResult(T result) {
         this.result = result;
     }
@@ -82,6 +90,15 @@ public class HttpResult<T> {
         return this;
     }
 
+    @ConvertDisabled
+    public Convert getConvert() {
+        return convert;
+    }
+
+    public void setConvert(Convert convert) {
+        this.convert = convert;
+    }
+
     public Map<String, String> getHeaders() {
         return headers;
     }
diff --git a/src/org/redkale/net/http/RestResult.java b/src/org/redkale/net/http/RestResult.java
deleted file mode 100644
index 2ff3a927a..000000000
--- a/src/org/redkale/net/http/RestResult.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkale.net.http;
-
-import org.redkale.convert.Convert;
-
-/**
- * 当RestMapping方法需要指定Convert进行序列化时将结果和Convert对象绑定输出
- *
- * <p>
- * 详情见: https://redkale.org
- *
- * @author zhangjx
- * @param <T> 结果对象的类型
- */
-public class RestResult<T> {
-
-    protected Convert convert;
-
-    protected T result;
-
-    public RestResult() {
-    }
-
-    public RestResult(Convert convert, T result) {
-        this.convert = convert;
-        this.result = result;
-    }
-
-    public Convert getConvert() {
-        return convert;
-    }
-
-    public void setConvert(Convert convert) {
-        this.convert = convert;
-    }
-
-    public T getResult() {
-        return result;
-    }
-
-    public void setResult(T result) {
-        this.result = result;
-    }
-
-}