validator: change option param to interface

golangid · Apr 10, 2023 · c622e7c · c622e7c
1 parent ce53ad1
commit c622e7c
Show file tree

Hide file tree

Showing 9 changed files with 153 additions and 139 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,6 @@
 
 # mocks all interfaces
 mocks:
-	@rm -rf mocks/cmd;
 	@mockery --all --keeptree
 	@if [ -f mocks/candiutils/HTTPRequestOption.go ]; then rm mocks/candiutils/HTTPRequestOption.go; fi;
 	@if [ -f mocks/candiutils/httpClientDo.go ]; then rm mocks/candiutils/httpClientDo.go; fi;
@@ -17,6 +16,9 @@ mocks:
 	@if [ -f mocks/codebase/app/rest_server/OptionFunc.go ]; then rm mocks/codebase/app/rest_server/OptionFunc.go; fi;
 	@if [ -f mocks/codebase/app/task_queue_worker/OptionFunc.go ]; then rm mocks/codebase/app/task_queue_worker/OptionFunc.go; fi;
 	@if [ -f mocks/codebase/factory/dependency/Option.go ]; then rm mocks/codebase/factory/dependency/Option.go; fi;
+	@if [ -f mocks/validator/JSONSchemaValidatorOptionFunc.go ]; then rm mocks/validator/JSONSchemaValidatorOptionFunc.go; fi;
+	@if [ -f mocks/validator/StructValidatorOptionFunc.go ]; then rm mocks/validator/StructValidatorOptionFunc.go; fi;
+	@rm -rf mocks/cmd;
 
 # unit test & calculate code coverage
 test:

diff --git a/init.go b/init.go
@@ -2,5 +2,5 @@ package candi
 
 const (
 	// Version of this library
-	Version = "v1.14.3"
+	Version = "v1.14.4"
 )
diff --git a/mocks/validator/JSONSchemaValidator.go b/mocks/validator/JSONSchemaValidator.go
diff --git a/mocks/validator/JSONSchemaValidatorOptionFunc.go b/mocks/validator/JSONSchemaValidatorOptionFunc.go
diff --git a/mocks/validator/StructValidator.go b/mocks/validator/StructValidator.go
diff --git a/mocks/validator/StructValidatorOptionFunc.go b/mocks/validator/StructValidatorOptionFunc.go
diff --git a/validator/json_schema.go b/validator/json_schema.go
@@ -10,34 +10,39 @@ import (
 	"github.com/golangid/gojsonschema"
 )
 
+// JSONSchemaValidator abstraction
+type JSONSchemaValidator interface {
+	ValidateDocument(schemaID string, documentSource interface{}) error
+}
+
 // JSONSchemaValidatorOptionFunc type
-type JSONSchemaValidatorOptionFunc func(*JSONSchemaValidator)
+type JSONSchemaValidatorOptionFunc func(*jsonSchemaValidator)
 
 // SetSchemaStorageJSONSchemaValidatorOption option func
 func SetSchemaStorageJSONSchemaValidatorOption(s Storage) JSONSchemaValidatorOptionFunc {
-	return func(v *JSONSchemaValidator) {
+	return func(v *jsonSchemaValidator) {
 		v.schemaStorage = s
 	}
 }
 
 // AddHideErrorListTypeJSONSchemaValidatorOption option func
 func AddHideErrorListTypeJSONSchemaValidatorOption(descType ...string) JSONSchemaValidatorOptionFunc {
-	return func(v *JSONSchemaValidator) {
+	return func(v *jsonSchemaValidator) {
 		for _, e := range descType {
 			v.notShowErrorListType[e] = struct{}{}
 		}
 	}
 }
 
-// JSONSchemaValidator validator
-type JSONSchemaValidator struct {
+// jsonSchemaValidator validator
+type jsonSchemaValidator struct {
 	schemaStorage        Storage
 	notShowErrorListType map[string]struct{}
 }
 
 // NewJSONSchemaValidator constructor
-func NewJSONSchemaValidator(opts ...JSONSchemaValidatorOptionFunc) *JSONSchemaValidator {
-	v := &JSONSchemaValidator{
+func NewJSONSchemaValidator(opts ...JSONSchemaValidatorOptionFunc) JSONSchemaValidator {
+	v := &jsonSchemaValidator{
 		schemaStorage: NewInMemStorage(os.Getenv(candihelper.WORKDIR) + "api/jsonschema"),
 		notShowErrorListType: map[string]struct{}{
 			"condition_else": {}, "condition_then": {},
@@ -52,7 +57,7 @@ func NewJSONSchemaValidator(opts ...JSONSchemaValidatorOptionFunc) *JSONSchemaVa
 }
 
 // ValidateDocument based on schema id
-func (v *JSONSchemaValidator) ValidateDocument(schemaID string, documentSource interface{}) error {
+func (v *jsonSchemaValidator) ValidateDocument(schemaID string, documentSource interface{}) error {
 
 	s, err := v.schemaStorage.Get(schemaID)
 	if err != nil {