From 66ffc20172beb93e4b6df34b358a9bd482b91360 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 1 Mar 2022 12:05:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8B=BC=E5=86=99=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../es/{Requst.java => Request.java} | 2 +- ...WithCursor.java => RequestWithCursor.java} | 2 +- .../provider/datasource/EsProvider.java | 24 +++++++++---------- 3 files changed, 13 insertions(+), 15 deletions(-) rename backend/src/main/java/io/dataease/controller/request/datasource/es/{Requst.java => Request.java} (89%) rename backend/src/main/java/io/dataease/controller/request/datasource/es/{RequstWithCursor.java => RequestWithCursor.java} (69%) diff --git a/backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java b/backend/src/main/java/io/dataease/controller/request/datasource/es/Request.java similarity index 89% rename from backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java rename to backend/src/main/java/io/dataease/controller/request/datasource/es/Request.java index f69c4290cc..b66102e581 100644 --- a/backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java +++ b/backend/src/main/java/io/dataease/controller/request/datasource/es/Request.java @@ -3,7 +3,7 @@ package io.dataease.controller.request.datasource.es; import lombok.Data; @Data -public class Requst { +public class Request { private String query; private Integer fetch_size = 10000; private boolean field_multi_value_leniency = true; diff --git a/backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java b/backend/src/main/java/io/dataease/controller/request/datasource/es/RequestWithCursor.java similarity index 69% rename from backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java rename to backend/src/main/java/io/dataease/controller/request/datasource/es/RequestWithCursor.java index eebd503d5d..9da1be5145 100644 --- a/backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java +++ b/backend/src/main/java/io/dataease/controller/request/datasource/es/RequestWithCursor.java @@ -3,6 +3,6 @@ package io.dataease.controller.request.datasource.es; import lombok.Data; @Data -public class RequstWithCursor extends Requst{ +public class RequestWithCursor extends Request { private String cursor; } diff --git a/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java b/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java index eb055a45b4..7b88b14edf 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java @@ -5,16 +5,14 @@ import com.google.gson.Gson; import io.dataease.commons.utils.HttpClientConfig; import io.dataease.commons.utils.HttpClientUtil; import io.dataease.controller.request.datasource.es.EsReponse; -import io.dataease.controller.request.datasource.es.Requst; -import io.dataease.controller.request.datasource.es.RequstWithCursor; +import io.dataease.controller.request.datasource.es.Request; +import io.dataease.controller.request.datasource.es.RequestWithCursor; import io.dataease.controller.request.datasource.DatasourceRequest; import io.dataease.dto.datasource.EsConfiguration; import io.dataease.dto.datasource.TableDesc; import io.dataease.dto.datasource.TableField; import io.dataease.exception.DataEaseException; import io.dataease.i18n.Translator; -import io.dataease.provider.ProviderFactory; -import io.dataease.provider.query.QueryProvider; import io.dataease.provider.query.es.EsQueryProvider; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; @@ -55,11 +53,11 @@ public class EsProvider extends DatasourceProvider { byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8)); httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); } - Requst requst = new Requst(); - requst.setQuery(dsr.getQuery()); - requst.setFetch_size(dsr.getFetchSize()); + Request request = new Request(); + request.setQuery(dsr.getQuery()); + request.setFetch_size(dsr.getFetchSize()); String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + esConfiguration.getUri() + "?format=json" : esConfiguration.getUrl() + "/" + esConfiguration.getUri() + "?format=json"; - String response = HttpClientUtil.post(url, new Gson().toJson(requst), httpClientConfig); + String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig); EsReponse esReponse = new Gson().fromJson(response, EsReponse.class); list.addAll(fetchResult(esReponse)); @@ -69,7 +67,7 @@ public class EsProvider extends DatasourceProvider { } if (!dsr.isPreviewData()) { while (StringUtils.isNotEmpty(esReponse.getCursor())) { - RequstWithCursor requstWithCursor = new RequstWithCursor(); + RequestWithCursor requstWithCursor = new RequestWithCursor(); requstWithCursor.setQuery(dsr.getQuery()); requstWithCursor.setFetch_size(dsr.getFetchSize()); requstWithCursor.setCursor(esReponse.getCursor()); @@ -286,11 +284,11 @@ public class EsProvider extends DatasourceProvider { httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); } - Requst requst = new Requst(); - requst.setQuery(sql); - requst.setFetch_size(datasourceRequest.getFetchSize()); + Request request = new Request(); + request.setQuery(sql); + request.setFetch_size(datasourceRequest.getFetchSize()); String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + uri : esConfiguration.getUrl() + "/" + uri; - String response = HttpClientUtil.post(url, new Gson().toJson(requst), httpClientConfig); + String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig); return response; }