From 28cf46778ff1c6da85d2e424125af7365c6989e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20S=C3=B8by?= Date: Wed, 1 Jun 2022 10:31:38 +0200 Subject: [PATCH 01/17] Cleaned up the WebApp integrity-service code. --- .../src/main/webapp/integrity-service.html | 203 +++++++++--------- 1 file changed, 102 insertions(+), 101 deletions(-) diff --git a/bitrepository-webclient/src/main/webapp/integrity-service.html b/bitrepository-webclient/src/main/webapp/integrity-service.html index 3d20476af..c3bf41407 100644 --- a/bitrepository-webclient/src/main/webapp/integrity-service.html +++ b/bitrepository-webclient/src/main/webapp/integrity-service.html @@ -20,17 +20,17 @@ #L% --> - + Bitrepository integrity service - +
-
+

Integrity service

@@ -45,7 +45,7 @@

Integrity service
-
+
Workflows status @@ -60,14 +60,14 @@

Integrity service

-
+
-
+
-
+
Integrity status @@ -78,6 +78,7 @@

Integrity service

Pillar ID + Hostname Total number of files Number of missing files Number of missing checksums @@ -99,10 +100,10 @@

Modal header

Loading

-
-
+
+
-
+
@@ -113,38 +114,37 @@

Modal header

From 13e34419f5121737beac4c7edd652744b76c5983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20S=C3=B8by?= Date: Wed, 1 Jun 2022 10:32:34 +0200 Subject: [PATCH 02/17] Cleaned some additional code. --- .../java/org/bitrepository/BasicClient.java | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/bitrepository-webclient/src/main/java/org/bitrepository/BasicClient.java b/bitrepository-webclient/src/main/java/org/bitrepository/BasicClient.java index 673511aef..c3b53e460 100644 --- a/bitrepository-webclient/src/main/java/org/bitrepository/BasicClient.java +++ b/bitrepository-webclient/src/main/java/org/bitrepository/BasicClient.java @@ -5,16 +5,16 @@ * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 2.1 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 2.1 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * . * #L% @@ -31,45 +31,46 @@ import java.util.List; public class BasicClient { - private Settings settings; + private final Settings settings; private final Logger log = LoggerFactory.getLogger(getClass()); + public BasicClient(Settings settings) { log.debug("---- Basic client instantiating ----"); this.settings = settings; log.debug("---- Basic client instantiated ----"); } - + public List getCollectionIDs() { List collections = new ArrayList<>(); - for(Collection collection : settings.getRepositorySettings().getCollections().getCollection()) { + for (Collection collection : settings.getRepositorySettings().getCollections().getCollection()) { collections.add(collection.getID()); } return collections; } public void shutdown() { - // currently nothing to do here + // Currently, there's nothing to do here } public String getSettingsSummary() { StringBuilder sb = new StringBuilder(); RepositorySettings repositorySettings = settings.getRepositorySettings(); sb.append("Collections:
"); - for (Collection collection: settings.getCollections()) { - sb.append("ID:" + collection.getID()); + for (Collection collection : settings.getCollections()) { + sb.append("ID:").append(collection.getID()); sb.append("Pillars:"); - for (String pillarID: collection.getPillarIDs().getPillarID()) { - sb.append("  " + pillarID); + for (String pillarID : collection.getPillarIDs().getPillarID()) { + sb.append("  ").append(pillarID); } } sb.append("
"); sb.append(""); - sb.append("Messagebus URL:
    "); - sb.append(repositorySettings.getProtocolSettings().getMessageBusConfiguration().getURL() + "
"); + sb.append("Messagebus URL:
    "); + sb.append(repositorySettings.getProtocolSettings().getMessageBusConfiguration().getURL()).append("
"); return sb.toString(); } - + public Settings getSettings() { return settings; } From b92f6031c76e575614c5c898aa1c2d6b9ce0fda2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20S=C3=B8by?= Date: Fri, 3 Jun 2022 15:17:50 +0200 Subject: [PATCH 03/17] Added hostname to ReferenceSettings.PillarSettings and updated the related ReferenceSettings tests. --- .../examples/settings/ReferenceSettings.xml | 5 + .../common/settings/SettingsLoaderTest.java | 28 ++--- .../bitrepository-devel/ReferenceSettings.xml | 1 + .../main/resources/xsd/ReferenceSettings.xsd | 106 ++++++++++-------- .../java/org/bitrepository/BasicClient.java | 5 + .../src/main/webapp/integrity-service.html | 6 +- 6 files changed, 86 insertions(+), 65 deletions(-) diff --git a/bitrepository-core/src/main/resources/examples/settings/ReferenceSettings.xml b/bitrepository-core/src/main/resources/examples/settings/ReferenceSettings.xml index 6e2f5111d..01d84a5cc 100644 --- a/bitrepository-core/src/main/resources/examples/settings/ReferenceSettings.xml +++ b/bitrepository-core/src/main/resources/examples/settings/ReferenceSettings.xml @@ -77,6 +77,11 @@ ID of the pillar --> test-pillar + + + test@test.dk test-pillar - - - test@test.dk - - Bitrepository integrity service - - - + + Bitrepository integrity service + + + - -
-
-
-
-

Integrity service

- + +
+
+
+
+

Integrity service

+ Integrity information @@ -42,79 +42,79 @@

Integrity service

Change collection: - -
-
-
- Workflows status - - - - - - - - - - - -
Workflow nameNext runLast runIntervalCurrent state
-
-
-
- - -
-
-
-
- + +
+
+
+ Workflows status + + + + + + + + + + + +
Workflow nameNext runLast runIntervalCurrent state
+
+
+
+ + +
+
+
+
+ Integrity status - - - - - - - - - - - - - - - -
Pillar IDHostnamePillar TypeTotal number of filesNumber of missing filesNumber of missing checksumsNumber of obsolete checksumsNumber of inconsistent checksums
-
+ + + + + + + + + + + + + + + +
Pillar IDHostnamePillar TypeTotal number of filesNumber of missing filesNumber of missing checksumsNumber of obsolete checksumsNumber of inconsistent checksums
+
-