Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.4.x] BZ1301051: Column values are deleted after changing the operator in a Guided Decision Table #128

Closed
wants to merge 1 commit into from
Closed

[6.4.x] BZ1301051: Column values are deleted after changing the operator in a Guided Decision Table #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...s/workbench/screens/dtablexls/backend/server/conversion/GuidedDecisionTablePopulater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ private List<List<DTCellValue52>> assertFragmentData( final ParameterizedValueBu
for ( int iRow = columnData.size(); iRow < maxRowCount; iRow++ ) {
final List<DTCellValue52> brlFragmentData = new ArrayList<DTCellValue52>();
for ( int iCol = 0; iCol < parameters.size(); iCol++ ) {
brlFragmentData.add( new DTCellValue52() );
brlFragmentData.add( new DTCellValue52( ) );
}
columnData.add( brlFragmentData );
}
Expand Down
3 changes: 2 additions & 1 deletion ...dtablexls/backend/server/conversion/builders/GuidedDecisionTableDateEffectiveBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ public void populateDecisionTable( final GuidedDecisionTable52 dtable,
public void addCellValue( final int row,
final int column,
final String value ) {
final DTCellValue52 dcv = new DTCellValue52();
final DTCellValue52 dcv = new DTCellValue52( "" );
try {
dcv.setStringValue( value );

} catch ( IllegalArgumentException iae ) {
final String message = "Date-Effective is not a date literal, in cell " + RuleSheetParserUtil.rc2name( row,
column );
Expand Down
3 changes: 2 additions & 1 deletion ...s/dtablexls/backend/server/conversion/builders/GuidedDecisionTableDateExpiresBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ public void populateDecisionTable( final GuidedDecisionTable52 dtable,
public void addCellValue( final int row,
final int column,
final String value ) {
final DTCellValue52 dcv = new DTCellValue52();
final DTCellValue52 dcv = new DTCellValue52( "" );
try {
dcv.setStringValue( value );

} catch ( IllegalArgumentException iae ) {
final String message = "Date-Expires is not a date literal, in cell " + RuleSheetParserUtil.rc2name( row,
column );
Expand Down
6 changes: 4 additions & 2 deletions ...eens/dtablexls/backend/server/conversion/builders/GuidedDecisionTableDurationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ public void populateDecisionTable( final GuidedDecisionTable52 dtable,

if ( this.values.size() < maxRowCount ) {
for ( int iRow = this.values.size(); iRow < maxRowCount; iRow++ ) {
this.values.add( new DTCellValue52( Long.valueOf( "" ) ) );
final DTCellValue52 dcv = new DTCellValue52( 0 );
this.values.add( dcv );
}
}

Expand All @@ -58,9 +59,10 @@ public void populateDecisionTable( final GuidedDecisionTable52 dtable,
public void addCellValue( final int row,
final int column,
final String value ) {
final DTCellValue52 dcv = new DTCellValue52();
final DTCellValue52 dcv = new DTCellValue52( 0 );
try {
dcv.setNumericValue( Long.valueOf( value ) );

} catch ( NumberFormatException nfe ) {
final String message = "Duration is not an long literal, in cell " + RuleSheetParserUtil.rc2name( row,
column );
Expand Down
6 changes: 4 additions & 2 deletions ...eens/dtablexls/backend/server/conversion/builders/GuidedDecisionTableSalienceBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ public void populateDecisionTable( final GuidedDecisionTable52 dtable,

if ( this.values.size() < maxRowCount ) {
for ( int iRow = this.values.size(); iRow < maxRowCount; iRow++ ) {
this.values.add( new DTCellValue52( Integer.valueOf( "" ) ) );
final DTCellValue52 dcv = new DTCellValue52( 0 );
this.values.add( dcv );
}
}

Expand All @@ -78,9 +79,10 @@ public void addCellValue( final int row,
value = value.substring( 1,
value.lastIndexOf( ")" ) - 1 );
}
final DTCellValue52 dcv = new DTCellValue52();
final DTCellValue52 dcv = new DTCellValue52( 0 );
try {
dcv.setNumericValue( Integer.valueOf( value ) );

} catch ( NumberFormatException nfe ) {
final String message = "Priority is not an integer literal, in cell " + RuleSheetParserUtil.rc2name( row,
column );
Expand Down
4 changes: 2 additions & 2 deletions ...ools/workbench/screens/dtablexls/backend/server/conversion/builders/RowNumberBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void populateDecisionTable( final GuidedDecisionTable52 dtable,
final int maxRowCount ) {
if ( this.values.size() < maxRowCount ) {
for ( int iRow = this.values.size(); iRow < maxRowCount; iRow++ ) {
this.values.add( new DTCellValue52() );
this.values.add( new DTCellValue52( 0 ) );
}
}

Expand All @@ -53,7 +53,7 @@ public void populateDecisionTable( final GuidedDecisionTable52 dtable,
public void addCellValue( final int row,
final int col,
final String value ) {
this.values.add( new DTCellValue52() );
this.values.add( new DTCellValue52( 0 ) );
}

@Override
Expand Down
79 changes: 40 additions & 39 deletions ...ablexls/backend/server/conversion/DecisionTableXLSToDecisionTableGuidedConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ public void testAttributes() {
//Check data
assertEquals( 2,
dtable.getData().size() );
assertTrue( isRowEquivalent( new String[]{ "1", "Specific rule 1", "1", "g1", "100", "T1", "CAL1", "TRUE", "TRUE", "TRUE", "AG1", "RFG1" },
assertTrue( isRowEquivalent( new Object[]{ 1, "Specific rule 1", 1, "g1", 100l, "T1", "CAL1", true, true, true, "AG1", "RFG1" },
dtable.getData().get( 0 ) ) );
assertTrue( isRowEquivalent( new String[]{ "2", "Specific rule 2", "2", "g2", "200", "T2", "CAL2", "FALSE", "FALSE", "FALSE", "AG2", "RFG2" },
assertTrue( isRowEquivalent( new Object[]{ 2, "Specific rule 2", 2, "g2", 200l, "T2", "CAL2", false, false, false, "AG2", "RFG2" },
dtable.getData().get( 1 ) ) );
}

Expand Down Expand Up @@ -265,9 +265,9 @@ public void testSequentialSalience() {
//Check data
assertEquals( 2,
dtable.getData().size() );
assertTrue( isRowEquivalent( new String[]{ "1", "Created from row 8", "2" },
assertTrue( isRowEquivalent( new Object[]{ 1, "Created from row 8", 2 },
dtable.getData().get( 0 ) ) );
assertTrue( isRowEquivalent( new String[]{ "2", "Created from row 9", "1" },
assertTrue( isRowEquivalent( new Object[]{ 2, "Created from row 9", 1 },
dtable.getData().get( 1 ) ) );
}

Expand Down Expand Up @@ -336,9 +336,9 @@ public void testSalienceWarnings() {
//Check data
assertEquals( 2,
dtable.getData().size() );
assertTrue( isRowEquivalent( new String[]{ "1", "Created from row 7", "" },
assertTrue( isRowEquivalent( new Object[]{ 1, "Created from row 7", 0 },
dtable.getData().get( 0 ) ) );
assertTrue( isRowEquivalent( new String[]{ "2", "Created from row 8", "" },
assertTrue( isRowEquivalent( new Object[]{ 2, "Created from row 8", 0 },
dtable.getData().get( 1 ) ) );
}

Expand Down Expand Up @@ -407,9 +407,9 @@ public void testDurationWarnings() {
//Check data
assertEquals( 2,
dtable.getData().size() );
assertTrue( isRowEquivalent( new String[]{ "1", "Created from row 7", "" },
assertTrue( isRowEquivalent( new Object[]{ 1, "Created from row 7", 0 },
dtable.getData().get( 0 ) ) );
assertTrue( isRowEquivalent( new String[]{ "2", "Created from row 8", "" },
assertTrue( isRowEquivalent( new Object[]{ 2, "Created from row 8", 0 },
dtable.getData().get( 1 ) ) );
}

Expand Down Expand Up @@ -470,9 +470,9 @@ public void testMetadata() {
//Check data
assertEquals( 2,
dtable.getData().size() );
assertTrue( isRowEquivalent( new String[]{ "1", "Created from row 7", "cheddar" },
assertTrue( isRowEquivalent( new Object[]{ 1, "Created from row 7", "cheddar" },
dtable.getData().get( 0 ) ) );
assertTrue( isRowEquivalent( new String[]{ "2", "Created from row 8", "edam" },
assertTrue( isRowEquivalent( new Object[]{ 2, "Created from row 8", "edam" },
dtable.getData().get( 1 ) ) );
}

Expand Down Expand Up @@ -659,32 +659,32 @@ public void testActions() {
//Check data
assertEquals( 2,
dtable.getData().size() );
assertTrue( isRowEquivalent( new String[]{ "1", "Created from row 7", "10", "20", "30", "hello", "TRUE" },
assertTrue( isRowEquivalent( new Object[]{ 1, "Created from row 7", "10", "20", "30", "hello", true },
dtable.getData().get( 0 ) ) );
assertTrue( isRowEquivalent( new String[]{ "2", "Created from row 8", "50", "60", "70", "goodbye", "FALSE" },
assertTrue( isRowEquivalent( new Object[]{ 2, "Created from row 8", "50", "60", "70", "goodbye", false },
dtable.getData().get( 1 ) ) );
}

@Test
public void testConditions() {
final List<String[]> expectedRows = new ArrayList<String[]>( 2 );
expectedRows.add( new String[]{ "1", "Created from row 7", "20", "Mike", "Brown", "BMW", "M3" } );
expectedRows.add( new String[]{ "2", "Created from row 8", "30", "Jason", "Grey", "Audi", "S4" } );
final List<Object[]> expectedRows = new ArrayList<Object[]>( 2 );
expectedRows.add( new Object[]{ 1, "Created from row 7", 20, "Mike", "Brown", "BMW", "M3" } );
expectedRows.add( new Object[]{ 2, "Created from row 8", 30, "Jason", "Grey", "Audi", "S4" } );
conditionsTest( "Conditions.xls",
expectedRows );
}

@Test
public void testConditionsIndexedParameters() {
final List<String[]> expectedRows = new ArrayList<String[]>( 2 );
expectedRows.add( new String[]{ "1", "Created from row 7", "20", "Mike", "Brown", "BMW", "M3" } );
expectedRows.add( new String[]{ "2", "Created from row 8", "30", "Jason", "Grey", "", "" } );
final List<Object[]> expectedRows = new ArrayList<Object[]>( 2 );
expectedRows.add( new Object[]{ 1, "Created from row 7", 20, "Mike", "Brown", "BMW", "M3" } );
expectedRows.add( new Object[]{ 2, "Created from row 8", 30, "Jason", "Grey", "", "" } );
conditionsTest( "Conditions-indexedParameters.xls",
expectedRows );
}

private void conditionsTest( final String xlsFileName,
final List<String[]> expectedRows ) {
final List<Object[]> expectedRows ) {
final ConversionResult result = new ConversionResult();
final List<DataListener> listeners = new ArrayList<DataListener>();

Expand Down Expand Up @@ -935,7 +935,8 @@ private void conditionsTest( final String xlsFileName,
assertTrue( expectedRows.size() == 2 );

for ( int i = 0; i < 2; i++ ) {
assertTrue( isRowEquivalent( expectedRows.get( i ), dtable.getData().get( i ) ) );
assertTrue( isRowEquivalent( expectedRows.get( i ),
dtable.getData().get( i ) ) );
}
}

Expand Down Expand Up @@ -1073,9 +1074,9 @@ public void testMultipleRuleTables() {
//Check data
assertEquals( 2,
dtable0.getData().size() );
assertTrue( isRowEquivalent( new String[]{ "1", "Created from row 7", "AG1", "John", "Hello Sir" },
assertTrue( isRowEquivalent( new Object[]{ 1, "Created from row 7", "AG1", "John", "Hello Sir" },
dtable0.getData().get( 0 ) ) );
assertTrue( isRowEquivalent( new String[]{ "2", "Created from row 8", "AG2", "Jane", "Hello Madam" },
assertTrue( isRowEquivalent( new Object[]{ 2, "Created from row 8", "AG2", "Jane", "Hello Madam" },
dtable0.getData().get( 1 ) ) );

//Check expanded columns
Expand Down Expand Up @@ -1156,9 +1157,9 @@ public void testMultipleRuleTables() {
//Check data
assertEquals( 2,
dtable1.getData().size() );
assertTrue( isRowEquivalent( new String[]{ "1", "Created from row 15", "John", "25" },
assertTrue( isRowEquivalent( new Object[]{ 1, "Created from row 15", "John", "25" },
dtable1.getData().get( 0 ) ) );
assertTrue( isRowEquivalent( new String[]{ "2", "Created from row 16", "Jane", "29" },
assertTrue( isRowEquivalent( new Object[]{ 2, "Created from row 16", "Jane", "29" },
dtable1.getData().get( 1 ) ) );

}
Expand Down Expand Up @@ -1247,9 +1248,9 @@ public void testMultipleSingleParameters() {
//Check data
assertEquals( 2,
dtable.getData().size() );
assertTrue( isRowEquivalent( new String[]{ "1", "Created from row 7", "isQualified" },
assertTrue( isRowEquivalent( new Object[]{ 1, "Created from row 7", "isQualified" },
dtable.getData().get( 0 ) ) );
assertTrue( isRowEquivalent( new String[]{ "2", "Created from row 8", "isLicensed" },
assertTrue( isRowEquivalent( new Object[]{ 2, "Created from row 8", "isLicensed" },
dtable.getData().get( 1 ) ) );
}

Expand Down Expand Up @@ -1668,7 +1669,7 @@ public void testMissingTemplateKeyValues() {
//Check data
assertEquals( 1,
dtable.getData().size() );
assertTrue( isRowEquivalent( new String[]{ "1", "Created from row 10", "false", "", "true", "0" },
assertTrue( isRowEquivalent( new Object[]{ 1, "Created from row 10", "false", "", "true", "0" },
dtable.getData().get( 0 ) ) );
}

Expand Down Expand Up @@ -1865,7 +1866,7 @@ public void testMissingTemplateKeyValues_RHSInsertThenUpdate() {
//Check data
assertEquals( 1,
dtable.getData().size() );
assertTrue( isRowEquivalent( new String[]{ "1", "Created from row 10", "false", "true", "false", "false" },
assertTrue( isRowEquivalent( new Object[]{ 1, "Created from row 10", false, true, false, false },
dtable.getData().get( 0 ) ) );
}

Expand Down Expand Up @@ -1936,7 +1937,7 @@ public void testEmptyCells() {
assertTrue( columns.get( 19 ) instanceof BRLActionVariableColumn );
}

private boolean isRowEquivalent( String[] expected,
private boolean isRowEquivalent( Object[] expected,
List<DTCellValue52> actual ) {
//Sizes should match
if ( expected.length != actual.size() ) {
Expand All @@ -1949,60 +1950,60 @@ private boolean isRowEquivalent( String[] expected,
switch ( dcv.getDataType() ) {
case NUMERIC:
final BigDecimal numeric = (BigDecimal) dcv.getNumericValue();
if ( !expected[ i ].equals( numeric.toPlainString() ) ) {
if ( !expected[ i ].equals( numeric ) ) {
return false;
}
break;
case NUMERIC_BIGDECIMAL:
final BigDecimal numericBigDecimal = (BigDecimal) dcv.getNumericValue();
if ( !expected[ i ].equals( numericBigDecimal.toPlainString() ) ) {
if ( !expected[ i ].equals( numericBigDecimal ) ) {
return false;
}
break;
case NUMERIC_BIGINTEGER:
final BigInteger numericBigInteger = (BigInteger) dcv.getNumericValue();
if ( !expected[ i ].equals( numericBigInteger.toString() ) ) {
if ( !expected[ i ].equals( numericBigInteger ) ) {
return false;
}
break;
case NUMERIC_BYTE:
final Byte numericByte = (Byte) dcv.getNumericValue();
if ( !expected[ i ].equals( numericByte.toString() ) ) {
if ( !expected[ i ].equals( numericByte ) ) {
return false;
}
break;
case NUMERIC_DOUBLE:
final Double numericDouble = (Double) dcv.getNumericValue();
if ( !expected[ i ].equals( numericDouble.toString() ) ) {
if ( !expected[ i ].equals( numericDouble ) ) {
return false;
}
break;
case NUMERIC_FLOAT:
final Float numericFloat = (Float) dcv.getNumericValue();
if ( !expected[ i ].equals( numericFloat.toString() ) ) {
if ( !expected[ i ].equals( numericFloat ) ) {
return false;
}
break;
case NUMERIC_INTEGER:
final Integer numericInteger = (Integer) dcv.getNumericValue();
if ( !expected[ i ].equals( numericInteger.toString() ) ) {
if ( !expected[ i ].equals( numericInteger ) ) {
return false;
}
break;
case NUMERIC_LONG:
final Long numericLong = (Long) dcv.getNumericValue();
if ( !expected[ i ].equals( numericLong.toString() ) ) {
if ( !expected[ i ].equals( numericLong ) ) {
return false;
}
break;
case NUMERIC_SHORT:
final Short numericShort = (Short) dcv.getNumericValue();
if ( !expected[ i ].equals( numericShort.toString() ) ) {
if ( !expected[ i ].equals( numericShort ) ) {
return false;
}
break;
case BOOLEAN:
if ( Boolean.parseBoolean( expected[ i ] ) != dcv.getBooleanValue() ) {
if ( !expected[ i ].equals( dcv.getBooleanValue() ) ) {
return false;
}
break;
Expand Down
14 changes: 8 additions & 6 deletions ...in/java/org/drools/workbench/screens/guided/dtable/client/utils/DTCellValueUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,14 @@ public void removeCommaSeparatedValue( DTCellValue52 dcv ) {
if ( dcv == null ) {
return;
}
if ( dcv.getStringValue() == null ) {
return;
}
String[] values = dcv.getStringValue().split( "," );
if ( values.length > 0 ) {
dcv.setStringValue( values[ 0 ] );
if ( dcv.getDataType().equals( DataType.DataTypes.STRING ) ) {
if ( dcv.getStringValue() == null ) {
return;
}
String[] values = dcv.getStringValue().split( "," );
if ( values.length > 0 ) {
dcv.setStringValue( values[ 0 ] );
}
}
}

Expand Down
Loading