Upgrading Spring Boot to 2.6.10.

Author: dennisstritzke

pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.2.13.RELEASE</version>
+    <version>2.6.10</version>
   </parent>
 
   <properties>

src/main/java/me/stritzke/moneytracker/DocumentationRootLink.java

@@ -9,7 +9,7 @@
 public class DocumentationRootLink implements RepresentationModelProcessor<RepositoryLinksResource> {
   @Override
   public RepositoryLinksResource process(RepositoryLinksResource resource) {
-    resource.add(new Link("/doc/api-guide.html").withRel("doc"));
+    resource.add(Link.of("/doc/api-guide.html").withRel("doc"));
     return resource;
   }
 }

src/main/java/me/stritzke/moneytracker/SpringDataRestConfiguration.java

@@ -1,13 +1,15 @@
 package me.stritzke.moneytracker;
 
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
-import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapter;
+import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer;
 import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 
 @Component
-public class SpringDataRestConfiguration extends RepositoryRestConfigurerAdapter {
+public class SpringDataRestConfiguration implements RepositoryRestConfigurer {
   @Override
-  public void configureRepositoryRestConfiguration(RepositoryRestConfiguration configuration) {
-    configuration.setBasePath("/api");
+  public void configureRepositoryRestConfiguration(RepositoryRestConfiguration config, CorsRegistry cors) {
+    RepositoryRestConfigurer.super.configureRepositoryRestConfiguration(config, cors);
+    config.setBasePath("/api");
   }
 }

src/main/java/me/stritzke/moneytracker/expenses/ExpenseEndpoint.java

@@ -3,10 +3,12 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.rest.webmvc.RepositoryLinksResource;
-import org.springframework.hateoas.*;
+import org.springframework.hateoas.CollectionModel;
+import org.springframework.hateoas.Link;
+import org.springframework.hateoas.RepresentationModel;
 import org.springframework.hateoas.server.ExposesResourceFor;
 import org.springframework.hateoas.server.RepresentationModelProcessor;
-import org.springframework.hateoas.server.mvc.ControllerLinkBuilder;
+import org.springframework.hateoas.server.mvc.WebMvcLinkBuilder;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -34,22 +36,22 @@ public RepresentationModel<Expense> getExpenseRoot() {
   }
 
   private Link getLinkToExpenses(String rel, DateWrapper date) {
-    return ControllerLinkBuilder.linkTo(methodOn(ExpenseEndpoint.class).getExpensesOfMonth(date.getYear(), date.getMonth())).withRel(rel);
+    return WebMvcLinkBuilder.linkTo(methodOn(ExpenseEndpoint.class).getExpensesOfMonth(date.getYear(), date.getMonth())).withRel(rel);
   }
 
   @RequestMapping(method = RequestMethod.POST)
   public ResponseEntity<?> addExpense(@RequestBody ExpenseCreationDTO expenseCreationDTO) {
     DateWrapper date = new DateWrapper();
     Expense expense = expenseService.save(expenseCreationDTO.getAmount(), expenseCreationDTO.getComment(), date.getYear(), date.getMonth());
-    URI location = ControllerLinkBuilder.linkTo(methodOn(ExpenseEndpoint.class).getExpense(date.getYear(), date.getMonth(), expense.getNumericId())).toUri();
+    URI location = WebMvcLinkBuilder.linkTo(methodOn(ExpenseEndpoint.class).getExpense(date.getYear(), date.getMonth(), expense.getNumericId())).toUri();
     return ResponseEntity.created(location).build();
   }
 
   @RequestMapping(method = RequestMethod.GET, value = "/{year}/{month}")
   public ResponseEntity<CollectionModel<Expense>> getExpensesOfMonth(@PathVariable("year") Integer year, @PathVariable("month") Integer month) {
     Collection<Expense> byYearAndMonth = expenseService.find(new DateWrapper(year, month));
     byYearAndMonth.forEach(this::addSelfLink);
-    CollectionModel<Expense> expenseResource = new CollectionModel<>(byYearAndMonth);
+    CollectionModel<Expense> expenseResource = CollectionModel.of(byYearAndMonth);
     DateWrapper date = new DateWrapper(year, month);
     expenseResource.add(getLinkToExpenses("self", date));
     expenseResource.add(getLinkToExpenses("previous", date.getPreviousMonth()));
@@ -59,8 +61,8 @@ public ResponseEntity<CollectionModel<Expense>> getExpensesOfMonth(@PathVariable
 
   private void addSelfLink(Expense expense) {
     expense.add(linkTo(methodOn(ExpenseEndpoint.class)
-            .getExpense(expense.getYear(), expense.getMonth(), expense.getNumericId()))
-            .withSelfRel());
+        .getExpense(expense.getYear(), expense.getMonth(), expense.getNumericId()))
+        .withSelfRel());
   }
 
   @RequestMapping(method = RequestMethod.POST, value = "/{year}/{month}")
@@ -69,7 +71,7 @@ public ResponseEntity<?> addExpenseInMonth(@PathVariable("year") Integer year,
                                              @PathVariable("month") Integer month,
                                              @RequestBody ExpenseCreationDTO expenseCreationDTO) throws URISyntaxException {
     Expense expense = expenseService.save(expenseCreationDTO.getAmount(), expenseCreationDTO.getComment(), year, month);
-    URI location = ControllerLinkBuilder.linkTo(methodOn(ExpenseEndpoint.class).getExpense(year, month, expense.getNumericId())).toUri();
+    URI location = WebMvcLinkBuilder.linkTo(methodOn(ExpenseEndpoint.class).getExpense(year, month, expense.getNumericId())).toUri();
     return ResponseEntity.created(location).build();
   }
 
@@ -95,7 +97,7 @@ public ResponseEntity<?> deleteExpense(@PathVariable("year") Integer year,
 
   @Override
   public RepositoryLinksResource process(RepositoryLinksResource resource) {
-    resource.add(ControllerLinkBuilder.linkTo(ExpenseEndpoint.class).withRel("expenses"));
+    resource.add(WebMvcLinkBuilder.linkTo(ExpenseEndpoint.class).withRel("expenses"));
     return resource;
   }
 }