OP#18070 Removed MongoDB entirely. Cahcing is now also based on JPA and H2. We...

OP#18070 Removed MongoDB entirely. Cahcing is now also based on JPA and H2. We don't want to burden "standalone" GEMIMEG users to having to install a MOngoDB instance locally.

gemimeg-backend/pom.xml

@@ -62,7 +62,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-data-mongodb</artifactId>
+      <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
     <dependency>
       <groupId>org.mapstruct</groupId>
@@ -197,12 +197,6 @@
       <artifactId>xmlunit-matchers</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>de.flapdoodle.embed</groupId>
-      <artifactId>de.flapdoodle.embed.mongo.spring3x</artifactId>
-      <version>${de.flapdoodle.embed.mongo.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

gemimeg-backend/src/main/java/de/ptb/common/dcc/controller/CacheController.java

@@ -43,7 +43,7 @@ public class CacheController {
 
   @Operation(description = "Gets the cached item by its ID.")
   @GetMapping(path = BASE_PATH_ID, produces = APPLICATION_JSON_VALUE)
-  public ReadResponseDto findById(@PathVariable(name = ID_PARAM_NAME) String id) {
+  public ReadResponseDto findById(@PathVariable(name = ID_PARAM_NAME) Long id) {
     return service.findById(id)
         .orElseThrow(() -> new NotFoundStatus("Cached file with ID " + id + " could not be found."));
   }

gemimeg-backend/src/main/java/de/ptb/common/dcc/data/CacheItemRepository.java

 package de.ptb.common.dcc.data;
 
 import de.ptb.common.dcc.model.CacheItem;
-import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.Date;
 import java.util.List;
 
 @Repository
-public interface CacheItemRepository extends MongoRepository<CacheItem, String> {
+public interface CacheItemRepository extends JpaRepository<CacheItem, Long> {
 
   List<CacheItem> findByCreatedAtLessThan(Date createdAt);
 }

gemimeg-backend/src/main/java/de/ptb/common/dcc/data/CalibrationCertificateRepository.java

 package de.ptb.common.dcc.data;
 
 import de.ptb.common.dcc.model.CalibrationCertificate;
-import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.Date;
 import java.util.List;
 
 @Repository
-public interface CalibrationCertificateRepository extends MongoRepository<CalibrationCertificate, String> {
+public interface CalibrationCertificateRepository extends JpaRepository<CalibrationCertificate, String> {
 
   List<CalibrationCertificate> findByCreatedAtLessThan(Date createdAt);
 }

gemimeg-backend/src/main/java/de/ptb/common/dcc/model/CacheItem.java

 package de.ptb.common.dcc.model;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import lombok.Data;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Date;
 
 @Data
-@Document
+@Entity
+@Table(name = "CACHE")
 public class CacheItem {
 
   @Id
-  private String id;
+  @Column(name = "ID", nullable = false, unique = true)
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "cached_item_seq_gen")
+  @SequenceGenerator(name = "cached_item_seq_gen", sequenceName = "cached_item_seq")
+  private Long id;
+
+  @Column(name = "CALLBACK_URL")
   private String callbackUrl;
+
+  @Column(name = "FILE_NAME", nullable = false)
   private String fileName;
+
+  @Column(name = "MIME_TYPE", nullable = false)
   private String mimeType;
+
+  @Lob
+  @Column(name = "DATA", nullable = false)
   private byte[] fileContent;
+
+  @Column(name = "CREATED_AT", nullable = false)
   private Date createdAt;
 }

gemimeg-backend/src/main/java/de/ptb/common/dcc/model/CalibrationCertificate.java

 package de.ptb.common.dcc.model;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Date;
 
 @Data
-@Document
+@Entity
+@Table(name = "DCC")
 public class CalibrationCertificate {
 
   @Id
+  @Column(name = "ID", nullable = false, unique = true)
   private String id;
+
+  @Column(name = "DCC_JSON", nullable = false)
   private String dccJson;
+
+  @Column(name = "CREATED_AT", nullable = false)
   private Date createdAt;
 }

gemimeg-backend/src/main/java/de/ptb/common/dcc/service/CacheService.java

@@ -38,12 +38,12 @@ public class CacheService {
     cacheItem.setMimeType(request.getMimeType());
     cacheItem = repository.save(cacheItem);
     StoreResponseDto response = new StoreResponseDto();
-    response.setRetrievalUrl(BASE_PATH_ID.replace(ID_PLACEHOLDER, cacheItem.getId()));
+    response.setRetrievalUrl(BASE_PATH_ID.replace(ID_PLACEHOLDER, cacheItem.getId().toString()));
     return response;
   }
 
   @Nonnull
-  public Optional<ReadResponseDto> findById(@Nonnull String id) {
+  public Optional<ReadResponseDto> findById(@Nonnull Long id) {
     Optional<CacheItem> cacheItem = repository.findById(id);
     if (cacheItem.isPresent()) {
       ReadResponseDto readResponse = new ReadResponseDto();

gemimeg-backend/src/main/resources/application.yml

@@ -13,18 +13,26 @@ spring:
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher
+  datasource:
+    url: jdbc:h2:file:./${spring.application.name}
+    username: sa
+    password: password
+    driverClassName: org.h2.Driver
+  jpa:
+    database: default
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.H2Dialect
+    open-in-view: true
+  h2:
+    console.enabled: true
+    console:
+      path: /h2-console
+      settings.trace: false
+      settings.web-allow-others: false
   main:
     lazy-initialization: true
     allow-bean-definition-overriding: true
-  data:
-    mongodb:
-      database: ${spring.application.name}
-      port: 27017
-de:
-  flapdoodle:
-    mongodb:
-      embedded:
-        version: 6.0.4
 common:
   security:
     enabled: ${server.ssl.enabled}

gemimeg-backend/src/test/java/de/ptb/common/dcc/data/CacheItemRepositoryTest.java

@@ -7,7 +7,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
-import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
@@ -15,7 +15,7 @@ import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@DataMongoTest
+@DataJpaTest
 class CacheItemRepositoryTest {
 
   private final static String XML = """
@@ -31,9 +31,6 @@ class CacheItemRepositoryTest {
   @Autowired
   private CacheConfiguration configuration;
 
-  @Autowired
-  private MongoTemplate mongoTemplate;
-
   private final long currentTimeMillis = System.currentTimeMillis();
 
   @BeforeEach
@@ -44,13 +41,13 @@ class CacheItemRepositoryTest {
     expired.setFileName("FDH_expired.xml");
     expired.setFileContent(XML.getBytes(StandardCharsets.UTF_8));
     expired.setCreatedAt(new Date(expiredTimeMillis));
-    mongoTemplate.insert(expired);
     CacheItem notExpired = new CacheItem();
     notExpired.setMimeType("application/xml");
     notExpired.setFileName("FDH_notExpired.xml");
     notExpired.setFileContent(XML.getBytes(StandardCharsets.UTF_8));
     notExpired.setCreatedAt(new Date(currentTimeMillis));
-    mongoTemplate.insert(notExpired);
+    repository.saveAll(List.of(expired, notExpired));
+    assertEquals(2, repository.count());
   }
 
   @Test
@@ -62,6 +59,7 @@ class CacheItemRepositoryTest {
 
   @AfterEach
   void tearDown() {
-    mongoTemplate.getDb().drop();
+    repository.deleteAll();
+    assertEquals(0, repository.count());
   }
 }
\ No newline at end of file

gemimeg-backend/src/test/java/de/ptb/common/dcc/data/CalibrationCertificateRepositoryTest.java

@@ -7,13 +7,14 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 
 import java.util.Date;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@DataMongoTest
+@DataJpaTest
 class CalibrationCertificateRepositoryTest {
 
   @Autowired

gemimeg-backend/src/test/java/de/ptb/common/dcc/service/CacheServiceTest.java

@@ -8,6 +8,7 @@ import de.ptb.common.dcc.config.CacheConfiguration;
 import de.ptb.common.dcc.config.VersionConfiguration;
 import de.ptb.common.dcc.data.CacheItemRepository;
 import de.ptb.common.dcc.model.CacheItem;
+import org.apache.commons.lang3.RandomUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +18,6 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Optional;
-import java.util.UUID;
 
 import static de.ptb.common.dcc.api.v1.CacheControllerRoutes.BASE_PATH_ID;
 import static de.ptb.common.dcc.api.v1.CacheControllerRoutes.ID_PLACEHOLDER;
@@ -49,13 +49,15 @@ class CacheServiceTest {
   private CacheService service;
   private CacheItem cacheItem;
 
+  private final Long cacheItemId = RandomUtils.nextLong();
+
   @BeforeEach
   void setUp() {
     when(versionConfiguration.getArtifactId()).thenReturn("cache-service-test");
     when(versionConfiguration.getVersion()).thenReturn("1.0.0");
     when(configuration.getPersistLifespan()).thenReturn(600);
     cacheItem = new CacheItem();
-    cacheItem.setId(UUID.randomUUID().toString());
+    cacheItem.setId(cacheItemId);
     cacheItem.setMimeType("text/plain");
     cacheItem.setFileName("test.txt");
     cacheItem.setCallbackUrl("http://test/callbackAction");
@@ -73,7 +75,7 @@ class CacheServiceTest {
     when(repository.save(any())).thenReturn(cacheItem);
     StoreResponseDto actual = service.store(request);
     assertNotNull(actual);
-    assertEquals(BASE_PATH_ID.replace(ID_PLACEHOLDER, cacheItem.getId()), actual.getRetrievalUrl());
+    assertEquals(BASE_PATH_ID.replace(ID_PLACEHOLDER, cacheItem.getId().toString()), actual.getRetrievalUrl());
   }
 
   @Test
@@ -91,11 +93,11 @@ class CacheServiceTest {
 
   @Test
   void findById_NotFound() {
-    when(repository.findById("missingId")).thenReturn(Optional.empty());
-    Optional<ReadResponseDto> actual = service.findById("missingId");
+    when(repository.findById(cacheItemId + 1)).thenReturn(Optional.empty());
+    Optional<ReadResponseDto> actual = service.findById(cacheItemId + 1);
     assertNotNull(actual);
     assertFalse(actual.isPresent());
-    verify(repository).findById("missingId");
+    verify(repository).findById(cacheItemId + 1);
     verifyNoMoreInteractions(repository);
   }
 }
\ No newline at end of file

gemimeg-backend/src/test/resources/application.yml

@@ -16,18 +16,26 @@ spring:
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher
+  datasource:
+    url: jdbc:h2:file:./${spring.application.name}-test
+    username: sa
+    password: password
+    driverClassName: org.h2.Driver
+  jpa:
+    database: default
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.H2Dialect
+    open-in-view: true
+  h2:
+    console.enabled: true
+    console:
+      path: /h2-console
+      settings.trace: false
+      settings.web-allow-others: false
   main:
     lazy-initialization: true
     allow-bean-definition-overriding: true
-  data:
-    mongodb:
-      database: ${spring.application.name}
-      port: 27017
-de:
-  flapdoodle:
-    mongodb:
-      embedded:
-        version: 6.0.4
 common:
   security:
     enabled: ${server.ssl.enabled}

pom.xml

@@ -23,7 +23,6 @@
   <properties>
     <dcc-namespace-uri>https://ptb.de/dcc</dcc-namespace-uri>
     <byte-buddy.version>1.15.1</byte-buddy.version>
-    <de.flapdoodle.embed.mongo.version>4.18.0</de.flapdoodle.embed.mongo.version>
   </properties>
 
   <!-- SCM settings -->