Skip to content

Fix loading CML files with imports via relative paths (#364) #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stefan-ka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix loading CML files with imports via relative paths (#364) #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions org.contextmapper.dsl.tests/integ-test-files/standalone/imports/BoundedContexts.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Domain Insurance {
Subdomain CustomerDomain
Subdomain PolicyDomain
}

BoundedContext CustomerManagement implements CustomerDomain {
Aggregate Customers {
Entity Customer {
aggregateRoot
String firstname
}
}
}

BoundedContext PolicyManagement implements PolicyDomain {
Aggregate Policies {
Entity Policy {
aggregateRoot
String policyNr
}
}
}
7 changes: 7 additions & 0 deletions org.contextmapper.dsl.tests/integ-test-files/standalone/imports/ContextMap.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import "./BoundedContexts.cml"

ContextMap InsuranceContextMap {
contains CustomerManagement, PolicyManagement

CustomerManagement [U,OHS,PL] -> [D,ACL] PolicyManagement
}
17 changes: 17 additions & 0 deletions org.contextmapper.dsl.tests/src/org/contextmapper/dsl/standalone/StandaloneAPITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.contextmapper.dsl.contextMappingDSL.ContextMappingDSLFactory;
import org.contextmapper.dsl.contextMappingDSL.ContextMappingModel;
import org.contextmapper.dsl.generator.ContextMapGenerator;
import org.contextmapper.dsl.generator.PlantUMLGenerator;
import org.contextmapper.dsl.generator.contextmap.ContextMapFormat;
import org.contextmapper.dsl.refactoring.SplitBoundedContextByOwner;
import org.eclipse.xtext.resource.SaveOptions;
Expand Down Expand Up @@ -138,6 +139,22 @@ public void canGenerateIntoCustomDirectory() {
assertTrue(expectedOutput.exists());
}

@Test
public void canLoadCMLWithImportsViaRelativePathAndCallGenerator() {
// given
StandaloneContextMapperAPI contextMapper = ContextMapperStandaloneSetup.getStandaloneAPI();
CMLResource cml = contextMapper.loadCML("./integ-test-files/standalone/imports/ContextMap.cml");
File expectedOutput = new File("./out/imports/ContextMap_ContextMap.puml");
ensureFileDoesNotExist(expectedOutput);

// when
contextMapper.callGenerator(cml, new PlantUMLGenerator(), "./out/imports");

// then
assertTrue(cml.getURI().isFile());
assertTrue(expectedOutput.exists());
}

@Test
public void canApplyRefactoring() throws IOException {
// given
Expand Down
12 changes: 11 additions & 1 deletion org.contextmapper.dsl/src/org/contextmapper/dsl/standalone/StandaloneContextMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,17 @@ public StandaloneContextMapper() {

@Override
public CMLResource loadCML(String filepath) {
return new CMLResource(new ResourceSetImpl().getResource(URI.createURI(filepath), true));
return new CMLResource(new ResourceSetImpl().getResource(toURI(filepath), true));
}

private URI toURI(String filepath) {
URI uri = URI.createURI(filepath);
// plain file paths (relative or absolute, without scheme) are converted into absolute file URIs;
// otherwise imports cannot be resolved against the URI of the loaded resource (see issue #364)
// a single letter scheme is a Windows drive letter (C:\...)
if (uri.scheme() == null || uri.scheme().length() == 1)
return URI.createFileURI(new File(filepath).getAbsolutePath());
return uri;
}

@Override
Expand Down
Loading