Skip to content

Closes #7 additional properties for bounded contexts and (sub) domains #8

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.

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,19 @@ public ContextMapperDescriptor scan(FileResource fileResource, String path, Scop
private DomainDescriptor processDomain(Store store, Domain domain) {
DomainDescriptor domainDescriptor = store.create(DomainDescriptor.class);
domainDescriptor.setName(domain.getName());
if (domain.getDomainVisionStatement() != null) {
domainDescriptor.setDomainVisionStatement(domain.getDomainVisionStatement());
}

domain.getSubdomains().forEach(s -> {
SubdomainDescriptor subdomainDescriptor = store.create(SubdomainDescriptor.class);
subdomainDescriptor.setName(s.getName());
if (s.getType() != null) {
subdomainDescriptor.setType(s.getType().getName());
}
if (s.getDomainVisionStatement() != null) {
subdomainDescriptor.setDomainVisionStatement(s.getDomainVisionStatement());
}
domainDescriptor.getSubdomains().add(subdomainDescriptor);
});

Expand All @@ -81,6 +87,18 @@ private BoundedContextDescriptor processBoundedContexts(Store store, List<Domain
if (boundedContext.getType() != null) {
boundedContextDescriptor.setType(boundedContext.getType().getName());
}
if (boundedContext.getDomainVisionStatement() != null) {
boundedContextDescriptor.setDomainVisionStatement(boundedContext.getDomainVisionStatement());
}
if (boundedContext.getImplementationTechnology() != null) {
boundedContextDescriptor.setImplementationTechnology(boundedContext.getImplementationTechnology());
}
if (boundedContext.getResponsibilities() != null && !boundedContext.getResponsibilities().isEmpty()) {
boundedContextDescriptor.setResponsibilities(boundedContext.getResponsibilities().toArray(String[]::new));
}
if (boundedContext.getKnowledgeLevel() != null) {
boundedContextDescriptor.setKnowledgeLevel(boundedContext.getKnowledgeLevel().getLiteral());
}
boundedContext.getImplementedDomainParts().forEach(d -> {
if (d instanceof Subdomain) {
getSubdomainByName(domains, d.getName()).ifPresent(descriptor -> boundedContextDescriptor.getSubdomains().add(descriptor));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,22 @@
@Label("BoundedContext")
public interface BoundedContextBaseDescriptor extends Descriptor {

String getDomainVisionStatement();

void setDomainVisionStatement(String domainVisionStatement);

String getImplementationTechnology();

void setImplementationTechnology(String implementationTechnology);

String[] getResponsibilities();

void setResponsibilities(String[] responsibility);

String getKnowledgeLevel();

void setKnowledgeLevel(String knowledgeLevel);

String getName();

void setName(String name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
@Label("Domain")
public interface DomainDescriptor extends ContextMapperDescriptor {

String getDomainVisionStatement();

void setDomainVisionStatement(String domainVisionStatement);

String getName();

void setName(String name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
@Label("Subdomain")
public interface SubdomainDescriptor extends ContextMapperDescriptor {

String getDomainVisionStatement();

void setDomainVisionStatement(String domainVisionStatement);

String getName();

void setName(String name);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package org.jqassistant.plugin.contextmapper.scanner;

import com.buschmais.jqassistant.core.scanner.api.DefaultScope;
import com.buschmais.jqassistant.core.store.api.model.Descriptor;
import com.buschmais.jqassistant.core.test.plugin.AbstractPluginIT;
import lombok.Builder;
import lombok.Singular;
import org.jqassistant.plugin.contextmapper.model.*;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.io.File;
import java.util.*;

import static org.assertj.core.api.Assertions.assertThat;
import static org.jqassistant.plugin.contextmapper.model.BoundedContextDependencyType.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

public class FullPropertyMapIT extends AbstractPluginIT {

@Test
public void testFullPropertyExample() {
store.beginTransaction();

scanFileAndAssert("Full-Property-Example.cml");

store.commitTransaction();
}

private ContextMapDescriptor scanFileAndAssert(String fileName) {
File testFile = new File(getClassesDirectory(FullPropertyMapIT.class), fileName);
Descriptor descriptor = getScanner().scan(testFile, fileName, DefaultScope.NONE);
assertThat(descriptor).isInstanceOf(ContextMapperDescriptor.class);
assertThat(descriptor).isInstanceOf(ContextMapperFileDescriptor.class);
ContextMapperFileDescriptor contextMapper = (ContextMapperFileDescriptor) descriptor;
assertThat(contextMapper.getContextMaps()).hasSize(1);
assertContextMapNode(contextMapper.getContextMaps().get(0), "FullPropertyMap", "SYSTEM_LANDSCAPE", "TO_BE");
assertThat(contextMapper.getContextMaps().get(0).getBoundedContexts()).hasSize(1);
BoundedContextDescriptor boundedContextDescriptor = contextMapper.getContextMaps().get(0).getBoundedContexts().get(0);
assertThat(boundedContextDescriptor.getDomainVisionStatement()).isEqualTo("Context 1 domainVisionStatement");
assertThat(boundedContextDescriptor.getImplementationTechnology()).isEqualTo("Java, JEE Application");
assertThat(boundedContextDescriptor.getResponsibilities()).containsExactlyInAnyOrderElementsOf(Arrays.asList("Responsibility 1", "Responsibility 2"));
assertThat(boundedContextDescriptor.getKnowledgeLevel()).isEqualTo("CONCRETE");
return contextMapper.getContextMaps().get(0);
}

private void assertContextMapNode(ContextMapDescriptor contextMap, String name, String type, String state) {
assertThat(contextMap.getName()).isEqualTo(name);
assertThat(contextMap.getType()).isEqualTo(type);
assertThat(contextMap.getState()).isEqualTo(state);
}

}
26 changes: 26 additions & 0 deletions src/test/resources/Full-Property-Example.cml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* Example Context Map written with 'ContextMapper DSL' */
ContextMap FullPropertyMap {
type = SYSTEM_LANDSCAPE
state = TO_BE

/* Add bounded contexts to this context map: */
contains Context1
}

/* Bounded Context Definitions */
BoundedContext Context1 implements Subdomain1 {
domainVisionStatement = "Context 1 domainVisionStatement"
implementationTechnology = "Java, JEE Application"
responsibilities = "Responsibility 1", "Responsibility 2"
knowledgeLevel = CONCRETE
}

/* Domain & Subdomain Definitions */
Domain Domain1 {
domainVisionStatement = "Domain 1 domainVisionStatement"

Subdomain Subdomain1 {
type = CORE_DOMAIN
domainVisionStatement = "Subdomain 1 domainVisionStatement"
}
}
Loading