sabi-144 Migrate Testframework from junit4 to junit5

- Migrated Server Module (fixed junit, hazelcast serialization problem)
StefanSchubert · Nov 25, 2023 · 5268739 · 5268739
1 parent 51f814b
commit 5268739
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/sabi-server/pom.xml b/sabi-server/pom.xml
@@ -335,14 +335,18 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
                 <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit-platform</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>org.springframework</groupId>
                         <artifactId>spring-instrument</artifactId>
                         <version>${spring.instrument.version}</version>
                     </dependency>
                 </dependencies>
                 <configuration>
-                    <test>de.bluewhale.sabi.MasterTestSuite</test>
                     <!--suppress UnresolvedMavenProperty -->
                     <argLine>
                         -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.instrument.version}/spring-instrument-${spring.instrument.version}.jar

diff --git a/sabi-server/src/main/java/de/bluewhale/sabi/services/MeasurementServiceImpl.java b/sabi-server/src/main/java/de/bluewhale/sabi/services/MeasurementServiceImpl.java
@@ -18,6 +18,7 @@
 import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -91,6 +92,7 @@ public List<MeasurementTo> listMeasurementsFilteredBy(Long pTankID, Integer pUni
 
 
     @Override
+    @Cacheable("unitsCache")
     public @NotNull List<UnitTo> listAllMeasurementUnits() {
         List<UnitTo> unitToList = Collections.emptyList();
         List<UnitEntity> unitEntityList = unitRepository.findAll();