@@ -265,20 +265,24 @@ private static String determineCollectionType( final Collection collection, fina
265
265
266
266
if ( collection .isAllowDuplicates () && collection .isOrdered () ) {
267
267
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 );
269
270
}
270
271
if ( !collection .isAllowDuplicates () && collection .isOrdered () ) {
271
272
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 );
273
275
}
274
276
if ( collection .isAllowDuplicates () && !collection .isOrdered () ) {
275
277
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 ),
277
280
elementConstraint );
278
281
}
279
282
if ( !collection .isAllowDuplicates () && !collection .isOrdered () ) {
280
283
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 );
282
286
}
283
287
throw new CodeGenerationException ( "Could not determine Java collection type for " + collection .getName () );
284
288
}
@@ -304,12 +308,13 @@ public static String containerType( final Class<?> containerClass, final String
304
308
* @param importTracker the import tracker
305
309
* @return a {@link String} containing the definition of the Java Data Type
306
310
*/
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 ) {
308
313
return dataType .map ( type -> {
309
314
final Type actualDataType = dataType .get ();
310
315
if ( actualDataType instanceof ComplexType ) {
311
316
final String complexDataType = ((ComplexType ) actualDataType ).getName ();
312
- if ( ( !codeGenerationConfig .namePrefix ().isBlank () || !codeGenerationConfig .namePostfix ().isBlank () ) ) {
317
+ if ( (!codeGenerationConfig .namePrefix ().isBlank () || !codeGenerationConfig .namePostfix ().isBlank ()) ) {
313
318
return codeGenerationConfig .namePrefix () + complexDataType + codeGenerationConfig .namePostfix ();
314
319
}
315
320
return complexDataType ;
@@ -491,7 +496,8 @@ public static String generateFilterCompare( final Optional<Type> optionalDataTyp
491
496
public static String getCharacteristicJavaType ( final Property property , final JavaCodeGenerationConfig codeGenerationConfig ) {
492
497
final Supplier <RuntimeException > error = () -> new CodeGenerationException ( "No data type found for Property " + property .getName () );
493
498
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 );
495
501
}
496
502
497
503
return property .getEffectiveCharacteristic ().flatMap ( Characteristic ::getDataType ).map ( type -> {
@@ -564,7 +570,7 @@ public static String genericClassSignature( final StructureElement element ) {
564
570
}
565
571
566
572
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 ) ) {
568
574
return config .namePrefix () + element .getName () + config .namePostfix ();
569
575
}
570
576
return element .getName ();
0 commit comments