Rename EmptyObject to GlobalScope

Author: emacsway

grade/internal/domain/endorser/specifications.go

@@ -18,7 +18,7 @@ func (c EndorserCriteria) pendingEndorsementCount() s.FieldNode {
 }
 
 func (c EndorserCriteria) obj() s.ObjectNode {
-	return s.Object(s.EmptyObject(), "endorser")
+	return s.Object(s.GlobalScope(), "endorser")
 }
 
 var endorser = EndorserCriteria{}

grade/internal/domain/seedwork/specification/evaluate_visitor.go

@@ -25,7 +25,7 @@ func (v *EvaluateVisitor) SetCurrentValue(val []any) {
 	v.currentValue = val
 }
 
-func (v *EvaluateVisitor) VisitGlobalScope(n EmptyObjectNode) error {
+func (v *EvaluateVisitor) VisitGlobalScope(n GlobalScopeNode) error {
 	v.SetCurrentValue([]any{v.Context})
 	return nil
 }
@@ -255,7 +255,7 @@ type Context interface {
 func ExtractFieldPath(n FieldNode) []string {
 	path := []string{n.Name()}
 	var obj EmptiableObject = n.Object()
-	for !obj.IsEmpty() {
+	for !obj.IsRoot() {
 		path = append([]string{obj.Name()}, path...)
 		obj = obj.Parent()
 	}

grade/internal/domain/seedwork/specification/nodes.go

@@ -62,7 +62,7 @@ type Visitable interface {
 }
 
 type Visitor interface {
-	VisitGlobalScope(EmptyObjectNode) error
+	VisitGlobalScope(GlobalScopeNode) error
 	VisitObject(ObjectNode) error
 	VisitWildcard(WilcardNode) error
 	VisitItem(ItemNode) error
@@ -223,28 +223,27 @@ type EmptiableObject interface {
 	Visitable
 	Parent() EmptiableObject
 	Name() string
-	IsEmpty() bool
+	IsRoot() bool
 }
 
-// TODO: Rename me to GlobalScope
-func EmptyObject() EmptyObjectNode {
-	return EmptyObjectNode{}
+func GlobalScope() GlobalScopeNode {
+	return GlobalScopeNode{}
 }
 
-type EmptyObjectNode struct{}
+type GlobalScopeNode struct{}
 
-func (n EmptyObjectNode) Parent() EmptiableObject {
+func (n GlobalScopeNode) Parent() EmptiableObject {
 	return n
 }
 
-func (n EmptyObjectNode) Name() string {
+func (n GlobalScopeNode) Name() string {
 	return "Empty"
 }
 
-func (n EmptyObjectNode) IsEmpty() bool {
+func (n GlobalScopeNode) IsRoot() bool {
 	return true
 }
-func (n EmptyObjectNode) Accept(v Visitor) error {
+func (n GlobalScopeNode) Accept(v Visitor) error {
 	return v.VisitGlobalScope(n)
 }
 
@@ -268,7 +267,7 @@ func (n ObjectNode) Name() string {
 	return n.name
 }
 
-func (n ObjectNode) IsEmpty() bool {
+func (n ObjectNode) IsRoot() bool {
 	return false
 }
 
@@ -317,7 +316,7 @@ func Item() ItemNode {
 type ItemNode struct{}
 
 func (n ItemNode) Parent() EmptiableObject {
-	return EmptyObject()
+	return GlobalScope()
 }
 
 func (n ItemNode) Name() string {

grade/internal/infrastructure/seedwork/specification/postgresql_visitor.go

@@ -85,7 +85,7 @@ func (v *PostgresqlVisitor) visit(precedenceKey string, callable func() error) e
 	return nil
 }
 
-func (v *PostgresqlVisitor) VisitGlobalScope(_ s.EmptyObjectNode) error {
+func (v *PostgresqlVisitor) VisitGlobalScope(_ s.GlobalScopeNode) error {
 	return nil
 }
 

grade/internal/infrastructure/seedwork/specification/transform_visitor.go

@@ -25,7 +25,7 @@ type TransformVisitor struct {
 	Context
 }
 
-func (v *TransformVisitor) VisitGlobalScope(_ s.EmptyObjectNode) error {
+func (v *TransformVisitor) VisitGlobalScope(_ s.GlobalScopeNode) error {
 	return nil
 }
 

grade/internal/infrastructure/seedwork/specification/transform_visitor_test.go

@@ -20,7 +20,7 @@ func (sc SomethingCriteria) Id() s.FieldNode {
 }
 
 func (sc SomethingCriteria) obj() s.ObjectNode {
-	return s.Object(s.EmptyObject(), "something")
+	return s.Object(s.GlobalScope(), "something")
 }
 
 type SomethingSpecification struct {