Skip to content

Commit

Permalink
Merge pull request #231 from ozlerhakan/3.1.6
Browse files Browse the repository at this point in the history
bump version 3.1.6
  • Loading branch information
ozlerhakan committed Mar 20, 2022
2 parents 0cc2679 + d722872 commit da3a2d1
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 12 deletions.
6 changes: 3 additions & 3 deletions README.adoc
Expand Up @@ -2,11 +2,11 @@
:toclevels: 2

= Poiji
:version: v3.1.5
:branch: 3.1.5
:version: v3.1.6
:branch: 3.1.6

image:https://github.com/ozlerhakan/poiji/actions/workflows/maven.yml/badge.svg["Build Status"] image:https://app.codacy.com/project/badge/Grade/64f7e2cb9e604807b62334a4cfc3952d["Codacy code quality", link="https://www.codacy.com/gh/ozlerhakan/poiji/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ozlerhakan/poiji&utm_campaign=Badge_Grade"]
image:https://codecov.io/gh/ozlerhakan/poiji/branch/{branch}/graph/badge.svg?token=MN6V6xOWBq["Codecov", link="https://codecov.io/gh/ozlerhakan/poiji"] image:https://img.shields.io/badge/apache.poi-5.1.0-brightgreen.svg[] image:https://app.fossa.com/api/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji.svg?type=shield["FOSSA Status", link="https://app.fossa.com/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji?ref=badge_shield"]
image:https://codecov.io/gh/ozlerhakan/poiji/branch/{branch}/graph/badge.svg?token=MN6V6xOWBq["Codecov", link="https://codecov.io/gh/ozlerhakan/poiji"] image:https://img.shields.io/badge/apache.poi-5.2.1-brightgreen.svg[] image:https://app.fossa.com/api/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji.svg?type=shield["FOSSA Status", link="https://app.fossa.com/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji?ref=badge_shield"]

Poiji is a tiny thread-safe Java library that provides one way mapping from Excel sheets to Java classes. In a way it lets us convert each row of the specified excel data into Java objects. Poiji uses https://poi.apache.org/[Apache Poi] (the Java API for Microsoft Documents) under the hood to fulfill the mapping process.

Expand Down
11 changes: 5 additions & 6 deletions pom.xml
Expand Up @@ -6,7 +6,7 @@

<groupId>com.github.ozlerhakan</groupId>
<artifactId>poiji</artifactId>
<version>3.1.5</version>
<version>3.1.6</version>
<packaging>jar</packaging>

<name>poiji</name>
Expand Down Expand Up @@ -45,8 +45,8 @@
</issueManagement>

<properties>
<apache.poi.version>5.1.0</apache.poi.version>
<junit.version>4.12</junit.version>
<apache.poi.version>5.2.1</apache.poi.version>
<junit.version>4.13.2</junit.version>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Expand Down Expand Up @@ -126,7 +126,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>3.3.2</version>
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
Expand All @@ -143,7 +143,6 @@
<configuration>
<source>11</source>
<detectJavaApiLink>false</detectJavaApiLink>
<additionalparam>${javadoc.none}</additionalparam>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -202,7 +201,7 @@
<profile>
<id>javadoclint</id>
<activation>
<jdk>[1.8,)</jdk>
<jdk>[1.8)</jdk>
</activation>
<properties>
<javadoc.none>-Xdoclint:none</javadoc.none>
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/poiji/bind/Poiji.java
Expand Up @@ -28,7 +28,7 @@
* <p>
* Example:
* <pre>
* List<Employee> employees = Poiji.fromExcel(new File("employees.xls"), Employee.class);
* List employees = Poiji.fromExcel(new File("employees.xls"), Employee.class);
* employees.size();
* // 3
* Employee firstEmployee = employees.get(0);
Expand Down Expand Up @@ -314,6 +314,7 @@ public static <T> void fromExcel(final InputStream inputStream,
* @param type type of the root object.
* @param <T> type of the root object.
* @param options specifies to change the default behaviour of the poiji.
* @return the newly created objects
* @throws PoijiException if an internal exception occurs during the mapping process.
* @see Poiji#fromExcel(Sheet, Class, PoijiOptions, Consumer)
* @see Poiji#fromExcel(Sheet, Class)
Expand All @@ -334,6 +335,7 @@ public static <T> List<T> fromExcel(final Sheet sheet,
* @param sheet excel sheet its workbook must be either an instance of {@code HSSFWorkbook} or {@code XSSFWorkbook}.
* @param type type of the root object.
* @param <T> type of the root object.
* @return the newly created objects
* @throws PoijiException if an internal exception occurs during the mapping process.
* @see Poiji#fromExcel(Sheet, Class, PoijiOptions)
* @see Poiji#fromExcel(Sheet, Class, PoijiOptions, Consumer)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/poiji/option/PoijiOptions.java
Expand Up @@ -600,7 +600,7 @@ public PoijiOptionsBuilder headerStart(int headerStart) {

/**
* This is to set the number of row contains headers
* <br/>
*
* Set 0 to indicate that no header in the excel file.
* Default - 1.
*
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/poiji/util/AnnotationUtil.java
Expand Up @@ -24,7 +24,12 @@ private AnnotationUtil() {
* Validate that all headers specified via @ExcelCellName annotations are present in the list of header names.
* <p>
* Validation is only performed if it is set in the PoijiOptions
*
* @param options poijoption
* @param formatting formatting
* @param modelType class model
* @param titleToIndex tiletoindex
* @param indexToTitle indextoTitle
* @param <T> model Type
* @throws HeaderMissingException if one or more headers are missing
*/
public static <T> void validateMandatoryNameColumns(PoijiOptions options,
Expand Down

0 comments on commit da3a2d1

Please sign in to comment.