Merge branch 'develop'

Author: fugerit79

docgen/parameters.json

@@ -1,8 +1,8 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "0.5.11",
-	"date" : "19/12/2022",
+	"version" : "0.5.12",
+	"date" : "20/12/2022",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"

docgen/release-notes.txt

@@ -1,6 +1,12 @@
-0.5.11 (2022-12-19)
+0.5.20 (2022-12-20)
+------------------
++ Added compatibility check for Tiff Image Validator (required java 9+ at runtime)
++ Updated fj-core version to 0.8.5
+
+0.5.11 (2022-12-19)
 ------------------
 + Added doc type validation module (fj-doc-val)
++ Now fj-doc requires java9+ at build time (will be build with java 11), java8 at runtime (some functionalities will not works)
 
 0.5.10 (2022-12-12)
 ------------------

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

@@ -16,6 +16,8 @@ public interface DocTypeValidator {
 
 	boolean check( InputStream is ) throws IOException;
 
+	boolean checkCompatibility();
+	
 	DocTypeValidationResult validate( InputStream is ) throws IOException;
 
 }

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

@@ -31,19 +31,23 @@ private DocValidatorFacade() {
 	}
 
 	private boolean addValidator( DocTypeValidator validator ) {
-		boolean ok = true;
-		this.validators.add(validator);
-		DocTypeValidator previous = this.mimMapValidator.put( validator.getMimeType(), validator );
-		if ( previous != null ) {
-			ok = false;
-			logger.warn( "Validator {} has been overridden for mimeType {}", previous, validator.getMimeType() );
-		}
-		for ( String ext : validator.getSupportedExtensions() ) {
-			previous = this.extMapValidator.put(ext, validator);
+		boolean ok = validator.checkCompatibility();
+		if ( ok ) {
+			this.validators.add(validator);
+			DocTypeValidator previous = this.mimMapValidator.put( validator.getMimeType(), validator );
 			if ( previous != null ) {
 				ok = false;
-				logger.warn( "Validator {} has been overridden for extension {}", previous, ext );
+				logger.warn( "Validator {} has been overridden for mimeType {}", previous, validator.getMimeType() );
 			}
+			for ( String ext : validator.getSupportedExtensions() ) {
+				previous = this.extMapValidator.put(ext, validator);
+				if ( previous != null ) {
+					ok = false;
+					logger.warn( "Validator {} has been overridden for extension {}", previous, ext );
+				}
+			}	
+		} else {
+			logger.info( "Validator compatibility check failed : {}", validator );
 		}
 		return ok;
 	}

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

@@ -61,6 +61,11 @@ public boolean check(InputStream is) throws IOException {
 		return this.validate(is).isResultOk();
 	}
 
+	@Override
+	public boolean checkCompatibility() {
+		return true;
+	}
+
 	@Override
 	abstract public DocTypeValidationResult validate(InputStream is) throws IOException;
 

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

@@ -9,6 +9,7 @@
 import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 
+import org.fugerit.java.core.lang.helpers.JavaVersionHelper;
 import org.fugerit.java.doc.val.core.DocTypeValidationResult;
 import org.fugerit.java.doc.val.core.DocTypeValidator;
 import org.slf4j.Logger;
@@ -35,12 +36,14 @@ public class ImageValidator extends AbstractDocTypeValidator {
 	/**
 	 * Tiff validator, only supported from java 9+
 	 */
-	public static final DocTypeValidator TIFF_VALIDATOR = new ImageValidator( MIME_TIFF, EXT_TIFF, FORMAT_TIFF );
+	public static final DocTypeValidator TIFF_VALIDATOR = new ImageValidator( MIME_TIFF, EXT_TIFF, FORMAT_TIFF, JavaVersionHelper.MAJOR_VERSION_JAVA_9 );
 
 	private static final Logger logger = LoggerFactory.getLogger( ImageValidator.class );
 
 	private String format;
 
+	private int javaMajorVersionRequired;
+	
 	@Override
 	public DocTypeValidationResult validate(InputStream is) throws IOException {
 		DocTypeValidationResult result = DocTypeValidationResult.newFail();
@@ -61,14 +64,25 @@ public DocTypeValidationResult validate(InputStream is) throws IOException {
 		return result;
 	}
 
-	protected ImageValidator(String mimeType, Set<String> supportedExtensions, String format) {
+	protected ImageValidator(String mimeType, Set<String> supportedExtensions, String format, int javaMajorVersionRequired) {
 		super(mimeType, supportedExtensions);
 		this.format = format;
+		this.javaMajorVersionRequired = javaMajorVersionRequired;
+	}
+	
+	protected ImageValidator(String mimeType, Set<String> supportedExtensions, String format) {
+		this(mimeType, supportedExtensions, format, JavaVersionHelper.MAJOR_VERSION_JAVA_8);
 	}
 
-	protected ImageValidator(String mimeType, String extension, String format) {
-		super(mimeType, extension);
-		this.format = format;
+	@Override
+	public boolean checkCompatibility() {
+		boolean ok = super.checkCompatibility();
+		int javaMajorVersionFound =  JavaVersionHelper.parseUniversalJavaMajorVersion() ;
+		if ( javaMajorVersionFound < this.javaMajorVersionRequired ) {
+			ok = false;
+			logger.warn( "java major version found : '{}' lower than required : '{}'", javaMajorVersionFound, this.javaMajorVersionRequired );
+		}
+		return ok;
 	}
 
 }

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

@@ -35,6 +35,4 @@ public DocTypeValidationResult validate(InputStream is) {
 		return result;
 	}
 
-	
-	
 }

fj-doc-val/src/test/java/test/org/fugerit/java/doc/val/TestTiffValidator.java

@@ -0,0 +1,23 @@
+package test.org.fugerit.java.doc.val;
+
+import org.fugerit.java.doc.val.core.DocValidatorFacade;
+import org.fugerit.java.doc.val.core.basic.ImageValidator;
+import org.junit.Test;
+
+public class TestTiffValidator extends TestDocValidatorFacade {
+
+	private static final DocValidatorFacade FACADE = DocValidatorFacade.newFacadeStrict( 
+			ImageValidator.TIFF_VALIDATOR
+	);
+	
+	// note : only supported for java 9+
+	@Test
+	public void testTiffAsTiff() {
+		this.worker(FACADE, "tiff_as_tiff.tiff", true );
+	}
+	@Test
+	public void testTiffAsTiffExtTif() {
+		this.worker(FACADE, "tiff_as_tiff.tif", true );
+	}
+	
+}

pom.xml

@@ -24,7 +24,7 @@
 	    <maven.compiler.source>${java-version-compliance}</maven.compiler.source>
 	    <maven.compiler.target>${java-version-compliance}</maven.compiler.target>
 	    <!-- fj java versions -->
-	    <fj-version>0.8.4</fj-version>
+	    <fj-version>0.8.5</fj-version>
 	    <fj-doc-version>${project.version}</fj-doc-version>
 	</properties>