Skip to content

Commit 0d1f312

Browse files
committed
Fix styles
1 parent 124f425 commit 0d1f312

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -265,20 +265,24 @@ private static String determineCollectionType( final Collection collection, fina
265265

266266
if ( collection.isAllowDuplicates() && collection.isOrdered() ) {
267267
codeGenerationConfig.importTracker().importExplicit( List.class );
268-
return containerType( List.class, getDataType( dataType, codeGenerationConfig.importTracker(), codeGenerationConfig ), elementConstraint );
268+
return containerType( List.class, getDataType( dataType, codeGenerationConfig.importTracker(), codeGenerationConfig ),
269+
elementConstraint );
269270
}
270271
if ( !collection.isAllowDuplicates() && collection.isOrdered() ) {
271272
codeGenerationConfig.importTracker().importExplicit( LinkedHashSet.class );
272-
return containerType( LinkedHashSet.class, getDataType( dataType, codeGenerationConfig.importTracker(), codeGenerationConfig ), elementConstraint );
273+
return containerType( LinkedHashSet.class, getDataType( dataType, codeGenerationConfig.importTracker(), codeGenerationConfig ),
274+
elementConstraint );
273275
}
274276
if ( collection.isAllowDuplicates() && !collection.isOrdered() ) {
275277
codeGenerationConfig.importTracker().importExplicit( java.util.Collection.class );
276-
return containerType( java.util.Collection.class, getDataType( dataType, codeGenerationConfig.importTracker(), codeGenerationConfig ),
278+
return containerType( java.util.Collection.class,
279+
getDataType( dataType, codeGenerationConfig.importTracker(), codeGenerationConfig ),
277280
elementConstraint );
278281
}
279282
if ( !collection.isAllowDuplicates() && !collection.isOrdered() ) {
280283
codeGenerationConfig.importTracker().importExplicit( Set.class );
281-
return containerType( Set.class, getDataType( dataType, codeGenerationConfig.importTracker(), codeGenerationConfig ), elementConstraint );
284+
return containerType( Set.class, getDataType( dataType, codeGenerationConfig.importTracker(), codeGenerationConfig ),
285+
elementConstraint );
282286
}
283287
throw new CodeGenerationException( "Could not determine Java collection type for " + collection.getName() );
284288
}
@@ -304,12 +308,13 @@ public static String containerType( final Class<?> containerClass, final String
304308
* @param importTracker the import tracker
305309
* @return a {@link String} containing the definition of the Java Data Type
306310
*/
307-
public static String getDataType( final Optional<Type> dataType, final ImportTracker importTracker, final JavaCodeGenerationConfig codeGenerationConfig ) {
311+
public static String getDataType( final Optional<Type> dataType, final ImportTracker importTracker,
312+
final JavaCodeGenerationConfig codeGenerationConfig ) {
308313
return dataType.map( type -> {
309314
final Type actualDataType = dataType.get();
310315
if ( actualDataType instanceof ComplexType ) {
311316
final String complexDataType = ((ComplexType) actualDataType).getName();
312-
if ( ( !codeGenerationConfig.namePrefix().isBlank() || !codeGenerationConfig.namePostfix().isBlank() ) ) {
317+
if ( (!codeGenerationConfig.namePrefix().isBlank() || !codeGenerationConfig.namePostfix().isBlank()) ) {
313318
return codeGenerationConfig.namePrefix() + complexDataType + codeGenerationConfig.namePostfix();
314319
}
315320
return complexDataType;
@@ -491,7 +496,8 @@ public static String generateFilterCompare( final Optional<Type> optionalDataTyp
491496
public static String getCharacteristicJavaType( final Property property, final JavaCodeGenerationConfig codeGenerationConfig ) {
492497
final Supplier<RuntimeException> error = () -> new CodeGenerationException( "No data type found for Property " + property.getName() );
493498
if ( hasContainerType( property ) ) {
494-
return getDataType( property.getCharacteristic().orElseThrow( error ).getDataType(), codeGenerationConfig.importTracker(), codeGenerationConfig );
499+
return getDataType( property.getCharacteristic().orElseThrow( error ).getDataType(), codeGenerationConfig.importTracker(),
500+
codeGenerationConfig );
495501
}
496502

497503
return property.getEffectiveCharacteristic().flatMap( Characteristic::getDataType ).map( type -> {
@@ -564,7 +570,7 @@ public static String genericClassSignature( final StructureElement element ) {
564570
}
565571

566572
public static String generateClassName( final StructureElement element, final JavaCodeGenerationConfig config ) {
567-
if ( ( !config.namePrefix().isBlank() || !config.namePostfix().isBlank() ) && element.is( StructureElement.class ) ) {
573+
if ( (!config.namePrefix().isBlank() || !config.namePostfix().isBlank()) && element.is( StructureElement.class ) ) {
568574
return config.namePrefix() + element.getName() + config.namePostfix();
569575
}
570576
return element.getName();

0 commit comments

Comments
 (0)