From 03e54cc57bcb112138506796e426ccfc688c5c4e Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Wed, 10 Jan 2024 15:10:19 +0100 Subject: [PATCH] small adjustments to request mapping snippets --- .../BootJavaCompletionEngineConfigurer.java | 24 +++++++++---------- .../test/RequestMappingSnippetTests.java | 6 ++--- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java index 17542b411..162d8efb6 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java @@ -61,34 +61,34 @@ public class BootJavaCompletionEngineConfigurer { ImmutableList.of("org.springframework.web.bind.annotation.RequestMapping", "org.springframework.web.bind.annotation.RequestMethod", "org.springframework.web.bind.annotation.RequestParam"), - "@RequestMapping(\"${path}\", method=RequestMethod.${GET})\n" - + "public ${SomeData} ${requestMethodName}(@RequestParam ${String} ${param}) {\n" - + " return new ${SomeData}(${cursor});\n" + "}\n", + "@RequestMapping(\"${1:path}\", method=RequestMethod.${GET})\n" + + "public ${2:String} ${3:requestMethodName}(@RequestParam ${4:String} ${5:param}) {\n" + + " return new ${2:String}($0);\n" + "}\n", "RequestMapping")); snippetManager.add( new JavaSnippet("@GetMapping(..) {..}", webControllerContext, CompletionItemKind.Method, ImmutableList.of("org.springframework.web.bind.annotation.GetMapping", "org.springframework.web.bind.annotation.RequestParam"), - "@GetMapping(\"${path}\")\n" - + "public ${SomeData} ${getMethodName}(@RequestParam ${String} ${param}) {\n" - + " return new ${SomeData}(${cursor});\n" + "}\n", + "@GetMapping(\"${1:path}\")\n" + + "public ${2:String} ${3:getMethodName}(@RequestParam ${4:String} ${5:param}) {\n" + + " return new ${2:String}($0);\n" + "}\n", "GetMapping")); snippetManager.add( new JavaSnippet("@PostMapping(..) {..}", webControllerContext, CompletionItemKind.Method, ImmutableList.of("org.springframework.web.bind.annotation.PostMapping", "org.springframework.web.bind.annotation.RequestBody"), - "@PostMapping(\"${path}\")\n" - + "public ${SomeEnityData} ${postMethodName}(@RequestBody ${SomeEnityData} ${entity}) {\n" - + " //TODO: process POST request\n" + " ${cursor}\n" + " return ${entity};\n" + "}\n", + "@PostMapping(\"${1:path}\")\n" + + "public ${2:String} ${3:postMethodName}(@RequestBody ${4:String} ${5:entity}) {\n" + + " //TODO: process POST request\n" + " $0\n" + " return ${5:entity};\n" + "}\n", "PostMapping")); snippetManager.add( new JavaSnippet("@PutMapping(..) {..}", webControllerContext, CompletionItemKind.Method, ImmutableList.of("org.springframework.web.bind.annotation.PutMapping", "org.springframework.web.bind.annotation.RequestBody", "org.springframework.web.bind.annotation.PathVariable"), - "@PutMapping(\"${path}/{${id}}\")\n" - + "public ${SomeEnityData} ${putMethodName}(@PathVariable ${pvt:String} ${id}, @RequestBody ${SomeEnityData} ${entity}) {\n" - + " //TODO: process PUT request\n" + " ${cursor}\n" + " return ${entity};\n" + "}", + "@PutMapping(\"${1:path}/{${2:id}}\")\n" + + "public ${3:String} ${4:putMethodName}(@PathVariable ${5:String} ${2:id}, @RequestBody ${6:String} ${7:entity}) {\n" + + " //TODO: process PUT request\n" + " $0\n" + " return ${7:entity};\n" + "}", "PutMapping")); // } diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingSnippetTests.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingSnippetTests.java index cf9a91bf6..609286e96 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingSnippetTests.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingSnippetTests.java @@ -23,7 +23,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Import; import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest; import org.springframework.ide.vscode.boot.bootiful.HoverTestConf; @@ -33,7 +32,6 @@ import org.springframework.ide.vscode.languageserver.testharness.Editor; import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness; import org.springframework.ide.vscode.project.harness.ProjectsHarness; import org.springframework.test.context.junit.jupiter.SpringExtension; -import org.springframework.web.bind.annotation.RequestParam; @ExtendWith(SpringExtension.class) @BootLanguageServerTest @@ -162,8 +160,8 @@ public class RequestMappingSnippetTests { + "public class SampleController {\n" + "\n" + "@GetMapping(\"${1:path}\")\n" - + "public ${2:SomeData} ${3:getMethodName}(@RequestParam ${4:String} ${5:param}) {\n" - + " return new ${2:SomeData}($0);\n" + + "public ${2:String} ${3:getMethodName}(@RequestParam ${4:String} ${5:param}) {\n" + + " return new ${2:String}($0);\n" + "}\n" + "<*>\n" + "\n"