Since Spring now only registers controllers with @controller and rela…

…ted annotations adding @RestController annotations on controllers and fixing ordering, for details see: spring-projects/spring-framework#22154
croz-ltd · Jan 31, 2023 · a6b628a · a6b628a
1 parent bd44036
commit a6b628a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/nrich-encrypt/README.md b/nrich-encrypt/README.md
@@ -76,8 +76,8 @@ endpoints (one for retrieving and one for updating account data) that looks like
 ```java
 
 @RequiredArgsConstructor
-@RestController
 @RequestMapping("account")
+@RestController
 public class AccountController {
 
  private final AccountService accountService;

diff --git a/...rc/main/java/net/croz/nrich/formconfiguration/controller/FormConfigurationController.java b/...rc/main/java/net/croz/nrich/formconfiguration/controller/FormConfigurationController.java
@@ -24,24 +24,23 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import jakarta.validation.Valid;
 import java.util.List;
 
 @RequiredArgsConstructor
 @RequestMapping("${nrich.form-configuration.endpoint-path:nrich/form/configuration}")
+@RestController
 public class FormConfigurationController {
 
  private final FormConfigurationService formConfigurationService;
 
- @ResponseBody
  @PostMapping("fetch-all")
  public List<FormConfiguration> fetchAll() {
  return formConfigurationService.fetchFormConfigurationList();
  }
 
- @ResponseBody
  @PostMapping("fetch")
  public List<FormConfiguration> fetch(@RequestBody @Valid FetchFormConfigurationRequest request) {
  return formConfigurationService.fetchFormConfigurationList(request.getFormIdList());

diff --git a/nrich-notification/README.md b/nrich-notification/README.md
@@ -325,8 +325,8 @@ Example of manual providing:
 
 ```java
 @RequiredArgsConstructor
-@RestController
 @RequestMapping("notification-example")
+@RestController
 public class ExampleController {
 
  private final NotificationResponseService notificationResponseService;
@@ -369,8 +369,8 @@ Example of automatic resolving:
 
 ```java
 @RequiredArgsConstructor
-@RestController
 @RequestMapping("notification-example")
+@RestController
 public class ExampleController {
 
  private final NotificationResponseService notificationResponseService;

diff --git a/...ava/net/croz/nrich/registry/configuration/controller/RegistryConfigurationController.java b/...ava/net/croz/nrich/registry/configuration/controller/RegistryConfigurationController.java
@@ -22,13 +22,13 @@
 import net.croz.nrich.registry.api.configuration.service.RegistryConfigurationService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 @RequiredArgsConstructor
 @RequestMapping("${nrich.registry.configuration.endpoint-path:nrich/registry/configuration}")
-@ResponseBody
+@RestController
 public class RegistryConfigurationController {
 
  private final RegistryConfigurationService registryConfigurationService;

diff --git a/...egistry/src/main/java/net/croz/nrich/registry/data/controller/RegistryDataController.java b/...egistry/src/main/java/net/croz/nrich/registry/data/controller/RegistryDataController.java
@@ -34,14 +34,14 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import jakarta.validation.Valid;
 import java.util.Map;
 
 @RequiredArgsConstructor
 @RequestMapping("${nrich.registry.data.endpoint-path:nrich/registry/data}")
-@ResponseBody
+@RestController
 public class RegistryDataController {
 
  private final RegistryDataService registryDataService;

diff --git a/...y/src/main/java/net/croz/nrich/registry/history/controller/RegistryHistoryController.java b/...y/src/main/java/net/croz/nrich/registry/history/controller/RegistryHistoryController.java
@@ -25,13 +25,13 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import jakarta.validation.Valid;
 
 @RequiredArgsConstructor
 @RequestMapping("${nrich.registry.history.endpoint-path:nrich/registry/history}")
-@ResponseBody
+@RestController
 public class RegistryHistoryController {
 
  private final RegistryHistoryService registryHistoryService;

diff --git a/...y-csrf/src/main/java/net/croz/nrich/security/csrf/core/controller/CsrfPingController.java b/...y-csrf/src/main/java/net/croz/nrich/security/csrf/core/controller/CsrfPingController.java
@@ -19,7 +19,7 @@
 
 import net.croz.nrich.security.csrf.core.constants.CsrfConstants;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -28,12 +28,12 @@
  * Used by client for csrf ping url
  */
 @RequestMapping
+@RestController
 public class CsrfPingController {
 
  private static final String SUCCESS_KEY = "success";
 
  @RequestMapping("${nrich.security.csrf.endpoint-path:" + CsrfConstants.CSRF_DEFAULT_PING_URI + "}")
- @ResponseBody
  public Map<String, Boolean> ping() {
  Map<String, Boolean> result = new HashMap<>();