DTO to EMF converters (c.d.)

- Fix for issue with custom `java.util.Map$Entry`, used when creating `EMap` - Fix for issue with `org.gecko.emf.converter` used as package name in integration tests Signed-off-by: Michael H. Siemaszko <mhs@into.software>
geckoprojects-org · May 26, 2024 · b968eac · b968eac
1 parent c25e1c2
commit b968eac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/org.gecko.emf.converter.tests/bnd.bnd b/org.gecko.emf.converter.tests/bnd.bnd
@@ -8,6 +8,7 @@ Bundle-Version: 1.0.0.SNAPSHOT
 
 -buildpath: \
 	org.gecko.emf.converter;version=snapshot,\
+	org.gecko.emf.converter.model;version=snapshot,\
 	org.osgi.dto,\
 	org.osgi.util.converter;version=latest,\
 	org.osgi.util.function;version=latest

diff --git a/...ecko.emf.converter.tests/src/org/gecko/emf/converter/tests/DTOToEObjectConverterTest.java b/...ecko.emf.converter.tests/src/org/gecko/emf/converter/tests/DTOToEObjectConverterTest.java
@@ -36,7 +36,7 @@
 @ExtendWith(BundleContextExtension.class)
 @ExtendWith(ServiceExtension.class)
 public class DTOToEObjectConverterTest {
-	private static final String PACKAGE_NAME = "org.gecko.emf.converter";
+	private static final String PACKAGE_NAME = "dto_to_eobject_converter_test";
 	private static final String NS_URI = "http://gecko.org/test/model/converter/1.0";
 	private static final String NS_PREFIX = "tests";
 

diff --git a/...cko.emf.converter.tests/src/org/gecko/emf/converter/tests/DTOToEPackageConverterTest.java b/...cko.emf.converter.tests/src/org/gecko/emf/converter/tests/DTOToEPackageConverterTest.java
@@ -43,7 +43,7 @@
 @ExtendWith(BundleContextExtension.class)
 @ExtendWith(ServiceExtension.class)
 public class DTOToEPackageConverterTest {
-	private static final String PACKAGE_NAME = "org.gecko.emf.converter";
+	private static final String PACKAGE_NAME = "dto_to_epackage_converter_test";
 	private static final String NS_URI = "http://gecko.org/test/model/converter/1.0";
 	private static final String NS_PREFIX = "tests";
 

diff --git a/org.gecko.emf.converter/src/org/gecko/emf/converter/DTOToEPackageConverter.java b/org.gecko.emf.converter/src/org/gecko/emf/converter/DTOToEPackageConverter.java
@@ -298,16 +298,16 @@ private static void createEMap(EcoreFactory eFactory, EPackage ePackage, EClass
 			mapEntryEClass.setInstanceClassName("java.util.Map$Entry");
 
 			// key
-			EReference dynamicMapEntryKeyEReference = eFactory.createEReference();
-			dynamicMapEntryKeyEReference.setName("key");
-			dynamicMapEntryKeyEReference.setEType(getEClassifierForJavaType(eFactory, ePackage, mapKeyActualType));
-			mapEntryEClass.getEStructuralFeatures().add(dynamicMapEntryKeyEReference);
+			EAttribute dynamicMapEntryKeyEAttribute = eFactory.createEAttribute();
+			dynamicMapEntryKeyEAttribute.setName("key");
+			dynamicMapEntryKeyEAttribute.setEType(getEClassifierForJavaType(eFactory, ePackage, mapKeyActualType));
+			mapEntryEClass.getEStructuralFeatures().add(dynamicMapEntryKeyEAttribute);
 
 			// value
-			EReference dynamicMapEntryValueEReference = eFactory.createEReference();
-			dynamicMapEntryValueEReference.setName("value");
-			dynamicMapEntryValueEReference.setEType(getEClassifierForJavaType(eFactory, ePackage, mapValueActualType));
-			mapEntryEClass.getEStructuralFeatures().add(dynamicMapEntryValueEReference);
+			EAttribute dynamicMapEntryValueEAttribute = eFactory.createEAttribute();
+			dynamicMapEntryValueEAttribute.setName("value");
+			dynamicMapEntryValueEAttribute.setEType(getEClassifierForJavaType(eFactory, ePackage, mapValueActualType));
+			mapEntryEClass.getEStructuralFeatures().add(dynamicMapEntryValueEAttribute);
 
 			ePackage.getEClassifiers().add(mapEntryEClass);