Skip to content

Commit d3d56cd

Browse files
fugerit79fugerit79
committed
Merge branch 'develop'
2 parents 47193ce + 0638fab commit d3d56cd

File tree

15 files changed

+263
-38
lines changed

15 files changed

+263
-38
lines changed

‎docgen/parameters.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"title" : "Venus (Fugerit Document Generation Framework)",
33
"name": "Venus",
4-
"version" : "0.6.0",
5-
"date" : "20/12/2022",
4+
"version" : "0.6.1",
5+
"date" : "22/12/2022",
66
"organization" : {
77
"name" : "Fugerit Org",
88
"url" : "https://www.fugerit.org"

‎docgen/release-notes.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0.6.1 (2022-12-22)
2+
------------------
3+
+ Added doc(x) and xls(x) validators
4+
+ Corrected type in package name
5+
16
0.6.0 (2022-12-20)
27
------------------
38
+ Added compatibility check for Tiff Image Validator (required java 9+ at runtime)
@@ -7,6 +12,7 @@
712
0.5.11 (2022-12-19)
813
------------------
914
+ Added doc type validation module (fj-doc-val)
15+
+ Now fj-doc requires java9+ at build time (will be build with java 11), java8 at runtime (some functionalities will not works)
1016

1117
0.5.10 (2022-12-12)
1218
------------------

‎fj-doc-val/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,17 @@
4141
<artifactId>pdfbox</artifactId>
4242
<version>${pdfbox-version}</version>
4343
</dependency>
44+
45+
<dependency>
46+
<groupId>org.apache.poi</groupId>
47+
<artifactId>poi-ooxml</artifactId>
48+
</dependency>
49+
50+
<dependency>
51+
<groupId>org.apache.poi</groupId>
52+
<artifactId>poi-scratchpad</artifactId>
53+
<version>${poi-version}</version>
54+
</dependency>
4455

4556
</dependencies>
4657

‎fj-doc-val/src/main/java/org/fugerit/java/doc/val/pdf/boc/PdfboxValidator.java

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,6 @@
11
package org.fugerit.java.doc.val.pdf.boc;
22

3-
import java.io.InputStream;
4-
5-
import org.apache.pdfbox.pdmodel.PDDocument;
6-
import org.fugerit.java.doc.val.core.DocTypeValidationResult;
7-
import org.fugerit.java.doc.val.core.DocTypeValidator;
8-
import org.fugerit.java.doc.val.core.basic.AbstractDocTypeValidator;
9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
11-
12-
public class PdfboxValidator extends AbstractDocTypeValidator {
13-
14-
private static final Logger logger = LoggerFactory.getLogger( PdfboxValidator.class );
15-
16-
public static final String EXTENSION = "PDF";
17-
18-
public static final String MIME_TYPE = "application/pdf";
19-
20-
public static final DocTypeValidator DEFAULT = new PdfboxValidator();
21-
22-
public PdfboxValidator() {
23-
super( MIME_TYPE, EXTENSION );
24-
}
25-
26-
@Override
27-
public DocTypeValidationResult validate(InputStream is) {
28-
DocTypeValidationResult result = DocTypeValidationResult.newFail();
29-
try {
30-
PDDocument.load( is );
31-
result = DocTypeValidationResult.newOk();
32-
} catch (Exception e) {
33-
logger.warn( "Failed check on pdf : "+e );
34-
}
35-
return result;
36-
}
3+
@Deprecated
4+
public class PdfboxValidator extends org.fugerit.java.doc.val.pdf.box.PdfboxValidator {
375

386
}

‎fj-doc-val/src/main/java/org/fugerit/java/doc/val/pdf/box/PdfboxValidator.java

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package org.fugerit.java.doc.val.pdf.box;
2+
3+
import java.io.InputStream;
4+
5+
import org.apache.pdfbox.pdmodel.PDDocument;
6+
import org.fugerit.java.doc.val.core.DocTypeValidationResult;
7+
import org.fugerit.java.doc.val.core.DocTypeValidator;
8+
import org.fugerit.java.doc.val.core.basic.AbstractDocTypeValidator;
9+
import org.slf4j.Logger;
10+
import org.slf4j.LoggerFactory;
11+
12+
public class PdfboxValidator extends AbstractDocTypeValidator {
13+
14+
private static final Logger logger = LoggerFactory.getLogger( PdfboxValidator.class );
15+
16+
public static final String EXTENSION = "PDF";
17+
18+
public static final String MIME_TYPE = "application/pdf";
19+
20+
public static final DocTypeValidator DEFAULT = new PdfboxValidator();
21+
22+
public PdfboxValidator() {
23+
super( MIME_TYPE, EXTENSION );
24+
}
25+
26+
@Override
27+
public DocTypeValidationResult validate(InputStream is) {
28+
DocTypeValidationResult result = DocTypeValidationResult.newFail();
29+
try {
30+
PDDocument.load( is );
31+
result = DocTypeValidationResult.newOk();
32+
} catch (Exception e) {
33+
logger.warn( "Failed check on pdf : "+e );
34+
}
35+
return result;
36+
}
37+
38+
}

‎fj-doc-val/src/main/java/org/fugerit/java/doc/val/poi/DocValidator.java

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package org.fugerit.java.doc.val.poi;
2+
3+
import java.io.InputStream;
4+
5+
import org.apache.poi.hwpf.HWPFDocument;
6+
import org.fugerit.java.doc.val.core.DocTypeValidationResult;
7+
import org.fugerit.java.doc.val.core.DocTypeValidator;
8+
import org.fugerit.java.doc.val.core.basic.AbstractDocTypeValidator;
9+
import org.slf4j.Logger;
10+
import org.slf4j.LoggerFactory;
11+
12+
public class DocValidator extends AbstractDocTypeValidator {
13+
14+
private static final Logger logger = LoggerFactory.getLogger( DocValidator.class );
15+
16+
public static final String EXTENSION = "DOC";
17+
18+
public static final String MIME_TYPE = "application/msword";
19+
20+
public static final DocTypeValidator DEFAULT = new DocValidator();
21+
22+
public DocValidator() {
23+
super( MIME_TYPE, EXTENSION );
24+
}
25+
26+
@Override
27+
public DocTypeValidationResult validate(InputStream is) {
28+
DocTypeValidationResult result = DocTypeValidationResult.newFail();
29+
try ( HWPFDocument workbook = new HWPFDocument( is ) ) {
30+
result = DocTypeValidationResult.newOk();
31+
} catch (Exception e) {
32+
logger.warn( "Failed check on pdf : "+e );
33+
}
34+
return result;
35+
}
36+
37+
}

‎fj-doc-val/src/main/java/org/fugerit/java/doc/val/poi/DocxValidator.java

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package org.fugerit.java.doc.val.poi;
2+
3+
import java.io.InputStream;
4+
5+
import org.apache.poi.xwpf.usermodel.XWPFDocument;
6+
import org.fugerit.java.doc.val.core.DocTypeValidationResult;
7+
import org.fugerit.java.doc.val.core.DocTypeValidator;
8+
import org.fugerit.java.doc.val.core.basic.AbstractDocTypeValidator;
9+
import org.slf4j.Logger;
10+
import org.slf4j.LoggerFactory;
11+
12+
public class DocxValidator extends AbstractDocTypeValidator {
13+
14+
private static final Logger logger = LoggerFactory.getLogger( DocxValidator.class );
15+
16+
public static final String EXTENSION = "DOCX";
17+
18+
public static final String MIME_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
19+
20+
public static final DocTypeValidator DEFAULT = new DocxValidator();
21+
22+
public DocxValidator() {
23+
super( MIME_TYPE, EXTENSION );
24+
}
25+
26+
@Override
27+
public DocTypeValidationResult validate(InputStream is) {
28+
DocTypeValidationResult result = DocTypeValidationResult.newFail();
29+
try ( XWPFDocument workbook = new XWPFDocument( is ) ) {
30+
result = DocTypeValidationResult.newOk();
31+
} catch (Exception e) {
32+
logger.warn( "Failed check on pdf : "+e );
33+
}
34+
return result;
35+
}
36+
37+
}

‎fj-doc-val/src/main/java/org/fugerit/java/doc/val/poi/XlsValidator.java

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package org.fugerit.java.doc.val.poi;
2+
3+
import java.io.InputStream;
4+
5+
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
6+
import org.fugerit.java.doc.val.core.DocTypeValidationResult;
7+
import org.fugerit.java.doc.val.core.DocTypeValidator;
8+
import org.fugerit.java.doc.val.core.basic.AbstractDocTypeValidator;
9+
import org.slf4j.Logger;
10+
import org.slf4j.LoggerFactory;
11+
12+
public class XlsValidator extends AbstractDocTypeValidator {
13+
14+
private static final Logger logger = LoggerFactory.getLogger( XlsValidator.class );
15+
16+
public static final String EXTENSION = "XLS";
17+
18+
public static final String MIME_TYPE = "application/vnd.ms-excel";
19+
20+
public static final DocTypeValidator DEFAULT = new XlsValidator();
21+
22+
public XlsValidator() {
23+
super( MIME_TYPE, EXTENSION );
24+
}
25+
26+
@Override
27+
public DocTypeValidationResult validate(InputStream is) {
28+
DocTypeValidationResult result = DocTypeValidationResult.newFail();
29+
try ( HSSFWorkbook workbook = new HSSFWorkbook( is ) ) {
30+
result = DocTypeValidationResult.newOk();
31+
} catch (Exception e) {
32+
logger.warn( "Failed check on pdf : "+e );
33+
}
34+
return result;
35+
}
36+
37+
}

‎fj-doc-val/src/main/java/org/fugerit/java/doc/val/poi/XlsxValidator.java

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package org.fugerit.java.doc.val.poi;
2+
3+
import java.io.InputStream;
4+
5+
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
6+
import org.fugerit.java.doc.val.core.DocTypeValidationResult;
7+
import org.fugerit.java.doc.val.core.DocTypeValidator;
8+
import org.fugerit.java.doc.val.core.basic.AbstractDocTypeValidator;
9+
import org.slf4j.Logger;
10+
import org.slf4j.LoggerFactory;
11+
12+
public class XlsxValidator extends AbstractDocTypeValidator {
13+
14+
private static final Logger logger = LoggerFactory.getLogger( XlsxValidator.class );
15+
16+
public static final String EXTENSION = "XLSX";
17+
18+
public static final String MIME_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
19+
20+
public static final DocTypeValidator DEFAULT = new XlsxValidator();
21+
22+
public XlsxValidator() {
23+
super( MIME_TYPE, EXTENSION );
24+
}
25+
26+
@Override
27+
public DocTypeValidationResult validate(InputStream is) {
28+
DocTypeValidationResult result = DocTypeValidationResult.newFail();
29+
try ( XSSFWorkbook workbook = new XSSFWorkbook( is ) ) {
30+
result = DocTypeValidationResult.newOk();
31+
} catch (Exception e) {
32+
logger.warn( "Failed check on pdf : "+e );
33+
}
34+
return result;
35+
}
36+
37+
}

‎fj-doc-val/src/test/java/test/org/fugerit/java/doc/val/TestAllFacade.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.fugerit.java.doc.val.core.DocValidatorFacade;
44
import org.fugerit.java.doc.val.core.basic.ImageValidator;
5-
import org.fugerit.java.doc.val.pdf.boc.PdfboxValidator;
5+
import org.fugerit.java.doc.val.pdf.box.PdfboxValidator;
66
import org.junit.Test;
77

88
public class TestAllFacade extends TestDocValidatorFacade {

‎fj-doc-val/src/test/java/test/org/fugerit/java/doc/val/TestPdfBoxValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package test.org.fugerit.java.doc.val;
22

33
import org.fugerit.java.doc.val.core.DocValidatorFacade;
4-
import org.fugerit.java.doc.val.pdf.boc.PdfboxValidator;
4+
import org.fugerit.java.doc.val.pdf.box.PdfboxValidator;
55
import org.junit.Test;
66

77
public class TestPdfBoxValidator extends TestDocValidatorFacade {

‎fj-doc-val/src/test/java/test/org/fugerit/java/doc/val/TestPoiValidator.java

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package test.org.fugerit.java.doc.val;
2+
3+
import org.fugerit.java.doc.val.core.DocValidatorFacade;
4+
import org.fugerit.java.doc.val.poi.DocValidator;
5+
import org.fugerit.java.doc.val.poi.DocxValidator;
6+
import org.fugerit.java.doc.val.poi.XlsValidator;
7+
import org.fugerit.java.doc.val.poi.XlsxValidator;
8+
import org.junit.Test;
9+
10+
public class TestPoiValidator extends TestDocValidatorFacade {
11+
12+
private static final DocValidatorFacade FACADE = DocValidatorFacade.newFacadeStrict(
13+
DocxValidator.DEFAULT,
14+
DocValidator.DEFAULT,
15+
XlsxValidator.DEFAULT,
16+
XlsValidator.DEFAULT
17+
);
18+
19+
@Test
20+
public void testDocAsDoc() {
21+
this.worker(FACADE, "doc_as_doc.doc", true );
22+
}
23+
24+
@Test
25+
public void testDocxAsDocx() {
26+
this.worker(FACADE, "docx_as_docx.docx", true );
27+
}
28+
29+
@Test
30+
public void testXlsAsXls() {
31+
this.worker(FACADE, "xls_as_xls.xls", true );
32+
}
33+
34+
@Test
35+
public void testXlsxAsXlsx() {
36+
this.worker(FACADE, "xlsx_as_xlsx.xlsx", true );
37+
}
38+
39+
@Test
40+
public void testDocxAsDoc() {
41+
this.worker(FACADE, "docx_as_doc.doc", false );
42+
}
43+
44+
@Test
45+
public void testJpgAsXlsx() {
46+
this.worker(FACADE, "jpg_as_xlsx.xlsx", false );
47+
}
48+
49+
@Test
50+
public void testXlsxAsXls() {
51+
this.worker(FACADE, "xlsx_as_xls.xls", false );
52+
}
53+
54+
}

‎fj-doc-val/src/test/resources/sample/docx_as_doc.doc

11.5 KB
Binary file not shown.

‎fj-doc-val/src/test/resources/sample/jpg_as_xlsx.xlsx

6.88 KB
Binary file not shown.

‎fj-doc-val/src/test/resources/sample/xlsx_as_xls.xlsx

7.91 KB
Binary file not shown.

0 commit comments

Comments
 (0)