Skip to content

Commit 0953277

Browse files
committed
chore: failed validation logging review #562
1 parent d72ffec commit 0953277

File tree

5 files changed

+13
-21
lines changed

5 files changed

+13
-21
lines changed

fj-doc-val-core/src/main/java/org/fugerit/java/doc/val/core/basic/AbstractDocTypeValidator.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@
1616

1717
import lombok.Getter;
1818
import lombok.extern.slf4j.Slf4j;
19+
import org.slf4j.Logger;
20+
import org.slf4j.LoggerFactory;
1921

2022
@Slf4j
2123
public abstract class AbstractDocTypeValidator implements DocTypeValidator {
2224

23-
@Override
25+
private static final Logger logger = LoggerFactory.getLogger( AbstractDocTypeValidator.class );
26+
27+
@Override
2428
public String toString() {
2529
return this.getClass().getSimpleName()+"[mimeType=" + mimeType + ", supportedExtensions=" + supportedExtensions + "]";
2630
}
@@ -74,4 +78,8 @@ public boolean checkCompatibility() {
7478
return Boolean.TRUE;
7579
}
7680

81+
protected void logFailedCheck( String type, Exception e ) {
82+
logger.warn( "Failed check on {} : {}", type, e.toString() );
83+
}
84+
7785
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@
66
import org.fugerit.java.doc.val.core.DocTypeValidationResult;
77
import org.fugerit.java.doc.val.core.DocTypeValidator;
88
import org.fugerit.java.doc.val.core.basic.AbstractDocTypeValidator;
9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
119

1210
public class DocValidator extends AbstractDocTypeValidator {
1311

14-
private static final Logger logger = LoggerFactory.getLogger( DocValidator.class );
15-
1612
public static final String EXTENSION = "DOC";
1713

1814
public static final String MIME_TYPE = "application/msword";
@@ -29,7 +25,7 @@ public DocTypeValidationResult validate(InputStream is) {
2925
try ( HWPFDocument workbook = new HWPFDocument( is ) ) {
3026
result = DocTypeValidationResult.newOk();
3127
} catch (Exception e) {
32-
logger.warn( "Failed check on pdf : {}", e.toString() );
28+
this.logFailedCheck( EXTENSION, e );
3329
result.withMainException( e );
3430
}
3531
return result;

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@
66
import org.fugerit.java.doc.val.core.DocTypeValidationResult;
77
import org.fugerit.java.doc.val.core.DocTypeValidator;
88
import org.fugerit.java.doc.val.core.basic.AbstractDocTypeValidator;
9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
119

1210
public class DocxValidator extends AbstractDocTypeValidator {
1311

14-
private static final Logger logger = LoggerFactory.getLogger(DocxValidator.class);
15-
1612
public static final String EXTENSION = "DOCX";
1713

1814
public static final String MIME_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
@@ -29,7 +25,7 @@ public DocTypeValidationResult validate(InputStream is) {
2925
try (XWPFDocument workbook = new XWPFDocument(is)) {
3026
result = DocTypeValidationResult.newOk();
3127
} catch (Exception e) {
32-
logger.warn("Failed check on pdf : {}", e.toString());
28+
this.logFailedCheck( EXTENSION, e );
3329
result.withMainException( e );
3430
}
3531
return result;

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@
66
import org.fugerit.java.doc.val.core.DocTypeValidationResult;
77
import org.fugerit.java.doc.val.core.DocTypeValidator;
88
import org.fugerit.java.doc.val.core.basic.AbstractDocTypeValidator;
9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
119

1210
public class XlsValidator extends AbstractDocTypeValidator {
1311

14-
private static final Logger logger = LoggerFactory.getLogger( XlsValidator.class );
15-
1612
public static final String EXTENSION = "XLS";
1713

1814
public static final String MIME_TYPE = "application/vnd.ms-excel";
@@ -29,7 +25,7 @@ public DocTypeValidationResult validate(InputStream is) {
2925
try ( HSSFWorkbook workbook = new HSSFWorkbook( is ) ) {
3026
result = DocTypeValidationResult.newOk();
3127
} catch (Exception e) {
32-
logger.warn( "Failed check on pdf : {}", e.toString() );
28+
this.logFailedCheck( EXTENSION, e );
3329
result.withMainException( e );
3430
}
3531
return result;

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@
66
import org.fugerit.java.doc.val.core.DocTypeValidationResult;
77
import org.fugerit.java.doc.val.core.DocTypeValidator;
88
import org.fugerit.java.doc.val.core.basic.AbstractDocTypeValidator;
9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
119

1210
public class XlsxValidator extends AbstractDocTypeValidator {
1311

14-
private static final Logger logger = LoggerFactory.getLogger( XlsxValidator.class );
15-
1612
public static final String EXTENSION = "XLSX";
1713

1814
public static final String MIME_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
@@ -29,7 +25,7 @@ public DocTypeValidationResult validate(InputStream is) {
2925
try ( XSSFWorkbook workbook = new XSSFWorkbook( is ) ) {
3026
result = DocTypeValidationResult.newOk();
3127
} catch (Exception e) {
32-
logger.warn( "Failed check on pdf : {}", e.toString() );
28+
this.logFailedCheck( EXTENSION, e );
3329
result.withMainException( e );
3430
}
3531
return result;

0 commit comments

Comments
 (0)