Rewrite 'Split Aggregate by Entity' and removed Henshin dependency (Eclipse 2021-06 compatibility) (#299)

Author: stefan-ka

org.contextmapper.dsl.ide/src/org/contextmapper/dsl/ide/commands/impl/refactoring/SplitAggregateByEntitiesRefactoringCommand.java

@@ -17,7 +17,7 @@
 
 import org.contextmapper.dsl.ide.edit.WorkspaceEditRecorder;
 import org.contextmapper.dsl.refactoring.SemanticCMLRefactoring;
-import org.contextmapper.dsl.refactoring.henshin.SplitAggregateByEntitiesRefactoring;
+import org.contextmapper.dsl.refactoring.SplitAggregateByEntitiesRefactoring;
 import org.eclipse.lsp4j.ExecuteCommandParams;
 
 import com.google.gson.JsonPrimitive;

org.contextmapper.dsl.repository/category.xml

@@ -18,23 +18,7 @@
    <feature id="contextmapper.freemarker">
       <category name="main"/>
    </feature>
-   <bundle id="org.eclipse.emf.henshin.interpreter" version="1.6.0.202001052147">
-      <category name="main"/>
-   </bundle>
-   <bundle id="org.eclipse.emf.henshin.model" version="1.6.0.202001052147">
-      <category name="main"/>
-   </bundle>
-   <bundle id="org.eclipse.emf.henshin.diagram" version="1.6.0.202001052147">
-      <category name="main"/>
-   </bundle>
-   <bundle id="org.eclipse.emf.henshin.edit" version="1.6.0.202001052147">
-      <category name="main"/>
-   </bundle>
-   <bundle id="org.eclipse.emf.henshin.editor" version="1.6.0.202001052147">
-      <category name="main"/>
-   </bundle>
    <category-def name="main" label="Context Mapper"/>
-   <repository-reference location="https://download.eclipse.org/modeling/emft/henshin/updates/1.6.0/" enabled="true" />
    <repository-reference location="https://contextmapper.jfrog.io/artifactory/context-map-generator-releases/" enabled="true" />
    <repository-reference location="https://contextmapper.jfrog.io/artifactory/service-cutter-library-releases/" enabled="true" />
    <repository-reference location="https://contextmapper.jfrog.io/artifactory/context-mapper-osgi-bundles/1.0.0/" enabled="true" />

org.contextmapper.dsl.target/org.contextmapper.dsl.target.target

@@ -35,10 +35,6 @@
 			<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
 			<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-09"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="org.eclipse.emf.henshin.sdk.feature.group" version="1.6.0.202001052147"/>
-			<repository location="https://download.eclipse.org/modeling/emft/henshin/updates/1.6.0/"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://contextmapper.jfrog.io/artifactory/context-map-generator-releases/"/>
 			<unit id="org.contextmapper.contextmap.generator.feature.feature.group" version="1.2.1"/>
@@ -60,4 +56,4 @@
 			<unit id="org.yaml.snakeyaml" version="1.14.0.v201604211500"/>
 		</location>
 	</locations>
-</target>
+</target>

org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/henshin/SplitAggregateByEntitiesTest.java renamed to org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/SplitAggregateByEntitiesTest.java

@@ -1,4 +1,4 @@
-package org.contextmapper.dsl.refactoring.henshin;
+package org.contextmapper.dsl.refactoring;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -15,8 +15,6 @@
 import org.contextmapper.dsl.contextMappingDSL.ContextMappingModel;
 import org.contextmapper.dsl.contextMappingDSL.SculptorModule;
 import org.contextmapper.dsl.contextMappingDSL.UpstreamDownstreamRelationship;
-import org.contextmapper.dsl.refactoring.AbstractRefactoringTest;
-import org.contextmapper.dsl.refactoring.henshin.SplitAggregateByEntitiesRefactoring;
 import org.contextmapper.tactic.dsl.tacticdsl.DomainObject;
 import org.contextmapper.tactic.dsl.tacticdsl.SimpleDomainObject;
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -45,7 +43,7 @@ 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"));
+		assertTrue(aggregateNames.contains("Account"));
 
 		for (Aggregate aggregate : bc.getAggregates()) {
 			SimpleDomainObject obj = aggregate.getDomainObjects().get(0);
@@ -95,7 +93,7 @@ void canSplitInModule() throws IOException {
 
 		List<String> aggregateNames = testModule.getAggregates().stream().map(a -> a.getName()).collect(Collectors.toList());
 		assertTrue(aggregateNames.contains("Customers"));
-		assertTrue(aggregateNames.contains("NewAggregate1"));
+		assertTrue(aggregateNames.contains("Account"));
 	}
 
 	@Test
@@ -119,12 +117,12 @@ void canFixExposedAggregatesInContextMap() throws IOException {
 		assertEquals(2, customerBC.getAggregates().size());
 		List<String> aggregateNames = customerBC.getAggregates().stream().map(a -> a.getName()).collect(Collectors.toList());
 		assertTrue(aggregateNames.contains("Customers"));
-		assertTrue(aggregateNames.contains("NewAggregate1"));
+		assertTrue(aggregateNames.contains("Account"));
 
 		UpstreamDownstreamRelationship relationship = (UpstreamDownstreamRelationship) model.getMap().getRelationships().get(0);
 		List<String> upstreamExposedAggregates = relationship.getUpstreamExposedAggregates().stream().map(a -> a.getName()).collect(Collectors.toList());
 		assertTrue(upstreamExposedAggregates.contains("Customers"));
-		assertTrue(upstreamExposedAggregates.contains("NewAggregate1"));
+		assertTrue(upstreamExposedAggregates.contains("Account"));
 	}
 
 	@Test

org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/henshin/HenshinTransformationFileProviderTest.java

@@ -937,9 +937,6 @@
 			</menu>
 		</menuContribution>
 	</extension>
-	<extension point="org.eclipse.ui.startup">
-		<startup class="org.contextmapper.dsl.ui.startup.ContextMapperPluginStartup"/>
-	</extension>
 	<extension point="org.eclipse.ui.newWizards">
     	<wizard
         	icon="icons/cml-dialog-image.png"

org.contextmapper.dsl.ui/plugin.xml

@@ -21,7 +21,7 @@
 import org.contextmapper.dsl.cml.CMLResource;
 import org.contextmapper.dsl.contextMappingDSL.Aggregate;
 import org.contextmapper.dsl.refactoring.SemanticCMLRefactoring;
-import org.contextmapper.dsl.refactoring.henshin.SplitAggregateByEntitiesRefactoring;
+import org.contextmapper.dsl.refactoring.SplitAggregateByEntitiesRefactoring;
 import org.contextmapper.tactic.dsl.tacticdsl.Entity;
 import org.contextmapper.tactic.dsl.tacticdsl.SimpleDomainObject;
 import org.eclipse.core.commands.ExecutionEvent;

org.contextmapper.dsl.ui/src/org/contextmapper/dsl/ui/handler/SplitAggregateByEntitiesRefactoringHandler.java

@@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.emf.common,
  org.eclipse.xtend.lib;bundle-version="2.14.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.eclipse.emf.henshin.interpreter;bundle-version="1.4.0",
  org.apache.commons.io;bundle-version="2.2.0",
  org.contextmapper.contextmap.generator;bundle-version="1.2.1",
  org.apache.commons.lang3;bundle-version="3.9.0",
@@ -61,7 +60,6 @@ Export-Package: org.contextmapper.dsl,
  org.contextmapper.dsl.quickfixes.tactic,
  org.contextmapper.dsl.refactoring,
  org.contextmapper.dsl.refactoring.exception,
- org.contextmapper.dsl.refactoring.henshin,
  org.contextmapper.dsl.scoping,
  org.contextmapper.dsl.serializer,
  org.contextmapper.dsl.services,

org.contextmapper.dsl.ui/src/org/contextmapper/dsl/ui/startup/ContextMapperPluginStartup.java

@@ -10,7 +10,6 @@ dependencies {
 	compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.9'
 	compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.9'
 	compile group: 'org.yaml', name: 'snakeyaml', version: '1.14'
-	compile group: 'org.contextmapper', name: 'henshin-interpreter', version: '1.6.0'
 	compile group: 'org.contextmapper', name: 'context-map-generator', version: '1.2.1'
 	compile group: 'org.contextmapper', name: 'service-cutter-library', version: '1.2.1'
 }