@@ -326,12 +326,14 @@ private static void fixupByteBase(String byteResult) throws IOException {
326
326
private static void fixupBoolean (String boolResult ) throws IOException {
327
327
final File objectFile = new File (boolResult );
328
328
List <String > lines = FileUtils .readLines (objectFile , Charset .defaultCharset ());
329
+ lines = removeImport (lines , "import static io.deephaven.util.QueryConstants.NULL_BOOLEAN;" );
329
330
lines = addImport (lines , "import io.deephaven.engine.table.ColumnSource;" ,
330
331
"import java.util.Map;" ,
331
332
"import java.util.Collections;" ,
332
333
"import io.deephaven.engine.table.impl.sources.BooleanArraySource;" ,
333
334
"import io.deephaven.engine.table.impl.sources.BooleanSparseArraySource;" ,
334
- "import io.deephaven.engine.table.WritableColumnSource;" );
335
+ "import io.deephaven.engine.table.WritableColumnSource;" ,
336
+ "import io.deephaven.util.BooleanUtils;" );
335
337
336
338
lines = globalReplacements (lines ,
337
339
"BaseBooleanUpdateByOperator" , "BaseByteUpdateByOperator" ,
@@ -343,14 +345,13 @@ private static void fixupBoolean(String boolResult) throws IOException {
343
345
"boolean previousVal" , "byte previousVal" ,
344
346
"boolean currentVal" , "byte currentVal" ,
345
347
"BooleanChunk" , "ByteChunk" ,
346
- "NULL_BOOLEAN" , "NULL_BOOLEAN_AS_BYTE" );
347
- lines = globalReplacements (lines ,
348
- "!BooleanPrimitives\\ .isNull\\ (currentVal\\ )" , "currentVal != NULL_BOOLEAN_AS_BYTE" );
348
+ "val != NULL_BOOLEAN" , "BooleanUtils.isNull(val)"
349
+ );
349
350
lines = replaceRegion (lines , "extra-methods" ,
350
351
Collections .singletonList (
351
352
" @Override\n " +
352
353
" protected byte getNullValue() {\n " +
353
- " return NULL_BOOLEAN_AS_BYTE;\n " +
354
+ " return BooleanUtils. NULL_BOOLEAN_AS_BYTE;\n " +
354
355
" }\n " +
355
356
" @Override\n " +
356
357
" protected WritableColumnSource<Byte> makeSparseSource() {\n " +
0 commit comments