Bev 718 test i bitmagasinets referencekode

bitrepository-alarm-service/pom.xml

@@ -14,41 +14,29 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-web-api</artifactId>
-      <version>${javaee.web.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>${javax.servlet.version}</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
-      <version>${cxf.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
-      <version>${cxf.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>${jackson.version}</version>
+      <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+      <artifactId>jackson-jakarta-rs-json-provider</artifactId>
     </dependency>
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
       <artifactId>jakarta.ws.rs-api</artifactId>
-      <version>${jakarta.ws.rs.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bitrepository.reference</groupId>
@@ -58,7 +46,6 @@
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>javax.mail-api</artifactId>
-      <version>1.6.2</version>
     </dependency>
     <dependency>
       <groupId>org.bitrepository.reference</groupId>
@@ -83,7 +70,16 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-server</artifactId>
-      <version>${artemis.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers-postgresql</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -94,11 +90,6 @@
       <plugin>
         <groupId>io.qameta.allure</groupId>
         <artifactId>allure-maven</artifactId>
-        <version>2.12.0</version>
-        <configuration>
-          <resultsDirectory>${project.build.directory}/allure-results</resultsDirectory>
-          <reportDirectory>${project.build.directory}/allure-report</reportDirectory>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>

bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/AlarmServiceInput.java

@@ -21,7 +21,7 @@
  */
 package org.bitrepository.alarm.alarmservice;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 public class AlarmServiceInput {

bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/AlarmServiceRestApplication.java

@@ -1,8 +1,8 @@
 package org.bitrepository.alarm.alarmservice;
 
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 
-import javax.ws.rs.core.Application;
+import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
+import jakarta.ws.rs.core.Application;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;

bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/RestAlarmService.java

@@ -30,13 +30,13 @@
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.common.utils.CalendarUtils;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.util.ArrayList;

bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java

@@ -26,8 +26,8 @@
 import org.bitrepository.common.utils.CalendarUtils;
 import org.bitrepository.common.utils.TimeUtils;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 /**
  * Class to format alarms for web display

bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractor.java

@@ -206,12 +206,12 @@ private String createRestriction() {
             res.append(ALARM_CODE + " = ?");
         }
 
-        if (model.getStartDate() != null) {
+        if (model.getStart() != null) {
             nextArgument(res);
             res.append(ALARM_DATE + " >= ?");
         }
 
-        if (model.getEndDate() != null) {
+        if (model.getEnd() != null) {
             nextArgument(res);
             res.append(ALARM_DATE + " <= ?");
         }
@@ -258,12 +258,12 @@ private Object[] extractArgumentsFromModel() {
             res.add(model.getAlarmCode().toString());
         }
 
-        if (model.getStartDate() != null) {
-            res.add(model.getStartDate().getTime());
+        if (model.getStart() != null) {
+            res.add(model.getStart().toEpochMilli());
         }
 
-        if (model.getEndDate() != null) {
-            res.add(model.getEndDate().getTime());
+        if (model.getEnd() != null) {
+            res.add(model.getEnd().toEpochMilli());
         }
 
         if (model.getFileID() != null) {

bitrepository-alarm-service/src/main/webapp/WEB-INF/web.xml

@@ -32,7 +32,7 @@
     <servlet-name>Bitrepository-alarmservice</servlet-name>
     <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
     <init-param>
-      <param-name>javax.ws.rs.Application</param-name>
+      <param-name>jakarta.ws.rs.Application</param-name>
       <param-value>org.bitrepository.alarm.alarmservice.AlarmServiceRestApplication</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>

bitrepository-alarm-service/src/test/java/org/bitrepository/alarm/handler/AlarmHandlerTest.java → bitrepository-alarm-service/src/test/java/org/bitrepository/alarm/handler/AlarmHandlerIT.java

@@ -36,7 +36,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @ExtendWith(SuiteInfoParameterResolver.class)
-public class AlarmHandlerTest extends IntegrationTest {
+public class AlarmHandlerIT extends IntegrationTest {
     @Test
     @Tag("regressiontest")
     public void alarmMediatorTest() throws Exception {

bitrepository-alarm-service/src/test/java/org/bitrepository/alarm/store/AlarmDatabaseTest.java

@@ -26,19 +26,19 @@
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.TestSettingsProvider;
 import org.bitrepository.common.utils.CalendarUtils;
-import org.bitrepository.common.utils.FileUtils;
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseUtils;
-import org.bitrepository.service.database.DerbyDatabaseDestroyer;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
+import org.testcontainers.containers.BindMode;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.postgresql.PostgreSQLContainer;
 
-import java.io.File;
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -50,7 +50,7 @@
 /**
  * Sees if alarms are correctly stored in the database.
  */
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Testcontainers
 class AlarmDatabaseTest {
     /**
      * The settings for the tests. Should be instantiated in the setup.
@@ -62,19 +62,23 @@ class AlarmDatabaseTest {
     String collection1 = "collection1";
     String collection2 = "collection2";
     String DATABASE_NAME = "alarmservicedb";
-    String DATABASE_DIRECTORY = "test-data";
-    String DATABASE_URL = "jdbc:derby:" + DATABASE_DIRECTORY + "/" + DATABASE_NAME;
-    File dbDir = null;
 
-    @BeforeAll
+    @Container
+    PostgreSQLContainer postgreSQLContainer =
+            new PostgreSQLContainer("postgres:18-alpine")
+                    .withDatabaseName(DATABASE_NAME)
+                    .withClasspathResourceMapping("sql/postgres/alarmServiceDBCreation.sql",
+                                                  "/docker-entrypoint-initdb.d/init.sql",
+                                                  BindMode.READ_ONLY);
+
+    @BeforeEach
     void setup() {
         settings = TestSettingsProvider.reloadSettings("AlarmDatabaseUnderTest");
-
-        DerbyDatabaseDestroyer.deleteDatabase(
-                settings.getReferenceSettings().getAlarmServiceSettings().getAlarmServiceDatabase());
-
-        AlarmDatabaseCreator integrityDatabaseCreator = new AlarmDatabaseCreator();
-        integrityDatabaseCreator.createAlarmDatabase(settings, null);
+        var alarmServiceDatabaseSettings = settings.getReferenceSettings().getAlarmServiceSettings().getAlarmServiceDatabase();
+        alarmServiceDatabaseSettings.setDatabaseURL(postgreSQLContainer.getJdbcUrl());
+        alarmServiceDatabaseSettings.setUsername(postgreSQLContainer.getUsername());
+        alarmServiceDatabaseSettings.setPassword(postgreSQLContainer.getPassword());
+        alarmServiceDatabaseSettings.setDriverClass(postgreSQLContainer.getDriverClassName());
     }
 
     @AfterEach
@@ -86,11 +90,8 @@ void cleanupDatabase() {
     }
 
     @AfterAll
-    void shutdown() {
+    static void shutdown() {
         addStep("Cleanup after test.", "Should remove directory with test material.");
-        if (dbDir != null) {
-            FileUtils.delete(dbDir);
-        }
     }
 
     @Test

bitrepository-audit-trail-service/pom.xml

@@ -25,38 +25,26 @@
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
-      <version>${cxf.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
-      <version>${cxf.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>${jackson.version}</version>
+      <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+      <artifactId>jackson-jakarta-rs-json-provider</artifactId>
     </dependency>
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
       <artifactId>jakarta.ws.rs-api</artifactId>
-      <version>${jakarta.ws.rs.version}</version>
     </dependency>
     <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-web-api</artifactId>
-      <version>${javaee.web.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>${javax.servlet.version}</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -82,21 +70,25 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-server</artifactId>
-      <version>${artemis.version}</version>
       <scope>test</scope>
     </dependency>
+      <dependency>
+          <groupId>org.testcontainers</groupId>
+          <artifactId>testcontainers-junit-jupiter</artifactId>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.testcontainers</groupId>
+          <artifactId>testcontainers-postgresql</artifactId>
+          <scope>test</scope>
+      </dependency>
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
         <groupId>io.qameta.allure</groupId>
         <artifactId>allure-maven</artifactId>
-        <version>2.12.0</version>
-        <configuration>
-          <resultsDirectory>${project.basedir}/allure-results</resultsDirectory>
-          <reportDirectory>${project.basedir}/allure-report</reportDirectory>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>

bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/AuditTrailServiceRestApplication.java

@@ -1,8 +1,8 @@
 package org.bitrepository.audittrails.webservice;
 
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 
-import javax.ws.rs.core.Application;
+import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
+import jakarta.ws.rs.core.Application;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;

bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/CollectorInfo.java

@@ -21,7 +21,7 @@
  */
 package org.bitrepository.audittrails.webservice;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 public class CollectorInfo {

bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/PreservationInfo.java

@@ -1,6 +1,6 @@
 package org.bitrepository.audittrails.webservice;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 public class PreservationInfo {