Merge pull request #76 from moosetechnology/export-refactoring

Refactoring in FMModel export
moosetechnology · May 14, 2024 · 62b9248 · 62b9248
2 parents 311c421 + 1d7ba56
commit 62b9248
Show file tree

Hide file tree

Showing 6 changed files with 322 additions and 293 deletions.
diff --git a/src/Fame-Core/FMModel.class.st b/src/Fame-Core/FMModel.class.st
@@ -55,9 +55,10 @@ Class {
 
 { #category : #'instance creation' }
 FMModel class >> withMetamodel: aMetamodel [
+
 	^ self new
-		metamodel: aMetamodel;
-		yourself
+		  metamodel: aMetamodel;
+		  yourself
 ]
 
 { #category : #visiting }

diff --git a/src/Fame-ImportExport/FMModel.extension.st b/src/Fame-ImportExport/FMModel.extension.st
@@ -2,32 +2,50 @@ Extension { #name : #FMModel }
 
 { #category : #'*Fame-ImportExport' }
 FMModel >> exportJsonString [
-	| printer |
-	printer := FMJSONPrinter onString.
-	self exportWithPrinter: printer.
-	^ printer stream contents
+
+	^ String streamContents: [ :stream |
+		  self exportWithPrinter: (FMJSONPrinter on: stream) ]
 ]
 
 { #category : #'*Fame-ImportExport' }
-FMModel >> exportOn: aStream [
-	self exportOn: aStream usingPrinter: FMMSEPrinter
+FMModel >> exportMSEString [
+
+	^ String streamContents: [ :stream | self exportToMSEStream: stream ]
 ]
 
 { #category : #'*Fame-ImportExport' }
-FMModel >> exportOn: aStream usingPrinter: aPrinter [
-	self exportWithPrinter: (aPrinter on: aStream)
+FMModel >> exportOn: aStream [
+
+	self
+		deprecated:
+		'Please specify the format you want to export to. Default is MSE. JSON is also available.'
+		transformWith: '`@receiver exportOn: `@stream'
+			-> '`@receiver exportToMSEStream: `@stream'.
+
+	self exportToMSEStream: aStream
 ]
 
 { #category : #'*Fame-ImportExport' }
 FMModel >> exportString [
-	| printer |
-	printer := FMMSEPrinter onString.
-	self exportWithPrinter: printer.
-	^ printer stream contents
+
+	self
+		deprecated:
+		'Please specify the format you want to export to. Default is MSE. JSON is also available.'
+		transformWith:
+		'`@receiver exportString' -> '`@receiver exportMSEString'.
+
+	^ self exportMSEString
+]
+
+{ #category : #'*Fame-ImportExport' }
+FMModel >> exportToMSEStream: aStream [
+
+	self exportWithPrinter: (FMMSEPrinter on: aStream)
 ]
 
 { #category : #'*Fame-ImportExport' }
 FMModel >> exportWithPrinter: aParseClient [
+
 	FMModelExporter new
 		model: self;
 		printer: aParseClient;
@@ -36,20 +54,23 @@ FMModel >> exportWithPrinter: aParseClient [
 
 { #category : #'*Fame-ImportExport' }
 FMModel class >> fromJSONString: aString [
+
 	^ self new
-		importJSONString: aString;
-		yourself
+		  importJSONString: aString;
+		  yourself
 ]
 
 { #category : #'*Fame-ImportExport' }
 FMModel class >> fromString: aString [
+
 	^ self new
-		importString: aString;
-		yourself
+		  importString: aString;
+		  yourself
 ]
 
 { #category : #'*Fame-ImportExport' }
 FMModel >> importJSONStream: aReadStream [
+
 	(FMImporter model: self)
 		stream: aReadStream;
 		parser: FMJSONParser;
@@ -58,17 +79,20 @@ FMModel >> importJSONStream: aReadStream [
 
 { #category : #'*Fame-ImportExport' }
 FMModel >> importJSONString: mseString [
+
 	self importJSONStream: mseString readStream
 ]
 
 { #category : #'*Fame-ImportExport' }
 FMModel >> importStream: aReadStream [
+
 	(FMImporter model: self)
 		stream: aReadStream;
 		run
 ]
 
 { #category : #'*Fame-ImportExport' }
 FMModel >> importString: mseString [
+
 	self importStream: mseString readStream
 ]
diff --git a/src/Fame-Tests/FMDebugImporter.class.st b/src/Fame-Tests/FMDebugImporter.class.st
@@ -46,15 +46,19 @@ FMDebugImporter >> endProperty: name [
 
 { #category : #accessing }
 FMDebugImporter >> exportJsonString [
+
 	| printer |
+
 	printer := FMJSONPrinter onString.
 	self replayOn: printer.
 	^ printer stream contents
 ]
 
 { #category : #accessing }
-FMDebugImporter >> exportString [
+FMDebugImporter >> exportMSEString [
+
 	| printer |
+
 	printer := FMMSEPrinter onString.
 	self replayOn: printer.
 	^ printer stream contents