Bugfix: Set aggregateRoot property in newly generated aggregates (AR 'Split Aggregate by Entities') (#61)

Author: stefan-ka

org.contextmapper.dsl.tests/src/org/contextmapper/dsl/tests/generators/refactoring/henshin/SplitAggregateByEntitiesTest.java

@@ -13,6 +13,8 @@
 import org.contextmapper.dsl.contextMappingDSL.Module;
 import org.contextmapper.dsl.refactoring.henshin.SplitAggregateByEntitiesRefactoring;
 import org.contextmapper.dsl.tests.generators.refactoring.AbstractRefactoringTest;
+import org.contextmapper.tactic.dsl.tacticdsl.DomainObject;
+import org.contextmapper.tactic.dsl.tacticdsl.SimpleDomainObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.xbase.lib.IteratorExtensions;
 import org.junit.jupiter.api.Test;
@@ -44,6 +46,12 @@ void canSplitWithTwoAggregates() throws IOException {
 		List<String> aggregateNames = bc.getAggregates().stream().map(a -> a.getName()).collect(Collectors.toList());
 		assertTrue(aggregateNames.contains("Customers"));
 		assertTrue(aggregateNames.contains("NewAggregate1"));
+
+		for (Aggregate aggregate : bc.getAggregates()) {
+			SimpleDomainObject obj = aggregate.getDomainObjects().get(0);
+			if (obj instanceof DomainObject)
+				assertTrue(((DomainObject) obj).isAggregateRoot());
+		}
 	}
 
 	@Test
@@ -79,9 +87,9 @@ void canSplitInModule() throws IOException {
 		List<ContextMappingModel> contextMappingModels = IteratorExtensions
 				.<ContextMappingModel>toList(Iterators.<ContextMappingModel>filter(reloadResource(input).getAllContents(), ContextMappingModel.class));
 		BoundedContext bc = contextMappingModels.get(0).getBoundedContexts().get(0);
-		
+
 		Module testModule = bc.getModules().get(0);
-		
+
 		assertEquals(2, testModule.getAggregates().size());
 
 		for (Aggregate aggregate : testModule.getAggregates()) {

org.contextmapper.dsl.ui/src/org/contextmapper/dsl/ui/handler/wizard/pages/AggregateSelectionWizardPage.java

@@ -24,6 +24,7 @@
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.program.Program;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
@@ -127,4 +128,9 @@ public List<String> getSelectedAggregates() {
 	public boolean isPageComplete() {
 		return boundedContextName.getText() != null && !"".equals(boundedContextName.getText()) && getSelectedAggregates().size() >= 1;
 	}
+	
+	@Override
+	public void performHelp() {
+		Program.launch("https://contextmapper.github.io/docs/ar-extract-aggregates-by-nfr/");
+	}
 }

org.contextmapper.dsl.ui/src/org/contextmapper/dsl/ui/handler/wizard/pages/ContextMapperWizardPage.java

@@ -18,7 +18,7 @@ public Image getImage() {
 
 	@Override
 	public void performHelp() {
-		Program.launch("https://contextmapper.github.io/docs");
+		Program.launch("https://contextmapper.github.io/docs/architectural-refactorings/");
 	}
 
 }

org.contextmapper.dsl.ui/src/org/contextmapper/dsl/ui/handler/wizard/pages/TwoBoundedContextSelectionWizardPage.java

@@ -26,6 +26,7 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.program.Program;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
@@ -110,7 +111,7 @@ public void keyReleased(KeyEvent e) {
 		setControl(container);
 		setPageComplete(false);
 	}
-	
+
 	@Override
 	public void setVisible(boolean visible) {
 		super.setVisible(visible);
@@ -129,4 +130,9 @@ public String getBoundedContext2() {
 	public boolean isPageComplete() {
 		return this.allBoundedContexts.contains(comboBC1.getText()) && this.allBoundedContexts.contains(comboBC2.getText()) && !comboBC1.getText().equals(comboBC2.getText());
 	}
+
+	@Override
+	public void performHelp() {
+		Program.launch("https://contextmapper.github.io/docs/ar-merge-bounded-contexts/");
+	}
 }

org.contextmapper.dsl/src/org/contextmapper/dsl/refactoring/henshin/SplitAggregateByEntitiesRefactoring.java

@@ -22,6 +22,8 @@
 import org.contextmapper.dsl.contextMappingDSL.BoundedContext;
 import org.contextmapper.dsl.contextMappingDSL.ContextMappingModel;
 import org.contextmapper.dsl.contextMappingDSL.Module;
+import org.contextmapper.tactic.dsl.tacticdsl.DomainObject;
+import org.contextmapper.tactic.dsl.tacticdsl.SimpleDomainObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.henshin.interpreter.UnitApplication;
 import org.eclipse.xtext.EcoreUtil2;
@@ -72,26 +74,37 @@ protected void postProcessing(Resource resource) {
 			Aggregate inputAggregate = getSelectedAggregate(contextMappingModels.get(0));
 			if (inputAggregate == null)
 				return;
+			setAggregateRoot(inputAggregate);
 			if (inputAggregate.eContainer() instanceof BoundedContext) {
 				BoundedContext bc = (BoundedContext) inputAggregate.eContainer();
-				fixNewAggregateNames(bc.getAggregates());
+				fixNewAggregateNamesAndSetRoot(bc.getAggregates());
 			} else if (inputAggregate.eContainer() instanceof Module) {
 				Module m = (Module) inputAggregate.eContainer();
-				fixNewAggregateNames(m.getAggregates());
+				fixNewAggregateNamesAndSetRoot(m.getAggregates());
 			}
 		}
 
 	}
 
-	private void fixNewAggregateNames(List<Aggregate> aggregates) {
+	private void fixNewAggregateNamesAndSetRoot(List<Aggregate> aggregates) {
 		List<Aggregate> newAggregates = aggregates.stream().filter(agg -> agg.getName().equals(TEMP_AGGREGATE_NAMES)).collect(Collectors.toList());
 		int i = 1;
 		for (Aggregate newAggregate : newAggregates) {
 			newAggregate.setName(NEW_AGGREGATE_NAME_PREFIX + i);
+			setAggregateRoot(newAggregate);
 			i++;
 		}
 	}
 
+	private void setAggregateRoot(Aggregate aggregate) {
+		// after this refactoring, there should only be one entity per aggregate
+		if (aggregate.getDomainObjects().size() == 1) {
+			SimpleDomainObject object = aggregate.getDomainObjects().get(0);
+			if (object instanceof DomainObject)
+				((DomainObject) object).setAggregateRoot(true);
+		}
+	}
+
 	private Aggregate getSelectedAggregate(ContextMappingModel model) {
 		List<Aggregate> allAggregates = EcoreUtil2.<Aggregate>getAllContentsOfType(model, Aggregate.class);
 		List<Aggregate> aggregatesWithInputName = allAggregates.stream().filter(agg -> agg.getName().equals(aggregateName)).collect(Collectors.toList());

org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/formatting2/TacticDDDLanguageFormatter.xtend

@@ -17,6 +17,7 @@ package org.contextmapper.tactic.dsl.formatting2
 
 import com.google.inject.Inject
 import org.contextmapper.tactic.dsl.services.TacticDDDLanguageGrammarAccess
+import org.contextmapper.tactic.dsl.tacticdsl.DomainEvent
 import org.contextmapper.tactic.dsl.tacticdsl.Entity
 import org.contextmapper.tactic.dsl.tacticdsl.TacticDDDModel
 import org.eclipse.xtext.formatting2.AbstractFormatter2
@@ -39,6 +40,8 @@ class TacticDDDLanguageFormatter extends AbstractFormatter2 {
 			entity.regionFor.keyword('}').prepend[newLine].append[newLine]
 		)[indent]
 
+		entity.regionFor.keyword('aggregateRoot').append[newLine]
+
 		for (attribute : entity.attributes) {
 			attribute.format
 			attribute.append[newLine]
@@ -47,5 +50,22 @@ class TacticDDDLanguageFormatter extends AbstractFormatter2 {
 			reference.format
 		}
 	}
+	
+	def dispatch void format(DomainEvent domainEvent, extension IFormattableDocument document) {
+		interior(
+			domainEvent.regionFor.keyword('{').append[newLine],
+			domainEvent.regionFor.keyword('}').prepend[newLine].append[newLine]
+		)[indent]
+
+		domainEvent.regionFor.keyword('aggregateRoot').append[newLine]
+
+		for (attribute : domainEvent.attributes) {
+			attribute.format
+			attribute.append[newLine]
+		}
+		for (reference : domainEvent.references) {
+			reference.format
+		}
+	}
 
 }