This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch rename_rest in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 258d1bf495c90a9f6991606a8ba27d93d62ad706 Author: HTHou <[email protected]> AuthorDate: Mon Oct 31 10:35:48 2022 +0800 Rename mpprest to rest --- openapi/pom.xml | 26 ---------------------- .../MPPRestService.java => rest/RestService.java} | 20 ++++++++--------- .../{mpprest => rest}/filter/ApiOriginFilter.java | 2 +- .../filter/AuthorizationFilter.java | 4 ++-- .../filter/BasicSecurityContext.java | 2 +- .../db/protocol/{mpprest => rest}/filter/User.java | 2 +- .../{mpprest => rest}/filter/UserCache.java | 2 +- .../handler/AuthorizationHandler.java | 4 ++-- .../handler/ExceptionHandler.java | 4 ++-- .../handler/QueryDataSetHandler.java | 4 ++-- .../handler/RequestValidationHandler.java | 8 +++---- .../handler/StatementConstructionHandler.java | 4 ++-- .../impl/GrafanaApiServiceImpl.java | 20 ++++++++--------- .../{mpprest => rest}/impl/PingApiServiceImpl.java | 6 ++--- .../{mpprest => rest}/impl/RestApiServiceImpl.java | 20 ++++++++--------- .../java/org/apache/iotdb/db/service/DataNode.java | 4 ++-- .../java/org/apache/iotdb/db/service/NewIoTDB.java | 4 ++-- 17 files changed, 55 insertions(+), 81 deletions(-) diff --git a/openapi/pom.xml b/openapi/pom.xml index c3310cdc54..b0421a9d0a 100644 --- a/openapi/pom.xml +++ b/openapi/pom.xml @@ -89,32 +89,6 @@ <artifactId>openapi-generator-maven-plugin</artifactId> <version>${openapi.generator.version}</version> <executions> - <execution> - <id>generate-java-mpp-rest-codes</id> - <goals> - <goal>generate</goal> - </goals> - <configuration> - <inputSpec>${project.basedir}/src/main/openapi3/iotdb-rest.yaml</inputSpec> - <output>${project.build.directory}/generated-sources/java</output> - <apiPackage>org.apache.iotdb.db.protocol.mpprest</apiPackage> - <modelPackage>org.apache.iotdb.db.protocol.mpprest.model</modelPackage> - <invokerPackage>org.apache.iotdb.db.protocol.mpprest.invoker</invokerPackage> - <generatorName>jaxrs-jersey</generatorName> - <groupId>org.apache.iotdb</groupId> - <artifactId>iotdb-rest-service</artifactId> - <artifactVersion>${project.version}</artifactVersion> - <addCompileSourceRoot>true</addCompileSourceRoot> - <configOptions> - <licenseName>Apache License 2.0</licenseName> - <groupId>org.apache.iotdb</groupId> - <artifactId>iotdb-rest-service</artifactId> - <artifactVersion>${project.version}</artifactVersion> - <dateLibrary>java8</dateLibrary> - <useGzipFeature>true</useGzipFeature> - </configOptions> - </configuration> - </execution> <execution> <id>generate-java-rest-codes</id> <goals> diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/MPPRestService.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/RestService.java similarity index 90% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/MPPRestService.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/RestService.java index 859cfca98f..af4a74cb93 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/MPPRestService.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/RestService.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest; +package org.apache.iotdb.db.protocol.rest; import org.apache.iotdb.commons.exception.StartupException; import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceConfig; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor; -import org.apache.iotdb.db.protocol.mpprest.filter.ApiOriginFilter; +import org.apache.iotdb.db.protocol.rest.filter.ApiOriginFilter; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.server.HttpConfiguration; @@ -41,9 +41,9 @@ import javax.servlet.DispatcherType; import java.util.EnumSet; -public class MPPRestService implements IService { +public class RestService implements IService { - private static final Logger LOGGER = LoggerFactory.getLogger(MPPRestService.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RestService.class); private static Server server; @@ -97,7 +97,7 @@ public class MPPRestService implements IService { holder.setInitOrder(1); holder.setInitParameter( "jersey.config.server.provider.packages", - "io.swagger.jaxrs.listing, io.swagger.sample.resource, org.apache.iotdb.db.protocol.mpprest"); + "io.swagger.jaxrs.listing, io.swagger.sample.resource, org.apache.iotdb.db.protocol.rest"); holder.setInitParameter( "jersey.config.server.provider.classnames", "org.glassfish.jersey.media.multipart.MultiPartFeature"); @@ -149,14 +149,14 @@ public class MPPRestService implements IService { return ServiceType.REST_SERVICE; } - public static MPPRestService getInstance() { - return MPPRestServiceHolder.INSTANCE; + public static RestService getInstance() { + return RestServiceHolder.INSTANCE; } - private static class MPPRestServiceHolder { + private static class RestServiceHolder { - private static final MPPRestService INSTANCE = new MPPRestService(); + private static final RestService INSTANCE = new RestService(); - private MPPRestServiceHolder() {} + private RestServiceHolder() {} } } diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/ApiOriginFilter.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/ApiOriginFilter.java similarity index 96% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/ApiOriginFilter.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/ApiOriginFilter.java index d90886f85d..c5b8a7bba7 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/ApiOriginFilter.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/ApiOriginFilter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.filter; +package org.apache.iotdb.db.protocol.rest.filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/AuthorizationFilter.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/AuthorizationFilter.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/AuthorizationFilter.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/AuthorizationFilter.java index 7cb4d8681e..1ddeca7287 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/AuthorizationFilter.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/AuthorizationFilter.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.filter; +package org.apache.iotdb.db.protocol.rest.filter; import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.auth.authorizer.IAuthorizer; import org.apache.iotdb.db.auth.AuthorizerManager; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor; -import org.apache.iotdb.db.protocol.mpprest.model.ExecutionStatus; +import org.apache.iotdb.db.protocol.rest.model.ExecutionStatus; import org.apache.iotdb.rpc.TSStatusCode; import org.glassfish.jersey.internal.util.Base64; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/BasicSecurityContext.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/BasicSecurityContext.java similarity index 96% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/BasicSecurityContext.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/BasicSecurityContext.java index 7c6b3ca990..8914890136 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/BasicSecurityContext.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/BasicSecurityContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.filter; +package org.apache.iotdb.db.protocol.rest.filter; import javax.ws.rs.core.SecurityContext; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/User.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/User.java similarity index 95% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/User.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/User.java index 3d5bd6594c..d92a8a3f26 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/User.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/User.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.filter; +package org.apache.iotdb.db.protocol.rest.filter; public class User { private String username; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/UserCache.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/UserCache.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/UserCache.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/UserCache.java index 80022848bb..5a11385d08 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/filter/UserCache.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/UserCache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.filter; +package org.apache.iotdb.db.protocol.rest.filter; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceConfig; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/AuthorizationHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/AuthorizationHandler.java similarity index 93% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/AuthorizationHandler.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/AuthorizationHandler.java index d5ee9d2e80..434b986e11 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/AuthorizationHandler.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/AuthorizationHandler.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.handler; +package org.apache.iotdb.db.protocol.rest.handler; import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.mpp.plan.statement.Statement; -import org.apache.iotdb.db.protocol.mpprest.model.ExecutionStatus; +import org.apache.iotdb.db.protocol.rest.model.ExecutionStatus; import org.apache.iotdb.rpc.TSStatusCode; import javax.ws.rs.core.Response; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/ExceptionHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/ExceptionHandler.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/ExceptionHandler.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/ExceptionHandler.java index f1c27ddb13..97f2eb7001 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/ExceptionHandler.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/ExceptionHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.handler; +package org.apache.iotdb.db.protocol.rest.handler; import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.exception.IllegalPathException; @@ -26,7 +26,7 @@ import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SQLParserException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; -import org.apache.iotdb.db.protocol.mpprest.model.ExecutionStatus; +import org.apache.iotdb.db.protocol.rest.model.ExecutionStatus; import org.apache.iotdb.rpc.TSStatusCode; import org.antlr.v4.runtime.misc.ParseCancellationException; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/QueryDataSetHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/QueryDataSetHandler.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/QueryDataSetHandler.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/QueryDataSetHandler.java index 54041cc03f..3616722a8d 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/QueryDataSetHandler.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/QueryDataSetHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.handler; +package org.apache.iotdb.db.protocol.rest.handler; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.db.mpp.common.header.DatasetHeader; @@ -24,7 +24,7 @@ import org.apache.iotdb.db.mpp.plan.statement.Statement; import org.apache.iotdb.db.mpp.plan.statement.crud.QueryStatement; import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowChildPathsStatement; import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStatement; -import org.apache.iotdb.db.protocol.mpprest.model.ExecutionStatus; +import org.apache.iotdb.db.protocol.rest.model.ExecutionStatus; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.Path; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/RequestValidationHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/RequestValidationHandler.java similarity index 89% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/RequestValidationHandler.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/RequestValidationHandler.java index ca99130465..2837fbc6e1 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/RequestValidationHandler.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/RequestValidationHandler.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.handler; +package org.apache.iotdb.db.protocol.rest.handler; -import org.apache.iotdb.db.protocol.mpprest.model.ExpressionRequest; -import org.apache.iotdb.db.protocol.mpprest.model.InsertTabletRequest; -import org.apache.iotdb.db.protocol.mpprest.model.SQL; +import org.apache.iotdb.db.protocol.rest.model.ExpressionRequest; +import org.apache.iotdb.db.protocol.rest.model.InsertTabletRequest; +import org.apache.iotdb.db.protocol.rest.model.SQL; import org.apache.commons.lang3.Validate; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/StatementConstructionHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/StatementConstructionHandler.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/StatementConstructionHandler.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/StatementConstructionHandler.java index 532a356a77..f01f809c86 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/handler/StatementConstructionHandler.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/StatementConstructionHandler.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.handler; +package org.apache.iotdb.db.protocol.rest.handler; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.WriteProcessRejectException; import org.apache.iotdb.db.mpp.plan.statement.crud.InsertTabletStatement; -import org.apache.iotdb.db.protocol.mpprest.model.InsertTabletRequest; +import org.apache.iotdb.db.protocol.rest.model.InsertTabletRequest; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.utils.Binary; import org.apache.iotdb.tsfile.utils.BitMap; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/impl/GrafanaApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java similarity index 93% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/impl/GrafanaApiServiceImpl.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java index 12c230c5ce..5b8449a211 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/impl/GrafanaApiServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.impl; +package org.apache.iotdb.db.protocol.rest.impl; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBConfig; @@ -33,15 +33,15 @@ import org.apache.iotdb.db.mpp.plan.parser.StatementGenerator; import org.apache.iotdb.db.mpp.plan.statement.Statement; import org.apache.iotdb.db.mpp.plan.statement.crud.QueryStatement; import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStatement; -import org.apache.iotdb.db.protocol.mpprest.GrafanaApiService; -import org.apache.iotdb.db.protocol.mpprest.NotFoundException; -import org.apache.iotdb.db.protocol.mpprest.handler.AuthorizationHandler; -import org.apache.iotdb.db.protocol.mpprest.handler.ExceptionHandler; -import org.apache.iotdb.db.protocol.mpprest.handler.QueryDataSetHandler; -import org.apache.iotdb.db.protocol.mpprest.handler.RequestValidationHandler; -import org.apache.iotdb.db.protocol.mpprest.model.ExecutionStatus; -import org.apache.iotdb.db.protocol.mpprest.model.ExpressionRequest; -import org.apache.iotdb.db.protocol.mpprest.model.SQL; +import org.apache.iotdb.db.protocol.rest.GrafanaApiService; +import org.apache.iotdb.db.protocol.rest.NotFoundException; +import org.apache.iotdb.db.protocol.rest.handler.AuthorizationHandler; +import org.apache.iotdb.db.protocol.rest.handler.ExceptionHandler; +import org.apache.iotdb.db.protocol.rest.handler.QueryDataSetHandler; +import org.apache.iotdb.db.protocol.rest.handler.RequestValidationHandler; +import org.apache.iotdb.db.protocol.rest.model.ExecutionStatus; +import org.apache.iotdb.db.protocol.rest.model.ExpressionRequest; +import org.apache.iotdb.db.protocol.rest.model.SQL; import org.apache.iotdb.db.query.control.SessionManager; import org.apache.iotdb.db.utils.SetThreadName; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/impl/PingApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/PingApiServiceImpl.java similarity index 91% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/impl/PingApiServiceImpl.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/PingApiServiceImpl.java index 0c970a45c4..d16988e431 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/impl/PingApiServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/PingApiServiceImpl.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.impl; +package org.apache.iotdb.db.protocol.rest.impl; import org.apache.iotdb.commons.service.ThriftService; -import org.apache.iotdb.db.protocol.mpprest.PingApiService; -import org.apache.iotdb.db.protocol.mpprest.model.ExecutionStatus; +import org.apache.iotdb.db.protocol.rest.PingApiService; +import org.apache.iotdb.db.protocol.rest.model.ExecutionStatus; import org.apache.iotdb.db.service.RPCService; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/impl/RestApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java similarity index 91% rename from server/src/main/java/org/apache/iotdb/db/protocol/mpprest/impl/RestApiServiceImpl.java rename to server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java index 1d440c20de..28537790ad 100644 --- a/server/src/main/java/org/apache/iotdb/db/protocol/mpprest/impl/RestApiServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.protocol.mpprest.impl; +package org.apache.iotdb.db.protocol.rest.impl; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -32,15 +32,15 @@ import org.apache.iotdb.db.mpp.plan.execution.IQueryExecution; import org.apache.iotdb.db.mpp.plan.parser.StatementGenerator; import org.apache.iotdb.db.mpp.plan.statement.Statement; import org.apache.iotdb.db.mpp.plan.statement.crud.InsertTabletStatement; -import org.apache.iotdb.db.protocol.mpprest.RestApiService; -import org.apache.iotdb.db.protocol.mpprest.handler.AuthorizationHandler; -import org.apache.iotdb.db.protocol.mpprest.handler.ExceptionHandler; -import org.apache.iotdb.db.protocol.mpprest.handler.QueryDataSetHandler; -import org.apache.iotdb.db.protocol.mpprest.handler.RequestValidationHandler; -import org.apache.iotdb.db.protocol.mpprest.handler.StatementConstructionHandler; -import org.apache.iotdb.db.protocol.mpprest.model.ExecutionStatus; -import org.apache.iotdb.db.protocol.mpprest.model.InsertTabletRequest; -import org.apache.iotdb.db.protocol.mpprest.model.SQL; +import org.apache.iotdb.db.protocol.rest.RestApiService; +import org.apache.iotdb.db.protocol.rest.handler.AuthorizationHandler; +import org.apache.iotdb.db.protocol.rest.handler.ExceptionHandler; +import org.apache.iotdb.db.protocol.rest.handler.QueryDataSetHandler; +import org.apache.iotdb.db.protocol.rest.handler.RequestValidationHandler; +import org.apache.iotdb.db.protocol.rest.handler.StatementConstructionHandler; +import org.apache.iotdb.db.protocol.rest.model.ExecutionStatus; +import org.apache.iotdb.db.protocol.rest.model.InsertTabletRequest; +import org.apache.iotdb.db.protocol.rest.model.SQL; import org.apache.iotdb.db.query.control.SessionManager; import org.apache.iotdb.db.utils.SetThreadName; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java index a1b7ede369..a7e6690295 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -63,7 +63,7 @@ import org.apache.iotdb.db.metadata.schemaregion.SchemaEngine; import org.apache.iotdb.db.metadata.template.ClusterTemplateManager; import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeService; import org.apache.iotdb.db.mpp.execution.schedule.DriverScheduler; -import org.apache.iotdb.db.protocol.mpprest.MPPRestService; +import org.apache.iotdb.db.protocol.rest.RestService; import org.apache.iotdb.db.service.basic.ServiceProvider; import org.apache.iotdb.db.service.basic.StandaloneServiceProvider; import org.apache.iotdb.db.service.metrics.DataNodeMetricsHelper; @@ -664,7 +664,7 @@ public class DataNode implements DataNodeMBean { registerManager.register(MQTTService.getInstance()); } if (IoTDBRestServiceDescriptor.getInstance().getConfig().isEnableRestService()) { - registerManager.register(MPPRestService.getInstance()); + registerManager.register(RestService.getInstance()); } } diff --git a/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java b/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java index adba779cc9..63d4385e31 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java +++ b/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java @@ -42,7 +42,7 @@ import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.localconfignode.LocalConfigNode; import org.apache.iotdb.db.metadata.LocalSchemaProcessor; import org.apache.iotdb.db.mpp.execution.schedule.DriverScheduler; -import org.apache.iotdb.db.protocol.mpprest.MPPRestService; +import org.apache.iotdb.db.protocol.rest.RestService; import org.apache.iotdb.db.rescon.PrimitiveArrayManager; import org.apache.iotdb.db.rescon.SystemInfo; import org.apache.iotdb.db.service.metrics.DataNodeMetricsHelper; @@ -182,7 +182,7 @@ public class NewIoTDB implements NewIoTDBMBean { registerManager.register(MQTTService.getInstance()); } if (IoTDBRestServiceDescriptor.getInstance().getConfig().isEnableRestService()) { - registerManager.register(MPPRestService.getInstance()); + registerManager.register(RestService.getInstance()); } }
