Merge branch 'iotdb-collector' of https://github.com/apache/iotdb into iotdb-collector

Author: SteveYurongSu

iotdb-collector/collector-core/pom.xml

@@ -35,12 +35,45 @@
             <version>2.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-http</artifactId>
+            <groupId>org.apache.iotdb</groupId>
+            <artifactId>service-rpc</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
+            <groupId>org.apache.iotdb</groupId>
+            <artifactId>pipe-api</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.iotdb</groupId>
+            <artifactId>node-commons</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-handler</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-common</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>json-smart</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -54,9 +87,5 @@
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-        </dependency>
     </dependencies>
 </project>

iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/api/impl/PingApiServiceImpl.java

@@ -17,9 +17,8 @@
 
 package org.apache.iotdb.collector.api.impl;
 
-import org.apache.iotdb.collector.api.NotFoundException;
-import org.apache.iotdb.collector.api.PingApiService;
-import org.apache.iotdb.collector.api.v1.model.ExecutionStatus;
+import org.apache.iotdb.application.protocol.rest.PingApiService;
+import org.apache.iotdb.application.protocol.rest.v1.model.ExecutionStatus;
 import org.apache.iotdb.rpc.TSStatusCode;
 
 import javax.ws.rs.core.Response;
@@ -28,7 +27,7 @@
 public class PingApiServiceImpl extends PingApiService {
 
   @Override
-  public Response tryPing(final SecurityContext securityContext) throws NotFoundException {
+  public Response tryPing(final SecurityContext securityContext) {
     return Response.ok()
         .entity(
             new ExecutionStatus()

iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/api/v1/handler/RequestValidationHandler.java

@@ -19,8 +19,8 @@
 
 package org.apache.iotdb.collector.api.v1.handler;
 
-import org.apache.iotdb.collector.api.v1.model.CreatePipeRequest;
-import org.apache.iotdb.collector.api.v1.model.StopPipeRequest;
+import org.apache.iotdb.application.protocol.rest.v1.model.CreatePipeRequest;
+import org.apache.iotdb.application.protocol.rest.v1.model.StopPipeRequest;
 
 import java.util.Objects;
 

iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/api/v1/impl/AdminApiServiceImpl.java

@@ -19,15 +19,15 @@
 
 package org.apache.iotdb.collector.api.v1.impl;
 
+import org.apache.iotdb.application.protocol.rest.v1.AdminApiService;
+import org.apache.iotdb.application.protocol.rest.v1.NotFoundException;
+import org.apache.iotdb.application.protocol.rest.v1.model.AlterPipeRequest;
+import org.apache.iotdb.application.protocol.rest.v1.model.CreatePipeRequest;
+import org.apache.iotdb.application.protocol.rest.v1.model.DropPipeRequest;
+import org.apache.iotdb.application.protocol.rest.v1.model.StartPipeRequest;
+import org.apache.iotdb.application.protocol.rest.v1.model.StopPipeRequest;
 import org.apache.iotdb.collector.agent.CollectorAgent;
-import org.apache.iotdb.collector.api.v1.AdminApiService;
-import org.apache.iotdb.collector.api.v1.NotFoundException;
 import org.apache.iotdb.collector.api.v1.handler.RequestValidationHandler;
-import org.apache.iotdb.collector.api.v1.model.AlterPipeRequest;
-import org.apache.iotdb.collector.api.v1.model.CreatePipeRequest;
-import org.apache.iotdb.collector.api.v1.model.DropPipeRequest;
-import org.apache.iotdb.collector.api.v1.model.StartPipeRequest;
-import org.apache.iotdb.collector.api.v1.model.StopPipeRequest;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

iotdb-collector/pom.xml

@@ -33,11 +33,4 @@
         <module>collector-core</module>
         <module>collector-openapi</module>
     </modules>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.iotdb</groupId>
-            <artifactId>node-commons</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
 </project>