Skip to content

Commit ff94370

Browse files
andreas-schillingandreas-schilling
committed
Fix incomplete usage of class pre- and postfixes
This fixes #801 within the scope of the implementation for #695
1 parent 90caa4c commit ff94370

File tree

5 files changed

+32
-29
lines changed

5 files changed

+32
-29
lines changed

‎core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/AspectModelJavaUtil.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.eclipse.esmf.metamodel.ComplexType;
4141
import org.eclipse.esmf.metamodel.Entity;
4242
import org.eclipse.esmf.metamodel.HasProperties;
43+
import org.eclipse.esmf.metamodel.ModelElement;
4344
import org.eclipse.esmf.metamodel.Property;
4445
import org.eclipse.esmf.metamodel.Scalar;
4546
import org.eclipse.esmf.metamodel.StructureElement;
@@ -196,7 +197,7 @@ public static String determineCollectionAspectClassDefinition( final StructureEl
196197
if ( characteristic instanceof Collection ) {
197198
final String collectionType = determineCollectionType( (Collection) characteristic, false, codeGenerationConfig );
198199
final String dataType = getDataType( characteristic.getDataType(), codeGenerationConfig.importTracker(), codeGenerationConfig );
199-
return String.format( "public class %s implements CollectionAspect<%s,%s>", element.getName(), collectionType, dataType );
200+
return String.format( "public class %s implements CollectionAspect<%s,%s>", generateClassName( element, codeGenerationConfig ), collectionType, dataType );
200201
}
201202
}
202203
throw error.get();
@@ -576,7 +577,7 @@ public static String genericClassSignature( final StructureElement element ) {
576577
return generics.isEmpty() ? "" : "<" + generics + ">";
577578
}
578579

579-
public static String generateClassName( final StructureElement element, final JavaCodeGenerationConfig config ) {
580+
public static String generateClassName( final ModelElement element, final JavaCodeGenerationConfig config ) {
580581
if ( (!config.namePrefix().isBlank() || !config.namePostfix().isBlank()) && element.is( StructureElement.class ) ) {
581582
return config.namePrefix() + element.getName() + config.namePostfix();
582583
}

‎core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/metamodel/StaticMetaModelJavaArtifactGenerator.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Locale;
2222
import java.util.Map;
2323
import java.util.Properties;
24+
2425
import javax.annotation.processing.Generated;
2526
import javax.xml.datatype.DatatypeConfigurationException;
2627
import javax.xml.datatype.DatatypeConstants;
@@ -235,7 +236,7 @@ public JavaArtifact apply( final E element, final JavaCodeGenerationConfig confi
235236

236237
final String generatedSource = new TemplateEngine( context, engineConfiguration ).apply( "java-static-class" );
237238
try {
238-
return new JavaArtifact( Roaster.format( generatedSource ), "Meta" + element.getName(),
239+
return new JavaArtifact( Roaster.format( generatedSource ), "Meta" + AspectModelJavaUtil.generateClassName( element, config ),
239240
config.packageName() );
240241
} catch ( final Exception exception ) {
241242
throw new CodeGenerationException( generatedSource, exception );

‎core/esmf-aspect-model-java-generator/src/main/resources/java-pojo-class-body-lib.vm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ${util.determineCollectionAspectClassDefinition( $element, $codeGenerationConfig
3131
${util.generateAbstractEntityClassAnnotations( $complexElement, $codeGenerationConfig, $extendingEntities )}
3232
${util.determineComplexTypeClassDefinition( $complexElement, $codeGenerationConfig )}
3333
#else
34-
public class ${className} {
34+
public class $className {
3535
#end
3636
#foreach( $property in $element.properties )
3737
#javaPojoProperty( $property )

‎core/esmf-aspect-model-java-generator/src/main/resources/java-static-class-body-lib.vm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static final String MODEL_ELEMENT_URN = NAMESPACE + "${element.getName()}
2525

2626
private static String CHARACTERISTIC_NAMESPACE = "${characteristicBaseUrn}";
2727

28-
#propertyDeclaration() Meta${element.getName()} INSTANCE = new Meta${element.getName()}();
28+
#propertyDeclaration() Meta${className} INSTANCE = new Meta${className}();
2929

3030
#if( $util.isXmlDatatypeFactoryRequired( $element ) )
3131
$codeGenerationConfig.importTracker().importExplicit( $DatatypeConfigurationException )

‎core/esmf-aspect-model-java-generator/src/main/resources/java-static-class-property-lib.vm‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,46 +59,47 @@
5959

6060
#macro( javaStaticClassProperty $property $codeGenerationConfig $element )
6161
#set( $propertyType = $util.getPropertyType( $property, $codeGenerationConfig ) )
62+
#set( $containingClass = $util.generateClassName( $element, $codeGenerationConfig ) )
6263

6364
## public static final $type $property = (definition)
6465
#if( $Trait.isAssignableFrom( $property.getCharacteristic().get().getClass() ) )
6566
$codeGenerationConfig.importTracker().importExplicit( $StaticConstraintProperty )
6667
#if( $util.hasContainerType( $property ) )
6768
$codeGenerationConfig.importTracker().importExplicit( $StaticConstraintContainerProperty )
6869
#set( $containedType = $util.getCharacteristicJavaType( $property, $codeGenerationConfig ) )
69-
#propertyDeclaration() StaticConstraintContainerProperty<${element.getName()}, $containedType, $propertyType, #getCharacteristicClassName()>
70-
$util.toConstant( $property.getName() ) = #staticProperty( $property $codeGenerationConfig );
70+
#propertyDeclaration() StaticConstraintContainerProperty<$containingClass, $containedType, $propertyType, #getCharacteristicClassName()>
71+
$util.toConstant( $property.getName() ) = #staticProperty( $property $containingClass $codeGenerationConfig );
7172
#elseif( $util.hasUnit( $property.getCharacteristic().get() ) )
7273
$codeGenerationConfig.importTracker().importExplicit( $StaticConstraintUnitProperty )
7374
$codeGenerationConfig.importTracker().importExplicit( $Unit )
74-
#propertyDeclaration() StaticConstraintUnitProperty<${element.getName()}, $propertyType, #getCharacteristicClassName()>
75-
$util.toConstant( $property.getName() ) = #staticProperty( $property $codeGenerationConfig );
75+
#propertyDeclaration() StaticConstraintUnitProperty<$containingClass, $propertyType, #getCharacteristicClassName()>
76+
$util.toConstant( $property.getName() ) = #staticProperty( $property $containingClass $codeGenerationConfig );
7677
#else
77-
#propertyDeclaration() StaticConstraintProperty<${element.getName()}, $propertyType, #getCharacteristicClassName()>
78-
$util.toConstant( $property.getName() ) = #staticProperty( $property $codeGenerationConfig );
78+
#propertyDeclaration() StaticConstraintProperty<$containingClass, $propertyType, #getCharacteristicClassName()>
79+
$util.toConstant( $property.getName() ) = #staticProperty( $property $containingClass $codeGenerationConfig );
7980
#end
8081
#else
8182
#if( $util.hasContainerType( $property ) && !$propertyType.startsWith( "Map" ) )
8283
$codeGenerationConfig.importTracker().importExplicit( $StaticContainerProperty )
8384
#set( $containedType = $util.getCharacteristicJavaType( $property, $codeGenerationConfig ) )
84-
#propertyDeclaration() StaticContainerProperty<${element.getName()}, $containedType, java.util.$propertyType> $util.toConstant( $property.getName() ) =
85-
#staticProperty( $property $codeGenerationConfig );
85+
#propertyDeclaration() StaticContainerProperty<$containingClass, $containedType, java.util.$propertyType> $util.toConstant( $property.getName() ) =
86+
#staticProperty( $property $containingClass $codeGenerationConfig );
8687
#elseif( $util.hasUnit( $property.getCharacteristic().get() ) )
8788
$codeGenerationConfig.importTracker().importExplicit( $StaticUnitProperty )
8889
$codeGenerationConfig.importTracker().importExplicit( $Unit )
89-
#propertyDeclaration() StaticUnitProperty<${element.getName()}, $propertyType> $util.toConstant( $property.getName() ) =
90-
#staticProperty( $property $codeGenerationConfig );
90+
#propertyDeclaration() StaticUnitProperty<$containingClass, $propertyType> $util.toConstant( $property.getName() ) =
91+
#staticProperty( $property $containingClass $codeGenerationConfig );
9192
#else
92-
#propertyDeclaration() StaticProperty<${element.getName()}, $propertyType> $util.toConstant( $property.getName() ) =
93-
#staticProperty( $property $codeGenerationConfig );
93+
#propertyDeclaration() StaticProperty<$containingClass, $propertyType> $util.toConstant( $property.getName() ) =
94+
#staticProperty( $property $containingClass $codeGenerationConfig );
9495
#end
9596
#end
9697

9798
#end
9899

99100
## -------------------------------------------------
100101

101-
#macro( staticProperty $property $codeGenerationConfig )
102+
#macro( staticProperty $property $containingClass $codeGenerationConfig )
102103
#set( $propertyType = $util.getPropertyType( $property, $codeGenerationConfig ) )
103104

104105
## new $type(
@@ -107,25 +108,25 @@
107108
#if( $util.hasContainerType( $property ) )
108109
$codeGenerationConfig.importTracker().importExplicit( $StaticConstraintContainerProperty )
109110
#set( $containedType = $util.getCharacteristicJavaType( $property, $codeGenerationConfig ) )
110-
new StaticConstraintContainerProperty<${element.getName()}, $containedType, $propertyType, #getCharacteristicClassName()>(
111+
new StaticConstraintContainerProperty<$containingClass, $containedType, $propertyType, #getCharacteristicClassName()>(
111112
#elseif( $util.hasUnit( $property.getCharacteristic().get() ) )
112113
$codeGenerationConfig.importTracker().importExplicit( $StaticConstraintUnitProperty )
113114
$codeGenerationConfig.importTracker().importExplicit( $Unit )
114-
new StaticConstraintUnitProperty<${element.getName()}, $propertyType, #getCharacteristicClassName()>(
115+
new StaticConstraintUnitProperty<$containingClass, $propertyType, #getCharacteristicClassName()>(
115116
#else
116-
new StaticConstraintProperty<${element.getName()}, $propertyType, #getCharacteristicClassName()>(
117+
new StaticConstraintProperty<$containingClass, $propertyType, #getCharacteristicClassName()>(
117118
#end
118119
#else
119120
#if( $util.hasContainerType( $property ) && !$propertyType.startsWith( "Map" ) )
120121
$codeGenerationConfig.importTracker().importExplicit( $StaticContainerProperty )
121122
#set( $containedType = $util.getCharacteristicJavaType( $property, $codeGenerationConfig ) )
122-
new StaticContainerProperty<${element.getName()}, $containedType, $propertyType> (
123+
new StaticContainerProperty<$containingClass, $containedType, $propertyType> (
123124
#elseif( $util.hasUnit( $property.getCharacteristic().get() ) )
124125
$codeGenerationConfig.importTracker().importExplicit( $StaticUnitProperty )
125126
$codeGenerationConfig.importTracker().importExplicit( $Unit )
126-
new StaticUnitProperty<${element.getName()}, $propertyType>(
127+
new StaticUnitProperty<$containingClass, $propertyType>(
127128
#else
128-
new StaticProperty<${element.getName()}, $propertyType>(
129+
new StaticProperty<$containingClass, $propertyType>(
129130
#end
130131
#end
131132

@@ -140,7 +141,7 @@ Optional.of("$property.getPayloadName()"),
140141
#if ( $property.getExtends().isEmpty() )
141142
Optional.empty()
142143
#else
143-
Optional.of( #staticProperty( $property.getExtends().get(), $codeGenerationConfig ) )
144+
Optional.of( #staticProperty( $property.getExtends().get(), $containingClass, $codeGenerationConfig ) )
144145
#end
145146
) {
146147

@@ -175,8 +176,8 @@ public Class<$propertyType> getPropertyType() {
175176
}
176177

177178
@Override
178-
public Class<${element.getName()}> getContainingType() {
179-
return ${element.getName()}.class;
179+
public Class<$containingClass> getContainingType() {
180+
return ${containingClass}.class;
180181
}
181182

182183
#if( $util.hasContainerType( $property ) && !$propertyType.startsWith( "Map" ) )
@@ -188,14 +189,14 @@ public Class<$propertyType> getPropertyType() {
188189

189190
#set( $getterName = $util.getterName( $property ) )
190191
@Override
191-
public $propertyType getValue(${element.getName()} object) {
192+
public $propertyType getValue($containingClass object) {
192193
return object.$getterName();
193194
}
194195

195196
#if ( $codeGenerationConfig.enableSetters() )
196197
#set( $setterName = $util.setterName( $property, $codeGenerationConfig ) )
197198
@Override
198-
public void setValue( ${element.getName()} object, $propertyType value ) {
199+
public void setValue( $containingClass object, $propertyType value ) {
199200
object.$setterName( value );
200201
}
201202
#end

0 commit comments

Comments
 (0)