refactor VersionCheck to use fj-core VersionCompare #466

Author: fugerit79

fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/VersionCheck.java

@@ -1,8 +1,12 @@
 package org.fugerit.java.doc.project.facade;
 
 import lombok.extern.slf4j.Slf4j;
+import org.fugerit.java.core.cfg.VersionCompare;
 import org.fugerit.java.core.lang.helpers.ClassHelper;
+import org.fugerit.java.core.lang.helpers.StringUtils;
 import org.fugerit.java.core.util.PropsIO;
+import org.fugerit.java.core.util.mvn.FJCoreMaven;
+import org.fugerit.java.core.util.mvn.MavenProps;
 
 import java.util.Properties;
 
@@ -15,44 +19,17 @@ private VersionCheck() {}
 
     public static final String FALLBACK = "8.6.2";
 
-    public static String findFromPropsFile( String path ) {
-        Properties props = PropsIO.loadFromClassLoaderSafe( path );
-        if ( props.containsKey( "version" ) ) {
-            String latest = props.getProperty( "version" );
-            log.info( "findVersion() latest : {}", latest );
-            return latest;
-        } else {
-            log.info( "findVersion() fallback : {}", FALLBACK );
-            return FALLBACK;
-        }
-    }
-
     public static String findVersion(  String version ) {
         if ( version == null || version.equals(LATEST) ) {
-            return findFromPropsFile( "META-INF/maven/org.fugerit.java/fj-doc-maven-plugin/pom.properties" );
+            return StringUtils.valueWithDefault( MavenProps.getProperty(FJCoreMaven.FJ_CORE_GROUP_ID, "fj-doc-maven-plugin", MavenProps.VERSION ), FALLBACK );
         } else {
             log.info( "findVersion() input : {}", version );
             return version;
         }
     }
 
-    public static int convertVersionPart( String versionPart ) {
-        if (  versionPart.contains( "-" ) ) {
-            return Integer.parseInt( versionPart.substring( 0, versionPart.indexOf( "-" ) ) );
-        } else {
-            return Integer.parseInt( versionPart );
-        }
-    }
-
     public static boolean isMajorThan( String v1, String v2 ) {
-        String[] split1 = v1.split( "\\." );
-        String[] split2 = v2.split( "\\." );
-        for ( int i = 0 ; i < split1.length ; i++ ) {
-            if ( convertVersionPart( split1[i] ) > convertVersionPart( split2[i]) ) {
-                return true;
-            }
-        }
-        return false;
+        return VersionCompare.isGreaterThan( v1, v2 );
     }
 
 }

fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestVersionCheck.java

@@ -18,10 +18,9 @@ void testVersionCheck() {
         Assertions.assertTrue(VersionCheck.isMajorThan( V_8_6_2, "8.6.1-SNAPSHOT" ));
         Assertions.assertFalse(VersionCheck.isMajorThan( "8.5.1", "8.5.2" ));
         VenusContext context = new VenusContext( new File( "target" ), V_8_6_2, "base" );
-        Assertions.assertFalse( context.isPreVersion862() );
         log.info( "version from null to : {}", VersionCheck.findVersion( null ) );
         log.info( "version from null to : {}", VersionCheck.findVersion( VersionCheck.LATEST ) );
-        Assertions.assertEquals( V_8_6_2, VersionCheck.findFromPropsFile( "maven/pom.properties" ) );
+        Assertions.assertFalse( context.isPreVersion862() );
     }
 
 }