From 660c096659911f686fd48fc2826a73fca86343aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98xcsnx=E2=80=99?= <‘1192709687@qq.com’> Date: Tue, 2 Jul 2024 23:24:27 +0800 Subject: [PATCH] fix e2e checkstyle --- .../shenyu/e2e/client/admin/AdminClient.java | 46 +++++++++++-------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java b/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java index 20490cdc641d..8fbff2b69f91 100644 --- a/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java +++ b/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java @@ -197,6 +197,7 @@ public List listAllRules() { /** * all meta data list. + * * @return List */ public List listAllMetaData() { @@ -231,6 +232,7 @@ private List getMetaDataList(final String uri, /** * Fetch the selectors by the given conditions. + * * @param keyword expected selectors included the word. return all if absent. * @param plugins expected selectors under specified plugins. return all if absent. * @return paginated info with list of {@link SelectorDTO}s @@ -246,10 +248,11 @@ public SearchedResources searchSelectors(final String keyword, fina /** * Fetch the selectors by the given conditions. - * @param keyword expected selectors included the word. return all if absent. - * @param page page. + * + * @param keyword expected selectors included the word. return all if absent. + * @param page page. * @param pageSize size. - * @param plugins expected selectors under specified plugins. return all if absent. + * @param plugins expected selectors under specified plugins. return all if absent. * @return paginated info with list of {@link SelectorDTO}s */ public SearchedResources searchSelectors(final String keyword, final int page, final int pageSize, final String... plugins) { @@ -284,10 +287,10 @@ private SearchedResources search(final String uri, fi private SearchedResources search(final String uri, final int pageNum, final int pageSize, final QueryCondition condition, final TypeReference> valueType) { SearchCondition searchCondition = SearchCondition.builder() - .pageNum(pageNum) - .pageSize(pageSize) - .condition(condition) - .build(); + .pageNum(pageNum) + .pageSize(pageSize) + .condition(condition) + .build(); HttpEntity entity = new HttpEntity<>(searchCondition, basicAuth); ResponseEntity response = template.postForEntity(baseURL + uri, entity, ShenYuResult.class); @@ -295,7 +298,7 @@ private SearchedResources search(final String uri, fi return Assertions.assertDoesNotThrow( () -> mapper.readValue(rst.getData().traverse(), valueType), - "checking cast to SearchedResources" + "checking cast to SearchedResources" ); } @@ -304,12 +307,13 @@ private List getSearch(final String uri, final TypeRe ShenYuResult rst = assertAndGet(response, "query success"); return Assertions.assertDoesNotThrow( () -> mapper.readValue(rst.getData().traverse(), valueType), - "checking cast to SearchedResources" + "checking cast to SearchedResources" ); } /** * create selectorDTO. + * * @param selector selector * @return SelectorDTO */ @@ -321,6 +325,7 @@ public SelectorDTO create(final SelectorData selector) { /** * Create Rule. + * * @param rule rule * @return RuleDTO */ @@ -333,18 +338,18 @@ public RuleDTO create(final RuleData rule) { @SuppressWarnings("unchecked") private R create(final String uri, final T data) { log.info("trying to create resource({}) name: {}", data.getClass().getSimpleName(), data.getName()); - + data.setName(NameUtils.wrap(data.getName(), scenarioId)); - + HttpEntity entity = new HttpEntity<>(data, basicAuth); ResponseEntity response = template.postForEntity(baseURL + uri, entity, ShenYuResult.class); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode(), "status code"); - + ShenYuResult rst = response.getBody(); Assertions.assertNotNull(rst, "checking http response body"); Assertions.assertEquals(200, rst.getCode(), "checking shenyu result code"); Assertions.assertEquals("create success", rst.getMessage(), "checking shenyu result message"); - + SearchedResources searchedResources = null; if (data instanceof SelectorData) { searchedResources = searchSelectors(data.getName()); @@ -353,16 +358,17 @@ private R create(final String ur } Assertions.assertNotNull(searchedResources, "checking searchedResources object is non-null"); Assertions.assertEquals(1, searchedResources.getTotal(), "checking the total hits of searching"); - + ResourceDTO created = searchedResources.getList().get(0); Assertions.assertNotNull(created, "checking created object is non-null"); log.info("create resource({}) successful. name: {}, id: {}", data.getClass().getSimpleName(), data.getName(), created.getId()); - + return (R) created; } /** * bindingData. + * * @param bindingData bindingData */ public void bindingData(final BindingData bindingData) { @@ -370,7 +376,7 @@ public void bindingData(final BindingData bindingData) { ResponseEntity response = template.postForEntity(baseURL + "/proxy-selector/binding", entity, ShenYuResult.class); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode(), "status code"); } - + /** * Delete selectors in batch. * @@ -443,6 +449,7 @@ private void delete(final String uri, final List ids) { /** * Fetch Selector by given id. + * * @param id of selector that needs to fetch * @return {@link SelectorDTO} */ @@ -481,7 +488,7 @@ private ShenYuResult assertAndGet(final ResponseEntity response, f /** * change plugin status. * - * @param id id + * @param id id * @param formData formData */ public void changePluginStatus(final String id, final MultiValueMap formData) { @@ -490,7 +497,8 @@ public void changePluginStatus(final String id, final MultiValueMap T putResource(final String uri, final String id, final Class valueType, final MultiValueMap formData) { HttpEntity> requestEntity = new HttpEntity<>(formData, basicAuth); - ResponseEntity response = template.exchange(baseURL + uri + "/pluginId=" + id + "&namespaceId=" + SYS_DEFAULT_NAMESPACE_NAMESPACE_ID , HttpMethod.PUT, requestEntity, ShenYuResult.class); + ResponseEntity response = template.exchange(baseURL + uri + "/pluginId=" + id + + "&namespaceId=" + SYS_DEFAULT_NAMESPACE_NAMESPACE_ID, HttpMethod.PUT, requestEntity, ShenYuResult.class); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode(), "checking http status"); ShenYuResult rst = response.getBody(); Assertions.assertNotNull(rst, "checking http response body"); @@ -500,7 +508,7 @@ private T putResource(final String uri, final String id, /** * change plugin status. * - * @param id id + * @param id id * @param selectorData selectorData */ public void changeSelector(final String id, final SelectorData selectorData) {