You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by kl...@apache.org on 2024/04/15 07:08:19 UTC
(incubator-devlake) branch kw-gitext-diffsync created (now 5388b9901)
This is an automated email from the ASF dual-hosted git repository.
klesh pushed a change to branch kw-gitext-diffsync
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
at 5388b9901 fix: remove useless args and logics
This branch includes the following new commits:
new 5388b9901 fix: remove useless args and logics
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(incubator-devlake) 01/01: fix: remove useless args and logics
Posted by kl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch kw-gitext-diffsync
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 5388b99010a5d63a5f53bbb231b6c91273f1886a
Author: Klesh Wong <zh...@merico.dev>
AuthorDate: Mon Apr 15 15:07:48 2024 +0800
fix: remove useless args and logics
---
backend/helpers/pluginhelper/api/api_collector.go | 4 ++--
backend/helpers/pluginhelper/api/graphql_collector.go | 5 +----
backend/helpers/pluginhelper/api/model_api_helper.go | 2 +-
backend/helpers/pluginhelper/api/remote_api_helper.go | 2 +-
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/backend/helpers/pluginhelper/api/api_collector.go b/backend/helpers/pluginhelper/api/api_collector.go
index f79d09148..440113269 100644
--- a/backend/helpers/pluginhelper/api/api_collector.go
+++ b/backend/helpers/pluginhelper/api/api_collector.go
@@ -141,7 +141,7 @@ func NewApiCollector(args ApiCollectorArgs) (*ApiCollector, errors.Error) {
var rawTableAutoMigrateLock sync.Mutex
-func (collector *ApiCollector) ensureRawTable(table string) errors.Error {
+func (collector *ApiCollector) ensureRawTable() errors.Error {
db := collector.args.Ctx.GetDal()
rawTableAutoMigrateLock.Lock()
defer rawTableAutoMigrateLock.Unlock()
@@ -155,7 +155,7 @@ func (collector *ApiCollector) Execute() errors.Error {
// make sure table is created
db := collector.args.Ctx.GetDal()
- err := collector.ensureRawTable(collector.table)
+ err := collector.ensureRawTable()
if err != nil {
return errors.Default.Wrap(err, "error auto-migrating collector")
}
diff --git a/backend/helpers/pluginhelper/api/graphql_collector.go b/backend/helpers/pluginhelper/api/graphql_collector.go
index 122e1a575..a41eef950 100644
--- a/backend/helpers/pluginhelper/api/graphql_collector.go
+++ b/backend/helpers/pluginhelper/api/graphql_collector.go
@@ -100,10 +100,7 @@ func NewGraphqlCollector(args GraphqlCollectorArgs) (*GraphqlCollector, errors.E
// process args
rawDataSubTask, err := NewRawDataSubTask(args.RawDataSubTaskArgs)
if err != nil {
- return nil, errors.Default.Wrap(err, "error processing raw subtask args")
- }
- if err != nil {
- return nil, errors.Default.Wrap(err, "Failed to compile UrlTemplate")
+ return nil, err
}
if args.GraphqlClient == nil {
return nil, errors.Default.New("ApiClient is required")
diff --git a/backend/helpers/pluginhelper/api/model_api_helper.go b/backend/helpers/pluginhelper/api/model_api_helper.go
index 0dbc4ad95..dc41c69e4 100644
--- a/backend/helpers/pluginhelper/api/model_api_helper.go
+++ b/backend/helpers/pluginhelper/api/model_api_helper.go
@@ -216,7 +216,7 @@ func (self *ModelApiHelper[M]) PutMultipleCb(input *plugin.ApiResourceInput, bef
}, nil
}
-func parsePagination[P any](input *plugin.ApiResourceInput, query ...dal.Clause) (*P, errors.Error) {
+func parsePagination[P any](input *plugin.ApiResourceInput) (*P, errors.Error) {
if !input.Query.Has("page") {
input.Query.Set("page", "1")
}
diff --git a/backend/helpers/pluginhelper/api/remote_api_helper.go b/backend/helpers/pluginhelper/api/remote_api_helper.go
index 80d3eeedb..a1b73afe6 100644
--- a/backend/helpers/pluginhelper/api/remote_api_helper.go
+++ b/backend/helpers/pluginhelper/api/remote_api_helper.go
@@ -358,7 +358,7 @@ func (r *RemoteApiHelper[Conn, Scope, ApiScope, Group]) SearchRemoteScopes(input
p = 1
} else {
p, err1 = strconv.Atoi(page[0])
- if err != nil {
+ if err1 != nil {
return nil, errors.BadInput.Wrap(err1, fmt.Sprintf("failed to Atoi page:%s", page[0]))
}
}