Skip to content

Commit 2177d9a

Browse files
lmajanogithub-actions[bot]
authored andcommitted
Apply cfformat changes
1 parent 5c86ede commit 2177d9a

File tree

1 file changed

+6
-27
lines changed

1 file changed

+6
-27
lines changed

system/core/dynamic/BeanPopulator.cfc

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -343,25 +343,11 @@ component {
343343
nullValue = false;
344344
}
345345
// Is property in empty-to-null include list?
346-
if (
347-
(
348-
len( arguments.nullEmptyInclude ) && listFindNoCase(
349-
arguments.nullEmptyInclude,
350-
key
351-
)
352-
)
353-
) {
346+
if ( ( len( arguments.nullEmptyInclude ) && listFindNoCase( arguments.nullEmptyInclude, key ) ) ) {
354347
nullValue = true;
355348
}
356349
// Is property in empty-to-null exclude list, or is exclude list "*"?
357-
if (
358-
(
359-
len( arguments.nullEmptyExclude ) AND listFindNoCase(
360-
arguments.nullEmptyExclude,
361-
key
362-
)
363-
)
364-
) {
350+
if ( ( len( arguments.nullEmptyExclude ) AND listFindNoCase( arguments.nullEmptyExclude, key ) ) ) {
365351
nullValue = false;
366352
}
367353
// Is value nullable (e.g., simple, empty string)? If so, set null...
@@ -415,9 +401,7 @@ component {
415401
else {
416402
var annotations = server.keyExists( "boxlang" ) ? getClassMetadata(
417403
arguments.relationalMeta.properties[ key ].cfc
418-
).annotations : getComponentMetadata(
419-
arguments.relationalMeta.properties[ key ].cfc
420-
);
404+
).annotations : getComponentMetadata( arguments.relationalMeta.properties[ key ].cfc );
421405
if ( annotations.keyExists( "entityName" ) ) {
422406
targetEntityName = annotations.entityName;
423407
}
@@ -433,19 +417,14 @@ component {
433417
// if targetEntityName was successfully found
434418
if ( len( targetEntityName ) ) {
435419
// array or struct type (one-to-many, many-to-many)
436-
if (
437-
listContainsNoCase(
438-
"one-to-many,many-to-many",
439-
relationalMeta[ key ].fieldtype
440-
)
441-
) {
420+
if ( listContainsNoCase( "one-to-many,many-to-many", relationalMeta[ key ].fieldtype ) ) {
442421
// Support straight-up lists and convert to array
443422
if ( isSimpleValue( propertyValue ) ) {
444423
propertyValue = listToArray( propertyValue );
445424
}
446-
var relType = structKeyExists( relationalMeta[ key ], "type" ) && relationalMeta[
425+
var relType = structKeyExists( relationalMeta[ key ], "type" ) && relationalMeta[ key ].type != "any" ? relationalMeta[
447426
key
448-
].type != "any" ? relationalMeta[ key ].type : "array";
427+
].type : "array";
449428
var manyMap = reltype == "struct" ? {} : [];
450429
// loop over array
451430
for ( var relValue in propertyValue ) {

0 commit comments

Comments
 (0)