From 637b7f41c31123ce41635d2dd35a2d6b7dbed8dc Mon Sep 17 00:00:00 2001
From: 王彬 <wangbin@taover.com>
Date: Thu, 15 Aug 2019 16:35:20 +0800
Subject: [PATCH] optimized ResultInfoException

---
 src/main/java/com/taover/util/bean/ResultInfoException.java | 41 +++++++++++++++++++++++++++++++++++++++++
 src/main/java/com/taover/util/bean/UtilResultInfo.java      | 62 +++++++++++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 90 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/com/taover/util/bean/ResultInfoException.java

diff --git a/src/main/java/com/taover/util/bean/ResultInfoException.java b/src/main/java/com/taover/util/bean/ResultInfoException.java
new file mode 100644
index 0000000..53f2104
--- /dev/null
+++ b/src/main/java/com/taover/util/bean/ResultInfoException.java
@@ -0,0 +1,41 @@
+package com.taover.util.bean;
+
+public class ResultInfoException extends Exception {
+	private static final long serialVersionUID = 1L;
+	
+	private String code;
+	private String error;
+	private Object data;
+	
+	private ResultInfoException(){}
+	
+	protected ResultInfoException(String code, String error, Object data){
+		this.code = code;
+		this.error = error;
+		this.data = data;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getError() {
+		return error;
+	}
+
+	public void setError(String error) {
+		this.error = error;
+	}
+
+	public Object getData() {
+		return data;
+	}
+
+	public void setData(Object data) {
+		this.data = data;
+	}
+}
diff --git a/src/main/java/com/taover/util/bean/UtilResultInfo.java b/src/main/java/com/taover/util/bean/UtilResultInfo.java
index 402f37d..0b74021 100644
--- a/src/main/java/com/taover/util/bean/UtilResultInfo.java
+++ b/src/main/java/com/taover/util/bean/UtilResultInfo.java
@@ -1,35 +1,71 @@
 package com.taover.util.bean;
 
 public class UtilResultInfo {
-	public static final String SUCCESS ="success";
+	public static final String OK ="ok";
 	public static final String FAIL ="fail";
 	public static final String NOT_AUTHORIZED ="not_authorized";
 		
-	public static ResultInfo getResultFailure(String error){
-		return getResult(UtilResultInfo.FAIL, error, null);
+	public static ResultInfo getFailure(String error){
+		return getResultInfo(UtilResultInfo.FAIL, error, null);
 	}
 
 	public static ResultInfo getResultFailure(String error, Object data){
-		return getResult(UtilResultInfo.FAIL, error, data);
+		return getResultInfo(UtilResultInfo.FAIL, error, data);
 	}
 
-	public static ResultInfo getResultSuccess(String error){
-		return getResult(UtilResultInfo.SUCCESS, error, null);
+	public static ResultInfo getSuccess(String error){
+		return getResultInfo(UtilResultInfo.OK, error, null);
 	}
 
-	public static ResultInfo getResultSuccess(String error, Object data){
-		return getResult(UtilResultInfo.SUCCESS, error, data);
+	public static ResultInfo getSuccess(String error, Object data){
+		return getResultInfo(UtilResultInfo.OK, error, data);
 	}
 
-	public static ResultInfo getResultNotAuthorized(String error){
-		return getResult(UtilResultInfo.NOT_AUTHORIZED, error, null);
+	public static ResultInfo getNotAuthorized(String error){
+		return getResultInfo(UtilResultInfo.NOT_AUTHORIZED, error, null);
 	}
 	
-	public static ResultInfo getResultNotAuthorized(String error, Object data){
-		return getResult(UtilResultInfo.NOT_AUTHORIZED, error, data);
+	public static ResultInfo getNotAuthorized(String error, Object data){
+		return getResultInfo(UtilResultInfo.NOT_AUTHORIZED, error, data);
 	}
 	
-	public static ResultInfo getResult(String code, String error, Object data){
+	public static ResultInfo getResultInfo(String code, String error, Object data){
 		return new ResultInfo(code, error, data);
 	}
+	
+	public static ResultInfoException getExceptionFailure(String error){
+		return getResultInfoException(UtilResultInfo.FAIL, error, null);
+	}
+
+	public static ResultInfoException getExceptionFailure(String error, Object data){
+		return getResultInfoException(UtilResultInfo.FAIL, error, data);
+	}
+
+	public static ResultInfoException getExceptionSuccess(String error){
+		return getResultInfoException(UtilResultInfo.OK, error, null);
+	}
+
+	public static ResultInfoException getExceptionSuccess(String error, Object data){
+		return getResultInfoException(UtilResultInfo.OK, error, data);
+	}
+
+	public static ResultInfoException getExceptionNotAuthorized(String error){
+		return getResultInfoException(UtilResultInfo.NOT_AUTHORIZED, error, null);
+	}
+	
+	public static ResultInfoException getExceptionNotAuthorized(String error, Object data){
+		return getResultInfoException(UtilResultInfo.NOT_AUTHORIZED, error, data);
+	}
+	
+	public static ResultInfoException getResultInfoException(String code, String error, Object data){
+		return new ResultInfoException(code, error, data);
+	}
+	
+	public static ResultInfoException getExceptionFromResultInfo(ResultInfo result){
+		return getResultInfoException(result.getCode(), result.getCode(), result.getData());
+	}
+	
+	public static ResultInfo getResultInfoFromException(ResultInfoException exception){
+		return getResultInfo(exception.getCode(), exception.getError(), exception.getData());
+	}
 }
--
libgit2 0.21.2