MDSL generator fix: can handle multiple parameter references to empty domain objects (#171)

Author: stefan-ka

org.contextmapper.dsl.tests/integ-test-files/mdsl/mdsl-reference-to-empty-domain-object-3.cml

@@ -0,0 +1,34 @@
+ContextMap {
+	contains CustomerManagementContext, ContractManagementContext, JustAnotherContext
+	
+	CustomerManagementContext -> ContractManagementContext {
+		exposedAggregates = Customers
+		implementationTechnology = "RESTful HTTP"
+	}
+	
+	// this relationship must be ignored, because it has no exposedAggregates
+	CustomerManagementContext -> JustAnotherContext
+
+	// duplicate relationship should not change the result	
+	CustomerManagementContext -> ContractManagementContext {
+		exposedAggregates = Customers
+	}
+	
+}
+
+BoundedContext ContractManagementContext
+
+BoundedContext CustomerManagementContext {
+
+	Aggregate Customers {
+		Entity Customer {
+			aggregateRoot
+			
+			def ReturnType updateCustomer(@Param1 param1, @Param2 param2);
+		}
+		Entity Param1
+		Entity Param2
+	}
+}
+
+BoundedContext JustAnotherContext

org.contextmapper.dsl.tests/integ-test-files/mdsl/mdsl-reference-to-empty-domain-object-3.mdsl

@@ -0,0 +1,29 @@
+// Generated from DDD Context Map.
+API description CustomerManagementContextAPI
+
+
+data type Param1 P // the type Param1 has not been specified or does not contain any attributes in CML
+data type Param2 P // the type Param2 has not been specified or does not contain any attributes in CML
+data type ReturnType P // the type ReturnType has not been specified or does not contain any attributes in CML
+data type updateCustomerParameter { "param1":Param1, "param2":Param2 }
+
+
+endpoint type CustomersAggregate
+	exposes
+		operation updateCustomer
+			expecting
+				payload updateCustomerParameter
+			delivering
+				payload ReturnType
+
+
+API provider CustomerManagementContextProvider
+	offers CustomersAggregate
+	at endpoint location "http://localhost:8000"
+		via protocol "RESTful HTTP"
+
+
+API client ContractManagementContextClient
+	consumes CustomersAggregate
+
+IPA

org.contextmapper.dsl.tests/src/org/contextmapper/dsl/tests/generators/mdsl/MDSLAPIDescriptionCreatorTest.java

@@ -193,6 +193,11 @@ void canHandleReferencesToEmptyDomainObjects() throws IOException {
 	void canHandleDeepReferencesToEmptyDomainObjects() throws IOException {
 		testCMLInputAndMDSLOutputFiles("mdsl-reference-to-empty-domain-object-2");
 	}
+	
+	@Test
+	void canHandleMultipleParameterReferencesToEmptyDomainObjects() throws IOException {
+		testCMLInputAndMDSLOutputFiles("mdsl-reference-to-empty-domain-object-3");
+	}
 
 	private void testCMLInputAndMDSLOutputFiles(String baseFilename) throws IOException {
 		testCMLInputAndMDSLOutputFiles(baseFilename, false);

org.contextmapper.dsl/src/org/contextmapper/dsl/generator/mdsl/MDSLModelCreator.java

@@ -333,6 +333,10 @@ private DataTypeAttribute getDataTypeAttribute4DomainObject(DataType dataType, S
 				}
 			}
 			mdslAttribute.addChildren(refAttributes);
+			
+			// in case there are no attributes or refs, we need an abstract data type:
+			if (!mdslAttribute.hasChildren())
+				mdslAttribute.setType(mapAbstractDataType(simpleDomainObject.getName()));
 		} else if (simpleDomainObject instanceof Enum) {
 			mdslAttribute.setType(createEnumDataType((Enum) simpleDomainObject).getName());
 		} else {