update spring-boot 3.2.0

qihaiyan · Nov 24, 2023 · 5fa6c92 · 5fa6c92
1 parent 9a7539b
commit 5fa6c92
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 22 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        set('springBootVersion', "3.1.2")
+        set('springBootVersion', "3.2.0")
     }
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }

diff --git a/...g-rest-template-log/src/main/java/cn/springcamp/springresttemplatelog/DemoController.java b/...g-rest-template-log/src/main/java/cn/springcamp/springresttemplatelog/DemoController.java
@@ -6,8 +6,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
@@ -18,14 +17,14 @@ public class DemoController {
     private RestTemplate restTemplate;
 
     @GetMapping("/demo/get")
-    public Object demoGet(String arg) {
-        return restTemplate.postForObject("http://someservice/foo", new BodyRequest("test"), BodyRequest.class);
+    public BodyRequest demoGet(@RequestParam(value = "arg") String arg) {
+        return restTemplate.postForObject("http://someservice/foo", new BodyRequest(arg), BodyRequest.class);
     }
 
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
-    static class BodyRequest {
-        private String arg1;
+    public static class BodyRequest {
+        private String code;
     }
 }
diff --git a/...st-template-log/src/main/java/cn/springcamp/springresttemplatelog/RestTemplateConfig.java b/...st-template-log/src/main/java/cn/springcamp/springresttemplatelog/RestTemplateConfig.java
@@ -110,11 +110,6 @@ public HttpStatusCode getStatusCode() throws IOException {
             return this.response.getStatusCode();
         }
 
-        @NonNull
-        public int getRawStatusCode() throws IOException {
-            return this.response.getStatusCode().value();
-        }
-
         @NonNull
         public String getStatusText() throws IOException {
             return this.response.getStatusText();

diff --git a/...t-template-log/src/test/java/cn/springcamp/springresttemplatelog/DemoApplicationTest.java b/...t-template-log/src/test/java/cn/springcamp/springresttemplatelog/DemoApplicationTest.java
@@ -33,22 +33,13 @@ public void before() {
         mockRestServiceServer = MockRestServiceServer.bindTo(restTemplate).ignoreExpectOrder(true).build();
 
         this.mockRestServiceServer.expect(manyTimes(), MockRestRequestMatchers.requestTo(Matchers.startsWithIgnoringCase("http://someservice/foo")))
-                .andRespond(withSuccess("{\"code\": 200}", MediaType.APPLICATION_JSON));
+                .andRespond(withSuccess("{\"code\": \"200\"}", MediaType.APPLICATION_JSON));
 
     }
 
     @Test
     public void testGet() {
         String resp = testRestTemplate.getForObject("/demo/get?arg=test", String.class);
         log.info("rest: {}", resp);
-//                .andDo(print()).andExpect(status().isOk());
-//        this.mockMvc.perform(post("/demo/post/form")
-//                        .content(new ObjectMapper().writeValueAsString(new DemoController.BodyRequest("test")))
-//                        .contentType(MediaType.APPLICATION_FORM_URLENCODED))
-//                .andDo(print()).andExpect(status().isOk());
-//        this.mockMvc.perform(post("/demo/post/body")
-//                        .content(new ObjectMapper().writeValueAsString(new DemoController.BodyRequest("test")))
-//                        .contentType(MediaType.APPLICATION_JSON))
-//                .andDo(print()).andExpect(status().isOk());
     }
 }