Added 'fail-on-set' of duplicate entry for GenericListCatalogConfig

Author: fugerit79

fj-core/src/main/java/org/fugerit/java/core/cfg/xml/GenericListCatalogConfig.java

@@ -20,6 +20,7 @@
 import org.fugerit.java.core.lang.helpers.ClassHelper;
 import org.fugerit.java.core.lang.helpers.StringUtils;
 import org.fugerit.java.core.util.collection.KeyObject;
+import org.fugerit.java.core.util.collection.ListMapStringKey;
 import org.fugerit.java.core.xml.config.XMLSchemaCatalogConfig;
 import org.fugerit.java.core.xml.dom.DOMIO;
 import org.fugerit.java.core.xml.dom.DOMUtils;
@@ -129,6 +130,11 @@ public GenericListCatalogConfig( String attTagDataList, String attTagData ) {
 	 * If 'check-duplicate-id' is se to fail, the duplicate will cause the configuration to fail
 	 */
 	public static final String CONFIG_CHECK_DUPLICATE_ID_FAIL = "fail";
+
+	/**
+	 * If 'check-duplicate-entry-id' is se to fail, the duplicate will cause the configuration to fail
+	 */
+	public static final String CONFIG_CHECK_DUPLICATE_ID_FAIL_ON_SET = "fail-on-set";
 
 	/**
 	 * If 'check-duplicate-id' is se to warn, the duplicate will only be logged
@@ -367,6 +373,14 @@ public void configure(Element tag) throws ConfigException {
 					if ( !this.getEntryIdCheck().add( idSchema ) ) {
 						throw new ConfigException( "Duplicate entry id found : "+idSchema );
 					}
+				} else if ( StringUtils.isNotEmpty( idSchema ) && CONFIG_CHECK_DUPLICATE_ID_FAIL_ON_SET.equalsIgnoreCase( checkDuplicateUniversalId ) ) {
+					if ( listCurrent instanceof ListMapStringKey ) {
+						ListMapStringKey<?> listCheck = ((ListMapStringKey<?>)listCurrent);
+						if ( listCheck.getMap().containsKey( idSchema ) ) {
+							throw new ConfigException( "Duplicate entry id on set found : "+idSchema );
+						}	
+					}
+					
 				}
 				if ( ATT_TAG_TYPE_STRING.equals( type ) ) {
 					if ( StringUtils.isEmpty( idSchema ) ) {

fj-core/src/test/java/test/org/fugerit/java/core/util/filterchain/TestDuplicateFailOnSet.java

@@ -0,0 +1,38 @@
+package test.org.fugerit.java.core.util.filterchain;
+
+import static org.junit.Assert.fail;
+
+import org.fugerit.java.core.util.filterchain.MiniFilterConfig;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestDuplicateFailOnSet {
+
+	private final static Logger logger = LoggerFactory.getLogger( TestDuplicateFailOnSet.class );
+	
+	private static final String CONF_PATH_DUPLICATE_FAIL_ON_SET = "core/util/filterchain/minifilter-test-duplicate-fail-on-set.xml";
+	
+	@Test
+	public void testDuplicate() {
+		logger.info(  "**********************************************" );
+		logger.info(  "**********************************************" );
+		logger.info(  "*          TEST DUPLICATE                    *" );
+		boolean ok = false;
+		try {
+			MiniFilterConfig config = MiniFilterConfig.initFromClassLoaderWithRuntimeException( CONF_PATH_DUPLICATE_FAIL_ON_SET );
+			logger.info( config.toString() );
+		} catch (Exception e) {
+			logger.info( e.getMessage() );
+			if ( e.getMessage().toLowerCase().contains( "duplicate" ) ) {
+				ok = true;
+			}
+		}
+		if ( !ok ) {
+			fail( "Test failed, duplicate exception non triggered" );
+		}
+		logger.info(  "**********************************************" );
+		logger.info(  "**********************************************" );
+	}	
+	
+}

fj-core/src/test/resources/core/util/filterchain/minifilter-test-duplicate-fail-on-set.xml

@@ -0,0 +1,27 @@
+<data-catalog-config
+	check-duplicate-entry-id="fail-on-set" 
+	type="org.fugerit.java.core.util.filterchain.MiniFilterConfigEntry">
+
+	<data-list id="chain-base-01" >
+		<data id="step-01-01" defaultBehaviour="CONTINUE"
+			description="Step 01 01 Continue (this one will be printed)" 
+			type="test.org.fugerit.java.core.util.filterchain.ContinueStep"/>
+		<data id="step-01-02" defaultBehaviour="CONTINUE"
+			description="Step 01 02 Continue (this one will be printed)" 
+			type="test.org.fugerit.java.core.util.filterchain.ContinueStep"/>			
+	</data-list>
+	
+	<data-list id="chain-base-02">
+		<data id="step-02-01" defaultBehaviour="CONTINUE"
+			description="Step 02 01 Skip (this one will be printed)" 
+			type="test.org.fugerit.java.core.util.filterchain.SkipStep"/>
+		<data id="step-02-02" defaultBehaviour="CONTINUE"
+			description="Step 02 02 Skip (this one will be printed)" 
+			type="test.org.fugerit.java.core.util.filterchain.SkipStep"/>
+		<!-- has the same id of first step in this set -->
+		<data id="step-02-01" defaultBehaviour="CONTINUE"
+			description="Step 02 03 Skip (this one will be printed)" 
+			type="test.org.fugerit.java.core.util.filterchain.SkipStep"/>				
+	</data-list>	
+
+</data-catalog-config>