Skip to content

Commit b37cdaf

Browse files
committed
Merge main and retain Instant and SqlTime converter registrations
Signed-off-by: 56wj <[email protected]>
2 parents 0f428e3 + bf9bf92 commit b37cdaf

43 files changed

Lines changed: 1996 additions & 185 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci-docs.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
name: Documentation CI
18+
name: Docs CI
1919

2020
on:
2121
pull_request:
2222
paths:
2323
- 'website/**'
24+
- '.github/workflows/ci-docs.yml'
25+
26+
permissions:
27+
contents: read
2428

2529
concurrency:
2630
group: ci-docs-${{ github.event.pull_request.number || github.ref }}
@@ -32,6 +36,8 @@ jobs:
3236
steps:
3337
- name: Checkout code
3438
uses: actions/checkout@v7
39+
with:
40+
persist-credentials: false
3541

3642
- name: Setup pnpm
3743
uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86

‎.github/workflows/deploy-docs.yml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,35 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
name: Deploy Docusaurus to GitHub Pages
18+
name: Docs Deploy
1919

2020
on:
2121
push:
2222
branches: [ main ]
23+
paths:
24+
- 'website/**'
25+
- '.asf.yaml'
26+
- '.github/workflows/deploy-docs.yml'
27+
workflow_dispatch:
28+
29+
permissions:
30+
contents: read
31+
32+
concurrency:
33+
group: deploy-docs
34+
cancel-in-progress: false
2335

2436
jobs:
2537
deploy:
2638
if: github.repository == 'apache/fesod'
2739
runs-on: ubuntu-latest
40+
permissions:
41+
contents: write
2842
steps:
2943
- uses: actions/checkout@v7
3044
with:
3145
fetch-depth: 0
46+
persist-credentials: false
3247

3348
- uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86
3449
with:
@@ -38,6 +53,8 @@ jobs:
3853
- uses: actions/setup-node@v7
3954
with:
4055
node-version: "24"
56+
cache: pnpm
57+
cache-dependency-path: website/pnpm-lock.yaml
4158

4259
- name: Corepack
4360
working-directory: website

‎.github/workflows/preview-docs.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,30 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
name: Preview Documentation
18+
name: Docs Preview
1919

2020
on:
2121
pull_request:
2222
paths:
2323
- 'website/**'
24+
- '.github/workflows/preview-docs.yml'
25+
26+
permissions:
27+
contents: read
28+
pull-requests: write
29+
30+
concurrency:
31+
group: preview-docs-${{ github.event.pull_request.number || github.ref }}
32+
cancel-in-progress: true
2433

2534
jobs:
2635
deploy-preview:
2736
runs-on: ubuntu-latest
2837
steps:
2938
- name: Checkout code
3039
uses: actions/checkout@v7
40+
with:
41+
persist-credentials: false
3142

3243
- name: Setup pnpm
3344
uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86

‎fesod-sheet/src/main/java/org/apache/fesod/sheet/cache/MapCache.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
import java.util.ArrayList;
2929
import java.util.List;
30-
import org.apache.fesod.sheet.context.AnalysisContext;
3130

3231
/**
3332
* Putting temporary data directly into a map is a little more efficient but very memory intensive
@@ -37,9 +36,6 @@
3736
public class MapCache implements ReadCache {
3837
private final List<String> cache = new ArrayList<>();
3938

40-
@Override
41-
public void init(AnalysisContext analysisContext) {}
42-
4339
@Override
4440
public void put(String value) {
4541
cache.add(value);
@@ -52,10 +48,4 @@ public String get(Integer key) {
5248
}
5349
return cache.get(key);
5450
}
55-
56-
@Override
57-
public void putFinished() {}
58-
59-
@Override
60-
public void destroy() {}
6151
}

‎fesod-sheet/src/main/java/org/apache/fesod/sheet/cache/ReadCache.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@
2828
import org.apache.fesod.sheet.context.AnalysisContext;
2929

3030
/**
31-
* Read cache
32-
*
31+
* Shared-string (and similar) read cache.
3332
*
33+
* <p>{@link #get(Integer)} is the only required method. Lifecycle hooks and {@link #put(String)}
34+
* default to no-ops so implementations that wrap an existing store (for example {@link XlsCache})
35+
* do not need empty method bodies.
3436
*/
3537
public interface ReadCache {
3638

@@ -40,15 +42,15 @@ public interface ReadCache {
4042
* @param analysisContext
4143
* A context is the main anchorage point of a excel reader.
4244
*/
43-
void init(AnalysisContext analysisContext);
45+
default void init(AnalysisContext analysisContext) {}
4446

4547
/**
4648
* Automatically generate the key and put it in the cache.Key start from 0
4749
*
4850
* @param value
4951
* Cache value
5052
*/
51-
void put(String value);
53+
default void put(String value) {}
5254

5355
/**
5456
* Get value
@@ -62,10 +64,10 @@ public interface ReadCache {
6264
/**
6365
* It's called when all the values are put in
6466
*/
65-
void putFinished();
67+
default void putFinished() {}
6668

6769
/**
68-
* Called when the excel read is complete
70+
* Called when the Excel read is complete
6971
*/
70-
void destroy();
72+
default void destroy() {}
7173
}

‎fesod-sheet/src/main/java/org/apache/fesod/sheet/cache/XlsCache.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
package org.apache.fesod.sheet.cache;
2727

28-
import org.apache.fesod.sheet.context.AnalysisContext;
2928
import org.apache.poi.hssf.record.SSTRecord;
3029

3130
/**
@@ -41,20 +40,8 @@ public XlsCache(SSTRecord sstRecord) {
4140
this.sstRecord = sstRecord;
4241
}
4342

44-
@Override
45-
public void init(AnalysisContext analysisContext) {}
46-
47-
@Override
48-
public void put(String value) {}
49-
5043
@Override
5144
public String get(Integer key) {
5245
return sstRecord.getString(key).toString();
5346
}
54-
55-
@Override
56-
public void putFinished() {}
57-
58-
@Override
59-
public void destroy() {}
6047
}

‎fesod-sheet/src/main/java/org/apache/fesod/sheet/context/WriteContextImpl.java‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ public void finish(boolean onException) {
541541
try {
542542
isOutputStreamEncrypt = doOutputStreamEncrypt07();
543543
} catch (Throwable t) {
544-
throwable = t;
544+
throwable = recordFailure(throwable, t);
545545
}
546546
}
547547
if (!isOutputStreamEncrypt) {
@@ -551,7 +551,7 @@ public void finish(boolean onException) {
551551
}
552552
writeWorkbookHolder.getWorkbook().close();
553553
} catch (Throwable t) {
554-
throwable = t;
554+
throwable = recordFailure(throwable, t);
555555
}
556556
}
557557
try {
@@ -560,28 +560,28 @@ public void finish(boolean onException) {
560560
((SXSSFWorkbook) workbook).dispose();
561561
}
562562
} catch (Throwable t) {
563-
throwable = t;
563+
throwable = recordFailure(throwable, t);
564564
}
565565
try {
566566
if (writeWorkbookHolder.getAutoCloseStream() && writeWorkbookHolder.getOutputStream() != null) {
567567
writeWorkbookHolder.getOutputStream().close();
568568
}
569569
} catch (Throwable t) {
570-
throwable = t;
570+
throwable = recordFailure(throwable, t);
571571
}
572572
if (writeExcel && !isOutputStreamEncrypt) {
573573
try {
574574
doFileEncrypt07();
575575
} catch (Throwable t) {
576-
throwable = t;
576+
throwable = recordFailure(throwable, t);
577577
}
578578
}
579579
try {
580580
if (writeWorkbookHolder.getTempTemplateInputStream() != null) {
581581
writeWorkbookHolder.getTempTemplateInputStream().close();
582582
}
583583
} catch (Throwable t) {
584-
throwable = t;
584+
throwable = recordFailure(throwable, t);
585585
}
586586
clearEncrypt03();
587587
removeThreadLocalCache();
@@ -593,6 +593,19 @@ public void finish(boolean onException) {
593593
}
594594
}
595595

596+
/**
597+
* Returns the first recorded failure, attaching any later one to it as a suppressed exception.
598+
*/
599+
private static Throwable recordFailure(Throwable recorded, Throwable t) {
600+
if (recorded == null) {
601+
return t;
602+
}
603+
if (t != null && recorded != t) {
604+
recorded.addSuppressed(t);
605+
}
606+
return recorded;
607+
}
608+
596609
/**
597610
* Removes thread-local caches used during the write process.
598611
*/

‎fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/DefaultConverterLoader.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import org.apache.fesod.sheet.converters.byteconverter.ByteBooleanConverter;
4545
import org.apache.fesod.sheet.converters.byteconverter.ByteNumberConverter;
4646
import org.apache.fesod.sheet.converters.byteconverter.ByteStringConverter;
47+
import org.apache.fesod.sheet.converters.charconverter.CharacterStringConverter;
4748
import org.apache.fesod.sheet.converters.date.DateDateConverter;
4849
import org.apache.fesod.sheet.converters.date.DateNumberConverter;
4950
import org.apache.fesod.sheet.converters.date.DateStringConverter;
@@ -77,11 +78,15 @@
7778
import org.apache.fesod.sheet.converters.shortconverter.ShortBooleanConverter;
7879
import org.apache.fesod.sheet.converters.shortconverter.ShortNumberConverter;
7980
import org.apache.fesod.sheet.converters.shortconverter.ShortStringConverter;
81+
import org.apache.fesod.sheet.converters.sqltime.SqlTimeDateConverter;
82+
import org.apache.fesod.sheet.converters.sqltime.SqlTimeNumberConverter;
83+
import org.apache.fesod.sheet.converters.sqltime.SqlTimeStringConverter;
8084
import org.apache.fesod.sheet.converters.string.StringBooleanConverter;
8185
import org.apache.fesod.sheet.converters.string.StringErrorConverter;
8286
import org.apache.fesod.sheet.converters.string.StringNumberConverter;
8387
import org.apache.fesod.sheet.converters.string.StringStringConverter;
8488
import org.apache.fesod.sheet.converters.url.UrlImageConverter;
89+
import org.apache.fesod.sheet.converters.year.YearStringConverter;
8590

8691
/**
8792
* Load default handler
@@ -115,6 +120,8 @@ private static void initAllConverter() {
115120
putAllConverter(new ByteNumberConverter());
116121
putAllConverter(new ByteStringConverter());
117122

123+
putAllConverter(new CharacterStringConverter());
124+
118125
putAllConverter(new DateNumberConverter());
119126
putAllConverter(new DateStringConverter());
120127

@@ -126,6 +133,8 @@ private static void initAllConverter() {
126133

127134
putAllConverter(new LocalTimeNumberConverter());
128135
putAllConverter(new LocalTimeStringConverter());
136+
putAllConverter(new SqlTimeNumberConverter());
137+
putAllConverter(new SqlTimeStringConverter());
129138
putAllConverter(new OffsetDateTimeNumberConverter());
130139
putAllConverter(new OffsetDateTimeStringConverter());
131140

@@ -155,6 +164,8 @@ private static void initAllConverter() {
155164
putAllConverter(new StringNumberConverter());
156165
putAllConverter(new StringStringConverter());
157166
putAllConverter(new StringErrorConverter());
167+
168+
putAllConverter(new YearStringConverter());
158169
allConverter = Collections.unmodifiableMap(allConverter);
159170
}
160171

@@ -164,18 +175,21 @@ private static void initDefaultWriteConverter() {
164175
putWriteConverter(new BigIntegerNumberConverter());
165176
putWriteConverter(new BooleanBooleanConverter());
166177
putWriteConverter(new ByteNumberConverter());
178+
putWriteConverter(new CharacterStringConverter());
167179
putWriteConverter(new DateDateConverter());
168180
putWriteConverter(new LocalDateTimeDateConverter());
169181
putWriteConverter(new LocalDateDateConverter());
170182
putWriteConverter(new LocalTimeDateConverter());
171183
putWriteConverter(new InstantStringConverter());
184+
putWriteConverter(new SqlTimeDateConverter());
172185
putWriteConverter(new OffsetDateTimeDateConverter());
173186
putWriteConverter(new DoubleNumberConverter());
174187
putWriteConverter(new FloatNumberConverter());
175188
putWriteConverter(new IntegerNumberConverter());
176189
putWriteConverter(new LongNumberConverter());
177190
putWriteConverter(new ShortNumberConverter());
178191
putWriteConverter(new StringStringConverter());
192+
putWriteConverter(new YearStringConverter());
179193
putWriteConverter(new FileImageConverter());
180194
putWriteConverter(new InputStreamImageConverter());
181195
putWriteConverter(new ByteArrayImageConverter());
@@ -187,18 +201,21 @@ private static void initDefaultWriteConverter() {
187201
putWriteStringConverter(new BigIntegerStringConverter());
188202
putWriteStringConverter(new BooleanStringConverter());
189203
putWriteStringConverter(new ByteStringConverter());
204+
putWriteStringConverter(new CharacterStringConverter());
190205
putWriteStringConverter(new DateStringConverter());
191206
putWriteStringConverter(new LocalDateStringConverter());
192207
putWriteStringConverter(new LocalDateTimeStringConverter());
193208
putWriteStringConverter(new LocalTimeStringConverter());
194209
putWriteStringConverter(new InstantStringConverter());
210+
putWriteStringConverter(new SqlTimeStringConverter());
195211
putWriteStringConverter(new OffsetDateTimeStringConverter());
196212
putWriteStringConverter(new DoubleStringConverter());
197213
putWriteStringConverter(new FloatStringConverter());
198214
putWriteStringConverter(new IntegerStringConverter());
199215
putWriteStringConverter(new LongStringConverter());
200216
putWriteStringConverter(new ShortStringConverter());
201217
putWriteStringConverter(new StringStringConverter());
218+
putWriteStringConverter(new YearStringConverter());
202219
defaultWriteConverter = Collections.unmodifiableMap(defaultWriteConverter);
203220
}
204221

‎fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/bigdecimal/BigDecimalBooleanConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public BigDecimal convertToJavaData(
9393
@Override
9494
public WriteCellData<?> convertToExcelData(
9595
BigDecimal value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
96-
if (BigDecimal.ONE.equals(value)) {
96+
if (BigDecimal.ONE.compareTo(value) == 0) {
9797
return new WriteCellData<>(Boolean.TRUE);
9898
}
9999
return new WriteCellData<>(Boolean.FALSE);

0 commit comments

Comments
 (0)