From 7ed74b28ebe5d72464407ec4c30091d993860c75 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 6 Apr 2023 13:13:55 +0200 Subject: [PATCH] Polish "Replace @Controller with @RestController" See gh-1401 --- .../web/controller/CommandLineMetadataController.java | 6 +++--- .../web/controller/ProjectGenerationController.java | 4 ++-- .../web/controller/ProjectMetadataController.java | 5 ++--- .../web/controller/SpringCliDistributionController.java | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/initializr-web/src/main/java/io/spring/initializr/web/controller/CommandLineMetadataController.java b/initializr-web/src/main/java/io/spring/initializr/web/controller/CommandLineMetadataController.java index d8364a40..cbbb06fc 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/controller/CommandLineMetadataController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/controller/CommandLineMetadataController.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,12 +29,12 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity.BodyBuilder; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** - * {@link Controller} that handles assistance for CLI support using a + * {@link RestController} that handles assistance for CLI support using a * {@link CommandLineHelpGenerator}. * * @author Stephane Nicoll diff --git a/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectGenerationController.java b/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectGenerationController.java index 78711ed7..014af769 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectGenerationController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectGenerationController.java @@ -51,16 +51,16 @@ import org.apache.commons.logging.LogFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** - * Base {@link Controller} that provides endpoints for project generation. + * Base {@link RestController} that provides endpoints for project generation. * * @param the {@link ProjectRequest} type to use to bind request parameters * @author Stephane Nicoll diff --git a/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectMetadataController.java b/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectMetadataController.java index 3cc0557f..100967c9 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectMetadataController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectMetadataController.java @@ -39,14 +39,13 @@ import org.springframework.http.CacheControl; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; /** - * {@link Controller} that exposes metadata and service configuration. + * {@link RestController} that exposes metadata and service configuration. * * @author Stephane Nicoll */ diff --git a/initializr-web/src/main/java/io/spring/initializr/web/controller/SpringCliDistributionController.java b/initializr-web/src/main/java/io/spring/initializr/web/controller/SpringCliDistributionController.java index c302afc8..01014d52 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/controller/SpringCliDistributionController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/controller/SpringCliDistributionController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * * @author Stephane Nicoll */ -@RestController +@Controller public class SpringCliDistributionController { private final InitializrMetadataProvider metadataProvider;