Merge pull request #789 from moosetechnology/importer

Improve importers API
moosetechnology · Jun 18, 2024 · 4440fd1 · 4440fd1
2 parents 0f15a75 + a6ee96c
commit 4440fd1
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 12 deletions.
diff --git a/src/Moose-Importers/FamixAbstractFileImporter.class.st b/src/Moose-Importers/FamixAbstractFileImporter.class.st
@@ -13,7 +13,7 @@ Class {
 		'model',
 		'inputStream'
 	],
-	#category : #'Moose-Importers'
+	#category : #'Moose-Importers-FromPersistedFiles'
 }
 
 { #category : #testing }

diff --git a/src/Moose-Importers/FamixJSONFileImporter.class.st b/src/Moose-Importers/FamixJSONFileImporter.class.st
@@ -5,7 +5,7 @@ Importer for JSON file
 Class {
 	#name : #FamixJSONFileImporter,
 	#superclass : #FamixAbstractFileImporter,
-	#category : #'Moose-Importers'
+	#category : #'Moose-Importers-FromPersistedFiles'
 }
 
 { #category : #executing }

diff --git a/src/Moose-Importers/FamixJavaFoldersImporter.class.st b/src/Moose-Importers/FamixJavaFoldersImporter.class.st
@@ -24,12 +24,13 @@ Class {
 	#name : #FamixJavaFoldersImporter,
 	#superclass : #Object,
 	#instVars : [
-		'folders'
+		'folders',
+		'models'
 	],
 	#classVars : [
 		'VerveineJPath'
 	],
-	#category : #'Moose-Importers'
+	#category : #'Moose-Importers-ParseFolders'
 }
 
 { #category : #accessing }
@@ -39,13 +40,23 @@ FamixJavaFoldersImporter class >> defaultVerveineJDirectory [
 ]
 
 { #category : #actions }
-FamixJavaFoldersImporter class >> importFolder: aFileReference [
+FamixJavaFoldersImporter class >> importAndInstallFolder: aFileReference [
 
-	^ self importFolders: { aFileReference }
+	^ self importAndInstallFolders: { aFileReference }
+]
+
+{ #category : #actions }
+FamixJavaFoldersImporter class >> importAndInstallFolders: aCollection [
+	"I'll parse, import in a moose model and install the models  for each folder in the collection."
+
+	^ self new
+		  folders: aCollection;
+		  importAndInstall
 ]
 
 { #category : #actions }
 FamixJavaFoldersImporter class >> importFolders: aCollection [
+	"I'll parse and import in a moose model for each folder in the collection."
 
 	^ self new
 		  folders: aCollection;
@@ -124,7 +135,19 @@ FamixJavaFoldersImporter >> import [
 
 	self generateJsonOfProjects.
 
-	self importModels
+	self importModels.
+
+	^ models
+]
+
+{ #category : #actions }
+FamixJavaFoldersImporter >> importAndInstall [
+
+	self import.
+
+	self installModels.
+
+	^ models
 ]
 
 { #category : #actions }
@@ -143,12 +166,24 @@ FamixJavaFoldersImporter >> importModels [
 				inputFile: json;
 				run.
 
-			model
-				name: folder basename;
-				install ]
+			model name: folder basename.
+			models add: model ]
 		displayingProgress: [ :folder | folder basename ]
 ]
 
+{ #category : #initialization }
+FamixJavaFoldersImporter >> initialize [
+
+	super initialize.
+	models := OrderedCollection new
+]
+
+{ #category : #actions }
+FamixJavaFoldersImporter >> installModels [
+
+	models do: [ :model | model install ]
+]
+
 { #category : #actions }
 FamixJavaFoldersImporter >> jsonForFolder: folder [
 

diff --git a/src/Moose-Importers/FamixMSEFileImporter.class.st b/src/Moose-Importers/FamixMSEFileImporter.class.st
@@ -4,7 +4,7 @@ Importer for MSE files
 Class {
 	#name : #FamixMSEFileImporter,
 	#superclass : #FamixAbstractFileImporter,
-	#category : #'Moose-Importers'
+	#category : #'Moose-Importers-FromPersistedFiles'
 }
 
 { #category : #executing }

diff --git a/src/Moose-Importers/MooseFileStructureImporter.class.st b/src/Moose-Importers/MooseFileStructureImporter.class.st
@@ -8,7 +8,7 @@ Class {
 		'mooseModel',
 		'factory'
 	],
-	#category : #'Moose-Importers-Importers'
+	#category : #'Moose-Importers-FileSystem'
 }
 
 { #category : #accessing }