@@ -29,10 +29,10 @@ protected MoveSelector<Solution_> buildBaseMoveSelector(HeuristicConfigPolicy<So
2929 var leftPillarSelectorConfig =
3030 Objects .requireNonNullElseGet (config .getPillarSelectorConfig (), PillarSelectorConfig ::new );
3131 EntityDescriptor <Solution_ > leftEntityDescriptor = null ;
32- if ( leftPillarSelectorConfig .getEntitySelectorConfig () != null
33- && leftPillarSelectorConfig . getEntitySelectorConfig () .getEntityClass () != null ) {
34- leftEntityDescriptor = configPolicy . getSolutionDescriptor ()
35- . findEntityDescriptor ( leftPillarSelectorConfig . getEntitySelectorConfig () .getEntityClass ());
32+ var leftEntitySelectorConfig = leftPillarSelectorConfig .getEntitySelectorConfig ();
33+ if ( leftEntitySelectorConfig != null && leftEntitySelectorConfig .getEntityClass () != null ) {
34+ leftEntityDescriptor =
35+ configPolicy . getSolutionDescriptor (). findEntityDescriptor ( leftEntitySelectorConfig .getEntityClass ());
3636 }
3737 var leftVariableNameIncludeList = config .getVariableNameIncludeList ();
3838 if (leftVariableNameIncludeList == null && leftEntityDescriptor != null
@@ -45,10 +45,10 @@ protected MoveSelector<Solution_> buildBaseMoveSelector(HeuristicConfigPolicy<So
4545 var rightPillarSelectorConfig =
4646 Objects .requireNonNullElse (config .getSecondaryPillarSelectorConfig (), leftPillarSelectorConfig );
4747 EntityDescriptor <Solution_ > rightEntityDescriptor = null ;
48- if ( rightPillarSelectorConfig .getEntitySelectorConfig () != null
49- && rightPillarSelectorConfig . getEntitySelectorConfig () .getEntityClass () != null ) {
50- rightEntityDescriptor = configPolicy . getSolutionDescriptor ()
51- . findEntityDescriptor ( rightPillarSelectorConfig . getEntitySelectorConfig () .getEntityClass ());
48+ var rightEntitySelectorConfig = rightPillarSelectorConfig .getEntitySelectorConfig ();
49+ if ( rightEntitySelectorConfig != null && rightEntitySelectorConfig .getEntityClass () != null ) {
50+ rightEntityDescriptor =
51+ configPolicy . getSolutionDescriptor (). findEntityDescriptor ( rightEntitySelectorConfig .getEntityClass ());
5252 }
5353 var rightVariableNameIncludeList = config .getVariableNameIncludeList ();
5454 if (rightVariableNameIncludeList == null && rightEntityDescriptor != null
0 commit comments