From 28ae64c20b1208e06a28b20b6874e5d72d21ac98 Mon Sep 17 00:00:00 2001 From: WANG Xuerui Date: Fri, 6 Jan 2023 17:15:54 +0800 Subject: [PATCH] refactor: remove now duplicate biz error handling from generated API calls --- apis.md.go | 150 ------------------------------------ internal/sdkcodegen/emit.go | 3 - 2 files changed, 153 deletions(-) diff --git a/apis.md.go b/apis.md.go index 5e4aa88..271d738 100644 --- a/apis.md.go +++ b/apis.md.go @@ -9,9 +9,6 @@ func (c *WorkwxApp) execGetAccessToken(req reqAccessToken) (respAccessToken, err if err != nil { return respAccessToken{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respAccessToken{}, bizErr - } return resp, nil } @@ -23,9 +20,6 @@ func (c *WorkwxApp) execGetJSAPITicket(req reqJSAPITicket) (respJSAPITicket, err if err != nil { return respJSAPITicket{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respJSAPITicket{}, bizErr - } return resp, nil } @@ -37,9 +31,6 @@ func (c *WorkwxApp) execGetJSAPITicketAgentConfig(req reqJSAPITicketAgentConfig) if err != nil { return respJSAPITicket{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respJSAPITicket{}, bizErr - } return resp, nil } @@ -51,9 +42,6 @@ func (c *WorkwxApp) execJSCode2Session(req reqJSCode2Session) (respJSCode2Sessio if err != nil { return respJSCode2Session{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respJSCode2Session{}, bizErr - } return resp, nil } @@ -65,9 +53,6 @@ func (c *WorkwxApp) execUserGet(req reqUserGet) (respUserGet, error) { if err != nil { return respUserGet{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respUserGet{}, bizErr - } return resp, nil } @@ -79,9 +64,6 @@ func (c *WorkwxApp) execUserList(req reqUserList) (respUserList, error) { if err != nil { return respUserList{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respUserList{}, bizErr - } return resp, nil } @@ -93,9 +75,6 @@ func (c *WorkwxApp) execUserIDByMobile(req reqUserIDByMobile) (respUserIDByMobil if err != nil { return respUserIDByMobile{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respUserIDByMobile{}, bizErr - } return resp, nil } @@ -121,9 +100,6 @@ func (c *WorkwxApp) execDeptList(req reqDeptList) (respDeptList, error) { if err != nil { return respDeptList{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respDeptList{}, bizErr - } return resp, nil } @@ -149,9 +125,6 @@ func (c *WorkwxApp) execUserInfoGet(req reqUserInfoGet) (respUserInfoGet, error) if err != nil { return respUserInfoGet{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respUserInfoGet{}, bizErr - } return resp, nil } @@ -163,9 +136,6 @@ func (c *WorkwxApp) execExternalContactList(req reqExternalContactList) (respExt if err != nil { return respExternalContactList{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respExternalContactList{}, bizErr - } return resp, nil } @@ -177,9 +147,6 @@ func (c *WorkwxApp) execExternalContactGet(req reqExternalContactGet) (respExter if err != nil { return respExternalContactGet{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respExternalContactGet{}, bizErr - } return resp, nil } @@ -191,9 +158,6 @@ func (c *WorkwxApp) execExternalContactBatchList(req reqExternalContactBatchList if err != nil { return respExternalContactBatchList{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respExternalContactBatchList{}, bizErr - } return resp, nil } @@ -205,9 +169,6 @@ func (c *WorkwxApp) execExternalContactRemark(req reqExternalContactRemark) (res if err != nil { return respExternalContactRemark{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respExternalContactRemark{}, bizErr - } return resp, nil } @@ -219,9 +180,6 @@ func (c *WorkwxApp) execExternalContactListCorpTags(req reqExternalContactListCo if err != nil { return respExternalContactListCorpTags{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respExternalContactListCorpTags{}, bizErr - } return resp, nil } @@ -233,9 +191,6 @@ func (c *WorkwxApp) execExternalContactAddCorpTag(req reqExternalContactAddCorpT if err != nil { return respExternalContactAddCorpTag{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respExternalContactAddCorpTag{}, bizErr - } return resp, nil } @@ -247,9 +202,6 @@ func (c *WorkwxApp) execExternalContactEditCorpTag(req reqExternalContactEditCor if err != nil { return respExternalContactEditCorpTag{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respExternalContactEditCorpTag{}, bizErr - } return resp, nil } @@ -261,9 +213,6 @@ func (c *WorkwxApp) execExternalContactDelCorpTag(req reqExternalContactDelCorpT if err != nil { return respExternalContactDelCorpTag{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respExternalContactDelCorpTag{}, bizErr - } return resp, nil } @@ -275,9 +224,6 @@ func (c *WorkwxApp) execExternalContactMarkTag(req reqExternalContactMarkTag) (r if err != nil { return respExternalContactMarkTag{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respExternalContactMarkTag{}, bizErr - } return resp, nil } @@ -289,9 +235,6 @@ func (c *WorkwxApp) execListUnassignedExternalContact(req reqListUnassignedExter if err != nil { return respListUnassignedExternalContact{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respListUnassignedExternalContact{}, bizErr - } return resp, nil } @@ -303,9 +246,6 @@ func (c *WorkwxApp) execTransferExternalContact(req reqTransferExternalContact) if err != nil { return respTransferExternalContact{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respTransferExternalContact{}, bizErr - } return resp, nil } @@ -317,9 +257,6 @@ func (c *WorkwxApp) execGetTransferExternalContactResult(req reqGetTransferExter if err != nil { return respGetTransferExternalContactResult{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respGetTransferExternalContactResult{}, bizErr - } return resp, nil } @@ -331,9 +268,6 @@ func (c *WorkwxApp) execTransferGroupChatExternalContact(req reqTransferGroupCha if err != nil { return respTransferGroupChatExternalContact{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respTransferGroupChatExternalContact{}, bizErr - } return resp, nil } @@ -345,9 +279,6 @@ func (c *WorkwxApp) execAppchatListGet(req reqAppchatList) (respAppchatList, err if err != nil { return respAppchatList{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respAppchatList{}, bizErr - } return resp, nil } @@ -359,9 +290,6 @@ func (c *WorkwxApp) execAppchatInfoGet(req reqAppchatInfo) (respAppchatInfo, err if err != nil { return respAppchatInfo{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respAppchatInfo{}, bizErr - } return resp, nil } @@ -373,9 +301,6 @@ func (c *WorkwxApp) execAppchatCreate(req reqAppchatCreate) (respAppchatCreate, if err != nil { return respAppchatCreate{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respAppchatCreate{}, bizErr - } return resp, nil } @@ -387,9 +312,6 @@ func (c *WorkwxApp) execAppchatGet(req reqAppchatGet) (respAppchatGet, error) { if err != nil { return respAppchatGet{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respAppchatGet{}, bizErr - } return resp, nil } @@ -401,9 +323,6 @@ func (c *WorkwxApp) execMessageSend(req reqMessage) (respMessageSend, error) { if err != nil { return respMessageSend{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respMessageSend{}, bizErr - } return resp, nil } @@ -415,9 +334,6 @@ func (c *WorkwxApp) execAppchatSend(req reqMessage) (respMessageSend, error) { if err != nil { return respMessageSend{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respMessageSend{}, bizErr - } return resp, nil } @@ -429,9 +345,6 @@ func (c *WorkwxApp) execMediaUpload(req reqMediaUpload) (respMediaUpload, error) if err != nil { return respMediaUpload{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respMediaUpload{}, bizErr - } return resp, nil } @@ -443,9 +356,6 @@ func (c *WorkwxApp) execMediaUploadImg(req reqMediaUploadImg) (respMediaUploadIm if err != nil { return respMediaUploadImg{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respMediaUploadImg{}, bizErr - } return resp, nil } @@ -457,9 +367,6 @@ func (c *WorkwxApp) execOAGetTemplateDetail(req reqOAGetTemplateDetail) (respOAG if err != nil { return respOAGetTemplateDetail{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respOAGetTemplateDetail{}, bizErr - } return resp, nil } @@ -471,9 +378,6 @@ func (c *WorkwxApp) execOAApplyEvent(req reqOAApplyEvent) (respOAApplyEvent, err if err != nil { return respOAApplyEvent{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respOAApplyEvent{}, bizErr - } return resp, nil } @@ -485,9 +389,6 @@ func (c *WorkwxApp) execOAGetApprovalInfo(req reqOAGetApprovalInfo) (respOAGetAp if err != nil { return respOAGetApprovalInfo{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respOAGetApprovalInfo{}, bizErr - } return resp, nil } @@ -499,9 +400,6 @@ func (c *WorkwxApp) execOAGetApprovalDetail(req reqOAGetApprovalDetail) (respOAG if err != nil { return respOAGetApprovalDetail{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respOAGetApprovalDetail{}, bizErr - } return resp, nil } @@ -513,9 +411,6 @@ func (c *WorkwxApp) execMsgAuditListPermitUser(req reqMsgAuditListPermitUser) (r if err != nil { return respMsgAuditListPermitUser{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respMsgAuditListPermitUser{}, bizErr - } return resp, nil } @@ -527,9 +422,6 @@ func (c *WorkwxApp) execMsgAuditCheckSingleAgree(req reqMsgAuditCheckSingleAgree if err != nil { return respMsgAuditCheckSingleAgree{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respMsgAuditCheckSingleAgree{}, bizErr - } return resp, nil } @@ -541,9 +433,6 @@ func (c *WorkwxApp) execMsgAuditCheckRoomAgree(req reqMsgAuditCheckRoomAgree) (r if err != nil { return respMsgAuditCheckRoomAgree{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respMsgAuditCheckRoomAgree{}, bizErr - } return resp, nil } @@ -555,9 +444,6 @@ func (c *WorkwxApp) execMsgAuditGetGroupChat(req reqMsgAuditGetGroupChat) (respM if err != nil { return respMsgAuditGetGroupChat{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respMsgAuditGetGroupChat{}, bizErr - } return resp, nil } @@ -569,9 +455,6 @@ func (c *WorkwxApp) execListFollowUserExternalContact(req reqListFollowUserExter if err != nil { return respListFollowUserExternalContact{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respListFollowUserExternalContact{}, bizErr - } return resp, nil } @@ -583,9 +466,6 @@ func (c *WorkwxApp) execAddContactExternalContact(req reqAddContactExternalConta if err != nil { return respAddContactExternalContact{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respAddContactExternalContact{}, bizErr - } return resp, nil } @@ -597,9 +477,6 @@ func (c *WorkwxApp) execGetContactWayExternalContact(req reqGetContactWayExterna if err != nil { return respGetContactWayExternalContact{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respGetContactWayExternalContact{}, bizErr - } return resp, nil } @@ -611,9 +488,6 @@ func (c *WorkwxApp) execListContactWayChatExternalContact(req reqListContactWayE if err != nil { return respListContactWayChatExternalContact{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respListContactWayChatExternalContact{}, bizErr - } return resp, nil } @@ -625,9 +499,6 @@ func (c *WorkwxApp) execUpdateContactWayExternalContact(req reqUpdateContactWayE if err != nil { return respUpdateContactWayExternalContact{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respUpdateContactWayExternalContact{}, bizErr - } return resp, nil } @@ -639,9 +510,6 @@ func (c *WorkwxApp) execDelContactWayExternalContact(req reqDelContactWayExterna if err != nil { return respDelContactWayExternalContact{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respDelContactWayExternalContact{}, bizErr - } return resp, nil } @@ -653,9 +521,6 @@ func (c *WorkwxApp) execCloseTempChatExternalContact(req reqCloseTempChatExterna if err != nil { return respCloseTempChatExternalContact{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respCloseTempChatExternalContact{}, bizErr - } return resp, nil } @@ -667,9 +532,6 @@ func (c *WorkwxApp) execTransferCustomer(req reqTransferCustomer) (respTransferC if err != nil { return respTransferCustomer{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respTransferCustomer{}, bizErr - } return resp, nil } @@ -681,9 +543,6 @@ func (c *WorkwxApp) execGetTransferCustomerResult(req reqGetTransferCustomerResu if err != nil { return respGetTransferCustomerResult{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respGetTransferCustomerResult{}, bizErr - } return resp, nil } @@ -695,9 +554,6 @@ func (c *WorkwxApp) execTransferResignedCustomer(req reqTransferCustomer) (respT if err != nil { return respTransferCustomer{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respTransferCustomer{}, bizErr - } return resp, nil } @@ -709,9 +565,6 @@ func (c *WorkwxApp) execGetTransferResignedCustomerResult(req reqGetTransferCust if err != nil { return respGetTransferCustomerResult{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respGetTransferCustomerResult{}, bizErr - } return resp, nil } @@ -723,9 +576,6 @@ func (c *WorkwxApp) execAddMsgTemplate(req reqAddMsgTemplateExternalContact) (re if err != nil { return respAddMsgTemplateExternalContact{}, err } - if bizErr := resp.TryIntoErr(); bizErr != nil { - return respAddMsgTemplateExternalContact{}, bizErr - } return resp, nil } diff --git a/internal/sdkcodegen/emit.go b/internal/sdkcodegen/emit.go index 7cfd9f3..7e134dd 100644 --- a/internal/sdkcodegen/emit.go +++ b/internal/sdkcodegen/emit.go @@ -179,9 +179,6 @@ func (e *goEmitter) emitAPICall(x *apiCall) error { // TODO: error_chain e.e("return %s{}, err\n", x.respType) e.e("}\n") - e.e("if bizErr := resp.TryIntoErr(); bizErr != nil {\n") - e.e("return %s{}, bizErr\n", x.respType) - e.e("}\n") e.e("\n") e.e("return resp, nil\n") e.e("}\n")