From 1f4ef1b0afac3a5360147d8955f096420e7efb62 Mon Sep 17 00:00:00 2001
From: Phodal Huang <h@phodal.com>
Date: Thu, 16 Jan 2020 21:25:54 +0800
Subject: [PATCH] refactor: simplify jidentfier code

---
 pkg/domain/core_domain/jidentifier.go              | 14 +-------------
 .../ast/identifier/java_identifier_listener.go     |  8 +++-----
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/pkg/domain/core_domain/jidentifier.go b/pkg/domain/core_domain/jidentifier.go
index 0d22ab1..440d0e2 100644
--- a/pkg/domain/core_domain/jidentifier.go
+++ b/pkg/domain/core_domain/jidentifier.go
@@ -1,7 +1,5 @@
 package core_domain
 
-var methods []CodeFunction
-
 type JIdentifier struct {
 	Package     string
 	ClassName   string
@@ -14,17 +12,7 @@ type JIdentifier struct {
 }
 
 func NewJIdentifier() *JIdentifier {
-	identifier := &JIdentifier{"", "", "", "", nil, nil, nil, nil}
-	methods = nil
-	return identifier
-}
-
-func (identifier *JIdentifier) AddMethod(method CodeFunction) {
-	methods = append(methods, method)
-}
-
-func (identifier *JIdentifier) GetMethods() []CodeFunction {
-	return methods
+	return &JIdentifier{}
 }
 
 func (identifier *JIdentifier) GetClassFullName() string {
diff --git a/pkg/infrastructure/ast/identifier/java_identifier_listener.go b/pkg/infrastructure/ast/identifier/java_identifier_listener.go
index f7e7083..551bdca 100644
--- a/pkg/infrastructure/ast/identifier/java_identifier_listener.go
+++ b/pkg/infrastructure/ast/identifier/java_identifier_listener.go
@@ -66,7 +66,6 @@ func (s *JavaIdentifierListener) EnterClassDeclaration(ctx *parser.ClassDeclarat
 func (s *JavaIdentifierListener) ExitClassBody(ctx *parser.ClassBodyContext) {
 	hasEnterClass = false
 	if currentNode.ClassName != "" {
-		currentNode.Methods = currentNode.GetMethods()
 		nodes = append(nodes, *currentNode)
 	}
 	currentNode = core_domain.NewJIdentifier()
@@ -75,7 +74,6 @@ func (s *JavaIdentifierListener) ExitClassBody(ctx *parser.ClassBodyContext) {
 func (s *JavaIdentifierListener) ExitInterfaceDeclaration(ctx *parser.InterfaceDeclarationContext) {
 	hasEnterClass = false
 	if currentNode.ClassName != "" {
-		currentNode.Methods = currentNode.GetMethods()
 		nodes = append(nodes, *currentNode)
 	}
 	currentNode = core_domain.NewJIdentifier()
@@ -100,7 +98,7 @@ func (s *JavaIdentifierListener) EnterConstructorDeclaration(ctx *parser.Constru
 }
 
 func (s *JavaIdentifierListener) ExitConstructorDeclaration(ctx *parser.ConstructorDeclarationContext) {
-	currentNode.AddMethod(currentMethod)
+	currentNode.Methods = append(currentNode.Methods, currentMethod)
 }
 
 func (s *JavaIdentifierListener) EnterInterfaceBodyDeclaration(ctx *parser.InterfaceBodyDeclarationContext) {
@@ -137,7 +135,7 @@ func (s *JavaIdentifierListener) EnterInterfaceMethodDeclaration(ctx *parser.Int
 }
 
 func (s *JavaIdentifierListener) ExitInterfaceMethodDeclaration(ctx *parser.InterfaceMethodDeclarationContext) {
-	currentNode.AddMethod(currentMethod)
+	currentNode.Methods = append(currentNode.Methods, currentMethod)
 	currentMethod = core_domain.NewJMethod()
 }
 
@@ -186,7 +184,7 @@ func (s *JavaIdentifierListener) EnterMethodDeclaration(ctx *parser.MethodDeclar
 }
 
 func (s *JavaIdentifierListener) ExitMethodDeclaration(ctx *parser.MethodDeclarationContext) {
-	currentNode.AddMethod(currentMethod)
+	currentNode.Methods = append(currentNode.Methods, currentMethod)
 	currentMethod = core_domain.NewJMethod()
 }
 
-- 
GitLab