Skip to content

Commit 1ed25be

Browse files
committed
Temporarily revert CML rule for coordination between services of different contexts (moved to feature branch)
This reverts commit cc42f8d.
1 parent cc42f8d commit 1ed25be

30 files changed

+12
-1296
lines changed

Diff for: .gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,3 @@ plugin.xml_gen
4242
.gradle/
4343
build/
4444

45-
# MacOS
46-
.DS_Store

Diff for: org.contextmapper.dsl.ide.tests/src/org/contextmapper/dsl/ide/tests/commands/generation/SketchMinerGeneratorCommandTest.xtend

-29
Original file line numberDiff line numberDiff line change
@@ -64,34 +64,5 @@ class SketchMinerGeneratorCommandTest extends AbstractCMLCommandTest {
6464
srcGenFolder.exists.assertTrue
6565
new File(srcGenFolder, "test_BC_TestContext_TestFlow.sketch_miner").exists.assertTrue
6666
}
67-
68-
@Test
69-
def void testSketchMinerGeneratorCommandExecutionOnCoordination() {
70-
// given
71-
initializeCommandsDynamically()
72-
val model = '''
73-
BoundedContext ContextA {
74-
Application {
75-
Coordination TestCoordination {
76-
ContextA::TestService::testOperation;
77-
}
78-
Service TestService {
79-
testOperation;
80-
}
81-
}
82-
}
83-
'''
84-
val fileURI = 'test.cml'.writeFile(model)
85-
86-
// when
87-
val result = languageServer.executeCommand(
88-
new ExecuteCommandParams("cml.generate.sketchminer", #[new JsonPrimitive(fileURI)]))
89-
val resultVal = result.get as String
90-
91-
// then
92-
CMLCommandService.COMMAND_EXECUTED_RETURN_VALUE.assertEquals(resultVal)
93-
srcGenFolder.exists.assertTrue
94-
new File(srcGenFolder, "coordinations/test_BC_ContextA_TestCoordination.sketch_miner").exists.assertTrue
95-
}
9667

9768
}

Diff for: org.contextmapper.dsl.ide.tests/src/org/contextmapper/dsl/ide/tests/quickfixes/OpenCoordinationInBPMNSketchMinerActionTest.xtend

-54
This file was deleted.

Diff for: org.contextmapper.dsl.ide/src/org/contextmapper/dsl/ide/actions/CMLActionRegistry.java

-3
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,12 @@
4242
import org.contextmapper.dsl.ide.actions.impl.SwitchFromSharedKernelToPartnershipAction;
4343
import org.contextmapper.dsl.ide.edit.WorkspaceEditRecorder;
4444
import org.contextmapper.dsl.ide.quickfix.QuickfixCommandMapper;
45-
import org.contextmapper.dsl.ide.quickfix.impl.OpenCoordinationInSketchMinerCommandMapper;
4645
import org.contextmapper.dsl.ide.quickfix.impl.OpenFlowInSketchMinerCommandMapper;
4746
import org.contextmapper.dsl.ide.quickfix.impl.SplitStoryByVerbCommandMapper;
4847
import org.contextmapper.dsl.quickfixes.CMLQuickFix;
4948
import org.contextmapper.dsl.quickfixes.CreateMissingBoundedContextQuickFix;
5049
import org.contextmapper.dsl.quickfixes.SplitStoryByVerb;
5150
import org.contextmapper.dsl.quickfixes.tactic.ExtractIDValueObjectQuickFix;
52-
import org.contextmapper.dsl.validation.ApplicationCoordinationSemanticsValidator;
5351
import org.contextmapper.dsl.validation.ApplicationFlowSemanticsValidator;
5452
import org.contextmapper.dsl.validation.DomainObjectValidator;
5553
import org.contextmapper.dsl.validation.UserRequirementsValidator;
@@ -121,7 +119,6 @@ private void registerAllQuickFixes() {
121119
registerActionQuickFix(DomainObjectValidator.ID_IS_PRIMITIVE_CODE, new ExtractIDValueObjectQuickFix());
122120
registerCommandQuickFix(UserRequirementsValidator.ID_SPLIT_FEATURE_BY_VERB_SUGGESTION, new SplitStoryByVerbCommandMapper(new SplitStoryByVerb()));
123121
registerCommandQuickFix(ApplicationFlowSemanticsValidator.SKETCH_MINER_INFO_ID, new OpenFlowInSketchMinerCommandMapper());
124-
registerCommandQuickFix(ApplicationCoordinationSemanticsValidator.SKETCH_MINER_INFO_ID, new OpenCoordinationInSketchMinerCommandMapper());
125122
}
126123

127124
public List<? extends Command> getApplicableActionCommands(CMLResource resource, List<EObject> selectedObjects) {

Diff for: org.contextmapper.dsl.ide/src/org/contextmapper/dsl/ide/quickfix/impl/OpenCoordinationInSketchMinerCommandMapper.java

-44
This file was deleted.

Diff for: org.contextmapper.dsl.tests/integ-test-files/sketchminer/link-integ-test2.cml

-45
This file was deleted.

Diff for: org.contextmapper.dsl.tests/integ-test-files/sketchminer/no-coordination-existing-test-1.cml

-2
This file was deleted.

Diff for: org.contextmapper.dsl.tests/integ-test-files/sketchminer/simple-coordination-test-1.cml

-28
This file was deleted.

Diff for: org.contextmapper.dsl.tests/integ-test-files/sketchminer/simple-coordination-test-2.cml

-41
This file was deleted.

0 commit comments

Comments
 (0)