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.

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

JXLS 3.0.0 #284

Merged
merged 161 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
da13c74
XmlAreaBuilder removed, logback-core removed
SoltauFintel Dec 8, 2023
587abbf
XmlAreaBuilder removed -> docs updated
SoltauFintel Dec 8, 2023
b8674cc
logback-core removed
SoltauFintel Dec 8, 2023
dbaab13
logback-classic removed
SoltauFintel Dec 8, 2023
57364d7
JEXL 3.3
SoltauFintel Dec 8, 2023
183434b
JEXL 3.3
SoltauFintel Dec 8, 2023
f96197e
JxlsJexlPermissions for stable hashCode based key
SoltauFintel Dec 8, 2023
44072f1
version 3.0.0
SoltauFintel Dec 8, 2023
c4209b9
unused method removed
SoltauFintel Dec 8, 2023
6dcd1a7
ExpectedException.none() is deprecated
SoltauFintel Dec 8, 2023
e5f4cdd
Java 17
SoltauFintel Dec 8, 2023
80d937c
Merge branch 'master' into feature-3.0
SoltauFintel Dec 8, 2023
ea2736f
cleanup imports
SoltauFintel Dec 8, 2023
18bf39d
Java 17 code-style: instanceof
SoltauFintel Dec 8, 2023
e21ced4
Java 17
SoltauFintel Dec 8, 2023
00ec89d
Java 17
SoltauFintel Dec 8, 2023
1d97c47
Eclipse Temurin Java 17 for Github actions
SoltauFintel Dec 8, 2023
83ea5c9
turn off Maven site build
SoltauFintel Dec 8, 2023
3973f87
I'm not able to update to newer Derby version
SoltauFintel Dec 8, 2023
800e86b
migrate some Groovy tests to Java
SoltauFintel Dec 8, 2023
534bf21
We don't use Bitbucket anymore.
SoltauFintel Dec 11, 2023
1298954
work in progress
SoltauFintel Dec 12, 2023
5c46005
work in progress
gastendonk Dec 13, 2023
80062b5
work in progress
gastendonk Dec 14, 2023
508fa7e
work in progress
gastendonk Dec 14, 2023
f57fe4d
work in progress
gastendonk Dec 14, 2023
dbdc0a5
KeepTemplateSheet
gastendonk Dec 14, 2023
8b29896
work in progress
gastendonk Dec 15, 2023
cefe8a2
work in progress
gastendonk Dec 15, 2023
9edd3c9
work in progress
gastendonk Dec 15, 2023
b0a25ea
new feature: orderBy="name ASC_ignoreCase"
gastendonk Dec 15, 2023
a8bcc75
maven test
gastendonk Dec 15, 2023
3503679
removed xml tests
gastendonk Dec 15, 2023
bc5a696
other solution for cell access in YellowCommand
gastendonk Dec 15, 2023
8301cde
ImageCommand and MergeCellsCommand moved to jxls-poi
gastendonk Dec 15, 2023
dd6c447
ImageCommand and MergeCellsCommand removed from standard
gastendonk Dec 15, 2023
bbaf6f6
Create Excel file using no comments
gastendonk Dec 15, 2023
0b09247
withIgnoreColumnProps and withIgnoreRowProps
gastendonk Dec 15, 2023
eff622c
reduced logging; removed deprecated stuff; removed ServiceLoader and
gastendonk Dec 15, 2023
c0a2fcd
Removed slf4j, introduced JxlsLogger
SoltauFintel Dec 18, 2023
4b5bf93
killed Groovy tests
SoltauFintel Dec 18, 2023
44b6571
logging
SoltauFintel Dec 18, 2023
2d69c23
logging (now tests are green)
SoltauFintel Dec 18, 2023
46f22a0
Merge branch 'master' into feature-3.0
SoltauFintel Dec 18, 2023
b8b1543
EachTest.testOutputCannotBeWritten() ??
SoltauFintel Dec 18, 2023
bec0c9c
javadoc
SoltauFintel Dec 18, 2023
69e945a
javadoc
SoltauFintel Dec 18, 2023
6326a8e
Github Maven trouble
SoltauFintel Dec 18, 2023
12d23b0
javadoc
SoltauFintel Dec 18, 2023
10a7ac1
"Util.java" is too unspecific
SoltauFintel Dec 18, 2023
23c28a9
"Util.java" is too unspecific
SoltauFintel Dec 18, 2023
f4fae4b
removed commons-io, spock and cglib
SoltauFintel Dec 18, 2023
ee65871
visibility of constants
SoltauFintel Dec 18, 2023
1d7f6e7
moved constants
SoltauFintel Dec 18, 2023
9a6c606
jx:each/varIndex testcase
SoltauFintel Dec 19, 2023
ff441fa
wrong expressions testcases
SoltauFintel Dec 19, 2023
f345b72
EachCommandJTest -> EachCommandTest
SoltauFintel Dec 19, 2023
4b8b9b3
EachCommandJTest -> EachCommandTest
SoltauFintel Dec 19, 2023
4b28a6f
fix warnings
SoltauFintel Dec 19, 2023
0a08dea
cleanup code
SoltauFintel Dec 19, 2023
c8bfea4
cleanup code
SoltauFintel Dec 19, 2023
af7d5ea
new testcase for GridCommand, removal of Grid JxlsHelper methods
SoltauFintel Dec 19, 2023
d88d632
Util.toByteArray() moved to ImageCommand
gastendonk Dec 21, 2023
7e92969
jx: prefix, remove var prefix for groupBy, if:noElse testcase,
gastendonk Dec 22, 2023
2393ec4
Boxing
SoltauFintel Dec 22, 2023
a4a6d7f
Boxing
SoltauFintel Dec 22, 2023
5954eb6
fix Gradle based jxls-poi unit tests
SoltauFintel Dec 22, 2023
320a524
fix Gradle based jxls-poi unit tests
SoltauFintel Dec 22, 2023
ec9f07d
Gradle
SoltauFintel Dec 22, 2023
7e65e17
ASC_ignoreCase and DESC_ignoreCase for groupOrder
SoltauFintel Dec 22, 2023
3dbe1fc
GroupSum: Iterable, ExpressionEvaluator access
SoltauFintel Dec 22, 2023
37a26bb
FormulaCopyDemo
SoltauFintel Dec 22, 2023
24c8594
AreaListener testcase
SoltauFintel Dec 22, 2023
04f6c85
removed unused code: XlsArea.cellShiftStrategy
SoltauFintel Dec 22, 2023
a4d0d5d
isFormulaProcessingRequired moved to map with key
SoltauFintel Dec 22, 2023
996d793
ignoreSourceCellStyle also moved to map
SoltauFintel Dec 22, 2023
bd09390
cellStyleMap also moved to map with key CellData.CELL_STYLE_MAP
SoltauFintel Dec 22, 2023
872e3bc
groupOrder bugfix
SoltauFintel Dec 22, 2023
079636b
use getRunVar() for internal vars
SoltauFintel Dec 22, 2023
ce928e0
GroupSum problem
SoltauFintel Dec 22, 2023
b7ac551
IS_FORMULA_PROCESSING_REQUIRED bugfix
SoltauFintel Dec 22, 2023
f43aa9c
JxlsHelper removal
SoltauFintel Dec 27, 2023
b30143c
JxlsHelper removal
SoltauFintel Dec 27, 2023
a5a0e9f
make subclassing of JxlsTemplateFiller easier (JxlsOptions new)
SoltauFintel Dec 27, 2023
b5aa2bf
ImageTest
SoltauFintel Dec 27, 2023
26acbc1
NeedsExpressionEvaluator
SoltauFintel Dec 27, 2023
29524be
revert my change: formulaProcessingRequired, ignoreSourceCellStyle,
SoltauFintel Dec 27, 2023
3932c51
not necessary that Context item exists
SoltauFintel Dec 27, 2023
6f3d75f
removed unused class
SoltauFintel Dec 27, 2023
d89f99e
removed stress
SoltauFintel Dec 27, 2023
4df43bc
removed PoiTransformer create... methods
SoltauFintel Dec 27, 2023
8855d74
removal TransformerFactory
SoltauFintel Dec 28, 2023
ed632f0
SimpleExporterTest; removed PoiContext
SoltauFintel Dec 28, 2023
7af5b4e
grid_template.xls -> .xlsx
SoltauFintel Dec 28, 2023
2791b6d
grid_template.xlsx also moved to jxls-poi
SoltauFintel Dec 28, 2023
9bcefc7
createContext()
SoltauFintel Dec 28, 2023
876b069
refactor long method
SoltauFintel Dec 28, 2023
4a38185
refactor long method
SoltauFintel Dec 28, 2023
50f5dd0
refactor similar code
SoltauFintel Dec 28, 2023
ee75783
RunVar (refactoring)
SoltauFintel Dec 28, 2023
cdaed28
CellRef copy constructor (refactoring)
SoltauFintel Dec 28, 2023
a195630
StandardFormulaProcessor, FastFormulaProcessor (refactoring)
SoltauFintel Dec 28, 2023
1820a22
RunVar
SoltauFintel Dec 28, 2023
65e655e
reordered arguments
SoltauFintel Dec 28, 2023
c50c205
compareSheetName (refactoring+optimization)
SoltauFintel Dec 28, 2023
d7396f6
StringBuilder
SoltauFintel Dec 28, 2023
3f8a114
TODO came from POI
SoltauFintel Dec 28, 2023
7819035
renamed noComments to noNotes
SoltauFintel Dec 28, 2023
340ea3b
duplicate code (refactoring)
SoltauFintel Dec 28, 2023
b0bea08
JdbcHelper
SoltauFintel Dec 28, 2023
2f14045
JdbcHelper renamed to DatabaseAccess
SoltauFintel Dec 28, 2023
554e124
JdbcHelper renamed to DatabaseAccess
SoltauFintel Dec 28, 2023
bad5ce7
javadoc
SoltauFintel Dec 28, 2023
6ff7e4b
TransformationConfig moved to Context
SoltauFintel Dec 28, 2023
302946b
evaluator methods, moved CellData.evaluate() to TransformationConfig
SoltauFintel Dec 29, 2023
3559889
TransformationConfig -> ExpressionEvaluatorContext
SoltauFintel Dec 29, 2023
15f8d66
copy streams
SoltauFintel Dec 29, 2023
9177790
NeedsExpressionEvaluator -> NeedsContext
SoltauFintel Dec 29, 2023
83adeaf
Context -> Map in some testcases
SoltauFintel Dec 29, 2023
d740756
Context is now an interface, new: ContextImpl, PublicContext
SoltauFintel Dec 29, 2023
bd230d8
reduced handleCellException() from all map keys to Context
SoltauFintel Dec 29, 2023
e4f0c94
javadoc
SoltauFintel Dec 29, 2023
a2ec574
reduced access to Context.toMap()
SoltauFintel Dec 29, 2023
a64d3bf
ensure TransformerDelegator can be applied
SoltauFintel Dec 29, 2023
8efd0f2
changed to Area.processFormulas(FormulaProcessor) because
SoltauFintel Dec 29, 2023
d34586f
alpha testing
SoltauFintel Dec 29, 2023
523188d
create simple PoiTransformer
SoltauFintel Dec 29, 2023
acfd86a
Map decorator as base for your special Map implementation
SoltauFintel Dec 29, 2023
854063f
PoiSafeSheetNameBuilder calls JxlsLogger.handleSheetNameChange()
SoltauFintel Dec 29, 2023
d186b1f
ExpressionEvaluator.isConditionTrue(map) needed
SoltauFintel Dec 29, 2023
c650b66
now builder can set updateCellDataArea
SoltauFintel Dec 29, 2023
3e2989a
Pre write actions
SoltauFintel Dec 29, 2023
7397f7e
Is sheetStreaming algo accessible?
SoltauFintel Dec 29, 2023
b6cd790
Gradle: removed Groovy plugin
SoltauFintel Dec 29, 2023
78c6a27
isConditionTrue(condition, map)
SoltauFintel Dec 29, 2023
e7fa3c6
buildAndFill that returns byte[]
SoltauFintel Dec 29, 2023
50537ff
fix testcase
SoltauFintel Dec 29, 2023
79fca94
Cell reference tracking
SoltauFintel Dec 29, 2023
b386374
New Jxls 3 documentation
SoltauFintel Dec 29, 2023
c153c97
docs update, README update
SoltauFintel Jan 2, 2024
9fca8ff
docs
SoltauFintel Jan 3, 2024
5897a26
Logging
SoltauFintel Jan 3, 2024
7e931c4
make public for outside use
gastendonk Jan 3, 2024
2cba262
Because of bugs we have to stick with POI version 5.2.2
SoltauFintel Jan 3, 2024
25bf1b7
assertNotEquals
SoltauFintel Jan 3, 2024
66f6f40
testcase for record class
SoltauFintel Jan 3, 2024
47548df
make PublicContext.getRunVar() behavior changable
SoltauFintel Jan 4, 2024
71560fd
3.0.0-a007
SoltauFintel Jan 4, 2024
8805c8f
EachCommand.filter currentIndex bugfix
gastendonk Jan 5, 2024
d642dfc
Revert "EachCommand.filter currentIndex bugfix"
gastendonk Jan 5, 2024
350ec2f
docs
gastendonk Jan 5, 2024
aa45c49
removed gmaven plugin because we don't use Groovy
SoltauFintel Jan 8, 2024
bb6b4c6
docs
SoltauFintel Jan 8, 2024
e04326c
Javadoc
SoltauFintel Jan 8, 2024
eb09013
docs
SoltauFintel Jan 9, 2024
c17c790
docs: table support, more responsiveness
SoltauFintel Jan 9, 2024
c82ac86
Command mappings not static
SoltauFintel Jan 9, 2024
85c6b72
code-review
SoltauFintel Jan 9, 2024
899b2e3
3.0.0-beta1, README links to new homepage
SoltauFintel Jan 9, 2024
9701b86
Removed redundant specification of type arguments
gastendonk Jan 15, 2024
e63e1de
Removed redundant specification of type arguments
gastendonk Jan 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 5 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- uses: actions/checkout@v4
- name: Set up Java 17
uses: actions/setup-java@v4
with:
java-version: 1.8
distribution: 'temurin'
java-version: '17'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- uses: actions/checkout@v4
- name: Set up Java 17
uses: actions/setup-java@v4
with:
java-version: 1.8
distribution: 'temurin'
java-version: '17'
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: jxls-site
run: cd jxls-site && mvn -B site --file pom.xml
# - name: jxls-site
# run: cd jxls-site && mvn -B site --file pom.xml
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ target/
/.gradle/
/build/
/publish.xml
/features.md
55 changes: 0 additions & 55 deletions CONTRIBUTING.md

This file was deleted.

34 changes: 16 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,35 @@
# JXLS
# Jxls

[![Java CI with Maven](https://github.com/jxlsteam/jxls/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/jxlsteam/jxls/actions?query=workflow%3A%22Java+CI+with+Maven%22) [![codecov](https://codecov.io/gh/jxlsteam/jxls/branch/master/graph/badge.svg)](https://codecov.io/gh/jxlsteam/jxls)


## Overview

[JXLS](http://jxls.sourceforge.net/) is a small and simple to use Java library for Excel report generation using Excel template files.
[Jxls](http://jxls.sourceforge.net/) is a small and simple to use Java library for Excel report generation using Excel template files.

JXLS abstracts Excel generation from underlying Java-to-Excel low-level processing library.
JXLS uses a special markup in Excel templates to define output formatting and data layout.
Jxls abstracts Excel generation from underlying Java-to-Excel low-level processing library.
Jxls uses a special markup in Excel templates to define output formatting and data layout.

## How to use

**Maven**

<dependency>
<groupId>org.jxls</groupId>
<artifactId>jxls-poi</artifactId>
<version>2.14.0</version>
</dependency>
```
<dependency>
<groupId>org.jxls</groupId>
<artifactId>jxls-poi</artifactId>
<version>3.0.0-beta1</version>
</dependency>
```

**Gradle**

implementation 'org.jxls:jxls-poi:2.14.0'
```
implementation 'org.jxls:jxls-poi:3.0.0-beta1'
```

**Getting started**

See [Getting started](http://jxls.sourceforge.net/getting_started.html) guide.

**Examples**

See [examples](http://jxls.sourceforge.net/samples/object_collection.html) on Jxls site and in the code.
See [Getting started guide](http://jxls.sourceforge.net/getting-started.html).

## Contributing

[see Contributing guide](CONTRIBUTING.md)
See [Contributing guide](https://jxls.sourceforge.net/sourcecode.html).
14 changes: 0 additions & 14 deletions bitbucket-pipelines.yml

This file was deleted.

16 changes: 12 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ allprojects {
apply plugin: 'jacoco'
apply plugin: 'org.owasp.dependencycheck'

version = '2.14.0-RC5-SNAPSHOT'
version = '3.0.0-a007-SNAPSHOT'
group = 'org.jxls'

repositories {
Expand All @@ -12,15 +12,23 @@ allprojects {

subprojects {
apply plugin: 'java-library'
apply plugin: 'groovy'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'

sourceCompatibility = 1.8
targetCompatibility = 1.8
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}
compileJava.options.encoding = 'windows-1252'
compileTestJava.options.encoding = 'windows-1252'

dependencies {
testImplementation 'org.junit.vintage:junit-vintage-engine:5.10.1'
testImplementation 'org.mockito:mockito-core:4.11.0'
testRuntimeOnly 'commons-logging:commons-logging:1.3.0'
}

java {
withJavadocJar()
withSourcesJar()
Expand Down
8 changes: 1 addition & 7 deletions jxls-poi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,8 @@ dependencies {
implementation project(':jxls')

implementation 'org.apache.poi:poi-ooxml:5.2.2'
implementation 'org.apache.commons:commons-compress:1.22'
implementation 'org.slf4j:jcl-over-slf4j:1.7.30'
implementation 'org.apache.commons:commons-compress:1.25.0'

testImplementation 'org.junit.vintage:junit-vintage-engine:5.8.2'
testImplementation 'org.mockito:mockito-core:4.3.1'
testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0'
testImplementation 'cglib:cglib-nodep:3.3.0'
testImplementation 'commons-io:commons-io:2.11.0'
testImplementation 'org.apache.derby:derby:10.12.1.1'
}

Expand Down
34 changes: 8 additions & 26 deletions jxls-poi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.jxls</groupId>
<artifactId>jxls-project</artifactId>
<version>2.14.1-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jxls-poi</artifactId>
Expand Down Expand Up @@ -30,19 +30,17 @@
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.22</version>
<version>1.25.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
Expand All @@ -54,22 +52,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
Expand Down
Loading