rewrote logic of defaultXXX() methods so that it's much more flexible, applies to all following WebPages and can be overriden later on

Author: jirka.pinkas@gmail.com

README.md

@@ -12,7 +12,7 @@ First add this library to classpath:
     <dependency>
       <groupId>cz.jiripinkas</groupId>
       <artifactId>jsitemapgenerator</artifactId>
-      <version>3.7</version>
+      <version>3.8</version>
     </dependency>
 
 If you want to use "ping google / bing" functionality, also add this library to classpath:
@@ -27,7 +27,6 @@ If you want to use "ping google / bing" functionality, also add this library to
 
 ```java
 String sitemap = SitemapGenerator.of("https://example.com")
-    .defaultChangeFreqWeekly() // optional default settings for all WebPages
     .addPage(WebPage.builder().maxPriorityRoot().build())
     .addPage(WebPage.of("foo.html")) // simplest way of creating web page
     .addPage(WebPage.builder().name("bar.html").build()) // builder is more complex
@@ -44,6 +43,26 @@ byte[] sitemap = SitemapGenerator.of("https://example.com")
     .constructSitemapGzip();
 ```
 
+you can set default settings (for the following WebPages):
+
+```java
+String sitemap = SitemapGenerator.of("https://example.com")
+    .addPage(WebPage.builder().maxPriorityRoot().build()) // URL will be: "/"
+    .defaultExtension("html")
+    .defaultDir("dir1")
+    .addPage(WebPage.of("foo")) // URL will be: "dir1/foo.html"
+    .addPage(WebPage.of("bar"))) // URL will be: "dir1/bar.html"
+    .defaultDir("dir2")
+    .addPage(WebPage.of("hello")) // URL will be: "dir2/hello.html"
+    .addPage(WebPage.of("yello"))) // URL will be: "dir2/yello.html"
+    // btw. specifying dir and / or extension on WebPage overrides default settings
+    .addPage(WebPage.builder().dir("dir3").extension(null).name("test").build()) // "dir3/test"
+    .resetDefaultDir() // resets default dir
+    .resetDefaultExtension() // resets default extension
+    .addPage(WebPage.of("mypage")) // URL will be: "mypage"
+    .constructSitemapString();
+```
+
 or to store it to file & ping google:
 
 ```java

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>cz.jiripinkas</groupId>
 	<artifactId>jsitemapgenerator</artifactId>
-	<version>3.7</version>
+	<version>3.8</version>
 	<packaging>jar</packaging>
 	<name>Java sitemap generator</name>
 	<description>This library generates a web sitemap and can ping Google that it has changed. This project has been inspired by sitemapgen4j, but is much more focused on traditional web sitemap and ease of use.</description>

src/main/java/cz/jiripinkas/jsitemapgenerator/AbstractGenerator.java

@@ -58,10 +58,20 @@ public AbstractGenerator(String baseUrl) {
      * @return this
      */
     public I addPage(WebPage webPage) {
-        urls.put(baseUrl + webPage.getName(), webPage);
+        beforeAddPageEvent(webPage);
+        urls.put(baseUrl + webPage.constructName(), webPage);
         return getThis();
     }
 
+    /**
+     * This method is called before adding a page to urls.
+     * It can be used to change webPage attributes
+     * @param webPage WebPage
+     */
+    protected void beforeAddPageEvent(WebPage webPage) {
+
+    }
+
     /**
      * Add collection of pages to sitemap
      *

src/main/java/cz/jiripinkas/jsitemapgenerator/WebPage.java

@@ -9,6 +9,14 @@
 
 public class WebPage implements Comparable<WebPage> {
     private String name;
+    /**
+     * Optional dir. In getName() it's added to name: "dir/name"
+     */
+    private String dir;
+    /**
+     * Optional dir. In getName() it's added to name: "name.extension"
+     */
+    private String extension;
     private Map<String, String> alternateNames;
     private Date lastMod;
     private ChangeFreq changeFreq;
@@ -97,8 +105,19 @@ public void setPriority(Double priority) {
         this.priority = priority;
     }
 
-    public String getName() {
-        return name;
+    /**
+     * Constructs name from dir and extension (if available)
+     * @return Name
+     */
+    public String constructName() {
+        String result = name;
+        if(dir != null) {
+            result = dir + "/" + result;
+        }
+        if(extension != null) {
+            result = result + "." + extension;
+        }
+        return result;
     }
 
     public Map<String, String> getAlternateNames() {
@@ -117,6 +136,22 @@ public Double getPriority() {
         return priority;
     }
 
+    public String getDir() {
+        return dir;
+    }
+
+    public void setDir(String dir) {
+        this.dir = dir;
+    }
+
+    public String getExtension() {
+        return extension;
+    }
+
+    public void setExtension(String extension) {
+        this.extension = extension;
+    }
+
     private static final Comparator<Double> PRIORITY_COMPARATOR = (a, b) -> {
         if (a == null && b == null) {
             return 0;
@@ -163,8 +198,6 @@ public static WebPageBuilder builder() {
 
     public static class WebPageBuilder {
         private WebPage webPage = new WebPage();
-        private String dir;
-        private String extension;
 
         /**
          * Sets WebPage name
@@ -228,7 +261,7 @@ public WebPageBuilder alternateName(String language, Supplier<String> supplier)
          * @return this
          */
         public WebPageBuilder dir(String dirName) {
-            this.dir = dirName;
+            webPage.setDir(dirName);
             return this;
         }
 
@@ -238,7 +271,7 @@ public WebPageBuilder dir(String dirName) {
          * @return this
          */
         public WebPageBuilder dir(String ... dirNames) {
-            this.dir = String.join("/", dirNames);
+            webPage.setDir(String.join("/", dirNames));
             return this;
         }
 
@@ -248,7 +281,7 @@ public WebPageBuilder dir(String ... dirNames) {
          * @return this
          */
         public WebPageBuilder extension(String extension) {
-            this.extension = extension;
+            webPage.setExtension(extension);
             return this;
         }
 
@@ -420,12 +453,6 @@ public WebPageBuilder images(List<Image> images) {
          * @return WebPage
          */
         public WebPage build() {
-            if(dir != null) {
-                webPage.setName(dir + "/" + webPage.getName());
-            }
-            if(extension != null) {
-                webPage.setName(webPage.getName() + "." + extension);
-            }
             return webPage;
         }
 
@@ -438,8 +465,6 @@ public static RssItemBuilder rssBuilder() {
     public static class RssItemBuilder {
 
         private WebPage webPage = new WebPage();
-        private String namePrefixDir;
-        private String nameSuffixExtension;
 
         /**
          * Sets pubDate
@@ -550,7 +575,7 @@ public RssItemBuilder name(String ... nameAndDirs) {
          * @return this
          */
         public RssItemBuilder dir(String dirName) {
-            this.namePrefixDir = dirName;
+            webPage.setDir(dirName);
             return this;
         }
 
@@ -560,7 +585,7 @@ public RssItemBuilder dir(String dirName) {
          * @return this
          */
         public RssItemBuilder dir(String ... dirNames) {
-            this.namePrefixDir = String.join("/", dirNames);
+            webPage.setDir(String.join("/", dirNames));
             return this;
         }
 
@@ -570,7 +595,7 @@ public RssItemBuilder dir(String ... dirNames) {
          * @return this
          */
         public RssItemBuilder extension(String extension) {
-            this.nameSuffixExtension = extension;
+            webPage.setExtension(extension);
             return this;
         }
 
@@ -580,12 +605,6 @@ public RssItemBuilder extension(String extension) {
          * @return WebPage
          */
         public WebPage build() {
-            if(namePrefixDir != null) {
-                webPage.setName(namePrefixDir + "/" + webPage.getName());
-            }
-            if(nameSuffixExtension != null) {
-                webPage.setName(webPage.getName() + "." + nameSuffixExtension);
-            }
             return webPage;
         }
 

src/main/java/cz/jiripinkas/jsitemapgenerator/generator/RssGenerator.java

@@ -142,7 +142,7 @@ public String constructRss() {
             builder.append("<item>" + "\n");
 
             builder.append("<title>");
-            builder.append(webPage.getName());
+            builder.append(webPage.constructName());
             builder.append("</title>" + "\n");
 
             builder.append("<description>");