Skip to content

Commit

Permalink
no functional change, applied vanilla eclipse formatting for xtend and
Browse files Browse the repository at this point in the history 
xtext files touched by former commit
  • Loading branch information
@astmuc
astmuc committed Dec 12, 2024
1 parent 56bf203 commit 9e3dc1b
Show file tree
Hide file tree
Showing 4 changed files with 234 additions and 237 deletions.
302 changes: 149 additions & 153 deletions org.contextmapper.dsl.tests/src/org/contextmapper/dsl/ContextMapDSLFormattingTest.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,176 +38,172 @@ class ContextMapDSLFormattingTest {
ParseHelper<ContextMappingModel> parseHelper
@Inject extension ISerializer

/**
* Aggregate with entities, traits, basic-types and enums with interspersed comments.
* The traits are used with the 'with' keyword
*/
/**
* Aggregate with entities, traits, basic-types and enums with interspersed comments.
* The traits are used with the 'with' keyword
*/
@Test
def void formatsMapLoadedFromFile() {
val testInput = '''
BoundedContext BC1 { Aggregate A1 { Entity E1 { String prop1 "prop1Comment" String prop2 }
enum State1 { A, B } Trait T1 {}
"State2Comment" enum State2 { "AA" A, B } "E2Comment" Entity E2
with@T1 { package = abc validate = "validation" aggregateRoot "E2Comment"
String prop3 } Entity E3 { String prop1 }
Trait T2 { "prop3Comment" String prop3 "ref1Comment" - @E1 ref1 }
BasicType BT1 { "prop4Comment" int prop4 - List< @T2> prop5 }
"V1Comment" ValueObject V1 with@T1 with@T2 { int intProp }}} BoundedContext BC2
{ Aggregate A2 { Entity E3 extends @E2 { "prop5comment" String prop5 String prop6 "prop6comment" int prop6}}}
ContextMap TestContextMap { contains BC1 }
''';
val expectedResult = '''
ContextMap TestContextMap {
contains BC1
}
BoundedContext BC1 {
Aggregate A1 {
Entity E1 {
String prop1
"prop1Comment"
String prop2
}
enum State1 {
A, B
}
Trait T1 {
}
"State2Comment"
enum State2 {
"AA" A, B
}
"E2Comment"
Entity E2 with@T1 {
package = abc
validate = "validation"
aggregateRoot
val testInput = '''
BoundedContext BC1 { Aggregate A1 { Entity E1 { String prop1 "prop1Comment" String prop2 }
enum State1 { A, B } Trait T1 {}
"State2Comment" enum State2 { "AA" A, B } "E2Comment" Entity E2
with@T1 { package = abc validate = "validation" aggregateRoot "E2Comment"
String prop3 } Entity E3 { String prop1 }
Trait T2 { "prop3Comment" String prop3 "ref1Comment" - @E1 ref1 }
BasicType BT1 { "prop4Comment" int prop4 - List< @T2> prop5 }
"V1Comment" ValueObject V1 with@T1 with@T2 { int intProp }}} BoundedContext BC2
{ Aggregate A2 { Entity E3 extends @E2 { "prop5comment" String prop5 String prop6 "prop6comment" int prop6}}}
ContextMap TestContextMap { contains BC1 }
''';
val expectedResult = '''
ContextMap TestContextMap {
contains BC1
}
BoundedContext BC1 {
Aggregate A1 {
Entity E1 {
String prop1
"prop1Comment"
String prop2
}
enum State1 {
A, B
}
Trait T1 {
}
"State2Comment"
enum State2 {
"AA" A, B
}
"E2Comment"
String prop3
}
Entity E3 {
String prop1
}
Trait T2 {
"prop3Comment"
String prop3
"ref1Comment"
- @E1 ref1
}
BasicType BT1 {
"prop4Comment"
int prop4
- List<@T2> prop5
}
"V1Comment"
ValueObject V1 with@T1 with@T2 {
int intProp
Entity E2 with@T1 {
package = abc
validate = "validation"
aggregateRoot
"E2Comment"
String prop3
}
Entity E3 {
String prop1
}
Trait T2 {
"prop3Comment"
String prop3
"ref1Comment"
- @E1 ref1
}
BasicType BT1 {
"prop4Comment"
int prop4
- List<@T2> prop5
}
"V1Comment"
ValueObject V1 with@T1 with@T2 {
int intProp
}
}
}
}
BoundedContext BC2
{
Aggregate A2 {
Entity E3 extends @E2 {
"prop5comment"
String prop5
String prop6
"prop6comment"
int prop6
BoundedContext BC2
{
Aggregate A2 {
Entity E3 extends @E2 {
"prop5comment"
String prop5
String prop6
"prop6comment"
int prop6
}
}
}
}
''';
// given
val model = parseHelper.parse(testInput)
''';
// given
val model = parseHelper.parse(testInput)
// when, then
assertEquals(expectedResult,
model.serialize(SaveOptions.newBuilder.format().getOptions()))
assertEquals(expectedResult, model.serialize(SaveOptions.newBuilder.format().getOptions()))
}

@Test
def void formatsMapLoadedFromAPI() {
val contextMapper = ContextMapperStandaloneSetup.getStandaloneAPI();
val factory = ContextMappingDSLFactory.eINSTANCE;
val tacticdslFactory = TacticdslFactory.eINSTANCE;

val resource = contextMapper.createCML( "target/test-create-cm.cml" );

// given
val model = resource.getContextMappingModel();
val contextMap = factory.createContextMap();
contextMap.setName( "TestContextMap" );
model.setMap( contextMap );

val boundedContext = factory.createBoundedContext();
boundedContext.setName( "TestContext" );
contextMap.getBoundedContexts().add( boundedContext );

val aggregate = factory.createAggregate();
aggregate.setName( "A1" );
model.getBoundedContexts().add( boundedContext );
boundedContext.getAggregates().add( aggregate );

val trait1 = tacticdslFactory.createTrait();
trait1.setName( "T1" );
aggregate.getDomainObjects().add( trait1 );

val entity1 = tacticdslFactory.createEntity();
aggregate.getDomainObjects().add( entity1 );
entity1.setName( "E100" );
entity1.setAggregateRoot( true );

val entity2 = tacticdslFactory.createEntity();
entity2.setExtends( entity1 );
entity2.setName( "E2" );
entity2.getTraits().add( trait1 );
aggregate.getDomainObjects().add( entity2 );

val attribute1 = tacticdslFactory.createAttribute();
attribute1.setName( "prop1" );
attribute1.setType( "String" );
attribute1.doc = "prop1Comment"
entity2.getAttributes().add( attribute1 );

var reference1 = tacticdslFactory.createReference();
reference1.setName( "ref1" );
reference1.setDomainObjectType( entity2 );
entity2.getReferences().add( reference1 );

val entity3 = tacticdslFactory.createEntity();
entity3.setExtends( entity1 );
entity3.setName( "E3" );
aggregate.getDomainObjects().add( entity3 );


val contextMapper = ContextMapperStandaloneSetup.getStandaloneAPI();
val factory = ContextMappingDSLFactory.eINSTANCE;
val tacticdslFactory = TacticdslFactory.eINSTANCE;

val resource = contextMapper.createCML("target/test-create-cm.cml");

// given
val model = resource.getContextMappingModel();
val contextMap = factory.createContextMap();
contextMap.setName("TestContextMap");
model.setMap(contextMap);

val boundedContext = factory.createBoundedContext();
boundedContext.setName("TestContext");
contextMap.getBoundedContexts().add(boundedContext);

val aggregate = factory.createAggregate();
aggregate.setName("A1");
model.getBoundedContexts().add(boundedContext);
boundedContext.getAggregates().add(aggregate);

val trait1 = tacticdslFactory.createTrait();
trait1.setName("T1");
aggregate.getDomainObjects().add(trait1);

val entity1 = tacticdslFactory.createEntity();
aggregate.getDomainObjects().add(entity1);
entity1.setName("E100");
entity1.setAggregateRoot(true);

val entity2 = tacticdslFactory.createEntity();
entity2.setExtends(entity1);
entity2.setName("E2");
entity2.getTraits().add(trait1);
aggregate.getDomainObjects().add(entity2);

val attribute1 = tacticdslFactory.createAttribute();
attribute1.setName("prop1");
attribute1.setType("String");
attribute1.doc = "prop1Comment"
entity2.getAttributes().add(attribute1);

var reference1 = tacticdslFactory.createReference();
reference1.setName("ref1");
reference1.setDomainObjectType(entity2);
entity2.getReferences().add(reference1);

val entity3 = tacticdslFactory.createEntity();
entity3.setExtends(entity1);
entity3.setName("E3");
aggregate.getDomainObjects().add(entity3);

val expectedResult = '''
ContextMap TestContextMap {
contains TestContext
}
BoundedContext TestContext {
Aggregate A1 {
Trait T1
Entity E100 {
aggregateRoot
}
Entity E2 extends @E100 with@T1 {
"prop1Comment"
String prop1
- @E2 ref1
ContextMap TestContextMap {
contains TestContext
}
BoundedContext TestContext {
Aggregate A1 {
Trait T1
Entity E100 {
aggregateRoot
}
Entity E2 extends @E100 with@T1 {
"prop1Comment"
String prop1
- @E2 ref1
}
Entity E3 extends @E100
}
Entity E3 extends @E100
}
}
'''

// when, then
assertEquals(expectedResult,
model.serialize(SaveOptions.newBuilder.format().getOptions()))
assertEquals(expectedResult, model.serialize(SaveOptions.newBuilder.format().getOptions()))
}


}
14 changes: 8 additions & 6 deletions org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSLRuntimeModule.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,24 @@ package org.contextmapper.dsl

import org.eclipse.xtext.util.formallang.PdaUtil
import org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider
import org.contextmapper.dsl.ContextMapperCrossReferenceSerializer

/**
* Use this class to register components to be used at runtime / without the Equinox extension registry.
*/
class ContextMappingDSLRuntimeModule extends AbstractContextMappingDSLRuntimeModule {

def Class<? extends PdaUtil> bindPdaUtil() {
return ContextMapperPDAUtil
}

override bindIGlobalScopeProvider() {
return ImportUriGlobalScopeProvider
}

override configure(com.google.inject.Binder binder) {
super.configure(binder)
binder.bind(org.eclipse.xtext.serializer.tokens.ICrossReferenceSerializer).to(org.contextmapper.dsl.ContextMapperCrossReferenceSerializer);
}
super.configure(binder)
binder.bind(org.eclipse.xtext.serializer.tokens.ICrossReferenceSerializer).to(
ContextMapperCrossReferenceSerializer);
}
}
1 change: 0 additions & 1 deletion org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/TacticDDDLanguage.xtext
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,4 +576,3 @@ terminal REF :

terminal ASC :
('--'|'association');

Loading

0 comments on commit 9e3dc1b

Please sign in to comment.