refactor: remove JImport

pkg/application/deps/dep_app.go

@@ -2,6 +2,7 @@ package deps
 
 import (
 	"github.com/phodal/coca/pkg/adapter/cocafile"
+	"github.com/phodal/coca/pkg/domain/core_domain"
 	"github.com/phodal/coca/pkg/domain/jdomain"
 	"github.com/phodal/coca/pkg/domain/support_domain"
 	"path/filepath"
@@ -15,8 +16,8 @@ func NewDepApp() *DepAnalysisApp {
 	return &DepAnalysisApp{}
 }
 
-func (d *DepAnalysisApp) BuildImportMap(deps []jdomain.JClassNode) map[string]jdomain.JImport {
-	var impMap = make(map[string]jdomain.JImport)
+func (d *DepAnalysisApp) BuildImportMap(deps []jdomain.JClassNode) map[string]core_domain.CodeImport {
+	var impMap = make(map[string]core_domain.CodeImport)
 	for _, clz := range deps {
 		for _, imp := range clz.Imports {
 			impMap[imp.Source] = imp

pkg/domain/core_domain/code_member.go

 package core_domain
 
-import (
-	"github.com/phodal/coca/pkg/domain/jdomain"
-)
-
 type CodeMember struct {
 	ID            string
 	Name          string
 	Type          string
-	ClassNodes    []jdomain.JClassNode
+	Structures    []CodeDataStruct
 	FunctionNodes []CodeFunction
 	Namespace     []string
 	FileID        string

pkg/domain/jdomain/jclass_node.go

 package jdomain
 
-import "strings"
+import (
+	"github.com/phodal/coca/pkg/domain/core_domain"
+	"strings"
+)
 
 type JClassNode struct {
 	Package     string
@@ -14,7 +17,7 @@ type JClassNode struct {
 	Implements  []string
 	Annotations []Annotation
 	InnerClass  []JClassNode
-	Imports     []JImport
+	Imports     []core_domain.CodeImport
 }
 
 type JField struct {

pkg/domain/jdomain/jimport.go

 package jdomain
 
-type JImport struct {
-	Source string
-}
+import "github.com/phodal/coca/pkg/domain/core_domain"
 
-func NewJImport(str string) JImport {
-	return JImport{
+func NewJImport(str string) core_domain.CodeImport {
+	return core_domain.CodeImport{
 		Source: str,
 	}
 }

trial/cocago/testdata/node_infos/basic_interface.json

@@ -112,7 +112,6 @@
   "Imports": null,
   "Members": [
     {
-      "ClassNodes": null,
       "DataStructID": "Shape",
       "FileID": "",
       "FunctionNodes": null,
@@ -125,10 +124,10 @@
         "StopLine": 0,
         "StopLinePosition": 0
       },
+      "Structures": null,
       "Type": "interface"
     },
     {
-      "ClassNodes": null,
       "DataStructID": "Object",
       "FileID": "",
       "FunctionNodes": null,
@@ -141,10 +140,10 @@
         "StopLine": 0,
         "StopLinePosition": 0
       },
+      "Structures": null,
       "Type": "interface"
     },
     {
-      "ClassNodes": null,
       "DataStructID": "Material",
       "FileID": "",
       "FunctionNodes": null,
@@ -157,6 +156,7 @@
         "StopLine": 0,
         "StopLinePosition": 0
       },
+      "Structures": null,
       "Type": "interface"
     }
   ],

trial/cocago/testdata/node_infos/data_struct_property.json

@@ -69,7 +69,6 @@
   ],
   "Members": [
     {
-      "ClassNodes": null,
       "DataStructID": "CodeFile",
       "FileID": "testdata/node_infos/data_struct_property.code",
       "FunctionNodes": null,
@@ -82,6 +81,7 @@
         "StopLine": 0,
         "StopLinePosition": 0
       },
+      "Structures": null,
       "Type": "struct"
     }
   ],

trial/cocago/testdata/node_infos/hello_world.json

@@ -12,7 +12,6 @@
   ],
   "Members": [
     {
-      "ClassNodes": null,
       "DataStructID": "default",
       "FileID": "",
       "FunctionNodes": [
@@ -67,6 +66,7 @@
         "StopLine": 0,
         "StopLinePosition": 0
       },
+      "Structures": null,
       "Type": "method"
     }
   ],

trial/cocago/testdata/node_infos/nested_method.json

@@ -12,7 +12,6 @@
   ],
   "Members": [
     {
-      "ClassNodes": null,
       "DataStructID": "default",
       "FileID": "",
       "FunctionNodes": [
@@ -67,6 +66,7 @@
         "StopLine": 0,
         "StopLinePosition": 0
       },
+      "Structures": null,
       "Type": "method"
     }
   ],

trial/cocago/testdata/node_infos/normal_method.json

@@ -19,7 +19,6 @@
   ],
   "Members": [
     {
-      "ClassNodes": null,
       "DataStructID": "default",
       "FileID": "",
       "FunctionNodes": [
@@ -121,10 +120,10 @@
         "StopLine": 0,
         "StopLinePosition": 0
       },
+      "Structures": null,
       "Type": "method"
     },
     {
-      "ClassNodes": null,
       "DataStructID": "default",
       "FileID": "",
       "FunctionNodes": [
@@ -226,6 +225,7 @@
         "StopLine": 0,
         "StopLinePosition": 0
       },
+      "Structures": null,
       "Type": "method"
     }
   ],

trial/cocago/testdata/node_infos/struct_type_zero.json

@@ -20,7 +20,6 @@
   "Imports": null,
   "Members": [
     {
-      "ClassNodes": null,
       "DataStructID": "O",
       "FileID": "",
       "FunctionNodes": [
@@ -52,6 +51,7 @@
         "StopLine": 0,
         "StopLinePosition": 0
       },
+      "Structures": null,
       "Type": "struct"
     }
   ],

trial/cocago/testdata/node_infos/struct_with_func.json

@@ -45,7 +45,6 @@
   "Imports": null,
   "Members": [
     {
-      "ClassNodes": null,
       "DataStructID": "Person",
       "FileID": "testdata/node_infos/struct_with_func.code",
       "FunctionNodes": null,
@@ -58,6 +57,7 @@
         "StopLine": 0,
         "StopLinePosition": 0
       },
+      "Structures": null,
       "Type": "struct"
     }
   ],

trial/cocago/testdata/node_infos/struct_with_func_decl.json

@@ -53,7 +53,6 @@
   ],
   "Members": [
     {
-      "ClassNodes": null,
       "DataStructID": "person",
       "FileID": "testdata/node_infos/struct_with_func_decl.code",
       "FunctionNodes": [
@@ -108,6 +107,7 @@
         "StopLine": 0,
         "StopLinePosition": 0
       },
+      "Structures": null,
       "Type": "struct"
     }
   ],