From 9c8a7e08bdce5f91b18aaf094a240954d01e2d3f Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Wed, 21 Aug 2024 03:11:21 +0200 Subject: [PATCH] Improved imports organization about jakarta.servlet. --- .settings/org.eclipse.jdt.ui.prefs | 4 ++++ src/website/charter/ErrorView.java | 3 ++- src/website/charter/FatalView.java | 4 ++-- src/website/federation/CrawlPage.java | 9 +++++---- src/website/federation/IndexXhtml.java | 3 ++- src/website/federation/LastStatsPage.java | 9 +++++---- src/website/federation/LogoDo.java | 9 +++++---- src/website/federation/PropertiesDo.java | 9 +++++---- src/website/federation/PropertiesFilesPage.java | 9 +++++---- src/website/federation/PropertyAlertFederationPage.java | 9 +++++---- .../federation/PropertyAlertOrganizationsPage.java | 9 +++++---- src/website/federation/PropertyAlertPage.java | 9 +++++---- src/website/federation/PropertyAlertServicesPage.java | 9 +++++---- src/website/federation/PropertyCheckPage.java | 9 +++++---- src/website/federation/PropertyStatsFederationPage.java | 9 +++++---- .../federation/PropertyStatsOrganizationsPage.java | 9 +++++---- src/website/federation/PropertyStatsPage.java | 9 +++++---- src/website/federation/PropertyStatsServicesPage.java | 9 +++++---- src/website/federation/ServicesPage.java | 9 +++++---- src/website/federation/SocialNetworksPage.java | 9 +++++---- src/website/federation/StatsPage.java | 9 +++++---- src/website/federation/UptimePage.java | 9 +++++---- src/website/federation/categories/CategoryPage.java | 9 +++++---- src/website/federation/categories/IndexPage.java | 9 +++++---- src/website/federation/exports/ExportDo.java | 9 +++++---- src/website/federation/exports/IndexPage.java | 9 +++++---- src/website/federation/metrics/IndexPage.java | 7 ++++--- src/website/federation/metrics/MetricGenericPage.java | 9 +++++---- src/website/federation/metrics/MetricSpecificPage.java | 9 +++++---- src/website/federation/metrics/MetricSummaryPage.java | 9 +++++---- src/website/federation/metrics/MetricWebPage.java | 9 +++++---- src/website/federation/organizations/IndexPage.java | 9 +++++---- .../federation/organizations/organization/CrawlPage.java | 9 +++++---- .../federation/organizations/organization/IndexPage.java | 9 +++++---- .../federation/organizations/organization/LogoDo.java | 9 +++++---- .../organizations/organization/PropertiesDo.java | 9 +++++---- .../organizations/organization/PropertyAlertPage.java | 9 +++++---- .../organizations/organization/PropertyCheckPage.java | 9 +++++---- .../organizations/organization/ServicesPage.java | 9 +++++---- .../federation/organizations/organization/StatsPage.java | 9 +++++---- .../organizations/organization/UptimePage.java | 9 +++++---- .../organizations/organization/metrics/IndexPage.java | 9 +++++---- .../organization/metrics/MetricGenericPage.java | 9 +++++---- .../organization/metrics/MetricSpecificPage.java | 9 +++++---- .../organization/metrics/MetricSummaryPage.java | 9 +++++---- .../organization/metrics/MetricWebPage.java | 9 +++++---- .../organizations/organization/services/IndexPage.java | 9 +++++---- .../organization/services/service/CrawlPage.java | 9 +++++---- .../organization/services/service/IndexPage.java | 9 +++++---- .../organization/services/service/LogoDo.java | 9 +++++---- .../organization/services/service/PropertiesDo.java | 9 +++++---- .../organization/services/service/PropertyAlertPage.java | 9 +++++---- .../organization/services/service/PropertyCheckPage.java | 9 +++++---- .../organization/services/service/ServicesPage.java | 9 +++++---- .../organization/services/service/StatsPage.java | 9 +++++---- .../organization/services/service/UptimePage.java | 9 +++++---- .../organization/services/service/metrics/IndexPage.java | 9 +++++---- .../services/service/metrics/MetricGenericPage.java | 9 +++++---- .../services/service/metrics/MetricSpecificPage.java | 9 +++++---- .../services/service/metrics/MetricSummaryPage.java | 9 +++++---- .../services/service/metrics/MetricWebPage.java | 9 +++++---- src/website/federation/softwares/IndexPage.java | 9 +++++---- src/website/federation/softwares/SoftwarePage.java | 9 +++++---- 63 files changed, 304 insertions(+), 239 deletions(-) diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 3f114b4..71f0ccd 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -150,8 +150,12 @@ jautodoc.cleanup.javadoc=false jautodoc.cleanup.replace_header=false org.eclipse.jdt.ui.exception.name=exception org.eclipse.jdt.ui.gettersetter.use.is=true +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;jakarta.servlet;org;com; org.eclipse.jdt.ui.keywordthis=true +org.eclipse.jdt.ui.ondemandthreshold=99 org.eclipse.jdt.ui.overrideannotation=true +org.eclipse.jdt.ui.staticondemandthreshold=99 org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_all=false sp_cleanup.add_default_serial_version_id=true diff --git a/src/website/charter/ErrorView.java b/src/website/charter/ErrorView.java index b0bc262..0d4fff0 100644 --- a/src/website/charter/ErrorView.java +++ b/src/website/charter/ErrorView.java @@ -20,10 +20,11 @@ package website.charter; import java.io.IOException; -import fr.devinsy.strings.StringList; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import fr.devinsy.strings.StringList; + /** * The Class ErrorView. */ diff --git a/src/website/charter/FatalView.java b/src/website/charter/FatalView.java index f1fab35..e75aafa 100644 --- a/src/website/charter/FatalView.java +++ b/src/website/charter/FatalView.java @@ -21,11 +21,11 @@ package website.charter; import java.io.IOException; import java.io.PrintWriter; - -import fr.devinsy.xidyn.utils.XidynUtils; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import fr.devinsy.xidyn.utils.XidynUtils; + /** * The Class FatalView. */ diff --git a/src/website/federation/CrawlPage.java b/src/website/federation/CrawlPage.java index ac0df0a..ecddb3d 100644 --- a/src/website/federation/CrawlPage.java +++ b/src/website/federation/CrawlPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,10 +33,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.CrawlView; diff --git a/src/website/federation/IndexXhtml.java b/src/website/federation/IndexXhtml.java index e1f64c0..c173683 100644 --- a/src/website/federation/IndexXhtml.java +++ b/src/website/federation/IndexXhtml.java @@ -20,11 +20,12 @@ package website.federation; import java.io.IOException; -import fr.devinsy.kiss4web.Redirector; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + +import fr.devinsy.kiss4web.Redirector; import website.charter.ErrorView; /** diff --git a/src/website/federation/LastStatsPage.java b/src/website/federation/LastStatsPage.java index a04803e..adf89a6 100644 --- a/src/website/federation/LastStatsPage.java +++ b/src/website/federation/LastStatsPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,10 +33,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.LastStatsView; diff --git a/src/website/federation/LogoDo.java b/src/website/federation/LogoDo.java index 7e0bba4..dc5d390 100644 --- a/src/website/federation/LogoDo.java +++ b/src/website/federation/LogoDo.java @@ -22,6 +22,11 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,10 +38,6 @@ import fr.devinsy.statoolinfos.core.Federation; import fr.devinsy.statoolinfos.crawl.CrawlCache; import fr.devinsy.statoolinfos.util.URLUtils; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; /** * The Class LogoDo. diff --git a/src/website/federation/PropertiesDo.java b/src/website/federation/PropertiesDo.java index 7d51915..7d83ced 100644 --- a/src/website/federation/PropertiesDo.java +++ b/src/website/federation/PropertiesDo.java @@ -21,6 +21,11 @@ package website.federation; import java.io.File; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,10 +33,6 @@ import fr.devinsy.kiss4web.dispatcher.KissDispatcherUtils; import fr.devinsy.kiss4web.dispatcher.annotation.KissServlet; import fr.devinsy.statoolinfos.core.Federation; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; /** * The Class PropertiesDo. diff --git a/src/website/federation/PropertiesFilesPage.java b/src/website/federation/PropertiesFilesPage.java index ceabf6c..8631520 100644 --- a/src/website/federation/PropertiesFilesPage.java +++ b/src/website/federation/PropertiesFilesPage.java @@ -21,6 +21,11 @@ package website.federation; import java.io.IOException; import java.time.format.DateTimeFormatter; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,10 +43,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; diff --git a/src/website/federation/PropertyAlertFederationPage.java b/src/website/federation/PropertyAlertFederationPage.java index dc3f501..bdff3f1 100644 --- a/src/website/federation/PropertyAlertFederationPage.java +++ b/src/website/federation/PropertyAlertFederationPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,10 +34,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyAlertView; diff --git a/src/website/federation/PropertyAlertOrganizationsPage.java b/src/website/federation/PropertyAlertOrganizationsPage.java index 7a5377c..5ad6957 100644 --- a/src/website/federation/PropertyAlertOrganizationsPage.java +++ b/src/website/federation/PropertyAlertOrganizationsPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +35,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyAlertView; diff --git a/src/website/federation/PropertyAlertPage.java b/src/website/federation/PropertyAlertPage.java index 1559c6b..1315d30 100644 --- a/src/website/federation/PropertyAlertPage.java +++ b/src/website/federation/PropertyAlertPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,10 +34,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyAlertView; diff --git a/src/website/federation/PropertyAlertServicesPage.java b/src/website/federation/PropertyAlertServicesPage.java index 7f49480..6c84503 100644 --- a/src/website/federation/PropertyAlertServicesPage.java +++ b/src/website/federation/PropertyAlertServicesPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +35,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyAlertView; diff --git a/src/website/federation/PropertyCheckPage.java b/src/website/federation/PropertyCheckPage.java index 6e42897..3f725f5 100644 --- a/src/website/federation/PropertyCheckPage.java +++ b/src/website/federation/PropertyCheckPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,10 +33,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyCheckView; diff --git a/src/website/federation/PropertyStatsFederationPage.java b/src/website/federation/PropertyStatsFederationPage.java index 9508101..5c989b1 100644 --- a/src/website/federation/PropertyStatsFederationPage.java +++ b/src/website/federation/PropertyStatsFederationPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +35,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyStatsView; diff --git a/src/website/federation/PropertyStatsOrganizationsPage.java b/src/website/federation/PropertyStatsOrganizationsPage.java index 50f0496..ad14441 100644 --- a/src/website/federation/PropertyStatsOrganizationsPage.java +++ b/src/website/federation/PropertyStatsOrganizationsPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +35,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyStatsView; diff --git a/src/website/federation/PropertyStatsPage.java b/src/website/federation/PropertyStatsPage.java index 0344e5d..411019e 100644 --- a/src/website/federation/PropertyStatsPage.java +++ b/src/website/federation/PropertyStatsPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,10 +36,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyStatsView; diff --git a/src/website/federation/PropertyStatsServicesPage.java b/src/website/federation/PropertyStatsServicesPage.java index ddb42ef..95000a7 100644 --- a/src/website/federation/PropertyStatsServicesPage.java +++ b/src/website/federation/PropertyStatsServicesPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +35,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyStatsView; diff --git a/src/website/federation/ServicesPage.java b/src/website/federation/ServicesPage.java index bd83454..3a07736 100644 --- a/src/website/federation/ServicesPage.java +++ b/src/website/federation/ServicesPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,10 +33,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.ServiceListView; diff --git a/src/website/federation/SocialNetworksPage.java b/src/website/federation/SocialNetworksPage.java index 8cb5615..718f3cf 100644 --- a/src/website/federation/SocialNetworksPage.java +++ b/src/website/federation/SocialNetworksPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,10 +42,6 @@ import fr.devinsy.xidyn.data.DisplayMode; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; diff --git a/src/website/federation/StatsPage.java b/src/website/federation/StatsPage.java index 2f4097f..82ff963 100644 --- a/src/website/federation/StatsPage.java +++ b/src/website/federation/StatsPage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,10 +42,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.ChartViews; diff --git a/src/website/federation/UptimePage.java b/src/website/federation/UptimePage.java index d351756..50a463d 100644 --- a/src/website/federation/UptimePage.java +++ b/src/website/federation/UptimePage.java @@ -20,6 +20,11 @@ package website.federation; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,10 +33,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.UptimeView; diff --git a/src/website/federation/categories/CategoryPage.java b/src/website/federation/categories/CategoryPage.java index b80fe87..6385b4a 100644 --- a/src/website/federation/categories/CategoryPage.java +++ b/src/website/federation/categories/CategoryPage.java @@ -20,6 +20,11 @@ package website.federation.categories; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,10 +41,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.FederationHeaderView; diff --git a/src/website/federation/categories/IndexPage.java b/src/website/federation/categories/IndexPage.java index bcf1c74..dbf1d18 100644 --- a/src/website/federation/categories/IndexPage.java +++ b/src/website/federation/categories/IndexPage.java @@ -20,6 +20,11 @@ package website.federation.categories; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,10 +43,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.FederationHeaderView; diff --git a/src/website/federation/exports/ExportDo.java b/src/website/federation/exports/ExportDo.java index 92b9afb..a42ae5e 100644 --- a/src/website/federation/exports/ExportDo.java +++ b/src/website/federation/exports/ExportDo.java @@ -21,6 +21,11 @@ package website.federation.exports; import java.io.File; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,10 +40,6 @@ import fr.devinsy.statoolinfos.uptime.ServiceUptimes; import fr.devinsy.statoolinfos.uptime.ServiceUptimesFile; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; /** diff --git a/src/website/federation/exports/IndexPage.java b/src/website/federation/exports/IndexPage.java index 7894724..d6f3493 100644 --- a/src/website/federation/exports/IndexPage.java +++ b/src/website/federation/exports/IndexPage.java @@ -20,6 +20,11 @@ package website.federation.exports; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,10 +36,6 @@ import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.FederationHeaderView; diff --git a/src/website/federation/metrics/IndexPage.java b/src/website/federation/metrics/IndexPage.java index 9fd3078..cbacb6d 100644 --- a/src/website/federation/metrics/IndexPage.java +++ b/src/website/federation/metrics/IndexPage.java @@ -20,13 +20,14 @@ package website.federation.metrics; import java.io.IOException; -import fr.devinsy.kiss4web.Redirector; -import fr.devinsy.statoolinfos.core.Organization; -import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + +import fr.devinsy.kiss4web.Redirector; +import fr.devinsy.statoolinfos.core.Organization; +import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import website.charter.ErrorView; /** diff --git a/src/website/federation/metrics/MetricGenericPage.java b/src/website/federation/metrics/MetricGenericPage.java index bbd4c62..f34075e 100644 --- a/src/website/federation/metrics/MetricGenericPage.java +++ b/src/website/federation/metrics/MetricGenericPage.java @@ -20,6 +20,11 @@ package website.federation.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,10 +39,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.FederationHeaderView; diff --git a/src/website/federation/metrics/MetricSpecificPage.java b/src/website/federation/metrics/MetricSpecificPage.java index 163d72c..0677ac9 100644 --- a/src/website/federation/metrics/MetricSpecificPage.java +++ b/src/website/federation/metrics/MetricSpecificPage.java @@ -20,6 +20,11 @@ package website.federation.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,10 +39,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.FederationHeaderView; diff --git a/src/website/federation/metrics/MetricSummaryPage.java b/src/website/federation/metrics/MetricSummaryPage.java index b0d05c3..b8a0e69 100644 --- a/src/website/federation/metrics/MetricSummaryPage.java +++ b/src/website/federation/metrics/MetricSummaryPage.java @@ -20,6 +20,11 @@ package website.federation.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,10 +40,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.FederationHeaderView; diff --git a/src/website/federation/metrics/MetricWebPage.java b/src/website/federation/metrics/MetricWebPage.java index fb9920f..d067469 100644 --- a/src/website/federation/metrics/MetricWebPage.java +++ b/src/website/federation/metrics/MetricWebPage.java @@ -20,6 +20,11 @@ package website.federation.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,10 +39,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.FederationHeaderView; diff --git a/src/website/federation/organizations/IndexPage.java b/src/website/federation/organizations/IndexPage.java index 5e2bd81..9bc8094 100644 --- a/src/website/federation/organizations/IndexPage.java +++ b/src/website/federation/organizations/IndexPage.java @@ -20,6 +20,11 @@ package website.federation.organizations; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,10 +33,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.FederationHeaderView; diff --git a/src/website/federation/organizations/organization/CrawlPage.java b/src/website/federation/organizations/organization/CrawlPage.java index 060ec25..806fffc 100644 --- a/src/website/federation/organizations/organization/CrawlPage.java +++ b/src/website/federation/organizations/organization/CrawlPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,10 +34,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.CrawlView; diff --git a/src/website/federation/organizations/organization/IndexPage.java b/src/website/federation/organizations/organization/IndexPage.java index fa7b1a8..dd2ee53 100644 --- a/src/website/federation/organizations/organization/IndexPage.java +++ b/src/website/federation/organizations/organization/IndexPage.java @@ -20,14 +20,15 @@ package website.federation.organizations.organization; 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.statoolinfosweb.StatoolInfosWeb; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + +import fr.devinsy.kiss4web.Redirector; +import fr.devinsy.kiss4web.dispatcher.annotation.KissServlet; +import fr.devinsy.statoolinfos.core.Organization; +import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import website.charter.ErrorView; /** diff --git a/src/website/federation/organizations/organization/LogoDo.java b/src/website/federation/organizations/organization/LogoDo.java index b96541c..aae4843 100644 --- a/src/website/federation/organizations/organization/LogoDo.java +++ b/src/website/federation/organizations/organization/LogoDo.java @@ -22,6 +22,11 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,10 +38,6 @@ import fr.devinsy.statoolinfos.core.Organization; import fr.devinsy.statoolinfos.crawl.CrawlCache; import fr.devinsy.statoolinfos.util.URLUtils; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; /** * The Class LogoDo. diff --git a/src/website/federation/organizations/organization/PropertiesDo.java b/src/website/federation/organizations/organization/PropertiesDo.java index dd0780a..ef87af7 100644 --- a/src/website/federation/organizations/organization/PropertiesDo.java +++ b/src/website/federation/organizations/organization/PropertiesDo.java @@ -21,6 +21,11 @@ package website.federation.organizations.organization; import java.io.File; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,10 +33,6 @@ import fr.devinsy.kiss4web.dispatcher.KissDispatcherUtils; import fr.devinsy.kiss4web.dispatcher.annotation.KissServlet; import fr.devinsy.statoolinfos.core.Organization; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; /** * The Class PropertiesDo. diff --git a/src/website/federation/organizations/organization/PropertyAlertPage.java b/src/website/federation/organizations/organization/PropertyAlertPage.java index 70055d5..4410823 100644 --- a/src/website/federation/organizations/organization/PropertyAlertPage.java +++ b/src/website/federation/organizations/organization/PropertyAlertPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,10 +34,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyAlertView; diff --git a/src/website/federation/organizations/organization/PropertyCheckPage.java b/src/website/federation/organizations/organization/PropertyCheckPage.java index 1201ce0..c5495a1 100644 --- a/src/website/federation/organizations/organization/PropertyCheckPage.java +++ b/src/website/federation/organizations/organization/PropertyCheckPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,10 +34,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyCheckView; diff --git a/src/website/federation/organizations/organization/ServicesPage.java b/src/website/federation/organizations/organization/ServicesPage.java index 05eb1cc..dde5246 100644 --- a/src/website/federation/organizations/organization/ServicesPage.java +++ b/src/website/federation/organizations/organization/ServicesPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,10 +34,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.ServiceListView; diff --git a/src/website/federation/organizations/organization/StatsPage.java b/src/website/federation/organizations/organization/StatsPage.java index ee7d1d3..38062cd 100644 --- a/src/website/federation/organizations/organization/StatsPage.java +++ b/src/website/federation/organizations/organization/StatsPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,10 +42,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.ChartViews; diff --git a/src/website/federation/organizations/organization/UptimePage.java b/src/website/federation/organizations/organization/UptimePage.java index acace22..44bb8c0 100644 --- a/src/website/federation/organizations/organization/UptimePage.java +++ b/src/website/federation/organizations/organization/UptimePage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,10 +34,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.UptimeView; diff --git a/src/website/federation/organizations/organization/metrics/IndexPage.java b/src/website/federation/organizations/organization/metrics/IndexPage.java index 5b095e8..7f58216 100644 --- a/src/website/federation/organizations/organization/metrics/IndexPage.java +++ b/src/website/federation/organizations/organization/metrics/IndexPage.java @@ -20,14 +20,15 @@ package website.federation.organizations.organization.metrics; 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.statoolinfosweb.StatoolInfosWeb; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + +import fr.devinsy.kiss4web.Redirector; +import fr.devinsy.kiss4web.dispatcher.annotation.KissServlet; +import fr.devinsy.statoolinfos.core.Organization; +import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import website.charter.ErrorView; /** diff --git a/src/website/federation/organizations/organization/metrics/MetricGenericPage.java b/src/website/federation/organizations/organization/metrics/MetricGenericPage.java index 6d59be5..3cb6121 100644 --- a/src/website/federation/organizations/organization/metrics/MetricGenericPage.java +++ b/src/website/federation/organizations/organization/metrics/MetricGenericPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,10 +40,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.organizations.organization.OrganizationHeaderView; diff --git a/src/website/federation/organizations/organization/metrics/MetricSpecificPage.java b/src/website/federation/organizations/organization/metrics/MetricSpecificPage.java index 1e971ac..f242fd8 100644 --- a/src/website/federation/organizations/organization/metrics/MetricSpecificPage.java +++ b/src/website/federation/organizations/organization/metrics/MetricSpecificPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,10 +38,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.organizations.organization.OrganizationHeaderView; diff --git a/src/website/federation/organizations/organization/metrics/MetricSummaryPage.java b/src/website/federation/organizations/organization/metrics/MetricSummaryPage.java index de983f2..e0dad22 100644 --- a/src/website/federation/organizations/organization/metrics/MetricSummaryPage.java +++ b/src/website/federation/organizations/organization/metrics/MetricSummaryPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,10 +40,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.organizations.organization.OrganizationHeaderView; diff --git a/src/website/federation/organizations/organization/metrics/MetricWebPage.java b/src/website/federation/organizations/organization/metrics/MetricWebPage.java index ec206b6..1afc507 100644 --- a/src/website/federation/organizations/organization/metrics/MetricWebPage.java +++ b/src/website/federation/organizations/organization/metrics/MetricWebPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,10 +39,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.organizations.organization.OrganizationHeaderView; diff --git a/src/website/federation/organizations/organization/services/IndexPage.java b/src/website/federation/organizations/organization/services/IndexPage.java index dc8abcf..baf7e64 100644 --- a/src/website/federation/organizations/organization/services/IndexPage.java +++ b/src/website/federation/organizations/organization/services/IndexPage.java @@ -20,15 +20,16 @@ package website.federation.organizations.organization.services; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + 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; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; /** diff --git a/src/website/federation/organizations/organization/services/service/CrawlPage.java b/src/website/federation/organizations/organization/services/service/CrawlPage.java index d45694c..572a328 100644 --- a/src/website/federation/organizations/organization/services/service/CrawlPage.java +++ b/src/website/federation/organizations/organization/services/service/CrawlPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.services.service; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +35,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.CrawlView; diff --git a/src/website/federation/organizations/organization/services/service/IndexPage.java b/src/website/federation/organizations/organization/services/service/IndexPage.java index e50335c..ac3ca71 100644 --- a/src/website/federation/organizations/organization/services/service/IndexPage.java +++ b/src/website/federation/organizations/organization/services/service/IndexPage.java @@ -20,15 +20,16 @@ package website.federation.organizations.organization.services.service; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + 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; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; /** diff --git a/src/website/federation/organizations/organization/services/service/LogoDo.java b/src/website/federation/organizations/organization/services/service/LogoDo.java index 94af1a8..9d4fd55 100644 --- a/src/website/federation/organizations/organization/services/service/LogoDo.java +++ b/src/website/federation/organizations/organization/services/service/LogoDo.java @@ -22,6 +22,11 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,10 +38,6 @@ import fr.devinsy.statoolinfos.core.Service; import fr.devinsy.statoolinfos.crawl.CrawlCache; import fr.devinsy.statoolinfos.util.URLUtils; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; /** * The Class LogoDo. diff --git a/src/website/federation/organizations/organization/services/service/PropertiesDo.java b/src/website/federation/organizations/organization/services/service/PropertiesDo.java index 4d54895..01455a4 100644 --- a/src/website/federation/organizations/organization/services/service/PropertiesDo.java +++ b/src/website/federation/organizations/organization/services/service/PropertiesDo.java @@ -21,6 +21,11 @@ package website.federation.organizations.organization.services.service; import java.io.File; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,10 +33,6 @@ import fr.devinsy.kiss4web.dispatcher.KissDispatcherUtils; import fr.devinsy.kiss4web.dispatcher.annotation.KissServlet; import fr.devinsy.statoolinfos.core.Service; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; /** * The Class PropertiesDo. diff --git a/src/website/federation/organizations/organization/services/service/PropertyAlertPage.java b/src/website/federation/organizations/organization/services/service/PropertyAlertPage.java index ca4633c..994793b 100644 --- a/src/website/federation/organizations/organization/services/service/PropertyAlertPage.java +++ b/src/website/federation/organizations/organization/services/service/PropertyAlertPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.services.service; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +35,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyAlertView; diff --git a/src/website/federation/organizations/organization/services/service/PropertyCheckPage.java b/src/website/federation/organizations/organization/services/service/PropertyCheckPage.java index 4e3cbda..cd03146 100644 --- a/src/website/federation/organizations/organization/services/service/PropertyCheckPage.java +++ b/src/website/federation/organizations/organization/services/service/PropertyCheckPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.services.service; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +35,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.PropertyCheckView; diff --git a/src/website/federation/organizations/organization/services/service/ServicesPage.java b/src/website/federation/organizations/organization/services/service/ServicesPage.java index 9ad634a..9e175b7 100644 --- a/src/website/federation/organizations/organization/services/service/ServicesPage.java +++ b/src/website/federation/organizations/organization/services/service/ServicesPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.services.service; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,10 +36,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.ServiceListView; diff --git a/src/website/federation/organizations/organization/services/service/StatsPage.java b/src/website/federation/organizations/organization/services/service/StatsPage.java index 75a75fb..121b38a 100644 --- a/src/website/federation/organizations/organization/services/service/StatsPage.java +++ b/src/website/federation/organizations/organization/services/service/StatsPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.services.service; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,10 +43,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.ChartViews; diff --git a/src/website/federation/organizations/organization/services/service/UptimePage.java b/src/website/federation/organizations/organization/services/service/UptimePage.java index ef75c5b..bd9e53d 100644 --- a/src/website/federation/organizations/organization/services/service/UptimePage.java +++ b/src/website/federation/organizations/organization/services/service/UptimePage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.services.service; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,10 +36,6 @@ import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfosweb.StatoolInfosWeb; import fr.devinsy.statoolinfosweb.StatoolInfosWebException; import fr.devinsy.statoolinfosweb.util.BreadcrumbTrail; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.views.UptimeView; diff --git a/src/website/federation/organizations/organization/services/service/metrics/IndexPage.java b/src/website/federation/organizations/organization/services/service/metrics/IndexPage.java index 5ee68f2..0c4c87f 100644 --- a/src/website/federation/organizations/organization/services/service/metrics/IndexPage.java +++ b/src/website/federation/organizations/organization/services/service/metrics/IndexPage.java @@ -20,15 +20,16 @@ package website.federation.organizations.organization.services.service.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + 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; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; /** diff --git a/src/website/federation/organizations/organization/services/service/metrics/MetricGenericPage.java b/src/website/federation/organizations/organization/services/service/metrics/MetricGenericPage.java index f993735..c4e4657 100644 --- a/src/website/federation/organizations/organization/services/service/metrics/MetricGenericPage.java +++ b/src/website/federation/organizations/organization/services/service/metrics/MetricGenericPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.services.service.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,10 +41,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.organizations.organization.services.service.ServiceHeaderView; diff --git a/src/website/federation/organizations/organization/services/service/metrics/MetricSpecificPage.java b/src/website/federation/organizations/organization/services/service/metrics/MetricSpecificPage.java index 3a30234..fadb8c1 100644 --- a/src/website/federation/organizations/organization/services/service/metrics/MetricSpecificPage.java +++ b/src/website/federation/organizations/organization/services/service/metrics/MetricSpecificPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.services.service.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,10 +41,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.organizations.organization.services.service.ServiceHeaderView; diff --git a/src/website/federation/organizations/organization/services/service/metrics/MetricSummaryPage.java b/src/website/federation/organizations/organization/services/service/metrics/MetricSummaryPage.java index 1afaf24..dc92bee 100644 --- a/src/website/federation/organizations/organization/services/service/metrics/MetricSummaryPage.java +++ b/src/website/federation/organizations/organization/services/service/metrics/MetricSummaryPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.services.service.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,10 +41,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.organizations.organization.services.service.ServiceHeaderView; diff --git a/src/website/federation/organizations/organization/services/service/metrics/MetricWebPage.java b/src/website/federation/organizations/organization/services/service/metrics/MetricWebPage.java index 9b0df93..31adc4a 100644 --- a/src/website/federation/organizations/organization/services/service/metrics/MetricWebPage.java +++ b/src/website/federation/organizations/organization/services/service/metrics/MetricWebPage.java @@ -20,6 +20,11 @@ package website.federation.organizations.organization.services.service.metrics; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,10 +41,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.organizations.organization.services.service.ServiceHeaderView; diff --git a/src/website/federation/softwares/IndexPage.java b/src/website/federation/softwares/IndexPage.java index 87b517f..8e6c1bd 100644 --- a/src/website/federation/softwares/IndexPage.java +++ b/src/website/federation/softwares/IndexPage.java @@ -20,6 +20,11 @@ package website.federation.softwares; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,10 +43,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.FederationHeaderView; diff --git a/src/website/federation/softwares/SoftwarePage.java b/src/website/federation/softwares/SoftwarePage.java index 3cd8723..1277cbd 100644 --- a/src/website/federation/softwares/SoftwarePage.java +++ b/src/website/federation/softwares/SoftwarePage.java @@ -20,6 +20,11 @@ package website.federation.softwares; import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,10 +41,6 @@ import fr.devinsy.xidyn.XidynException; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; import fr.devinsy.xidyn.utils.XidynUtils; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import website.charter.ErrorView; import website.charter.WebCharterView; import website.federation.FederationHeaderView;