#64: Moves additional methods into the corresponding helper class

sculptor · Apr 5, 2015 · 1e159f5 · 1e159f5
1 parent 990c48b
commit 1e159f5
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 23 deletions.
diff --git a/...tor-generator-core/src/main/java/org/sculptor/generator/transform/DslTransformation.xtend b/...tor-generator-core/src/main/java/org/sculptor/generator/transform/DslTransformation.xtend
@@ -69,7 +69,6 @@ import sculptormetamodel.Event
 import sculptormetamodel.InheritanceType
 import sculptormetamodel.NamedElement
 import sculptormetamodel.Repository
-import sculptormetamodel.Resource
 import sculptormetamodel.SculptormetamodelFactory
 import sculptormetamodel.Service
 import sculptormetamodel.Trait
@@ -712,31 +711,11 @@ class DslTransformation {
 	}
 
 	def void scaffold(DslDomainObject domainObject) {
-		domainObject.transformSimpleDomainObject.scaffold()
-	}
-
-	def void scaffold(DomainObject domainObject) {
-
-		// Scaffold repository
-		if (domainObject.repository == null)
-			domainObject.addRepository()
-		domainObject.repository.addRepositoryScaffoldOperations()
-
-		// Scaffold service
-		val serviceName = domainObject.name + "Service"
-		if (!domainObject.module.services.exists(s | s.name == serviceName))
-			domainObject.module.addService(serviceName)
-		domainObject.module.services.filter(s | s.name == serviceName).forEach[addServiceScaffoldOperations(domainObject.repository)]
+		domainObject.transformSimpleDomainObject.scaffold
 	}
 
 	def void scaffold(DslResource resource) {
-		resource.transform.scaffold()
-	}
-
-	def void scaffold(Resource resource) {
-		val serviceName = resource.getDomainResourceName() + "Service"
-		val delegateService = resource.module.application.modules.map[services].flatten.findFirst(e|e.name == serviceName)
-		resource.addResourceScaffoldOperations(delegateService)
+		resource.transform.scaffold
 	}
 
 }
diff --git a/...nerator-core/src/main/java/org/sculptor/generator/transform/DslTransformationHelper.xtend b/...nerator-core/src/main/java/org/sculptor/generator/transform/DslTransformationHelper.xtend
@@ -30,11 +30,14 @@ import org.sculptor.dsl.sculptordsl.DslResource
 import org.sculptor.dsl.sculptordsl.DslService
 import org.sculptor.dsl.sculptordsl.DslVisibility
 import org.sculptor.generator.chain.ChainOverridable
+import org.sculptor.generator.ext.Helper
 import org.sculptor.generator.ext.Properties
 import org.sculptor.generator.util.GenericAccessObjectManager
 import org.sculptor.generator.util.HelperBase
 import org.sculptor.generator.util.PropertiesBase
 import sculptormetamodel.DiscriminatorType
+import sculptormetamodel.DomainObject
+import sculptormetamodel.Resource
 
 /**
  * Overridable helper methods for transforming DSL meta model to generator meta model.
@@ -45,6 +48,7 @@ class DslTransformationHelper {
 	@Inject var GenericAccessObjectManager genericAccessObjectManager
 
 	@Inject extension HelperBase helperBase
+	@Inject extension Helper helper
 	@Inject extension PropertiesBase propertiesBase
 	@Inject extension Properties properties
 
@@ -189,4 +193,28 @@ class DslTransformationHelper {
 		handleBooleanAnnotation("valid", reference.valid, reference.validMessage, reference.validate)
 	}
 
+	def void scaffold(DomainObject domainObject) {
+		domainObject.scaffoldRepository
+		domainObject.scaffoldService
+	}
+
+	def void scaffoldRepository(DomainObject domainObject) {
+		if (domainObject.repository == null)
+			domainObject.addRepository
+		domainObject.repository.addRepositoryScaffoldOperations
+	}
+
+	def void scaffoldService(DomainObject domainObject) {
+		val serviceName = domainObject.name + "Service"
+		if (!domainObject.module.services.exists[s | s.name == serviceName])
+			domainObject.module.addService(serviceName)
+		domainObject.module.services.filter[s | s.name == serviceName].forEach[addServiceScaffoldOperations(domainObject.repository)]
+	}
+
+	def void scaffold(Resource resource) {
+		val serviceName = resource.domainResourceName + "Service"
+		val delegateService = resource.module.application.modules.map[services].flatten.findFirst(e|e.name == serviceName)
+		resource.addResourceScaffoldOperations(delegateService)
+	}
+
 }