diff --git a/plugin/module-gui/pom.xml b/plugin/module-gui/pom.xml index 93c3aad..950b546 100644 --- a/plugin/module-gui/pom.xml +++ b/plugin/module-gui/pom.xml @@ -2,7 +2,7 @@ 4.0.0 de.intranda.goobi.plugins.dashboard extended-gui - 1.0.0 + 23.04.1 plugin_intranda_dashboard_extended-GUI /opt/digiverso/goobi/plugins/GUI/ @@ -10,7 +10,7 @@ de.intranda.goobi.plugins.dashboard extended - 1.0.0 + 23.04.1 ${jar.name} diff --git a/plugin/module-main/pom.xml b/plugin/module-main/pom.xml index 454428a..799f06e 100644 --- a/plugin/module-main/pom.xml +++ b/plugin/module-main/pom.xml @@ -2,7 +2,7 @@ 4.0.0 de.intranda.goobi.plugins.dashboard extended-main - 1.0.0 + 23.04.1 plugin_intranda_dashboard_extended /opt/digiverso/goobi/plugins/dashboard/ @@ -10,7 +10,7 @@ de.intranda.goobi.plugins.dashboard extended - 1.0.0 + 23.04.1 ${jar.name} diff --git a/plugin/pom.xml b/plugin/pom.xml index faa627e..79f1a31 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -2,10 +2,10 @@ 4.0.0 de.intranda.goobi.plugins.dashboard extended - 1.0.0 + 23.04.1 pom - 23.03.2 + 23.04.1 UTF-8 diff --git a/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperItm.java b/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperItm.java index aee0741..34e8ca3 100644 --- a/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperItm.java +++ b/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperItm.java @@ -3,7 +3,7 @@ /** * This file is part of a plugin for the Goobi Application - a Workflow tool for the support of mass digitization. * - * Visit the websites for more information. + * Visit the websites for more information. * - https://goobi.io * - https://www.intranda.com * - https://github.com/intranda/goobi @@ -36,7 +36,7 @@ import de.intranda.digiverso.model.itm.DashQueuesObj; import de.intranda.digiverso.model.itm.IJob; import de.intranda.digiverso.model.itm.JobImpl; -import de.sub.goobi.helper.HttpClientHelper; +import io.goobi.workflow.api.connection.HttpUtils; public class DashboardHelperItm { @@ -51,24 +51,24 @@ public List getItmPlugins() throws MalformedURLException { Gson gson = new Gson(); // read all plugin types of the itm - String response = HttpClientHelper.getStringFromUrl(basisUrl + "action=getPlugins"); + String response = HttpUtils.getStringFromUrl(basisUrl + "action=getPlugins"); List itmPluginList = gson.fromJson(response, new TypeToken>() { }.getType()); if (itmPluginList != null) { // read all job queues for this plugin type for (DashQueuesObj dqo : itmPluginList) { - response = HttpClientHelper.getStringFromUrl(basisUrl + "action=getJobs&jobtype=" + dqo.getStrInt().getStr() + "&status=DONE"); + response = HttpUtils.getStringFromUrl(basisUrl + "action=getJobs&jobtype=" + dqo.getStrInt().getStr() + "&status=DONE"); List jobsDone = gson.fromJson(response, new TypeToken>() { }.getType()); dqo.setListDone(jobsDone); - response = HttpClientHelper.getStringFromUrl(basisUrl + "action=getJobs&jobtype=" + dqo.getStrInt().getStr() + "&status=ERROR"); + response = HttpUtils.getStringFromUrl(basisUrl + "action=getJobs&jobtype=" + dqo.getStrInt().getStr() + "&status=ERROR"); List jobsError = gson.fromJson(response, new TypeToken>() { }.getType()); dqo.setListError(jobsError); - response = HttpClientHelper.getStringFromUrl(basisUrl + "action=getJobs&jobtype=" + dqo.getStrInt().getStr() + "&status=PROCESSING"); + response = HttpUtils.getStringFromUrl(basisUrl + "action=getJobs&jobtype=" + dqo.getStrInt().getStr() + "&status=PROCESSING"); List jobsProcessing = gson.fromJson(response, new TypeToken>() { }.getType()); dqo.setListProcessing(jobsProcessing); diff --git a/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperNagios.java b/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperNagios.java index 15f21e5..b72ad7f 100644 --- a/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperNagios.java +++ b/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperNagios.java @@ -3,7 +3,7 @@ /** * This file is part of a plugin for the Goobi Application - a Workflow tool for the support of mass digitization. * - * Visit the websites for more information. + * Visit the websites for more information. * - https://goobi.io * - https://www.intranda.com * - https://github.com/intranda/goobi @@ -34,7 +34,7 @@ import de.intranda.digiverso.model.nagios.Host; import de.intranda.digiverso.model.nagios.Nagios; -import de.sub.goobi.helper.HttpClientHelper; +import io.goobi.workflow.api.connection.HttpUtils; public class DashboardHelperNagios { @@ -73,12 +73,12 @@ public List getHosts() { String serverPassword = config.getString("nagios-password", "password"); // run through all configured hosts - hosts = new ArrayList(); + hosts = new ArrayList<>(); int numberOfHosts = config.getMaxIndex("nagios-host"); for (int i = 0; i <= numberOfHosts; i++) { String url = config.getString("nagios-host(" + i + ")"); String serverURL = "http://monitoring.intranda.com/icinga/cgi-bin/status.cgi?host=" + url + "&jsonoutput"; - String json = HttpClientHelper.getStringFromUrl(serverURL, serverLogin, serverPassword, "monitoring.intranda.com", "80"); + String json = HttpUtils.getStringFromUrl(serverURL, serverLogin, serverPassword, "monitoring.intranda.com", "80"); Gson gson = new Gson(); Host host = new Host(url); host.setNagios(gson.fromJson(json, Nagios.class)); diff --git a/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperRss.java b/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperRss.java index 9ba75b5..b466b5d 100644 --- a/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperRss.java +++ b/plugin/src/de/intranda/digiverso/model/helper/DashboardHelperRss.java @@ -38,7 +38,7 @@ import com.rometools.rome.io.SyndFeedInput; import de.intranda.digiverso.model.rss.RssEntry; -import de.sub.goobi.helper.HttpClientHelper; +import io.goobi.workflow.api.connection.HttpUtils; public class DashboardHelperRss { @@ -55,7 +55,7 @@ public List getFeed() { try { SyndFeedInput input = new SyndFeedInput(); - SyndFeed feed = input.build(new StringReader(HttpClientHelper.getStringFromUrl(getFeedUrl()))); + SyndFeed feed = input.build(new StringReader(HttpUtils.getStringFromUrl(getFeedUrl()))); @SuppressWarnings("unchecked") List feedList = feed.getEntries();