src/fr/devinsy/statoolinfosweb/charts/DateCountList.java

@@ -29,7 +29,7 @@ import fr.devinsy.strings.StringList;
  */
 public class DateCountList extends ArrayList<DateCount>
 {
-    private static final long serialVersionUID = -2586123069620428247L;
+    private static final long serialVersionUID = -5526492552751712533L;
 
     /**
      * Instantiates a new date count map.

src/fr/devinsy/statoolinfosweb/charts/DateCountMap.java

@@ -25,7 +25,7 @@ import java.util.HashMap;
  */
 public class DateCountMap extends HashMap<String, DateCount>
 {
-    private static final long serialVersionUID = 1128805109299054737L;
+    private static final long serialVersionUID = -5526492552751712533L;
 
     /**
      * Instantiates a new date count map.

src/website/IndexXhtml.java

@@ -32,7 +32,7 @@ import website.charter.ErrorView;
  */
 public class IndexXhtml extends HttpServlet
 {
-    private static final long serialVersionUID = 5475871579048385643L;
+    private static final long serialVersionUID = 2794788000773558854L;
     private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(IndexXhtml.class);
 
     /* (non-Javadoc)

src/website/federation/CrawlPage.java

@@ -51,9 +51,6 @@ public class CrawlPage extends HttpServlet
     public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
     {
         try
-        {
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
         {
             // Get parameters.
             // ===============
@@ -72,9 +69,7 @@ public class CrawlPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Journal", "/federation/crawl.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/LastStatsPage.java

@@ -54,9 +54,6 @@ public class LastStatsPage extends HttpServlet
         {
             logger.info("PAGE Federation > Last Stats");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -74,9 +71,7 @@ public class LastStatsPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Chiffres", "/federation/servicesFigures.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/LogoDo.java

@@ -44,7 +44,7 @@ import jakarta.servlet.http.HttpServletResponse;
 @KissServlet("^/federation/logo.(jpg|png|gif|svg)$")
 public class LogoDo extends HttpServlet
 {
-    private static final long serialVersionUID = -2045864664869054230L;
+    private static final long serialVersionUID = -8274687319890495722L;
     private static Logger logger = LoggerFactory.getLogger(LogoDo.class);
 
     /* (non-Javadoc)

src/website/federation/PropertiesFilesPage.java

@@ -63,9 +63,6 @@ public class PropertiesFilesPage extends HttpServlet
         {
             logger.info("PAGE Federation > propertiesFiles");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -85,9 +82,7 @@ public class PropertiesFilesPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Fichiers", "/federation/propertiesFiles.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -134,8 +129,7 @@ public class PropertiesFilesPage extends HttpServlet
                 data.setAttribute("fileListLine", index, "fileListLineNameLink", "href", stat.getURLName());
                 data.setEscapedContent("fileListLine", index, "fileListLineNameLink", stat.getURLName());
 
-                data.setAttribute("fileListLine", index, "fileListLineOwnerLink", "href",
-                        "/federation/organizations/" + stat.getOrganization().getTechnicalName() + "/");
+                data.setAttribute("fileListLine", index, "fileListLineOwnerLink", "href", "/federation/organizations/" + stat.getOrganization().getTechnicalName() + "/");
                 data.setEscapedContent("fileListLine", index, "fileListLineNameValue", stat.getOrganization().getName());
                 data.setAttribute("fileListLine", index, "fileListLineOwnerLogo", "src", stat.getOrganization().getLogoFileName());
 
@@ -148,8 +142,7 @@ public class PropertiesFilesPage extends HttpServlet
                 String propertyCheckURL;
                 if (stat.getService() != null)
                 {
-                    propertyCheckURL = "/federation/organizations/" + stat.getOrganization().getTechnicalName() + "/services/"
-                            + stat.getService().getTechnicalName() + "/propertyCheck.xhtml";
+                    propertyCheckURL = "/federation/organizations/" + stat.getOrganization().getTechnicalName() + "/services/" + stat.getService().getTechnicalName() + "/propertyCheck.xhtml";
                 }
                 else if (stat.getOrganization() != null)
                 {
@@ -195,8 +188,7 @@ public class PropertiesFilesPage extends HttpServlet
                 }
 
                 data.setContent("fileListLine", index, "fileListLineDate", stat.getUpdateDate().format(DateTimeFormatter.ofPattern("dd/MM/YYYY")));
-                data.setAttribute("fileListLine", index, "fileListLineDate", "title",
-                        stat.getUpdateDate().format(DateTimeFormatter.ofPattern("HH:mm:ss")));
+                data.setAttribute("fileListLine", index, "fileListLineDate", "title", stat.getUpdateDate().format(DateTimeFormatter.ofPattern("HH:mm:ss")));
 
                 index += 1;
             }

src/website/federation/PropertyAlertFederationPage.java

@@ -43,7 +43,7 @@ import website.views.PropertyAlertView.MenuOption;
  */
 public class PropertyAlertFederationPage extends HttpServlet
 {
-    private static final long serialVersionUID = 5145544554225024765L;
+    private static final long serialVersionUID = 5318172674334358487L;
     private static Logger logger = LoggerFactory.getLogger(PropertyAlertFederationPage.class);
 
     /* (non-Javadoc)
@@ -56,9 +56,6 @@ public class PropertyAlertFederationPage extends HttpServlet
         {
             logger.info("PAGE Fédération > PropertyAlert");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -78,9 +75,7 @@ public class PropertyAlertFederationPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/organizations/");
             trail.add("Disponibilités", "/federation/uptimes.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/PropertyAlertOrganizationsPage.java

@@ -57,9 +57,6 @@ public class PropertyAlertOrganizationsPage extends HttpServlet
         {
             logger.info("PAGE Fédération > PropertyAlert");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -83,9 +80,7 @@ public class PropertyAlertOrganizationsPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/organizations/");
             trail.add("Disponibilités", "/federation/uptimes.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/PropertyAlertPage.java

@@ -43,7 +43,7 @@ import website.views.PropertyAlertView.MenuOption;
  */
 public class PropertyAlertPage extends HttpServlet
 {
-    private static final long serialVersionUID = 6674551983811751746L;
+    private static final long serialVersionUID = 5318172674334358487L;
     private static Logger logger = LoggerFactory.getLogger(PropertyAlertPage.class);
 
     /* (non-Javadoc)
@@ -56,9 +56,6 @@ public class PropertyAlertPage extends HttpServlet
         {
             logger.info("PAGE Fédération > PropertyAlerts");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -78,9 +75,7 @@ public class PropertyAlertPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/organizations/");
             trail.add("Alertes", "/federation/propertyAlerts.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/PropertyAlertServicesPage.java

@@ -44,7 +44,7 @@ import website.views.PropertyAlertView.MenuOption;
  */
 public class PropertyAlertServicesPage extends HttpServlet
 {
-    private static final long serialVersionUID = -1230801146098997767L;
+    private static final long serialVersionUID = 5318172674334358487L;
     private static Logger logger = LoggerFactory.getLogger(PropertyAlertServicesPage.class);
 
     /* (non-Javadoc)
@@ -57,9 +57,6 @@ public class PropertyAlertServicesPage extends HttpServlet
         {
             logger.info("PAGE Fédération > PropertyAlert");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -83,9 +80,7 @@ public class PropertyAlertServicesPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Disponibilités", "/federation/uptimes.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/PropertyCheckPage.java

@@ -51,9 +51,6 @@ public class PropertyCheckPage extends HttpServlet
     public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
     {
         try
-        {
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
         {
             // Get parameters.
             // ===============
@@ -72,9 +69,7 @@ public class PropertyCheckPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Propriétés", "/federation/propertyCheck.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/PropertyStatsFederationPage.java

@@ -43,7 +43,7 @@ import website.views.PropertyStatsView;
  */
 public class PropertyStatsFederationPage extends HttpServlet
 {
-    private static final long serialVersionUID = 8232521281178380986L;
+    private static final long serialVersionUID = 3895257190078166862L;
     private static Logger logger = LoggerFactory.getLogger(PropertyStatsFederationPage.class);
 
     /* (non-Javadoc)
@@ -56,9 +56,6 @@ public class PropertyStatsFederationPage extends HttpServlet
         {
             logger.info("PAGE Federation > propertiesStats");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -77,9 +74,7 @@ public class PropertyStatsFederationPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Propriétés", "/federation/propertiesStats.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/PropertyStatsOrganizationsPage.java

@@ -43,7 +43,7 @@ import website.views.PropertyStatsView;
  */
 public class PropertyStatsOrganizationsPage extends HttpServlet
 {
-    private static final long serialVersionUID = 1359431232426181125L;
+    private static final long serialVersionUID = 3895257190078166862L;
     private static Logger logger = LoggerFactory.getLogger(PropertyStatsOrganizationsPage.class);
 
     /* (non-Javadoc)
@@ -56,9 +56,6 @@ public class PropertyStatsOrganizationsPage extends HttpServlet
         {
             logger.info("PAGE Federation > propertiesStats");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -77,9 +74,7 @@ public class PropertyStatsOrganizationsPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Propriétés", "/federation/propertiesStats.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/PropertyStatsPage.java

@@ -44,7 +44,7 @@ import website.views.PropertyStatsView;
  */
 public class PropertyStatsPage extends HttpServlet
 {
-    private static final long serialVersionUID = -2375749701066813584L;
+    private static final long serialVersionUID = 3895257190078166862L;
     private static Logger logger = LoggerFactory.getLogger(PropertyStatsPage.class);
 
     /* (non-Javadoc)
@@ -57,9 +57,6 @@ public class PropertyStatsPage extends HttpServlet
         {
             logger.info("PAGE Federation > propertiesStats");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -79,9 +76,7 @@ public class PropertyStatsPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Propriétés", "/federation/propertiesStats.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/PropertyStatsServicesPage.java

@@ -43,7 +43,7 @@ import website.views.PropertyStatsView;
  */
 public class PropertyStatsServicesPage extends HttpServlet
 {
-    private static final long serialVersionUID = 3962143718171359732L;
+    private static final long serialVersionUID = 3895257190078166862L;
     private static Logger logger = LoggerFactory.getLogger(PropertyStatsServicesPage.class);
 
     /* (non-Javadoc)
@@ -56,9 +56,6 @@ public class PropertyStatsServicesPage extends HttpServlet
         {
             logger.info("PAGE Federation > propertiesStats");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -77,9 +74,7 @@ public class PropertyStatsServicesPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Propriétés", "/federation/propertiesStats.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/ServicesPage.java

@@ -54,9 +54,6 @@ public class ServicesPage extends HttpServlet
         {
             logger.info("PAGE Federation > services");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -74,9 +71,7 @@ public class ServicesPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Services", "/federation/services.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/SocialNetworksPage.java

@@ -62,9 +62,6 @@ public class SocialNetworksPage extends HttpServlet
         {
             logger.info("PAGE Federation > SocialNetworks");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -84,9 +81,7 @@ public class SocialNetworksPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Réseaux sociaux", "/federation/socialNetworks.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -139,8 +134,7 @@ public class SocialNetworksPage extends HttpServlet
                 if (StringUtils.isNotBlank(organization.getDiasporaWebpage()))
                 {
                     data.setAttribute("organizationListLine", index, "organizationListLineDiasporaImg", "class", "");
-                    data.getIdData("organizationListLine", index, "organizationListLineDiasporaImg").getAttribute("class")
-                            .setMode(DisplayMode.REPLACE);
+                    data.getIdData("organizationListLine", index, "organizationListLineDiasporaImg").getAttribute("class").setMode(DisplayMode.REPLACE);
                     data.setAttribute("organizationListLine", index, "organizationListLineDiasporaLink", "href", organization.getDiasporaWebpage());
                     data.setAttribute("organizationListLine", index, "organizationListLineDiaspora", "data-search", "1");
                     data.setAttribute("organizationListLine", index, "organizationListLineDiaspora", "data-order", "1");
@@ -149,8 +143,7 @@ public class SocialNetworksPage extends HttpServlet
                 if (StringUtils.isNotBlank(organization.getFunkwhaleWebpage()))
                 {
                     data.setAttribute("organizationListLine", index, "organizationListLineFunkwhaleImg", "class", "");
-                    data.getIdData("organizationListLine", index, "organizationListLineFunkwhaleImg").getAttribute("class")
-                            .setMode(DisplayMode.REPLACE);
+                    data.getIdData("organizationListLine", index, "organizationListLineFunkwhaleImg").getAttribute("class").setMode(DisplayMode.REPLACE);
                     data.setAttribute("organizationListLine", index, "organizationListLineFunkwhaleLink", "href", organization.getFunkwhaleWebpage());
                     data.setAttribute("organizationListLine", index, "organizationListLineFunkwhale", "data-search", "1");
                     data.setAttribute("organizationListLine", index, "organizationListLineFunkwhale", "data-order", "1");
@@ -159,8 +152,7 @@ public class SocialNetworksPage extends HttpServlet
                 if (StringUtils.isNotBlank(organization.getMastodonWebpage()))
                 {
                     data.setAttribute("organizationListLine", index, "organizationListLineMastodonImg", "class", "");
-                    data.getIdData("organizationListLine", index, "organizationListLineMastodonImg").getAttribute("class")
-                            .setMode(DisplayMode.REPLACE);
+                    data.getIdData("organizationListLine", index, "organizationListLineMastodonImg").getAttribute("class").setMode(DisplayMode.REPLACE);
                     data.setAttribute("organizationListLine", index, "organizationListLineMastodonLink", "href", organization.getMastodonWebpage());
                     data.setAttribute("organizationListLine", index, "organizationListLineMastodon", "data-search", "1");
                     data.setAttribute("organizationListLine", index, "organizationListLineMastodon", "data-order", "1");
@@ -169,8 +161,7 @@ public class SocialNetworksPage extends HttpServlet
                 if (StringUtils.isNotBlank(organization.getMobilizonWebpage()))
                 {
                     data.setAttribute("organizationListLine", index, "organizationListLineMobilizonImg", "class", "");
-                    data.getIdData("organizationListLine", index, "organizationListLineMobilizonImg").getAttribute("class")
-                            .setMode(DisplayMode.REPLACE);
+                    data.getIdData("organizationListLine", index, "organizationListLineMobilizonImg").getAttribute("class").setMode(DisplayMode.REPLACE);
                     data.setAttribute("organizationListLine", index, "organizationListLineMobilizonLink", "href", organization.getMobilizonWebpage());
                     data.setAttribute("organizationListLine", index, "organizationListLineMobilizon", "data-search", "1");
                     data.setAttribute("organizationListLine", index, "organizationListLineMobilizon", "data-order", "1");
@@ -179,8 +170,7 @@ public class SocialNetworksPage extends HttpServlet
                 if (StringUtils.isNotBlank(organization.getPixelfedWebpage()))
                 {
                     data.setAttribute("organizationListLine", index, "organizationListLinePixelfedImg", "class", "");
-                    data.getIdData("organizationListLine", index, "organizationListLinePixelfedImg").getAttribute("class")
-                            .setMode(DisplayMode.REPLACE);
+                    data.getIdData("organizationListLine", index, "organizationListLinePixelfedImg").getAttribute("class").setMode(DisplayMode.REPLACE);
                     data.setAttribute("organizationListLine", index, "organizationListLinePixelfedLink", "href", organization.getPixelfedWebpage());
                     data.setAttribute("organizationListLine", index, "organizationListLinePixelfed", "data-search", "1");
                     data.setAttribute("organizationListLine", index, "organizationListLinePixelfed", "data-order", "1");
@@ -189,8 +179,7 @@ public class SocialNetworksPage extends HttpServlet
                 if (StringUtils.isNotBlank(organization.getPeertubeWebpage()))
                 {
                     data.setAttribute("organizationListLine", index, "organizationListLinePeertubeImg", "class", "");
-                    data.getIdData("organizationListLine", index, "organizationListLinePeertubeImg").getAttribute("class")
-                            .setMode(DisplayMode.REPLACE);
+                    data.getIdData("organizationListLine", index, "organizationListLinePeertubeImg").getAttribute("class").setMode(DisplayMode.REPLACE);
                     data.setAttribute("organizationListLine", index, "organizationListLinePeertubeLink", "href", organization.getPeertubeWebpage());
                     data.setAttribute("organizationListLine", index, "organizationListLinePeertube", "data-search", "1");
                     data.setAttribute("organizationListLine", index, "organizationListLinePeertube", "data-order", "1");

src/website/federation/StatsPage.java

@@ -63,9 +63,6 @@ public class StatsPage extends HttpServlet
         {
             logger.info("PAGE Federation > Stats");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -84,9 +81,7 @@ public class StatsPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Stats", "/federation/stats.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/UptimePage.java

@@ -54,9 +54,6 @@ public class UptimePage extends HttpServlet
         {
             logger.info("PAGE Fédération > Uptimes");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -74,9 +71,7 @@ public class UptimePage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Disponibilités", "/federation/uptimes.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/categories/CategoryPage.java

@@ -64,9 +64,6 @@ public class CategoryPage extends HttpServlet
         {
             logger.info("PAGE Federation > Categories > Category");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -88,9 +85,7 @@ public class CategoryPage extends HttpServlet
             trail.add("Catégories", "/federation/categories/");
             trail.add(category.getName(), "/federation/categories/" + category.getTechnicalName() + ".xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/categories/IndexPage.java

@@ -64,9 +64,6 @@ public class IndexPage extends HttpServlet
         {
             logger.info("PAGE Federation > Categories");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -87,9 +84,7 @@ public class IndexPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Catégories", "/federation/categories/");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -130,11 +125,9 @@ public class IndexPage extends HttpServlet
                 data.setAttribute("categoryListLine", index, "categoryListLineNameLink", "title", stat.getCategory().getDescription());
                 data.setAttribute("categoryListLine", index, "categoryListLineNameLogo", "src", stat.getCategory().getLogoPath());
 
-                data.setEscapedContent("categoryListLine", index, "categoryListLineSoftwares",
-                        stat.getCategory().getSoftwares().sort().toStringWithFrenchCommas());
+                data.setEscapedContent("categoryListLine", index, "categoryListLineSoftwares", stat.getCategory().getSoftwares().sort().toStringWithFrenchCommas());
                 data.setContent("categoryListLine", index, "categoryListLineOrganizationCount", stat.getOrganizationCount());
-                data.setContent("categoryListLine", index, "categoryListLineServiceCount",
-                        StatoolInfosUtils.defaultIfZero(stat.getServiceCount(), "😿"));
+                data.setContent("categoryListLine", index, "categoryListLineServiceCount", StatoolInfosUtils.defaultIfZero(stat.getServiceCount(), "😿"));
                 data.setContent("categoryListLine", index, "categoryListLineUserCount", StatoolInfosUtils.defaultIfZero(stat.getUserCount(), "😢"));
                 data.setContent("categoryListLine", index, "categoryListLineVisitCount", StatoolInfosUtils.defaultIfZero(stat.getVisitCount(), "😞"));
 

src/website/federation/exports/IndexPage.java

@@ -57,9 +57,6 @@ public class IndexPage extends HttpServlet
         {
             logger.info("PAGE Fédération > Exports");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -77,9 +74,7 @@ public class IndexPage extends HttpServlet
             BreadcrumbTrail trail = new BreadcrumbTrail();
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/organizations/");
             trail.add("Exports", "/federation/exports/");
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/metrics/MetricGenericPage.java

@@ -65,9 +65,6 @@ public class MetricGenericPage extends HttpServlet
         {
             logger.info("PAGE Federation > Metrics > Generic");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -88,9 +85,7 @@ public class MetricGenericPage extends HttpServlet
             trail.add("Métriques", "/federation/metrics/");
             trail.add("Génériques", "/federation/metrics/generic.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -128,23 +123,19 @@ public class MetricGenericPage extends HttpServlet
             //
             data.setContent("graphic.users", MetricHtmlizer.htmlize(federation, view, period, "metrics.service.users", ChartColor.GREEN));
 
-            data.setContent("graphic.users.ipv4-ipv6", MetricHtmlizer.htmlize(federation, view, period, "service.users (ipv4 + ipv6)",
-                    "metrics.service.users.ipv4", ChartColor.YELLOW, "metrics.service.users.ipv6", ChartColor.GREEN));
+            data.setContent("graphic.users.ipv4-ipv6", MetricHtmlizer.htmlize(federation, view, period, "service.users (ipv4 + ipv6)", "metrics.service.users.ipv4", ChartColor.YELLOW,
+                    "metrics.service.users.ipv6", ChartColor.GREEN));
             data.setContent("graphic.users.ipv4", MetricHtmlizer.htmlize(federation, view, period, "metrics.service.users.ipv4", ChartColor.YELLOW));
             data.setContent("graphic.users.ipv6", MetricHtmlizer.htmlize(federation, view, period, "metrics.service.users.ipv6", ChartColor.GREEN));
 
             data.setContent("graphic.accounts", MetricHtmlizer.htmlize(federation, view, period, "metrics.service.accounts", ChartColor.GREEN));
-            data.setContent("graphic.accounts.active",
-                    MetricHtmlizer.htmlize(federation, view, period, "metrics.service.accounts.active", ChartColor.GREEN));
+            data.setContent("graphic.accounts.active", MetricHtmlizer.htmlize(federation, view, period, "metrics.service.accounts.active", ChartColor.GREEN));
 
-            data.setContent("graphic.database.bytes",
-                    MetricHtmlizer.htmlize(federation, view, period, "metrics.service.database.bytes", ChartColor.GREEN));
-            data.setContent("graphic.datafiles.bytes",
-                    MetricHtmlizer.htmlize(federation, view, period, "metrics.service.datafiles.bytes", ChartColor.GREEN));
+            data.setContent("graphic.database.bytes", MetricHtmlizer.htmlize(federation, view, period, "metrics.service.database.bytes", ChartColor.GREEN));
+            data.setContent("graphic.datafiles.bytes", MetricHtmlizer.htmlize(federation, view, period, "metrics.service.datafiles.bytes", ChartColor.GREEN));
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricGenericView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricGenericView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/metrics/MetricSpecificPage.java

@@ -65,9 +65,6 @@ public class MetricSpecificPage extends HttpServlet
         {
             logger.info("PAGE Federation > Metrics > Specific");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -88,9 +85,7 @@ public class MetricSpecificPage extends HttpServlet
             trail.add("Métriques", "/federation/metrics/");
             trail.add("Spécifiques", "/federation/metrics/specific.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -127,8 +122,7 @@ public class MetricSpecificPage extends HttpServlet
             data.setContent("metricMenuView", MetricMenuView.htmlize(TypeMenu.SPECIFIC, view, period));
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricSpecificView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricSpecificView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/metrics/MetricSummaryPage.java

@@ -66,9 +66,6 @@ public class MetricSummaryPage extends HttpServlet
         {
             logger.info("PAGE Federation > Metrics > Summary");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -89,9 +86,7 @@ public class MetricSummaryPage extends HttpServlet
             trail.add("Métriques", "/federation/metrics/");
             trail.add("Résumé", "/federation/metrics/summary.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -134,8 +129,7 @@ public class MetricSummaryPage extends HttpServlet
             data.setContent("http.visits", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.visits", ChartColor.GREEN));
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricSummaryView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricSummaryView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/metrics/MetricWebPage.java

@@ -65,9 +65,6 @@ public class MetricWebPage extends HttpServlet
         {
             logger.info("PAGE Federation > Metrics > Web");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -88,9 +85,7 @@ public class MetricWebPage extends HttpServlet
             trail.add("Métriques", "/federation/metrics/");
             trail.add("Web", "/federation/metrics/web.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -129,22 +124,22 @@ public class MetricWebPage extends HttpServlet
             //
             data.setContent("http.hits", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.hits", ChartColor.BLUE));
 
-            data.setContent("http.hits-ipv4ipv6", MetricHtmlizer.htmlize(federation, view, period, "http.hits (ipv4 + ipv6)",
-                    "metrics.http.hits.ipv4", ChartColor.YELLOW, "metrics.http.hits.ipv6", ChartColor.GREEN));
+            data.setContent("http.hits-ipv4ipv6",
+                    MetricHtmlizer.htmlize(federation, view, period, "http.hits (ipv4 + ipv6)", "metrics.http.hits.ipv4", ChartColor.YELLOW, "metrics.http.hits.ipv6",
+                            ChartColor.GREEN));
             data.setContent("http.hits.ipv4", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.hits.ipv4", ChartColor.YELLOW));
             data.setContent("http.hits.ipv6", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.hits.ipv6", ChartColor.GREEN));
 
-            data.setContent("http.hits-humansbots", MetricHtmlizer.htmlize(federation, view, period, "http.hits (humans + bots)",
-                    "metrics.http.hits.humans", ChartColor.GREEN, "metrics.http.hits.bots", ChartColor.YELLOW));
+            data.setContent("http.hits-humansbots", MetricHtmlizer.htmlize(federation, view, period, "http.hits (humans + bots)", "metrics.http.hits.humans", ChartColor.GREEN,
+                    "metrics.http.hits.bots", ChartColor.YELLOW));
             data.setContent("http.hits.humans", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.hits.humans", ChartColor.GREEN));
             data.setContent("http.hits.bots", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.hits.bots", ChartColor.YELLOW));
 
-            data.setContent("http.hits.humans-ipv4ipv6", MetricHtmlizer.htmlize(federation, view, period, "http.hits.humans (ipv4 + ipv6)",
-                    "metrics.http.hits.humans.ipv4", ChartColor.YELLOW, "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
-            data.setContent("http.hits.humans.ipv4",
-                    MetricHtmlizer.htmlize(federation, view, period, "metrics.http.hits.humans.ipv4", ChartColor.YELLOW));
-            data.setContent("http.hits.humans.ipv6",
-                    MetricHtmlizer.htmlize(federation, view, period, "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
+            data.setContent("http.hits.humans-ipv4ipv6",
+                    MetricHtmlizer.htmlize(federation, view, period, "http.hits.humans (ipv4 + ipv6)", "metrics.http.hits.humans.ipv4", ChartColor.YELLOW,
+                            "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
+            data.setContent("http.hits.humans.ipv4", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.hits.humans.ipv4", ChartColor.YELLOW));
+            data.setContent("http.hits.humans.ipv6", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
 
             data.setContent("http.errors", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.errors", ChartColor.RED));
             data.setContent("http.errors.php", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.errors.php", ChartColor.RED));
@@ -155,47 +150,43 @@ public class MetricWebPage extends HttpServlet
 
             data.setContent("http.ip", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.ip", ChartColor.BLUE));
 
-            data.setContent("http.ip-humansbots", MetricHtmlizer.htmlize(federation, view, period, "http.ip (humans + bots)",
-                    "metrics.http.ip.humans", ChartColor.GREEN, "metrics.http.ip.bots", ChartColor.YELLOW));
+            data.setContent("http.ip-humansbots",
+                    MetricHtmlizer.htmlize(federation, view, period, "http.ip (humans + bots)", "metrics.http.ip.humans", ChartColor.GREEN, "metrics.http.ip.bots", ChartColor.YELLOW));
             data.setContent("http.ip.humans", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.ip.humans", ChartColor.GREEN));
             data.setContent("http.ip.bots", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.ip.bots", ChartColor.YELLOW));
 
-            data.setContent("http.ip-ipv4ipv6", MetricHtmlizer.htmlize(federation, view, period, "http.ip (ipv4 + ipv6)", "metrics.http.ip.ipv4",
-                    ChartColor.YELLOW, "metrics.http.ip.ipv6", ChartColor.GREEN));
+            data.setContent("http.ip-ipv4ipv6", MetricHtmlizer.htmlize(federation, view, period, "http.ip (ipv4 + ipv6)", "metrics.http.ip.ipv4", ChartColor.YELLOW, "metrics.http.ip.ipv6",
+                    ChartColor.GREEN));
             data.setContent("http.ip.ipv4", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.ip.ipv4", ChartColor.YELLOW));
             data.setContent("http.ip.ipv6", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.ip.ipv6", ChartColor.GREEN));
 
             data.setContent("http.requesters", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.requesters", ChartColor.BLUE));
 
-            data.setContent("http.requesters-humansbots", MetricHtmlizer.htmlize(federation, view, period, "http.requesters (humans + bots)",
-                    "metrics.http.requesters.humans", ChartColor.GREEN, "metrics.http.requesters.bots", ChartColor.YELLOW));
-            data.setContent("http.requesters.humans",
-                    MetricHtmlizer.htmlize(federation, view, period, "metrics.http.requesters.humans", ChartColor.GREEN));
-            data.setContent("http.requesters.bots",
-                    MetricHtmlizer.htmlize(federation, view, period, "metrics.http.requesters.bots", ChartColor.YELLOW));
+            data.setContent("http.requesters-humansbots",
+                    MetricHtmlizer.htmlize(federation, view, period, "http.requesters (humans + bots)", "metrics.http.requesters.humans", ChartColor.GREEN,
+                            "metrics.http.requesters.bots", ChartColor.YELLOW));
+            data.setContent("http.requesters.humans", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.requesters.humans", ChartColor.GREEN));
+            data.setContent("http.requesters.bots", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.requesters.bots", ChartColor.YELLOW));
 
-            data.setContent("http.requesters-ipv4ipv6", MetricHtmlizer.htmlize(federation, view, period, "http.requesters (ipv4 + ipv6)",
-                    "metrics.http.requesters.ipv4", ChartColor.YELLOW, "metrics.http.requesters.ipv6", ChartColor.GREEN));
-            data.setContent("http.requesters.ipv4",
-                    MetricHtmlizer.htmlize(federation, view, period, "metrics.http.requesters.ipv4", ChartColor.YELLOW));
-            data.setContent("http.requesters.ipv6",
-                    MetricHtmlizer.htmlize(federation, view, period, "metrics.http.requesters.ipv6", ChartColor.GREEN));
+            data.setContent("http.requesters-ipv4ipv6", MetricHtmlizer.htmlize(federation, view, period, "http.requesters (ipv4 + ipv6)", "metrics.http.requesters.ipv4", ChartColor.YELLOW,
+                    "metrics.http.requesters.ipv6", ChartColor.GREEN));
+            data.setContent("http.requesters.ipv4", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.requesters.ipv4", ChartColor.YELLOW));
+            data.setContent("http.requesters.ipv6", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.requesters.ipv6", ChartColor.GREEN));
 
             data.setContent("http.visitors", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.visitors", ChartColor.BLUE));
-            data.setContent("http.visitors-ipv4ipv6", MetricHtmlizer.htmlize(federation, view, period, "http.visitors (ipv4 + ipv6)",
-                    "metrics.http.visitors.ipv4", ChartColor.YELLOW, "metrics.http.visitors.ipv6", ChartColor.GREEN));
+            data.setContent("http.visitors-ipv4ipv6", MetricHtmlizer.htmlize(federation, view, period, "http.visitors (ipv4 + ipv6)", "metrics.http.visitors.ipv4", ChartColor.YELLOW,
+                    "metrics.http.visitors.ipv6", ChartColor.GREEN));
             data.setContent("http.visitors.ipv4", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.visitors.ipv4", ChartColor.YELLOW));
             data.setContent("http.visitors.ipv6", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.visitors.ipv6", ChartColor.GREEN));
 
             data.setContent("http.visits", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.visits", ChartColor.BLUE));
-            data.setContent("http.visits-ipv4ipv6", MetricHtmlizer.htmlize(federation, view, period, "http.visits (ipv4 + ipv6)",
-                    "metrics.http.visits.ipv4", ChartColor.YELLOW, "metrics.http.visits.ipv6", ChartColor.GREEN));
+            data.setContent("http.visits-ipv4ipv6", MetricHtmlizer.htmlize(federation, view, period, "http.visits (ipv4 + ipv6)", "metrics.http.visits.ipv4", ChartColor.YELLOW,
+                    "metrics.http.visits.ipv6", ChartColor.GREEN));
             data.setContent("http.visits.ipv4", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.visits.ipv4", ChartColor.YELLOW));
             data.setContent("http.visits.ipv6", MetricHtmlizer.htmlize(federation, view, period, "metrics.http.visits.ipv6", ChartColor.GREEN));
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricWebView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricWebView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/organizations/IndexPage.java

@@ -41,7 +41,7 @@ import website.federation.FederationHeaderView;
  */
 public class IndexPage extends HttpServlet
 {
-    private static final long serialVersionUID = 3909086518893521246L;
+    private static final long serialVersionUID = -8274687319890495722L;
     private static Logger logger = LoggerFactory.getLogger(IndexPage.class);
 
     /* (non-Javadoc)
@@ -52,7 +52,7 @@ public class IndexPage extends HttpServlet
     {
         try
         {
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
+            String html = StatoolInfosWeb.instance().getHtmlCache().get(IndexPage.class.getCanonicalName());
             if (html == null)
             {
                 // Get parameters.
@@ -73,7 +73,7 @@ public class IndexPage extends HttpServlet
                 trail.add("Organisations", "/federation/organizations/");
 
                 html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
+                StatoolInfosWeb.instance().getHtmlCache().put(IndexPage.class.getCanonicalName(), html);
             }
 
             // Display page.

src/website/federation/organizations/organization/CrawlPage.java

@@ -56,9 +56,6 @@ public class CrawlPage extends HttpServlet
         {
             logger.info("PAGE Organization > Crawl");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -78,9 +75,7 @@ public class CrawlPage extends HttpServlet
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Journal", "/federation/organizations/" + organization.getTechnicalName() + "/crawl.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/PropertiesDo.java

@@ -39,7 +39,7 @@ import jakarta.servlet.http.HttpServletResponse;
 @KissServlet("^/federation/organizations/[^/]+/[^./]+\\.properties$")
 public class PropertiesDo extends HttpServlet
 {
-    private static final long serialVersionUID = -7536773873051469053L;
+    private static final long serialVersionUID = 2011776119103724440L;
     private static Logger logger = LoggerFactory.getLogger(PropertiesDo.class);
 
     /* (non-Javadoc)

src/website/federation/organizations/organization/PropertyAlertPage.java

@@ -56,9 +56,6 @@ public class PropertyAlertPage extends HttpServlet
         {
             logger.info("PAGE Organization > PropertyAlert");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -78,9 +75,7 @@ public class PropertyAlertPage extends HttpServlet
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Alertes", "/federation/organizations/" + organization.getTechnicalName() + "/propertyAlert.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/PropertyCheckPage.java

@@ -56,9 +56,6 @@ public class PropertyCheckPage extends HttpServlet
         {
             logger.info("PAGE Organization > PropertyCheck");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -78,9 +75,7 @@ public class PropertyCheckPage extends HttpServlet
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Propriétés", "/federation/organizations/" + organization.getTechnicalName() + "/propertyCheck.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/ServicesPage.java

@@ -56,9 +56,6 @@ public class ServicesPage extends HttpServlet
         {
             logger.info("PAGE Organization > Services");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -78,9 +75,7 @@ public class ServicesPage extends HttpServlet
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/StatsPage.java

@@ -64,9 +64,6 @@ public class StatsPage extends HttpServlet
         {
             logger.info("PAGE Organization > Stats");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -86,9 +83,7 @@ public class StatsPage extends HttpServlet
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Stats", "/federation/organizations/" + organization.getTechnicalName() + "/stats.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/UptimePage.java

@@ -56,9 +56,6 @@ public class UptimePage extends HttpServlet
         {
             logger.info("PAGE Organization > Uptime");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -78,9 +75,7 @@ public class UptimePage extends HttpServlet
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Disponibilité", "/federation/organizations/" + organization.getTechnicalName() + "/uptime.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/metrics/IndexPage.java

@@ -36,7 +36,7 @@ import website.charter.ErrorView;
 @KissServlet("^/federation/organizations/[^/]+/metrics/")
 public class IndexPage extends HttpServlet
 {
-    private static final long serialVersionUID = -2120869479686158841L;
+    private static final long serialVersionUID = 2794788000773558854L;
     private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(IndexPage.class);
 
     /* (non-Javadoc)

src/website/federation/organizations/organization/metrics/MetricGenericPage.java

@@ -66,9 +66,6 @@ public class MetricGenericPage extends HttpServlet
         {
             logger.info("PAGE Organization > Metrics > Summary");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -91,9 +88,7 @@ public class MetricGenericPage extends HttpServlet
             trail.add("Métriques", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/");
             trail.add("Génériques", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/generic.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -121,8 +116,7 @@ public class MetricGenericPage extends HttpServlet
      * @throws IOException
      *             Signals that an I/O exception has occurred.
      */
-    public static String htmlize(final Organization organization, final ViewMenu view, final PeriodMenu period)
-            throws StatoolInfosWebException, IOException
+    public static String htmlize(final Organization organization, final ViewMenu view, final PeriodMenu period) throws StatoolInfosWebException, IOException
     {
         String result;
 
@@ -136,23 +130,18 @@ public class MetricGenericPage extends HttpServlet
             //
             data.setContent("graphic.users", MetricHtmlizer.htmlize(organization, view, period, "metrics.service.users", ChartColor.GREEN));
 
-            data.setContent("graphic.users.ipv4-ipv6", MetricHtmlizer.htmlize(organization, view, period, "service.users (ipv4 + ipv6)",
-                    "metrics.service.users.ipv4", ChartColor.YELLOW, "metrics.service.users.ipv6", ChartColor.GREEN));
-            data.setContent("graphic.users.ipv4",
-                    MetricHtmlizer.htmlize(organization, view, period, "metrics.service.users.ipv4", ChartColor.YELLOW));
+            data.setContent("graphic.users.ipv4-ipv6", MetricHtmlizer.htmlize(organization, view, period, "service.users (ipv4 + ipv6)", "metrics.service.users.ipv4", ChartColor.YELLOW,
+                    "metrics.service.users.ipv6", ChartColor.GREEN));
+            data.setContent("graphic.users.ipv4", MetricHtmlizer.htmlize(organization, view, period, "metrics.service.users.ipv4", ChartColor.YELLOW));
             data.setContent("graphic.users.ipv6", MetricHtmlizer.htmlize(organization, view, period, "metrics.service.users.ipv6", ChartColor.GREEN));
 
             data.setContent("graphic.accounts", MetricHtmlizer.htmlize(organization, view, period, "metrics.service.accounts", ChartColor.GREEN));
-            data.setContent("graphic.accounts.active",
-                    MetricHtmlizer.htmlize(organization, view, period, "metrics.service.accounts.active", ChartColor.GREEN));
-            data.setContent("graphic.database.bytes",
-                    MetricHtmlizer.htmlize(organization, view, period, "metrics.service.database.bytes", ChartColor.GREEN));
-            data.setContent("graphic.datafiles.bytes",
-                    MetricHtmlizer.htmlize(organization, view, period, "metrics.service.datafiles.bytes", ChartColor.GREEN));
+            data.setContent("graphic.accounts.active", MetricHtmlizer.htmlize(organization, view, period, "metrics.service.accounts.active", ChartColor.GREEN));
+            data.setContent("graphic.database.bytes", MetricHtmlizer.htmlize(organization, view, period, "metrics.service.database.bytes", ChartColor.GREEN));
+            data.setContent("graphic.datafiles.bytes", MetricHtmlizer.htmlize(organization, view, period, "metrics.service.datafiles.bytes", ChartColor.GREEN));
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricGenericView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricGenericView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/organizations/organization/metrics/MetricSpecificPage.java

@@ -64,9 +64,6 @@ public class MetricSpecificPage extends HttpServlet
         {
             logger.info("PAGE Organization > Metrics > Specific");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -89,9 +86,7 @@ public class MetricSpecificPage extends HttpServlet
             trail.add("Métriques", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/");
             trail.add("Spécifiques", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/specific.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -118,8 +113,7 @@ public class MetricSpecificPage extends HttpServlet
      * @throws IOException
      *             Signals that an I/O exception has occurred.
      */
-    public static String htmlize(final Organization organization, final ViewMenu view, final PeriodMenu period)
-            throws StatoolInfosWebException, IOException
+    public static String htmlize(final Organization organization, final ViewMenu view, final PeriodMenu period) throws StatoolInfosWebException, IOException
     {
         String result;
 
@@ -133,8 +127,7 @@ public class MetricSpecificPage extends HttpServlet
             data.setContent("metricMenuView", MetricMenuView.htmlize(TypeMenu.SPECIFIC, view, period));
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricSpecificView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricSpecificView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/organizations/organization/metrics/MetricSummaryPage.java

@@ -66,9 +66,6 @@ public class MetricSummaryPage extends HttpServlet
         {
             logger.info("PAGE Organization > Metrics > Summary");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -91,9 +88,7 @@ public class MetricSummaryPage extends HttpServlet
             trail.add("Métriques", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/");
             trail.add("Résumé", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/summary.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -121,8 +116,7 @@ public class MetricSummaryPage extends HttpServlet
      * @throws IOException
      *             Signals that an I/O exception has occurred.
      */
-    public static String htmlize(final Organization organization, final ViewMenu view, final PeriodMenu period)
-            throws StatoolInfosWebException, IOException
+    public static String htmlize(final Organization organization, final ViewMenu view, final PeriodMenu period) throws StatoolInfosWebException, IOException
     {
         String result;
 
@@ -137,8 +131,7 @@ public class MetricSummaryPage extends HttpServlet
             data.setContent("http.visits", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.visits", ChartColor.GREEN));
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricSummaryView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricSummaryView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/organizations/organization/metrics/MetricWebPage.java

@@ -65,9 +65,6 @@ public class MetricWebPage extends HttpServlet
         {
             logger.info("PAGE Organization > Metrics > Web");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -90,9 +87,7 @@ public class MetricWebPage extends HttpServlet
             trail.add("Métriques", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/");
             trail.add("Web", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/web.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -118,8 +113,7 @@ public class MetricWebPage extends HttpServlet
      * @throws IOException
      *             Signals that an I/O exception has occurred.
      */
-    public static String htmlize(final Organization organization, final ViewMenu view, final PeriodMenu period)
-            throws StatoolInfosWebException, IOException
+    public static String htmlize(final Organization organization, final ViewMenu view, final PeriodMenu period) throws StatoolInfosWebException, IOException
     {
         String result;
 
@@ -133,22 +127,20 @@ public class MetricWebPage extends HttpServlet
             //
             data.setContent("http.hits", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.hits", ChartColor.BLUE));
 
-            data.setContent("http.hits-ipv4ipv6", MetricHtmlizer.htmlize(organization, view, period, "http.hits (ipv4 + ipv6)",
-                    "metrics.http.hits.ipv4", ChartColor.YELLOW, "metrics.http.hits.ipv6", ChartColor.GREEN));
+            data.setContent("http.hits-ipv4ipv6",
+                    MetricHtmlizer.htmlize(organization, view, period, "http.hits (ipv4 + ipv6)", "metrics.http.hits.ipv4", ChartColor.YELLOW, "metrics.http.hits.ipv6", ChartColor.GREEN));
             data.setContent("http.hits.ipv4", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.hits.ipv4", ChartColor.YELLOW));
             data.setContent("http.hits.ipv6", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.hits.ipv6", ChartColor.GREEN));
 
-            data.setContent("http.hits-humansbots", MetricHtmlizer.htmlize(organization, view, period, "http.hits (humans + bots)",
-                    "metrics.http.hits.humans", ChartColor.GREEN, "metrics.http.hits.bots", ChartColor.YELLOW));
+            data.setContent("http.hits-humansbots", MetricHtmlizer.htmlize(organization, view, period, "http.hits (humans + bots)", "metrics.http.hits.humans", ChartColor.GREEN,
+                    "metrics.http.hits.bots", ChartColor.YELLOW));
             data.setContent("http.hits.humans", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.hits.humans", ChartColor.GREEN));
             data.setContent("http.hits.bots", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.hits.bots", ChartColor.YELLOW));
 
-            data.setContent("http.hits.humans-ipv4ipv6", MetricHtmlizer.htmlize(organization, view, period, "http.hits.humans (ipv4 + ipv6)",
-                    "metrics.http.hits.humans.ipv4", ChartColor.YELLOW, "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
-            data.setContent("http.hits.humans.ipv4",
-                    MetricHtmlizer.htmlize(organization, view, period, "metrics.http.hits.humans.ipv4", ChartColor.YELLOW));
-            data.setContent("http.hits.humans.ipv6",
-                    MetricHtmlizer.htmlize(organization, view, period, "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
+            data.setContent("http.hits.humans-ipv4ipv6", MetricHtmlizer.htmlize(organization, view, period, "http.hits.humans (ipv4 + ipv6)", "metrics.http.hits.humans.ipv4", ChartColor.YELLOW,
+                    "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
+            data.setContent("http.hits.humans.ipv4", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.hits.humans.ipv4", ChartColor.YELLOW));
+            data.setContent("http.hits.humans.ipv6", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
 
             data.setContent("http.errors", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.errors", ChartColor.RED));
             data.setContent("http.errors.php", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.errors.php", ChartColor.RED));
@@ -159,48 +151,42 @@ public class MetricWebPage extends HttpServlet
 
             data.setContent("http.ip", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.ip", ChartColor.BLUE));
 
-            data.setContent("http.ip-humansbots", MetricHtmlizer.htmlize(organization, view, period, "http.ip (humans + bots)",
-                    "metrics.http.ip.humans", ChartColor.GREEN, "metrics.http.ip.bots", ChartColor.YELLOW));
+            data.setContent("http.ip-humansbots", MetricHtmlizer.htmlize(organization, view, period, "http.ip (humans + bots)", "metrics.http.ip.humans", ChartColor.GREEN,
+                    "metrics.http.ip.bots", ChartColor.YELLOW));
             data.setContent("http.ip.humans", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.ip.humans", ChartColor.GREEN));
             data.setContent("http.ip.bots", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.ip.bots", ChartColor.YELLOW));
 
-            data.setContent("http.ip-ipv4ipv6", MetricHtmlizer.htmlize(organization, view, period, "http.ip (ipv4 + ipv6)", "metrics.http.ip.ipv4",
-                    ChartColor.YELLOW, "metrics.http.ip.ipv6", ChartColor.GREEN));
+            data.setContent("http.ip-ipv4ipv6", MetricHtmlizer.htmlize(organization, view, period, "http.ip (ipv4 + ipv6)", "metrics.http.ip.ipv4", ChartColor.YELLOW, "metrics.http.ip.ipv6",
+                    ChartColor.GREEN));
             data.setContent("http.ip.ipv4", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.ip.ipv4", ChartColor.YELLOW));
             data.setContent("http.ip.ipv6", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.ip.ipv6", ChartColor.GREEN));
 
             data.setContent("http.requesters", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.requesters", ChartColor.BLUE));
 
-            data.setContent("http.requesters-humansbots", MetricHtmlizer.htmlize(organization, view, period, "http.requesters (humans + bots)",
-                    "metrics.http.requesters.humans", ChartColor.GREEN, "metrics.http.requesters.bots", ChartColor.YELLOW));
-            data.setContent("http.requesters.humans",
-                    MetricHtmlizer.htmlize(organization, view, period, "metrics.http.requesters.humans", ChartColor.GREEN));
-            data.setContent("http.requesters.bots",
-                    MetricHtmlizer.htmlize(organization, view, period, "metrics.http.requesters.bots", ChartColor.YELLOW));
+            data.setContent("http.requesters-humansbots", MetricHtmlizer.htmlize(organization, view, period, "http.requesters (humans + bots)", "metrics.http.requesters.humans", ChartColor.GREEN,
+                    "metrics.http.requesters.bots", ChartColor.YELLOW));
+            data.setContent("http.requesters.humans", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.requesters.humans", ChartColor.GREEN));
+            data.setContent("http.requesters.bots", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.requesters.bots", ChartColor.YELLOW));
 
-            data.setContent("http.requesters-ipv4ipv6", MetricHtmlizer.htmlize(organization, view, period, "http.requesters(ipv4 + ipv6)",
-                    "metrics.http.requesters.ipv4", ChartColor.YELLOW, "metrics.http.requesters.ipv6", ChartColor.GREEN));
-            data.setContent("http.requesters.ipv4",
-                    MetricHtmlizer.htmlize(organization, view, period, "metrics.http.requesters.ipv4", ChartColor.YELLOW));
-            data.setContent("http.requesters.ipv6",
-                    MetricHtmlizer.htmlize(organization, view, period, "metrics.http.requesters.ipv6", ChartColor.GREEN));
+            data.setContent("http.requesters-ipv4ipv6", MetricHtmlizer.htmlize(organization, view, period, "http.requesters(ipv4 + ipv6)", "metrics.http.requesters.ipv4", ChartColor.YELLOW,
+                    "metrics.http.requesters.ipv6", ChartColor.GREEN));
+            data.setContent("http.requesters.ipv4", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.requesters.ipv4", ChartColor.YELLOW));
+            data.setContent("http.requesters.ipv6", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.requesters.ipv6", ChartColor.GREEN));
 
             data.setContent("http.visitors", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.visitors", ChartColor.BLUE));
-            data.setContent("http.visitors-ipv4ipv6", MetricHtmlizer.htmlize(organization, view, period, "http.visitors (ipv4 + ipv6)",
-                    "metrics.http.visitors.ipv4", ChartColor.YELLOW, "metrics.http.visitors.ipv6", ChartColor.GREEN));
-            data.setContent("http.visitors.ipv4",
-                    MetricHtmlizer.htmlize(organization, view, period, "metrics.http.visitors.ipv4", ChartColor.YELLOW));
+            data.setContent("http.visitors-ipv4ipv6", MetricHtmlizer.htmlize(organization, view, period, "http.visitors (ipv4 + ipv6)", "metrics.http.visitors.ipv4", ChartColor.YELLOW,
+                    "metrics.http.visitors.ipv6", ChartColor.GREEN));
+            data.setContent("http.visitors.ipv4", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.visitors.ipv4", ChartColor.YELLOW));
             data.setContent("http.visitors.ipv6", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.visitors.ipv6", ChartColor.GREEN));
 
             data.setContent("http.visits", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.visits", ChartColor.BLUE));
-            data.setContent("http.visits-ipv4ipv6", MetricHtmlizer.htmlize(organization, view, period, "http.visits (ipv4 + ipv6)",
-                    "metrics.http.visits.ipv4", ChartColor.YELLOW, "metrics.http.visits.ipv6", ChartColor.GREEN));
+            data.setContent("http.visits-ipv4ipv6", MetricHtmlizer.htmlize(organization, view, period, "http.visits (ipv4 + ipv6)", "metrics.http.visits.ipv4", ChartColor.YELLOW,
+                    "metrics.http.visits.ipv6", ChartColor.GREEN));
             data.setContent("http.visits.ipv4", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.visits.ipv4", ChartColor.YELLOW));
             data.setContent("http.visits.ipv6", MetricHtmlizer.htmlize(organization, view, period, "metrics.http.visits.ipv6", ChartColor.GREEN));
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricWebView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricWebView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/organizations/organization/services/IndexPage.java

@@ -34,10 +34,10 @@ import website.charter.ErrorView;
 /**
  * The Class IndexPage.
  */
-@KissServlet("^/federation/organizations/[^/]+/services/$")
+@KissServlet("^/federation/organizations/[^/]+/services/[^/]+/$")
 public class IndexPage extends HttpServlet
 {
-    private static final long serialVersionUID = 3531927793016566272L;
+    private static final long serialVersionUID = -5951233202690068343L;
     private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(IndexPage.class);
 
     /* (non-Javadoc)

src/website/federation/organizations/organization/services/service/CrawlPage.java

@@ -57,9 +57,6 @@ public class CrawlPage extends HttpServlet
         {
             logger.info("PAGE Service > Crawl");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -79,14 +76,10 @@ public class CrawlPage extends HttpServlet
             trail.add("Organisations", "/federation/organizations/");
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
-                trail.add(service.getName(),
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
-                trail.add("Journal",
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/crawl.xhtml");
+            trail.add(service.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
+            trail.add("Journal", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/crawl.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/services/service/IndexPage.java

@@ -21,7 +21,6 @@ package website.federation.organizations.organization.services.service;
 import java.io.IOException;
 
 import fr.devinsy.kiss4web.Redirector;
-import fr.devinsy.kiss4web.dispatcher.annotation.KissServlet;
 import fr.devinsy.statoolinfos.core.Organization;
 import fr.devinsy.statoolinfos.core.Service;
 import fr.devinsy.statoolinfosweb.StatoolInfosWeb;
@@ -34,10 +33,9 @@ import website.charter.ErrorView;
 /**
  * The Class IndexPage.
  */
-@KissServlet("^/federation/organizations/[^/]+/services/[^/]+/$")
 public class IndexPage extends HttpServlet
 {
-    private static final long serialVersionUID = -1634795104224318821L;
+    private static final long serialVersionUID = -5951233202690068343L;
     private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(IndexPage.class);
 
     /* (non-Javadoc)
@@ -60,8 +58,7 @@ public class IndexPage extends HttpServlet
 
             // Send response.
             // ==============
-            Redirector.redirect(response,
-                    "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/stats.xhtml");
+            Redirector.redirect(response, "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/stats.xhtml");
         }
         catch (Exception exception)
         {

src/website/federation/organizations/organization/services/service/PropertiesDo.java

@@ -39,7 +39,7 @@ import jakarta.servlet.http.HttpServletResponse;
 @KissServlet("^/federation/organizations/[^/]+/services/[^/]+/[^./]+\\.properties$")
 public class PropertiesDo extends HttpServlet
 {
-    private static final long serialVersionUID = 7374815394064791347L;
+    private static final long serialVersionUID = 2011776119103724440L;
     private static Logger logger = LoggerFactory.getLogger(PropertiesDo.class);
 
     /* (non-Javadoc)

src/website/federation/organizations/organization/services/service/PropertyAlertPage.java

@@ -57,9 +57,6 @@ public class PropertyAlertPage extends HttpServlet
         {
             logger.info("PAGE Service > PropertyAlert");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -79,14 +76,10 @@ public class PropertyAlertPage extends HttpServlet
             trail.add("Organisations", "/federation/organizations/");
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
-                trail.add(service.getName(),
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
-                trail.add("Alertes", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName()
-                        + "/propertyAlert.xhtml");
+            trail.add(service.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
+            trail.add("Alertes", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/propertyAlert.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/services/service/PropertyCheckPage.java

@@ -57,9 +57,6 @@ public class PropertyCheckPage extends HttpServlet
         {
             logger.info("PAGE Service > PropertyCheck");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -79,14 +76,10 @@ public class PropertyCheckPage extends HttpServlet
             trail.add("Organisations", "/federation/organizations/");
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
-                trail.add(service.getName(),
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
-                trail.add("Propriétés", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName()
-                        + "/propertyCheck.xhtml");
+            trail.add(service.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
+            trail.add("Propriétés", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/propertyCheck.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/services/service/ServiceHeaderView.java

@@ -58,8 +58,8 @@ public class ServiceHeaderView
         {
             TagDataManager data = new TagDataManager();
 
-            data.setAttribute("serviceLogo", "src", "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services/"
-                    + service.getTechnicalName() + "/" + service.getLogoFileName());
+            data.setAttribute("serviceLogo", "src",
+                    "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services/" + service.getTechnicalName() + "/" + service.getLogoFileName());
 
             data.setEscapedContent("serviceName", service.getName());
             if (service.getWebsiteURL() != null)
@@ -84,19 +84,16 @@ public class ServiceHeaderView
             }
 
             data.setAttribute("serviceStatusImg", "src", "/commons/status-" + service.getStatus().toString().toLowerCase() + ".png");
-            data.setAttribute("serviceStatusImg", "title",
-                    StringUtils.defaultIfBlank(service.getStatusDescription(), service.getStatus().toString()));
+            data.setAttribute("serviceStatusImg", "title", StringUtils.defaultIfBlank(service.getStatusDescription(), service.getStatus().toString()));
 
-            data.setAttribute("organizationsLink", "href",
-                    "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services.xhtml");
+            data.setAttribute("organizationsLink", "href", "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services.xhtml");
             data.setAttribute("servicesLink", "href", "services.xhtml");
 
             data.setAttribute("rawLink", "href", service.getTechnicalName() + ".properties");
             data.setAttribute("rawCheckLink", "href", "propertyCheck.xhtml");
 
             data.setAttribute("statsLink", "href", "stats.xhtml");
-            data.setAttribute("metricsLink", "href", "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services/"
-                    + service.getTechnicalName() + "/metrics/");
+            data.setAttribute("metricsLink", "href", "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/");
 
             if (service.getLegalURL() != null)
             {
@@ -189,8 +186,7 @@ public class ServiceHeaderView
                 data.setAttribute("crawlLinkImg", "src", "/commons/circle-icons/download.svg");
             }
 
-            data.setAttribute("uptimeLink", "href", "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services/"
-                    + service.getTechnicalName() + "/uptime.xhtml");
+            data.setAttribute("uptimeLink", "href", "uptime.xhtml");
             Services services = new Services();
             services.add(service);
             if (uptimeJournal.hasRecentError(services))
@@ -212,8 +208,7 @@ public class ServiceHeaderView
             }
 
             //
-            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/serviceHeaderView.xhtml", data)
-                    .toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/serviceHeaderView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/organizations/organization/services/service/ServicesPage.java

@@ -58,9 +58,6 @@ public class ServicesPage extends HttpServlet
         {
             logger.info("PAGE Service > Services");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -80,14 +77,10 @@ public class ServicesPage extends HttpServlet
             trail.add("Organisations", "/federation/organizations/");
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
-                trail.add(service.getName(),
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
-                trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName()
-                        + "/services.xhtml");
+            trail.add(service.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
+            trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/services.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/services/service/StatsPage.java

@@ -65,9 +65,6 @@ public class StatsPage extends HttpServlet
         {
             logger.info("PAGE Service > Stats");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -87,14 +84,10 @@ public class StatsPage extends HttpServlet
             trail.add("Organisations", "/federation/organizations/");
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
-                trail.add(service.getName(),
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
-                trail.add("Stats",
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/stats.xhtml");
+            trail.add(service.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
+            trail.add("Stats", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/stats.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/services/service/UptimePage.java

@@ -58,9 +58,6 @@ public class UptimePage extends HttpServlet
         {
             logger.info("PAGE Service > Uptime");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -80,14 +77,10 @@ public class UptimePage extends HttpServlet
             trail.add("Organisations", "/federation/organizations/");
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
-                trail.add(service.getName(),
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
-                trail.add("Disponibilité",
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/uptime.xhtml");
+            trail.add(service.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
+            trail.add("Disponibilité", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/uptime.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");

src/website/federation/organizations/organization/services/service/metrics/IndexPage.java

@@ -37,7 +37,7 @@ import website.charter.ErrorView;
 @KissServlet("^/federation/organizations/[^/]+/services/[^/]+/metrics/")
 public class IndexPage extends HttpServlet
 {
-    private static final long serialVersionUID = -1317090585455417646L;
+    private static final long serialVersionUID = 2794788000773558854L;
     private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(IndexPage.class);
 
     /* (non-Javadoc)
@@ -60,8 +60,7 @@ public class IndexPage extends HttpServlet
 
             // Send response.
             // ==============
-            Redirector.redirect(response, "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName()
-                    + "/metrics/summary.xhtml");
+            Redirector.redirect(response, "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/summary.xhtml");
         }
         catch (Exception exception)
         {

src/website/federation/organizations/organization/services/service/metrics/MetricGenericPage.java

@@ -67,9 +67,6 @@ public class MetricGenericPage extends HttpServlet
         {
             logger.info("PAGE Service > MetricGenericPage");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -91,16 +88,11 @@ public class MetricGenericPage extends HttpServlet
             trail.add("Organisations", "/federation/organizations/");
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
-                trail.add(service.getName(),
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
-                trail.add("Métriques",
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/");
-                trail.add("Générique", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName()
-                        + "/metrics/generic.xhtml");
+            trail.add(service.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
+            trail.add("Métriques", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/");
+            trail.add("Générique", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/generic.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -142,19 +134,16 @@ public class MetricGenericPage extends HttpServlet
             //
             data.setContent("graphic.users", MetricHtmlizer.htmlize(service, view, period, "metrics.service.users", ChartColor.GREEN));
 
-            data.setContent("graphic.users.ipv4-ipv6", MetricHtmlizer.htmlize(service, view, period, "service.users (ipv4 + ipv6)",
-                    "metrics.service.users.ipv4", ChartColor.YELLOW, "metrics.service.users.ipv6", ChartColor.GREEN));
+            data.setContent("graphic.users.ipv4-ipv6",
+                    MetricHtmlizer.htmlize(service, view, period, "service.users (ipv4 + ipv6)", "metrics.service.users.ipv4", ChartColor.YELLOW, "metrics.service.users.ipv6", ChartColor.GREEN));
             data.setContent("graphic.users.ipv4", MetricHtmlizer.htmlize(service, view, period, "metrics.service.users.ipv4", ChartColor.YELLOW));
             data.setContent("graphic.users.ipv6", MetricHtmlizer.htmlize(service, view, period, "metrics.service.users.ipv6", ChartColor.GREEN));
 
             data.setContent("graphic.accounts", MetricHtmlizer.htmlize(service, view, period, "metrics.service.accounts", ChartColor.GREEN));
-            data.setContent("graphic.accounts.active",
-                    MetricHtmlizer.htmlize(service, view, period, "metrics.service.accounts.active", ChartColor.GREEN));
+            data.setContent("graphic.accounts.active", MetricHtmlizer.htmlize(service, view, period, "metrics.service.accounts.active", ChartColor.GREEN));
 
-            data.setContent("graphic.database.bytes",
-                    MetricHtmlizer.htmlize(service, view, period, "metrics.service.database.bytes", ChartColor.GREEN));
-            data.setContent("graphic.datafiles.bytes",
-                    MetricHtmlizer.htmlize(service, view, period, "metrics.service.datafiles.bytes", ChartColor.GREEN));
+            data.setContent("graphic.database.bytes", MetricHtmlizer.htmlize(service, view, period, "metrics.service.database.bytes", ChartColor.GREEN));
+            data.setContent("graphic.datafiles.bytes", MetricHtmlizer.htmlize(service, view, period, "metrics.service.datafiles.bytes", ChartColor.GREEN));
 
             // TODO
             // metrics.moderation.accounts.reported.* =
@@ -164,8 +153,7 @@ public class MetricGenericPage extends HttpServlet
             // metrics.moderation.accounts.cancelled.* =
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricGenericView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricGenericView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/organizations/organization/services/service/metrics/MetricSpecificPage.java

@@ -67,9 +67,6 @@ public class MetricSpecificPage extends HttpServlet
         {
             logger.info("PAGE Service > MetricGenericPage");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -91,16 +88,11 @@ public class MetricSpecificPage extends HttpServlet
             trail.add("Organisations", "/federation/organizations/");
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
-                trail.add(service.getName(),
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
-                trail.add("Métriques",
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/");
-                trail.add("Spécifique", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName()
-                        + "/metrics/specific.xhtml");
+            trail.add(service.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
+            trail.add("Métriques", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/");
+            trail.add("Spécifique", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/specific.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -147,8 +139,7 @@ public class MetricSpecificPage extends HttpServlet
             }
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricSpecificView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricSpecificView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/organizations/organization/services/service/metrics/MetricSummaryPage.java

@@ -67,9 +67,6 @@ public class MetricSummaryPage extends HttpServlet
         {
             logger.info("PAGE Service > MetricSummaryPage");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -91,16 +88,11 @@ public class MetricSummaryPage extends HttpServlet
             trail.add("Organisations", "/federation/organizations/");
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
-                trail.add(service.getName(),
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
-                trail.add("Métriques",
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/");
-                trail.add("Résumé", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName()
-                        + "/metrics/summary.xhtml");
+            trail.add(service.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
+            trail.add("Métriques", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/");
+            trail.add("Résumé", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/summary.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -144,8 +136,7 @@ public class MetricSummaryPage extends HttpServlet
             data.setContent("http.visits", MetricHtmlizer.htmlize(service, view, period, "metrics.http.visits", ChartColor.GREEN));
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricSummaryView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricSummaryView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/organizations/organization/services/service/metrics/MetricWebPage.java

@@ -67,9 +67,6 @@ public class MetricWebPage extends HttpServlet
         {
             logger.info("PAGE Service > MetricGenericPage");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -91,16 +88,11 @@ public class MetricWebPage extends HttpServlet
             trail.add("Organisations", "/federation/organizations/");
             trail.add(organization.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/");
             trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
-                trail.add(service.getName(),
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
-                trail.add("Métriques",
-                        "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/");
-                trail.add("Web", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName()
-                        + "/metrics/web.xhtml");
+            trail.add(service.getName(), "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/");
+            trail.add("Métriques", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/");
+            trail.add("Web", "/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/metrics/web.xhtml");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -141,22 +133,21 @@ public class MetricWebPage extends HttpServlet
 
             data.setContent("http.hits", MetricHtmlizer.htmlize(service, view, period, "metrics.http.hits", ChartColor.BLUE));
 
-            data.setContent("http.hits-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.hits (ipv4 + ipv6)", "metrics.http.hits.ipv4",
-                    ChartColor.YELLOW, "metrics.http.hits.ipv6", ChartColor.GREEN));
+            data.setContent("http.hits-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.hits (ipv4 + ipv6)", "metrics.http.hits.ipv4", ChartColor.YELLOW, "metrics.http.hits.ipv6",
+                    ChartColor.GREEN));
             data.setContent("http.hits.ipv4", MetricHtmlizer.htmlize(service, view, period, "metrics.http.hits.ipv4", ChartColor.YELLOW));
             data.setContent("http.hits.ipv6", MetricHtmlizer.htmlize(service, view, period, "metrics.http.hits.ipv6", ChartColor.GREEN));
 
-            data.setContent("http.hits-humansbots", MetricHtmlizer.htmlize(service, view, period, "http.hits (humans + bots)",
-                    "metrics.http.hits.humans", ChartColor.GREEN, "metrics.http.hits.bots", ChartColor.YELLOW));
+            data.setContent("http.hits-humansbots", MetricHtmlizer.htmlize(service, view, period, "http.hits (humans + bots)", "metrics.http.hits.humans", ChartColor.GREEN,
+                    "metrics.http.hits.bots",
+                    ChartColor.YELLOW));
             data.setContent("http.hits.humans", MetricHtmlizer.htmlize(service, view, period, "metrics.http.hits.humans", ChartColor.GREEN));
             data.setContent("http.hits.bots", MetricHtmlizer.htmlize(service, view, period, "metrics.http.hits.bots", ChartColor.YELLOW));
 
-            data.setContent("http.hits.humans-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.hits.humans (ipv4 + ipv6)",
-                    "metrics.http.hits.humans.ipv4", ChartColor.YELLOW, "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
-            data.setContent("http.hits.humans.ipv4",
-                    MetricHtmlizer.htmlize(service, view, period, "metrics.http.hits.humans.ipv4", ChartColor.YELLOW));
-            data.setContent("http.hits.humans.ipv6",
-                    MetricHtmlizer.htmlize(service, view, period, "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
+            data.setContent("http.hits.humans-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.hits.humans (ipv4 + ipv6)", "metrics.http.hits.humans.ipv4", ChartColor.YELLOW,
+                    "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
+            data.setContent("http.hits.humans.ipv4", MetricHtmlizer.htmlize(service, view, period, "metrics.http.hits.humans.ipv4", ChartColor.YELLOW));
+            data.setContent("http.hits.humans.ipv6", MetricHtmlizer.htmlize(service, view, period, "metrics.http.hits.humans.ipv6", ChartColor.GREEN));
 
             data.setContent("http.errors", MetricHtmlizer.htmlize(service, view, period, "metrics.http.errors", ChartColor.RED));
             data.setContent("http.errors.php", MetricHtmlizer.htmlize(service, view, period, "metrics.http.errors.php", ChartColor.RED));
@@ -167,44 +158,42 @@ public class MetricWebPage extends HttpServlet
 
             data.setContent("http.ip", MetricHtmlizer.htmlize(service, view, period, "metrics.http.ip", ChartColor.BLUE));
 
-            data.setContent("http.ip-humansbots", MetricHtmlizer.htmlize(service, view, period, "http.ip (humans + bots)", "metrics.http.ip.humans",
-                    ChartColor.GREEN, "metrics.http.ip.bots", ChartColor.YELLOW));
+            data.setContent("http.ip-humansbots", MetricHtmlizer.htmlize(service, view, period, "http.ip (humans + bots)", "metrics.http.ip.humans", ChartColor.GREEN, "metrics.http.ip.bots",
+                    ChartColor.YELLOW));
             data.setContent("http.ip.humans", MetricHtmlizer.htmlize(service, view, period, "metrics.http.ip.humans", ChartColor.GREEN));
             data.setContent("http.ip.bots", MetricHtmlizer.htmlize(service, view, period, "metrics.http.ip.bots", ChartColor.YELLOW));
 
-            data.setContent("http.ip-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.ip (ipv4 + ipv6)", "metrics.http.ip.ipv4",
-                    ChartColor.YELLOW, "metrics.http.ip.ipv6", ChartColor.GREEN));
+            data.setContent("http.ip-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.ip (ipv4 + ipv6)", "metrics.http.ip.ipv4", ChartColor.YELLOW, "metrics.http.ip.ipv6",
+                    ChartColor.GREEN));
             data.setContent("http.ip.ipv4", MetricHtmlizer.htmlize(service, view, period, "metrics.http.ip.ipv4", ChartColor.YELLOW));
             data.setContent("http.ip.ipv6", MetricHtmlizer.htmlize(service, view, period, "metrics.http.ip.ipv6", ChartColor.GREEN));
 
             data.setContent("http.requesters", MetricHtmlizer.htmlize(service, view, period, "metrics.http.requesters", ChartColor.BLUE));
 
-            data.setContent("http.requesters-humansbots", MetricHtmlizer.htmlize(service, view, period, "http.requesters (humans + bots)",
-                    "metrics.http.requesters.humans", ChartColor.GREEN, "metrics.http.requesters.bots", ChartColor.YELLOW));
-            data.setContent("http.requesters.humans",
-                    MetricHtmlizer.htmlize(service, view, period, "metrics.http.requesters.humans", ChartColor.GREEN));
+            data.setContent("http.requesters-humansbots", MetricHtmlizer.htmlize(service, view, period, "http.requesters (humans + bots)", "metrics.http.requesters.humans", ChartColor.GREEN,
+                    "metrics.http.requesters.bots", ChartColor.YELLOW));
+            data.setContent("http.requesters.humans", MetricHtmlizer.htmlize(service, view, period, "metrics.http.requesters.humans", ChartColor.GREEN));
             data.setContent("http.requesters.bots", MetricHtmlizer.htmlize(service, view, period, "metrics.http.requesters.bots", ChartColor.YELLOW));
 
-            data.setContent("http.requesters-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.requesters (ipv4 + ipv6)",
-                    "metrics.http.requesters.ipv4", ChartColor.YELLOW, "metrics.http.requesters.ipv6", ChartColor.GREEN));
+            data.setContent("http.requesters-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.requesters (ipv4 + ipv6)", "metrics.http.requesters.ipv4", ChartColor.YELLOW,
+                    "metrics.http.requesters.ipv6", ChartColor.GREEN));
             data.setContent("http.requesters.ipv4", MetricHtmlizer.htmlize(service, view, period, "metrics.http.requesters.ipv4", ChartColor.YELLOW));
             data.setContent("http.requesters.ipv6", MetricHtmlizer.htmlize(service, view, period, "metrics.http.requesters.ipv6", ChartColor.GREEN));
 
             data.setContent("http.visitors", MetricHtmlizer.htmlize(service, view, period, "metrics.http.visitors", ChartColor.BLUE));
-            data.setContent("http.visitors-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.visitors (ipv4 + ipv6)",
-                    "metrics.http.visitors.ipv4", ChartColor.YELLOW, "metrics.http.visitors.ipv6", ChartColor.GREEN));
+            data.setContent("http.visitors-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.visitors (ipv4 + ipv6)", "metrics.http.visitors.ipv4", ChartColor.YELLOW,
+                    "metrics.http.visitors.ipv6", ChartColor.GREEN));
             data.setContent("http.visitors.ipv4", MetricHtmlizer.htmlize(service, view, period, "metrics.http.visitors.ipv4", ChartColor.YELLOW));
             data.setContent("http.visitors.ipv6", MetricHtmlizer.htmlize(service, view, period, "metrics.http.visitors.ipv6", ChartColor.GREEN));
 
             data.setContent("http.visits", MetricHtmlizer.htmlize(service, view, period, "metrics.http.visits", ChartColor.BLUE));
-            data.setContent("http.visits-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.visits (ipv4 + ipv6)",
-                    "metrics.http.visits.ipv4", ChartColor.YELLOW, "metrics.http.visits.ipv6", ChartColor.GREEN));
+            data.setContent("http.visits-ipv4ipv6", MetricHtmlizer.htmlize(service, view, period, "http.visits (ipv4 + ipv6)", "metrics.http.visits.ipv4", ChartColor.YELLOW,
+                    "metrics.http.visits.ipv6", ChartColor.GREEN));
             data.setContent("http.visits.ipv4", MetricHtmlizer.htmlize(service, view, period, "metrics.http.visits.ipv4", ChartColor.YELLOW));
             data.setContent("http.visits.ipv6", MetricHtmlizer.htmlize(service, view, period, "metrics.http.visits.ipv6", ChartColor.GREEN));
 
             //
-            String content = PresenterUtils
-                    .dynamize("/website/federation/organizations/organization/services/service/metrics/metricWebView.xhtml", data).toString();
+            String content = PresenterUtils.dynamize("/website/federation/organizations/organization/services/service/metrics/metricWebView.xhtml", data).toString();
             result = XidynUtils.extractBodyContent(content);
         }
         catch (XidynException exception)

src/website/federation/softwares/IndexPage.java

@@ -66,9 +66,6 @@ public class IndexPage extends HttpServlet
         {
             logger.info("PAGE Federation > Softwares");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -89,9 +86,7 @@ public class IndexPage extends HttpServlet
             trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
             trail.add("Logiciels", "/federation/softwares/");
 
-                html = WebCharterView.build(headerView, contentView, trail);
-                StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-            }
+            String html = WebCharterView.build(headerView, contentView, trail);
 
             // Display page.
             response.setContentType("application/xhtml+xml; charset=UTF-8");
@@ -128,14 +123,12 @@ public class IndexPage extends HttpServlet
             for (SoftwareStat stat : stats.sortByName())
             {
                 data.setEscapedContent("softwareListLine", index, "softwareListLineNameLink", stat.getName());
-                data.setAttribute("softwareListLine", index, "softwareListLineNameLink", "href",
-                        "/federation/softwares/" + stat.getTechnicalName() + ".xhtml");
+                data.setAttribute("softwareListLine", index, "softwareListLineNameLink", "href", "/federation/softwares/" + stat.getTechnicalName() + ".xhtml");
 
                 data.setContent("softwareListLine", index, "softwareListLineCategory", CategoriesView.build(stat.getCategories(), Mode.ALL));
 
                 data.setContent("softwareListLine", index, "softwareListLineOrganizationCount", stat.getOrganizationCount());
-                data.setContent("softwareListLine", index, "softwareListLineServiceCount",
-                        StatoolInfosUtils.defaultIfZero(stat.getServiceCount(), "😿"));
+                data.setContent("softwareListLine", index, "softwareListLineServiceCount", StatoolInfosUtils.defaultIfZero(stat.getServiceCount(), "😿"));
                 data.setContent("softwareListLine", index, "softwareListLineUserCount", StatoolInfosUtils.defaultIfZero(stat.getUserCount(), "😢"));
                 data.setContent("softwareListLine", index, "softwareListLineVisitCount", StatoolInfosUtils.defaultIfZero(stat.getVisitCount(), "😞"));
 

src/website/federation/softwares/SoftwarePage.java

@@ -64,9 +64,6 @@ public class SoftwarePage extends HttpServlet
         {
             logger.info("PAGE Federation > Softwares > Software");
 
-            String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
-            if (html == null)
-            {
             // Get parameters.
             // ===============
 
@@ -93,9 +90,7 @@ public class SoftwarePage extends HttpServlet
                 trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/");
                 trail.add("Logiciels", "/federation/softwares/");
 
-                    html = WebCharterView.build(headerView, contentView, trail);
-                    StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
-                }
+                String html = WebCharterView.build(headerView, contentView, trail);
 
                 // Display page.
                 response.setContentType("application/xhtml+xml; charset=UTF-8");