feat: move behavior to domain

phodal · Dec 30, 2019 · 592f5e7 · 592f5e7
1 parent 0caa67b
commit 592f5e7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/core/context/evaluate/analyser.go b/core/context/evaluate/analyser.go
@@ -3,7 +3,6 @@ package evaluate
 import (
 	"github.com/phodal/coca/core/context/evaluate/evaluator"
 	"github.com/phodal/coca/core/domain"
-	"github.com/phodal/coca/core/infrastructure"
 	"gonum.org/v1/gonum/stat"
 	"strings"
 )
@@ -49,11 +48,11 @@ func (a Analyser) Analysis(classNodes []domain.JClassNode, identifiers []domain.
 		for _, method := range ident.Methods {
 			result.Summary.MethodCount++
 
-			if infrastructure.StringArrayContains(method.Modifiers, "static") {
+			if method.IsStatic() {
 				result.Summary.StaticMethodCount++
 			}
 
-			if !strings.HasPrefix(method.Name, "set") && !strings.HasPrefix(method.Name, "get") {
+			if method.IsGetterSetter() {
 				result.Summary.NormalMethodCount++
 				methodLength := method.StopLine - method.StartLine + 1
 				result.Summary.TotalMethodLength = result.Summary.TotalMethodLength + methodLength

diff --git a/core/domain/jmethod.go b/core/domain/jmethod.go
@@ -1,5 +1,10 @@
 package domain
 
+import (
+	"github.com/phodal/coca/core/infrastructure"
+	"strings"
+)
+
 type JMethod struct {
 	Name              string
 	Type              string
@@ -32,6 +37,14 @@ func NewJMethod() JMethod {
 	}
 }
 
+func (m *JMethod) IsStatic() bool {
+	return infrastructure.StringArrayContains(m.Modifiers, "static")
+}
+
+func (m *JMethod) IsGetterSetter() bool {
+	return strings.HasPrefix(m.Name, "set") || strings.HasPrefix(m.Name, "get")
+}
+
 type JMethodInfo struct {
 	Name       string
 	Type       string