提交 3f8aa824 编写于 作者: 街头小贩's avatar 街头小贩

修正TipMessage.Builder

上级 80873315
...@@ -117,6 +117,7 @@ public final class TipMessage { ...@@ -117,6 +117,7 @@ public final class TipMessage {
return new Builder(false, e.getMessage()); return new Builder(false, e.getMessage());
} }
} }
public static Builder or(Supplier<Boolean> condition){ public static Builder or(Supplier<Boolean> condition){
try{ try{
return new Builder(condition.get()); return new Builder(condition.get());
...@@ -124,6 +125,7 @@ public final class TipMessage { ...@@ -124,6 +125,7 @@ public final class TipMessage {
return new Builder(false, e.getMessage()); return new Builder(false, e.getMessage());
} }
} }
/** /**
* 若不调用默认为:操作成功 * 若不调用默认为:操作成功
* *
...@@ -131,11 +133,12 @@ public final class TipMessage { ...@@ -131,11 +133,12 @@ public final class TipMessage {
* @return * @return
*/ */
public Builder success(String successMessage){ public Builder success(String successMessage){
if(!this.condition){ if(!isCondition()){
return this; return this;
} }
return new Builder(this.condition, successMessage); return new Builder(isCondition(), successMessage);
} }
/** /**
* 生成TipMessage * 生成TipMessage
* *
...@@ -143,7 +146,15 @@ public final class TipMessage { ...@@ -143,7 +146,15 @@ public final class TipMessage {
* @return * @return
*/ */
public TipMessage error(String errorMessage){ public TipMessage error(String errorMessage){
return this.condition?TipMessage.ofSuccess(Optional.ofNullable(message).orElse("操作成功")):TipMessage.ofError(Optional.ofNullable(message).orElse(errorMessage)); return isCondition()?TipMessage.ofSuccess(Optional.ofNullable(getMessage()).orElse("操作成功")):TipMessage.ofError(Optional.ofNullable(getMessage()).orElse(errorMessage));
}
public boolean isCondition() {
return condition;
}
public String getMessage() {
return message;
} }
} }
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册