refactor/util: Optimize error handling and naming conventions

Author: lvan100

conf/bind_test.go

@@ -49,7 +49,7 @@ func PointConverter(val string) (image.Point, error) {
 }
 
 func PointSplitter(str string) ([]string, error) {
-	if !(strings.HasPrefix(str, "(") && strings.HasSuffix(str, ")")) {
+	if !strings.HasPrefix(str, "(") || !strings.HasSuffix(str, ")") {
 		return nil, errors.New("split error")
 	}
 	var ret []string

gs/examples/bookman/main.go

@@ -54,7 +54,10 @@ func runTest(ctx context.Context) error {
 		if err != nil {
 			panic(err)
 		}
-		defer resp.Body.Close()
+		defer func() {
+			err = resp.Body.Close()
+			_ = err
+		}()
 		fmt.Print(string(b))
 		time.Sleep(time.Millisecond * 400)
 	})

gs/examples/bookman/src/dao/book_dao/book_dao.go

@@ -59,7 +59,8 @@ func (dao *BookDao) ListBooks() ([]Book, error) {
 
 // GetBook retrieves a book by its ISBN.
 func (dao *BookDao) GetBook(isbn string) (Book, error) {
-	r, _ := dao.Store[isbn]
+	r, ok := dao.Store[isbn]
+	_ = ok
 	return r, nil
 }
 

gs/internal/gs_arg/arg.go

@@ -78,7 +78,7 @@ func Index(n int, arg gs.Arg) gs.Arg {
 
 // GetArgValue panics if called directly. IndexArg must be processed by ArgList.
 func (arg IndexArg) GetArgValue(ctx gs.ArgContext, t reflect.Type) (reflect.Value, error) {
-	panic(util.UnimplementedMethod)
+	panic(util.ErrUnimplementedMethod)
 }
 
 // ValueArg represents a fixed-value argument.

gs/internal/gs_cond/cond.go

@@ -269,7 +269,7 @@ func OnExpression(expression string) gs.Condition {
 
 // Matches checks if the condition is met according to the provided context.
 func (c *onExpression) Matches(ctx gs.CondContext) (bool, error) {
-	err := util.UnimplementedMethod
+	err := util.ErrUnimplementedMethod
 	return false, errutil.WrapError(err, "condition matches error: %s", c)
 }
 

gs/internal/gs_cond/cond_test.go

@@ -337,7 +337,7 @@ func TestOnExpression(t *testing.T) {
 	ctx := NewMockCondContext(ctrl)
 	cond := OnExpression("1+1==2")
 	_, err := cond.Matches(ctx)
-	assert.True(t, errors.Is(err, util.UnimplementedMethod))
+	assert.True(t, errors.Is(err, util.ErrUnimplementedMethod))
 }
 
 func TestNot(t *testing.T) {

gs/internal/gs_conf/conf.go

@@ -107,12 +107,8 @@ func (c *AppConfig) Refresh() (conf.Properties, error) {
 
 	var sources []PropertyCopier
 	sources = append(sources, NewNamedPropertyCopier("sys", sysconf.Clone()))
-	for _, file := range localFiles {
-		sources = append(sources, file)
-	}
-	for _, file := range remoteFiles {
-		sources = append(sources, file)
-	}
+	sources = append(sources, localFiles...)
+	sources = append(sources, remoteFiles...)
 	sources = append(sources, NewNamedPropertyCopier("remote", c.RemoteProp))
 	sources = append(sources, NewNamedPropertyCopier("env", c.Environment))
 	sources = append(sources, NewNamedPropertyCopier("cmd", c.CommandArgs))
@@ -156,9 +152,7 @@ func (c *BootConfig) Refresh() (conf.Properties, error) {
 
 	var sources []PropertyCopier
 	sources = append(sources, NewNamedPropertyCopier("sys", sysconf.Clone()))
-	for _, file := range localFiles {
-		sources = append(sources, file)
-	}
+	sources = append(sources, localFiles...)
 	sources = append(sources, NewNamedPropertyCopier("env", c.Environment))
 	sources = append(sources, NewNamedPropertyCopier("cmd", c.CommandArgs))
 

gs/internal/gs_core/injecting/injecting_test.go

@@ -211,6 +211,7 @@ type LazyA struct {
 }
 
 type LazyB struct {
+	// nolint
 	dummy int `value:"${dummy:=9}"`
 }
 

gs/internal/gs_dync/dync_test.go

@@ -147,6 +147,7 @@ func TestDync(t *testing.T) {
 			"config.s4.value": "123",
 		})
 		err = p.Refresh(prop)
+		assert.Nil(t, err)
 		assert.That(t, p.ObjectsCount()).Equal(2)
 		assert.That(t, cfg.S1.Value.Value()).Equal(99)
 		assert.That(t, cfg.S2.Value.Value()).Equal(456)
@@ -157,6 +158,7 @@ func TestDync(t *testing.T) {
 			"config.s3.value": "xyz",
 		})
 		err = p.Refresh(prop)
+		assert.Nil(t, err)
 		assert.That(t, p.ObjectsCount()).Equal(2)
 		assert.That(t, cfg.S1.Value.Value()).Equal(99)
 		assert.That(t, cfg.S2.Value.Value()).Equal(456)

util/error.go

@@ -20,8 +20,8 @@ import (
 	"errors"
 )
 
-// ForbiddenMethod throws this error when calling a method is prohibited.
-var ForbiddenMethod = errors.New("forbidden method")
+// ErrForbiddenMethod throws this error when calling a method is prohibited.
+var ErrForbiddenMethod = errors.New("forbidden method")
 
-// UnimplementedMethod throws this error when calling an unimplemented method.
-var UnimplementedMethod = errors.New("unimplemented method")
+// ErrUnimplementedMethod throws this error when calling an unimplemented method.
+var ErrUnimplementedMethod = errors.New("unimplemented method")