Author: tchemit Date: 2008-06-02 19:51:41 +0000 (Mon, 02 Jun 2008) New Revision: 80 Modified: trunk/lutinrss/pom.xml trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java Log: utilisation propri?\195?\169t?\195?\169 String au lieu de FeedType + setter en non statique, sinon BeanUtils ne fonctionne pas Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-06-02 19:50:57 UTC (rev 79) +++ trunk/lutinrss/pom.xml 2008-06-02 19:51:41 UTC (rev 80) @@ -24,7 +24,7 @@ <packaging>war</packaging> <!--Version--> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <!--Description--> <description>Servlet pouvant etre appeler depuis du JS pour recuperer un Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-02 19:50:57 UTC (rev 79) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGenerator.java 2008-06-02 19:51:41 UTC (rev 80) @@ -53,15 +53,18 @@ protected final EnumMap<Field, String> itemProperties; /** directory where feeds are stored */ protected final File generatorDirectory; - + /** feed format to use **/ + protected final FeedType format; + protected RSSGenerator() { this(null); } - protected RSSGenerator(EnumMap<Field, String> feedProperties, EnumMap<Field, String> itemProperties, File generatorDirectory) { + protected RSSGenerator(EnumMap<Field, String> feedProperties, EnumMap<Field, String> itemProperties, File generatorDirectory,FeedType format) { this.feedProperties = feedProperties; this.itemProperties = itemProperties; this.generatorDirectory = generatorDirectory; + this.format=format; } protected RSSGenerator(File generatorDirectory) { @@ -84,6 +87,7 @@ itemProperties.put(Field.TIME, "publishedDate"); this.generatorDirectory = generatorDirectory==null?new File(RSSGeneratorConfig.GENERATOR_DIRECTORY):generatorDirectory; + this.format=FeedType.valueOf(RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT); } /** @@ -193,6 +197,9 @@ } } + public FeedType getFormat() { + return format; + } /** * Obtain the file from his url location. * Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java 2008-06-02 19:50:57 UTC (rev 79) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java 2008-06-02 19:51:41 UTC (rev 80) @@ -22,7 +22,17 @@ public void doCreateFeed(HttpServletRequest request, HttpServletResponse response, String feedName, File file) throws ServletException, IOException { String type = request.getParameter("feedType"); - FeedType feedType = type != null ? FeedType.valueOf(type) : RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT; + FeedType feedType = null; + if (type != null) { + try { + feedType = FeedType.valueOf(type); + } catch (Exception e) { + feedType = null; + } + } + if (feedType == null) { + feedType = delegate.getFormat(); + } String description = request.getParameter("feedDescription"); String link = request.getParameter("feedLink"); String author = request.getParameter("feedAuthor"); @@ -59,7 +69,7 @@ public void doAddItem(HttpServletRequest request, HttpServletResponse response, String feedName, File file) throws ServletException, IOException { - Integer nbItems = convertToInt(request.getParameter("nbItems")); + Integer nbItems = convertToInt(request.getParameter("nbItems")); if (nbItems == null) { nbItems = RSSGeneratorConfig.DEFAULT_GENERATOR_NB_ITEM; } @@ -132,7 +142,7 @@ } @Override - protected ConfigInitializer<ServletConfig,?> newConfigInitializer() { + protected ConfigInitializer<ServletConfig, ?> newConfigInitializer() { return new RSSGeneratorConfig.RssGeneratorConfigInitializer<ServletConfig>() { protected String getConfigValue(ServletConfig config, String fullConfigName) { Modified: trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-06-02 19:50:57 UTC (rev 79) +++ trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-06-02 19:51:41 UTC (rev 80) @@ -47,7 +47,7 @@ assertFalse(f.exists()); RSSGenerator.log.info("feedFile : " + f); - helper.createFeedFile(f.toURI().toURL(), RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT, values); + helper.createFeedFile(f.toURI().toURL(), helper.getFormat(), values); // no lock assertFalse(helper.getWriteFileLock(f).exists()); // file exist @@ -59,7 +59,7 @@ RSSGenerator.log.debug(feed); } - assertEquals(feed.getFeedType(), RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT.getType()); + assertEquals(feed.getFeedType(), helper.getFormat().getType()); assertEquals(feed.getLink(), values.get(Field.LINK)); assertEquals(feed.getTitle(), values.get(Field.NAME)); assertEquals(feed.getDescription(), values.get(Field.DESCRIPTION)); @@ -78,7 +78,7 @@ assertTrue(f.exists()); try { - helper.createFeedFile(f.toURI().toURL(), RSSGeneratorConfig.DEFAULT_GENERATOR_FORMAT, values); + helper.createFeedFile(f.toURI().toURL(), helper.getFormat(), values); // file already exist, can not reach this code fail(); } catch (IllegalStateException e) {