migrates to Junit 5 and Java 8 date/time API

Author: tjuerge

pom.xml

@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.2.RELEASE</version>
+		<version>2.7.18</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -55,7 +55,7 @@
 	</organization>
 
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -89,11 +89,23 @@
 			<optional>true</optional>
 		</dependency>
 
+		<!-- Jackson JSR310 support -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+		</dependency>
+
 		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.junit.vintage</groupId>
+					<artifactId>junit-vintage-engine</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>

src/main/java/org/vaulttec/gitlab/enforcer/EnforcerEventPublisher.java

@@ -29,17 +29,18 @@
 @Service
 public class EnforcerEventPublisher {
   private static final Logger AUDIT_LOG = LoggerFactory.getLogger("AUDIT_LOG");
-  private static final ObjectMapper MAPPER = new ObjectMapper();
-
+  
   private final AuditEventRepository eventRepository;
+  private final ObjectMapper objectMapper;
 
-  public EnforcerEventPublisher(AuditEventRepository eventRepository) {
+  public EnforcerEventPublisher(AuditEventRepository eventRepository, ObjectMapper objectMapper) {
     this.eventRepository = eventRepository;
+    this.objectMapper = objectMapper;
   }
 
   public void publishEvent(AuditEvent event) {
     try {
-      AUDIT_LOG.trace(MAPPER.writeValueAsString(event));
+      AUDIT_LOG.trace(objectMapper.writeValueAsString(event));
     } catch (JsonProcessingException e) {
       AUDIT_LOG.error("Error serializing audit event: {}", event, e);
     }

src/main/java/org/vaulttec/gitlab/enforcer/config/JacksonConfig.java

@@ -0,0 +1,42 @@
+/*
+ * GitLab Enforcer
+ * Copyright (c) 2025 Torsten Juergeleit
+ * mailto:torsten AT vaulttec DOT org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.vaulttec.gitlab.enforcer.config;
+
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+/**
+ * Jackson configuration to ensure proper handling of Java 8 date/time types.
+ */
+@Configuration
+public class JacksonConfig {
+
+    /**
+     * Customizes the application-wide ObjectMapper to register the JavaTimeModule
+     * for proper handling of Java 8 date/time types like Instant.
+     * 
+     * @return Jackson2ObjectMapperBuilderCustomizer to register JavaTimeModule
+     */
+    @Bean
+    public Jackson2ObjectMapperBuilderCustomizer jacksonCustomizer() {
+        return builder -> builder.modules(new JavaTimeModule());
+    }
+}

src/main/java/org/vaulttec/gitlab/enforcer/systemhook/SystemEvent.java

@@ -17,7 +17,7 @@
  */
 package org.vaulttec.gitlab.enforcer.systemhook;
 
-import java.util.Date;
+import java.time.Instant;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -26,7 +26,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class SystemEvent {
   @JsonProperty("created_at")
-  private Date createdAt;
+  private Instant createdAt;
   @JsonProperty("event_name")
   private SystemEventName eventName;
   @JsonProperty("name")
@@ -39,11 +39,11 @@ public class SystemEvent {
   private String id;
   private Object object;
 
-  public Date getCreatedAt() {
+  public Instant getCreatedAt() {
     return createdAt;
   }
 
-  public void setCreatedAt(Date createdAt) {
+  public void setCreatedAt(Instant createdAt) {
     this.createdAt = createdAt;
   }
 

src/main/java/org/vaulttec/gitlab/enforcer/systemhook/SystemEventBuilder.java

@@ -17,7 +17,7 @@
  */
 package org.vaulttec.gitlab.enforcer.systemhook;
 
-import java.util.Date;
+import java.time.Instant;
 
 public class SystemEventBuilder {
   private SystemEventName eventName;
@@ -58,7 +58,7 @@ public SystemEventBuilder object(Object object) {
 
   public SystemEvent build() {
     SystemEvent event = new SystemEvent();
-    event.setCreatedAt(new Date(System.currentTimeMillis()));
+    event.setCreatedAt(Instant.now());
     event.setEventName(eventName);
     event.setName(name);
     event.setPath(path);

src/main/java/org/vaulttec/gitlab/enforcer/systemhook/SystemHooksController.java

@@ -33,17 +33,17 @@ public class SystemHooksController {
 
   private static final Logger LOG = LoggerFactory.getLogger(SystemHooksController.class);
 
-  private EnforcerClient client;
-  private EnforcerConfig config;
+  private final EnforcerClient client;
+  private final EnforcerConfig config;
 
   public SystemHooksController(EnforcerClient client, EnforcerConfig config) {
     this.client = client;
     this.config = config;
   }
 
   @PostMapping(value = "/systemhooks", consumes = "application/json")
-  public void process(@RequestHeader(name = "X-Gitlab-Event", required = true) String header,
-      @RequestHeader(name = "X-Gitlab-Token", required = true) String token, @RequestBody SystemEvent event) {
+  public void process(@RequestHeader(name = "X-Gitlab-Event") String header,
+                      @RequestHeader(name = "X-Gitlab-Token") String token, @RequestBody SystemEvent event) {
     if (StringUtils.hasText(config.getSystemHookToken()) && !config.getSystemHookToken().equals(token)) {
       LOG.warn("Unexpected token '{}' - ignoring {} event '{}'", token, header, event.getEventName());
     } else {

src/test/java/org/vaulttec/gitlab/enforcer/ApplicationTests.java

@@ -17,14 +17,11 @@
  */
 package org.vaulttec.gitlab.enforcer;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
 
 @ActiveProfiles("test")
-@RunWith(SpringRunner.class)
 @SpringBootTest
 public class ApplicationTests {
 

src/test/java/org/vaulttec/gitlab/enforcer/client/GitLabClientIntegrationTest.java

@@ -21,17 +21,15 @@
 
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.http.HttpMethod;
-import org.springframework.test.annotation.IfProfileValue;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.vaulttec.gitlab.enforcer.Application;
 import org.vaulttec.gitlab.enforcer.client.model.Branch;
 import org.vaulttec.gitlab.enforcer.client.model.Group;
@@ -42,8 +40,7 @@
 import org.vaulttec.gitlab.enforcer.client.model.PushRules;
 
 @ActiveProfiles("test")
-@IfProfileValue(name = "run.integration.tests", value = "true")
-@RunWith(SpringRunner.class)
+@EnabledIfSystemProperty(named = "run.integration.tests", matches = "true")
 @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.NONE)
 public class GitLabClientIntegrationTest {
   private static final Logger LOG = LoggerFactory.getLogger(GitLabClientIntegrationTest.class);

src/test/java/org/vaulttec/gitlab/enforcer/client/model/PermissionTest.java

@@ -17,10 +17,10 @@
  */
 package org.vaulttec.gitlab.enforcer.client.model;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PermissionTest {
 

src/test/java/org/vaulttec/gitlab/enforcer/rule/GroupSettingsRuleTest.java

@@ -26,8 +26,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.actuate.audit.AuditEvent;
 import org.springframework.boot.actuate.audit.AuditEventRepository;
 import org.vaulttec.gitlab.enforcer.EnforcerEventPublisher;
@@ -36,6 +36,7 @@
 import org.vaulttec.gitlab.enforcer.client.model.Group;
 import org.vaulttec.gitlab.enforcer.systemhook.SystemEventBuilder;
 import org.vaulttec.gitlab.enforcer.systemhook.SystemEventName;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class GroupSettingsRuleTest {
 
@@ -47,11 +48,13 @@ public class GroupSettingsRuleTest {
   private EnforcerEventPublisher eventPublisher;
   private GitLabClient client;
   private Map<String, String> config;
+  private ObjectMapper objectMapper;
 
-  @Before
-  public void setUp() throws Exception {
+  @BeforeEach
+  public void setUp() {
     eventRepository = mock(AuditEventRepository.class);
-    eventPublisher = new EnforcerEventPublisher(eventRepository);
+    objectMapper = mock(ObjectMapper.class);
+    eventPublisher = new EnforcerEventPublisher(eventRepository, objectMapper);
     client = mock(GitLabClient.class);
     config = new LinkedHashMap<>();
     config.put("membership_lock", "true");