Repository navigation
feat: add java.sql.Clob converter #1134
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fesod.sheet.converters.clob; | ||
|
|
||
| import java.io.Reader; | ||
| import java.sql.Clob; | ||
| import javax.sql.rowset.serial.SerialClob; | ||
| import org.apache.fesod.sheet.converters.Converter; | ||
| import org.apache.fesod.sheet.enums.CellDataTypeEnum; | ||
| import org.apache.fesod.sheet.metadata.GlobalConfiguration; | ||
| import org.apache.fesod.sheet.metadata.data.ReadCellData; | ||
| import org.apache.fesod.sheet.metadata.data.WriteCellData; | ||
| import org.apache.fesod.sheet.metadata.property.ExcelContentProperty; | ||
|
|
||
| /** | ||
| * Clob and string converter. Clob data is represented as a string cell; reads return a | ||
| * {@link SerialClob} so callers receive a usable, detached JDBC Clob value. | ||
| */ | ||
| public class ClobStringConverter implements Converter<Clob> { | ||
| @Override | ||
| public Class<?> supportJavaTypeKey() { | ||
| return Clob.class; | ||
| } | ||
|
|
||
| @Override | ||
| public CellDataTypeEnum supportExcelTypeKey() { | ||
| return CellDataTypeEnum.STRING; | ||
| } | ||
|
|
||
| @Override | ||
| public Clob convertToJavaData( | ||
| ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) | ||
| throws Exception { | ||
| if (cellData.getStringValue() == null) { | ||
| return null; | ||
| } | ||
| // Materialize cell text into a detached JDBC Clob, avoiding a database-specific Clob implementation. | ||
| return new SerialClob(cellData.getStringValue().toCharArray()); | ||
| } | ||
|
|
||
| @Override | ||
| public WriteCellData<?> convertToExcelData( | ||
| Clob value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) | ||
| throws Exception { | ||
| StringBuilder text = new StringBuilder(); | ||
| char[] buffer = new char[4096]; | ||
| try (Reader reader = value.getCharacterStream()) { | ||
| int count; | ||
| while ((count = reader.read(buffer)) != -1) { | ||
| text.append(buffer, 0, count); | ||
| } | ||
| } | ||
| return new WriteCellData<>(text.toString()); | ||
|
Comment on lines
+62
to
+70
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd suggest pre-sizing the long length = value.length();
if (length == 0) {
return new WriteCellData<>(CellDataTypeEnum.EMPTY);
}
if (length > Integer.MAX_VALUE) {
throw new IllegalArgumentException(String.format("Clob length (%d) exceeds maximum allowed: %d", length, Integer.MAX_VALUE));
}
StringBuilder text = new StringBuilder((int) length); |
||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fesod.sheet.converters.clob; | ||
|
|
||
| import java.io.File; | ||
| import java.sql.Clob; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import javax.sql.rowset.serial.SerialClob; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| import org.apache.fesod.sheet.testkit.Tags; | ||
| import org.apache.fesod.sheet.testkit.base.AbstractExcelTest; | ||
| import org.apache.fesod.sheet.testkit.enums.ExcelFormat; | ||
| import org.apache.fesod.sheet.testkit.helpers.RoundTripHelper; | ||
| import org.apache.fesod.sheet.testkit.params.ExcelFormatSource; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Tag; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
|
|
||
| /** | ||
| * Field-level round trips for Clob converter across every supported format. | ||
| */ | ||
| @Tag(Tags.ROUND_TRIP) | ||
| public class ClobFieldRoundTripTest extends AbstractExcelTest { | ||
|
|
||
| @ParameterizedTest | ||
| @ExcelFormatSource | ||
| void clobFieldRoundTrip(ExcelFormat format) throws Exception { | ||
| File file = createTempFile(format); | ||
| List<ClobFieldData> data = new ArrayList<>(); | ||
| ClobFieldData row = new ClobFieldData(); | ||
| row.setClob(new SerialClob("Large text 字符".toCharArray())); | ||
| data.add(row); | ||
|
|
||
| List<ClobFieldData> result = RoundTripHelper.writeAndRead(file, ClobFieldData.class, data); | ||
|
|
||
| Assertions.assertEquals(1, result.size()); | ||
| Clob actual = result.get(0).getClob(); | ||
| Assertions.assertNotNull(actual); | ||
| Assertions.assertEquals("Large text 字符", actual.getSubString(1, (int) actual.length())); | ||
| } | ||
|
|
||
| @Getter | ||
| @Setter | ||
| public static class ClobFieldData { | ||
|
|
||
| @ExcelProperty("clob") | ||
| private Clob clob; | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fesod.sheet.converters.clob; | ||
|
|
||
| import java.sql.Clob; | ||
| import javax.sql.rowset.serial.SerialClob; | ||
| import org.apache.fesod.sheet.enums.CellDataTypeEnum; | ||
| import org.apache.fesod.sheet.metadata.GlobalConfiguration; | ||
| import org.apache.fesod.sheet.metadata.data.ReadCellData; | ||
| import org.apache.fesod.sheet.metadata.data.WriteCellData; | ||
| import org.apache.fesod.sheet.testkit.Tags; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Tag; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| @Tag(Tags.UNIT) | ||
| class ClobStringConverterTest { | ||
| private static final GlobalConfiguration GLOBAL_CONFIGURATION = new GlobalConfiguration(); | ||
| private final ClobStringConverter converter = new ClobStringConverter(); | ||
|
|
||
| @Test | ||
| void supportKeys() { | ||
| Assertions.assertEquals(Clob.class, converter.supportJavaTypeKey()); | ||
| Assertions.assertEquals(CellDataTypeEnum.STRING, converter.supportExcelTypeKey()); | ||
| } | ||
|
|
||
| @Test | ||
| void convertsCellStringToDetachedClob() throws Exception { | ||
| Clob actual = converter.convertToJavaData(new ReadCellData<>("Large text 字符"), null, GLOBAL_CONFIGURATION); | ||
|
|
||
| Assertions.assertEquals("Large text 字符", actual.getSubString(1, (int) actual.length())); | ||
| } | ||
|
|
||
| @Test | ||
| void convertsClobCharacterStreamToCellString() throws Exception { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there a test gap on the write path? @Test
void convertsClobAtCellTextLimitToCellString() throws Exception {
StringBuilder expected = new StringBuilder();
for (int i = 0; i < 32767; i++) {
expected.append((char) ('a' + i % 26));
}
Clob value = new SerialClob(expected.toString().toCharArray());
WriteCellData<?> written = converter.convertToExcelData(value, null, GLOBAL_CONFIGURATION);
Assertions.assertEquals(expected.toString(), written.getStringValue());
}
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added |
||
| Clob value = new SerialClob("Large text 字符".toCharArray()); | ||
|
|
||
| WriteCellData<?> written = converter.convertToExcelData(value, null, GLOBAL_CONFIGURATION); | ||
|
|
||
| Assertions.assertEquals(CellDataTypeEnum.STRING, written.getType()); | ||
| Assertions.assertEquals("Large text 字符", written.getStringValue()); | ||
| } | ||
|
|
||
| @Test | ||
| void convertsClobAtCellTextLimitToCellString() throws Exception { | ||
| StringBuilder expected = new StringBuilder(); | ||
| for (int i = 0; i < 32767; i++) { | ||
| expected.append((char) ('a' + i % 26)); | ||
| } | ||
| Clob value = new SerialClob(expected.toString().toCharArray()); | ||
|
|
||
| WriteCellData<?> written = converter.convertToExcelData(value, null, GLOBAL_CONFIGURATION); | ||
|
|
||
| Assertions.assertEquals(expected.toString(), written.getStringValue()); | ||
| } | ||
|
|
||
| @Test | ||
| void convertToJavaDataReturnsNullForNullString() throws Exception { | ||
| Clob actual = converter.convertToJavaData(new ReadCellData<>(), null, GLOBAL_CONFIGURATION); | ||
| Assertions.assertNull(actual); | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe the code itself already expresses its intent clearly, so there is no need to add extra comments.