testing param config for flavours #333

Author: fugerit79

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

@@ -109,6 +109,16 @@ public static void checkFlavourExtraConfig( FlavourContext context, String actua
         checkFlavourExtraConfig( context, actualFlavour , flavourExtraConfig );
     }
 
+    public static void checkFlavourExtraConfigParam( String fieldName, ParamConfig paramConfig, String actualFlavour, Object value  ) {
+        log.debug( "fieldName : {}, value : {}", fieldName, value );
+        if ( value != null && paramConfig.getAcceptOnly() != null && !paramConfig.getAcceptOnly().contains( value.toString() ) ) {
+            log.debug( "accept only list : {} -> {}", fieldName, paramConfig.getAcceptOnly() );
+            String message = String.format( "Value '%s' not valid for flavour '%s' and param '%s', refer to flavour documentation.", value, actualFlavour, fieldName );
+            log.warn( message );
+            throw new ConfigRuntimeException( message );
+        }
+    }
+
     public static void checkFlavourExtraConfig( FlavourContext context, String actualFlavour, FlavourExtraConfig flavourExtraConfig ) {
         SafeFunction.applyIfNotNull( flavourExtraConfig.getParamConfig(), () -> {
             Field[] fields = FlavourContext.class.getDeclaredFields();
@@ -117,13 +127,7 @@ public static void checkFlavourExtraConfig( FlavourContext context, String actua
                 ParamConfig paramConfig = flavourExtraConfig.getParamConfig().get( fieldName );
                 if ( paramConfig != null ) {
                     Object value = readField( context, field, fieldName );
-                    log.debug( "fieldName : {}, value : {}", fieldName, value );
-                    if ( value != null && !paramConfig.getAcceptOnly().contains( value.toString() ) ) {
-                        log.info( "accept only list : {} -> {}", fieldName, paramConfig.getAcceptOnly() );
-                        String message = String.format( "Value '%s' not valid for flavour '%s' and param '%s', refer to flavour documentation.", value, actualFlavour, fieldName );
-                        log.warn( message );
-                        throw new ConfigRuntimeException( message );
-                    }
+                    checkFlavourExtraConfigParam( fieldName, paramConfig, actualFlavour, value );
                 }
             }
         } );

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

@@ -2,6 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.fugerit.java.core.cfg.ConfigRuntimeException;
+import org.fugerit.java.core.function.SafeFunction;
 import org.fugerit.java.core.lang.helpers.ClassHelper;
 import org.fugerit.java.doc.project.facade.FlavourContext;
 import org.fugerit.java.doc.project.facade.FlavourFacade;
@@ -15,19 +16,22 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.util.Arrays;
 
 @Slf4j
 public class TestFlavourExtraConfigFacade {
 
     private static final String FLAVOURTEST_1 = "flavourtest-1";
 
+    private static final String PARAM_ADD_LOMBOK = "addLombok";
+
     @Test
     public void readConfig() throws IOException {
         // test quarkus-3 config
         String flavourConfigPath = String.format( "config/flavour-extra-config/%s-config.yml", FLAVOURTEST_1 );
         try (InputStream is = ClassHelper.loadFromDefaultClassLoader( flavourConfigPath ) ) {
             FlavourExtraConfig configQuarkus3 = FlavourExtraConfigFacade.readConfigBlankDefault( is );
-            Assert.assertTrue( ((ParamConfig)configQuarkus3.getParamConfig().get( "addLombok" )).getAcceptOnly().contains( "true" ) );
+            Assert.assertTrue( ((ParamConfig)configQuarkus3.getParamConfig().get( PARAM_ADD_LOMBOK )).getAcceptOnly().contains( "true" ) );
         }
         // test config does not exist
         try (InputStream is = ClassHelper.loadFromDefaultClassLoader( "config/flavour-extra-config/do-not-exist.yml" ) ) {
@@ -54,6 +58,17 @@ public void testCheckFlavourExtraConfig() throws NoSuchFieldException {
         context.setFlavourVersion( testFlavourVersion );
         Field fieldFlavourVersion = FlavourContext.class.getDeclaredField( propertyFlavourVersion );
         Assert.assertEquals( testFlavourVersion, FlavourFacade.readField( context, fieldFlavourVersion, propertyFlavourVersion ) );
+        // check params
+        Object value = null;
+        FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, null, FLAVOURTEST_1, null );
+        FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, new ParamConfig(), FLAVOURTEST_1, null );
+        FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, new ParamConfig(), FLAVOURTEST_1, Boolean.TRUE.toString() );
+        final ParamConfig paramConfig = SafeFunction.get( () -> {
+            ParamConfig pc = new ParamConfig();
+            pc.setAcceptOnly( Arrays.asList( Boolean.TRUE.toString() ) );
+            return pc;
+        } );
+        Assert.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, paramConfig, FLAVOURTEST_1, Boolean.FALSE.toString() ) );
     }
 
 }