Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1639 - Prepare 2.0 development.

Browse Source 
Upgrade to Java 17 and Spring Framework 6. Switch to JakartaEE 9 version of the Servlet API. Drop support for Joda Time.

Configure Kotlin plugin to target JDK 1.8 as it doesn't support 17, yet.
This commit is contained in:
Oliver Drotbohm
2021-09-20 13:04:49 +02:00
parent 191996a2a8
commit 9352e56358
7 changed files with 36 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/org/springframework/hateoas/TestUtils.java
View File

@@ -17,10 +17,10 @@ package org.springframework.hateoas;
import static org.assertj.core.api.Assertions.*;
import java.io.IOException;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import org.junit.jupiter.api.BeforeEach;
import org.springframework.mock.web.MockFilterChain;

10
src/test/java/org/springframework/hateoas/server/mvc/WebMvcLinkBuilderFactoryUnitTest.java
View File

@@ -18,13 +18,13 @@ package org.springframework.hateoas.server.mvc;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.*;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import org.joda.time.DateTime;
import org.joda.time.format.ISODateTimeFormat;
import org.junit.jupiter.api.Test;
import org.springframework.core.MethodParameter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -96,11 +96,11 @@ class WebMvcLinkBuilderFactoryUnitTest extends TestUtils {
@Test
void usesDateTimeFormatForUriBinding() {
DateTime now = DateTime.now();
LocalDateTime now = LocalDateTime.now();
WebMvcLinkBuilderFactory factory = new WebMvcLinkBuilderFactory();
Link link = factory.linkTo(methodOn(SampleController.class).sampleMethod(now)).withSelfRel();
assertThat(link.getHref()).endsWith("/sample/" + ISODateTimeFormat.date().print(now));
assertThat(link.getHref()).endsWith("/sample/" + now.format(DateTimeFormatter.ISO_DATE));
}
/**
@@ -190,7 +190,7 @@ class WebMvcLinkBuilderFactoryUnitTest extends TestUtils {
HttpEntity<?> sampleMethod(@PathVariable("id") Long id, SpecialType parameter);
@RequestMapping("/sample/{time}")
HttpEntity<?> sampleMethod(@PathVariable("time") @DateTimeFormat(iso = ISO.DATE) DateTime time);
HttpEntity<?> sampleMethod(@PathVariable("time") @DateTimeFormat(iso = ISO.DATE) LocalDateTime time);
@RequestMapping("/sample/mapsupport")
HttpEntity<?> sampleMethodWithMap(@RequestParam Map<String, String> queryParams);