[#987]hessian support generics array (#988)

Author: liubao68

integration-tests/discovery-tests/common/src/main/java/com/huaweicloud/sample/hessian/HessianService.java

@@ -32,4 +32,8 @@ public interface HessianService {
   @PostMapping(path = "nonSerializableModel", consumes = "x-application/hessian2",
       produces = "x-application/hessian2")
   NonSerializableModel nonSerializableModel(@RequestBody NonSerializableModel b);
+
+  @PostMapping(path = "nonSerializableModelArray", consumes = "x-application/hessian2",
+      produces = "x-application/hessian2")
+  NonSerializableModel[] nonSerializableModelArray(@RequestBody NonSerializableModel[] b);
 }

integration-tests/discovery-tests/common/src/main/java/com/huaweicloud/sample/hessian/IBaseService.java

@@ -0,0 +1,33 @@
+/*
+
+ * Copyright (C) 2020-2022 Huawei Technologies Co., Ltd. All rights reserved.
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.huaweicloud.sample.hessian;
+
+import java.util.List;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+public interface IBaseService<T> {
+  @PostMapping(path = "query", consumes = "x-application/hessian2",
+      produces = "x-application/hessian2")
+  T[] query(@RequestBody T[] input);
+
+  @PostMapping(path = "queryList", consumes = "x-application/hessian2",
+      produces = "x-application/hessian2")
+  List<T> queryList(@RequestBody List<T> input);
+}

integration-tests/discovery-tests/common/src/main/java/com/huaweicloud/sample/hessian/IChildBaseService.java

@@ -0,0 +1,36 @@
+/*
+
+ * Copyright (C) 2020-2022 Huawei Technologies Co., Ltd. All rights reserved.
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.huaweicloud.sample.hessian;
+
+public interface IChildBaseService extends IBaseService<NonSerializableModel> {
+}

integration-tests/discovery-tests/common/src/main/java/com/huaweicloud/sample/hessian/IChildService.java

@@ -0,0 +1,21 @@
+/*
+
+ * Copyright (C) 2020-2022 Huawei Technologies Co., Ltd. All rights reserved.
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.huaweicloud.sample.hessian;
+
+public interface IChildService extends IBaseService<NonSerializableModel> {
+}

integration-tests/discovery-tests/discovery-tests-client/src/test/java/com/huaweicloud/sample/OrderControllerIT.java

@@ -97,4 +97,20 @@ public void testPojoModel() {
     assertThat(pojoModel.getName()).isEqualTo("hello");
     assertThat(pojoModel.getNum()).isEqualTo(2);
   }
+
+  @Test
+  public void testHeaderWithJson() throws Exception {
+    // feign need encode requests with value {}
+    String v = "{\"name\": {\"age\": \"22\"}}";
+
+    URLCodec codec = new URLCodec("UTF-8");
+    HttpHeaders headers = new HttpHeaders();
+    headers.add("model", codec.encode(v));
+    HttpEntity<Void> entity = new HttpEntity<>(headers);
+
+    String result = template.exchange(url + "/testHeaderWithJsonWrong", HttpMethod.POST, entity, String.class)
+        .getBody();
+    // Feign will keep response encoded and need request encode, this is quit inconvenient
+    assertThat(result).isEqualTo(codec.encode(v));
+  }
 }

integration-tests/discovery-tests/order-consumer/src/main/java/com/huaweicloud/sample/FeignService.java

@@ -20,10 +20,14 @@
 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.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import feign.Headers;
+import feign.Param;
+
 @FeignClient(name = "price")
 public interface FeignService {
   @PostMapping("/price")
@@ -64,4 +68,11 @@ public interface FeignService {
 
   @PostMapping("/testPostModel")
   PojoModel testPostModel(@RequestBody PojoModel model);
+
+  @PostMapping("/testHeaderWithJson")
+  public String testHeaderWithJsonWrong(@RequestHeader("model") String model);
+
+  @PostMapping("/testHeaderWithJson")
+  @Headers("model: {model}")
+  public String testHeaderWithJsonCorrect(@Param("model") String model);
 }

integration-tests/discovery-tests/order-consumer/src/main/java/com/huaweicloud/sample/OrderController.java

@@ -16,6 +16,9 @@
  */
 package com.huaweicloud.sample;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.servicecomb.service.center.client.model.Microservice;
 import org.apache.servicecomb.service.center.client.model.MicroserviceInstance;
@@ -26,6 +29,7 @@
 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.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -180,4 +184,22 @@ public PojoModel testPostModel(@RequestBody PojoModel model) {
   public PojoModel testPostModelFeign(@RequestBody PojoModel model) {
     return feignService.testPostModel(model);
   }
+
+  @PostMapping("/testHeaderWithJsonWrong")
+  public String testHeaderWithJsonWrong(@RequestHeader String model) {
+    return feignService.testHeaderWithJsonWrong(model);
+  }
+
+  @PostMapping("/testHeaderWithJsonCorrect")
+  public String testHeaderWithJsonCorrect(@RequestHeader String model) {
+    return feignService.testHeaderWithJsonCorrect(model);
+  }
+
+  public static String encodeHeader(String header) {
+    try {
+      return URLEncoder.encode(header, "UTF-8");
+    } catch (UnsupportedEncodingException e) {
+      return header;
+    }
+  }
 }

integration-tests/discovery-tests/order-consumer/src/main/java/com/huaweicloud/sample/hessian/HessianConfig.java

@@ -25,4 +25,12 @@ public class HessianConfig {
   @FeignClient(name = "price", contextId = "hessianService", path = "/hessian")
   public interface HessianServiceExt extends HessianService {
   }
+
+  @FeignClient(name = "price", contextId = "childService", path = "/hessian/child")
+  public interface IChildServiceExt extends IChildService {
+  }
+
+  @FeignClient(name = "price", contextId = "childServiceBase", path = "/hessian/baseChild")
+  public interface IChildBaseServiceExt extends IChildBaseService {
+  }
 }

integration-tests/discovery-tests/order-consumer/src/main/java/com/huaweicloud/sample/hessian/HessianController.java

@@ -18,8 +18,10 @@
 package com.huaweicloud.sample.hessian;
 
 import java.util.Arrays;
+import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,16 +32,64 @@ public class HessianController {
   @Autowired
   private HessianService hessianService;
 
+  @Autowired
+  private IChildService childService;
+
+  @Autowired
+  private IChildBaseService childBaseService;
+
   @RequestMapping("/testHessian")
   public String testHessian() {
     testBase();
     testChildBase();
     testGenericBase();
     testGenericChildBase();
     testNonSerializableModel();
+    testNonSerializableModelArray();
+    testInterfaceInheritanceList();
+    testInterfaceInheritance();
+    testProviderImplementsBase();
     return "success";
   }
 
+  private void testProviderImplementsBase() {
+    NonSerializableModel model = new NonSerializableModel();
+    model.setAge("age");
+
+    List<NonSerializableModel> resultList = childBaseService.queryList(Arrays.asList(model));
+    check(1 + "", resultList.size() + "", "wrong NonSerializableModel");
+    check("age", resultList.get(0).getAge(), "wrong NonSerializableModel");
+
+    // TODO : this test case not supported now, should support later
+//    NonSerializableModel[] result = childBaseService.query(new NonSerializableModel[] {model});
+//    check(1 + "", result.length + "", "wrong NonSerializableModel");
+//    check("age", result[0].getAge(), "wrong NonSerializableModel");
+  }
+
+  private void testInterfaceInheritance() {
+    NonSerializableModel model = new NonSerializableModel();
+    model.setAge("age");
+    NonSerializableModel[] result = childService.query(new NonSerializableModel[] {model});
+    check(1 + "", result.length + "", "wrong NonSerializableModel");
+    check("age", result[0].getAge(), "wrong NonSerializableModel");
+  }
+
+  private void testInterfaceInheritanceList() {
+    NonSerializableModel model = new NonSerializableModel();
+    model.setAge("age");
+    List<NonSerializableModel> result = childService.queryList(Arrays.asList(model));
+    check(1 + "", result.size() + "", "wrong NonSerializableModel");
+    check("age", result.get(0).getAge(), "wrong NonSerializableModel");
+  }
+
+  private void testNonSerializableModelArray() {
+    NonSerializableModel model = new NonSerializableModel();
+    model.setAge("age");
+    NonSerializableModel[] result = hessianService.nonSerializableModelArray(new NonSerializableModel[] {model});
+    check(1 + "", result.length + "", "wrong NonSerializableModel");
+    check("age", result[0].getAge(), "wrong NonSerializableModel");
+  }
+
   private void testNonSerializableModel() {
     NonSerializableModel model = new NonSerializableModel();
     model.setAge("age");

integration-tests/discovery-tests/price-provider/src/main/java/com/huaweicloud/sample/PriceController.java

@@ -24,6 +24,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+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;
@@ -119,4 +120,9 @@ public String priceBalance(@RequestParam("id") String id) {
   public PojoModel testPostModel(@RequestBody PojoModel model) {
     return model;
   }
+
+  @PostMapping("/testHeaderWithJson")
+  public String testHeaderWithJson(@RequestHeader("model") String model) {
+    return model;
+  }
 }