This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch
3412-move-resources-to-streampipes-rest-and-remove-streampipes-platform-services
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to
refs/heads/3412-move-resources-to-streampipes-rest-and-remove-streampipes-platform-services
by this push:
new cab2260675 fix(#3412): Remove module streampipes-platform-services
cab2260675 is described below
commit cab22606753669fd755baeb99f3920e919c17f3e
Author: Philipp Zehnder <[email protected]>
AuthorDate: Thu Jan 9 16:47:36 2025 +0100
fix(#3412): Remove module streampipes-platform-services
---
streampipes-platform-services/pom.xml | 81 ----------------------
.../rest/impl/datalake}/DataLakeImageResource.java | 2 +-
.../impl/datalake/DataLakeMeasureResource.java | 6 +-
.../rest/impl/datalake/DataLakeResource.java | 8 +--
.../impl/pe}/PipelineElementTemplateResource.java | 3 +-
5 files changed, 10 insertions(+), 90 deletions(-)
diff --git a/streampipes-platform-services/pom.xml
b/streampipes-platform-services/pom.xml
deleted file mode 100644
index c771c9fc65..0000000000
--- a/streampipes-platform-services/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>streampipes-parent</artifactId>
- <groupId>org.apache.streampipes</groupId>
- <version>0.98.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>streampipes-platform-services</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-data-explorer-export</artifactId>
- <version>0.98.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-data-explorer-influx</artifactId>
- <version>0.98.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-data-explorer-management</artifactId>
- <version>0.98.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-model</artifactId>
- <version>0.98.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-rest-shared</artifactId>
- <version>0.98.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-storage-api</artifactId>
- <version>0.98.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-rest</artifactId>
- <version>0.98.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-annotations-jakarta</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeImageResource.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeImageResource.java
similarity index 97%
rename from
streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeImageResource.java
rename to
streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeImageResource.java
index dca9b530d5..a95b2f85cd 100644
---
a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeImageResource.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeImageResource.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.streampipes.ps;
+package org.apache.streampipes.rest.impl.datalake;
import
org.apache.streampipes.rest.core.base.impl.AbstractAuthGuardedRestResource;
import org.apache.streampipes.storage.management.StorageDispatcher;
diff --git
a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeMeasureResourceV4.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeMeasureResource.java
similarity index 96%
rename from
streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeMeasureResourceV4.java
rename to
streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeMeasureResource.java
index 2e0f902745..8bef5a04f4 100644
---
a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeMeasureResourceV4.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeMeasureResource.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.streampipes.ps;
+package org.apache.streampipes.rest.impl.datalake;
import org.apache.streampipes.dataexplorer.api.IDataExplorerSchemaManagement;
import org.apache.streampipes.dataexplorer.management.DataExplorerDispatcher;
@@ -43,11 +43,11 @@ import java.util.Objects;
@RestController
@RequestMapping("/api/v4/datalake/measure")
-public class DataLakeMeasureResourceV4 extends AbstractAuthGuardedRestResource
{
+public class DataLakeMeasureResource extends AbstractAuthGuardedRestResource {
private final IDataExplorerSchemaManagement dataLakeMeasureManagement;
- public DataLakeMeasureResourceV4() {
+ public DataLakeMeasureResource() {
this.dataLakeMeasureManagement = new
DataExplorerDispatcher().getDataExplorerManager()
.getSchemaManagement();
}
diff --git
a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeResourceV4.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeResource.java
similarity index 98%
rename from
streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeResourceV4.java
rename to
streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeResource.java
index d4bda50882..acc464d960 100644
---
a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeResourceV4.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeResource.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.streampipes.ps;
+package org.apache.streampipes.rest.impl.datalake;
import org.apache.streampipes.dataexplorer.api.IDataExplorerQueryManagement;
import org.apache.streampipes.dataexplorer.api.IDataExplorerSchemaManagement;
@@ -78,12 +78,12 @@ import static
org.apache.streampipes.model.datalake.param.SupportedRestQueryPara
@RestController
@RequestMapping("/api/v4/datalake")
-public class DataLakeResourceV4 extends AbstractRestResource {
+public class DataLakeResource extends AbstractRestResource {
private final IDataExplorerQueryManagement dataExplorerQueryManagement;
private final IDataExplorerSchemaManagement dataExplorerSchemaManagement;
- public DataLakeResourceV4() {
+ public DataLakeResource() {
this.dataExplorerSchemaManagement = new DataExplorerDispatcher()
.getDataExplorerManager()
.getSchemaManagement();
@@ -92,7 +92,7 @@ public class DataLakeResourceV4 extends AbstractRestResource {
.getQueryManagement(this.dataExplorerSchemaManagement);
}
- public DataLakeResourceV4(IDataExplorerQueryManagement
dataExplorerQueryManagement) {
+ public DataLakeResource(IDataExplorerQueryManagement
dataExplorerQueryManagement) {
this.dataExplorerQueryManagement = dataExplorerQueryManagement;
this.dataExplorerSchemaManagement = new DataExplorerDispatcher()
.getDataExplorerManager()
diff --git
a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/PipelineElementTemplateResource.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/pe/PipelineElementTemplateResource.java
similarity index 99%
rename from
streampipes-platform-services/src/main/java/org/apache/streampipes/ps/PipelineElementTemplateResource.java
rename to
streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/pe/PipelineElementTemplateResource.java
index 9c939e6cfc..de59ef28a5 100644
---
a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/PipelineElementTemplateResource.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/pe/PipelineElementTemplateResource.java
@@ -15,7 +15,8 @@
* limitations under the License.
*
*/
-package org.apache.streampipes.ps;
+
+package org.apache.streampipes.rest.impl.pe;
import org.apache.streampipes.manager.template.AdapterTemplateHandler;
import org.apache.streampipes.manager.template.DataProcessorTemplateHandler;