Author: sletellier Date: 2010-12-13 12:17:57 +0100 (Mon, 13 Dec 2010) New Revision: 603 Url: http://nuiton.org/repositories/revision/wikitty/603 Log: - Fix build - Use generics to getComponents - Comment unfound method (config.getPrintableConfig) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java 2010-12-11 03:48:24 UTC (rev 602) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java 2010-12-13 11:17:57 UTC (rev 603) @@ -24,11 +24,8 @@ */ package org.nuiton.wikitty; +import java.util.*; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -90,14 +87,14 @@ ApplicationConfig config, String prefix) { WikittyService result = null; - List<Class> layers = getComponents(config, prefix, WikittyService.class); + List<Class<WikittyService>> layers = getComponents(config, prefix, WikittyService.class); Set comp = new HashSet(); for (Class<WikittyService> clazz : layers) { comp.clear(); comp.add(result); comp.add(config); - List<Class> comps = getComponents(config, prefix, clazz); + List<Class<WikittyService>> comps = getComponents(config, prefix, clazz); if (comps != null) { comp.addAll(comps); } @@ -120,12 +117,15 @@ * @param clazz * @return la liste de classe trouvee ou null si la cle n'existe pas */ - static protected List<Class> getComponents(ApplicationConfig config, - String prefix, Class clazz) { + static protected <E> List<Class<E>> getComponents(ApplicationConfig config, + String prefix, Class<E> clazz) { String key = prefix + clazz.getSimpleName() + ".components"; - List<Class> result = config.getOptionAsList(key).getOptionAsClass(); + // XXX sletellier 13/12/2010 : this code don't compile, provoke an "inconvertible types", + // this hack force compiler to not check cast +// List<Class<E>> result = (List<Class<E>>) config.getOptionAsList(key).getOptionAsClass(); + List<Class<E>> result = (List<Class<E>>)(List<?>) config.getOptionAsList(key).getOptionAsClass(); // String componentsString = config.getOption(key); // if (componentsString != null) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java 2010-12-11 03:48:24 UTC (rev 602) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java 2010-12-13 11:17:57 UTC (rev 603) @@ -68,8 +68,8 @@ @BeforeClass static public void loadWikittyService() throws Exception { WikittyConfig config = new WikittyConfig(); // default config for in memory - String msg = "Try to passe test with "+ config.getPrintableConfig("wikitty.*", 50); - log.info(msg); +// String msg = "Try to passe test with "+ config.getPrintableConfig("wikitty.*", 50); +// log.info(msg); ws = WikittyServiceFactory.buildWikittyService(config); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-12-11 03:48:24 UTC (rev 602) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-12-13 11:17:57 UTC (rev 603) @@ -66,8 +66,8 @@ public ApplicationConfig getConfig() { if (config == null) { config = new WikittyConfig(); // default config for in memory - String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); - log.info(msg); +// String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); +// log.info(msg); } return config; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2010-12-11 03:48:24 UTC (rev 602) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2010-12-13 11:17:57 UTC (rev 603) @@ -65,8 +65,8 @@ @BeforeClass static public void loadWikittyService() throws Exception { WikittyConfig config = new WikittyConfig(); // default config for in memory - String msg = "Try to passe test with "+ config.getPrintableConfig("wikitty.*", 50); - log.info(msg); +// String msg = "Try to passe test with "+ config.getPrintableConfig("wikitty.*", 50); +// log.info(msg); ws = WikittyServiceFactory.buildWikittyService(config); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-12-11 03:48:24 UTC (rev 602) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-12-13 11:17:57 UTC (rev 603) @@ -54,8 +54,8 @@ public ApplicationConfig getConfig() { if (config == null) { config = new WikittyConfig(); // default config for in memory - String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); - log.info(msg); +// String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); +// log.info(msg); } return config; } Modified: trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java =================================================================== --- trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2010-12-11 03:48:24 UTC (rev 602) +++ trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2010-12-13 11:17:57 UTC (rev 603) @@ -53,8 +53,8 @@ config = new WikittyConfig("wikitty-config-sample-standalone.properties"); config.setOption(WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey(), "./target/data"); - String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); - log.info(msg); +// String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); +// log.info(msg); } return config; }