This is an automated email from the ASF dual-hosted git repository.
dominikriemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 3a28f37623 fix: Properly read charts from import manifests (#4619)
3a28f37623 is described below
commit 3a28f37623448bb7f902b5b59e2e9cc653e8c0fe
Author: Dominik Riemer <[email protected]>
AuthorDate: Tue Jun 23 14:52:35 2026 +0200
fix: Properly read charts from import manifests (#4619)
---
.../export/dataimport/ImportGenerator.java | 2 +-
.../export/generator/ExportPackageGenerator.java | 2 +-
.../export/StreamPipesApplicationPackage.java | 28 ----------------------
3 files changed, 2 insertions(+), 30 deletions(-)
diff --git
a/streampipes-data-export/src/main/java/org/apache/streampipes/export/dataimport/ImportGenerator.java
b/streampipes-data-export/src/main/java/org/apache/streampipes/export/dataimport/ImportGenerator.java
index d2e582aaef..3a19e7ba27 100644
---
a/streampipes-data-export/src/main/java/org/apache/streampipes/export/dataimport/ImportGenerator.java
+++
b/streampipes-data-export/src/main/java/org/apache/streampipes/export/dataimport/ImportGenerator.java
@@ -74,7 +74,7 @@ public abstract class ImportGenerator<T> {
}
}
- for (String chartId : manifest.getDataViewWidgets()) {
+ for (String chartId : manifest.getDataViews()) {
try {
handleChart(asString(previewFiles.get(chartId)), chartId);
} catch (DocumentConflictException e) {
diff --git
a/streampipes-data-export/src/main/java/org/apache/streampipes/export/generator/ExportPackageGenerator.java
b/streampipes-data-export/src/main/java/org/apache/streampipes/export/generator/ExportPackageGenerator.java
index 5c47c06d5e..86ad0027ed 100644
---
a/streampipes-data-export/src/main/java/org/apache/streampipes/export/generator/ExportPackageGenerator.java
+++
b/streampipes-data-export/src/main/java/org/apache/streampipes/export/generator/ExportPackageGenerator.java
@@ -123,7 +123,7 @@ public class ExportPackageGenerator {
manifest::addDashboard);
var charts = resolver.getCharts(item.getResourceId());
var chartResolver = new ChartResolver(resourceManager);
- charts.forEach(widgetId -> addDoc(builder, widgetId, chartResolver,
manifest::addDataViewWidget));
+ charts.forEach(widgetId -> addDoc(builder, widgetId, chartResolver,
manifest::addDataView));
});
config.getDataViews().forEach(item -> {
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/export/StreamPipesApplicationPackage.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/export/StreamPipesApplicationPackage.java
index 2fee061875..97bf25bddc 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/export/StreamPipesApplicationPackage.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/export/StreamPipesApplicationPackage.java
@@ -33,9 +33,7 @@ public class StreamPipesApplicationPackage {
private Set<String> assets;
private Set<String> adapters;
private Set<String> dashboards;
- private Set<String> dashboardWidgets;
private Set<String> dataViews;
- private Set<String> dataViewWidgets;
private Set<String> dataLakeMeasures;
private Set<String> dataSources;
private Set<String> pipelines;
@@ -50,9 +48,7 @@ public class StreamPipesApplicationPackage {
this.adapters = new HashSet<>();
this.assets = new HashSet<>();
this.dashboards = new HashSet<>();
- this.dashboardWidgets = new HashSet<>();
this.dataViews = new HashSet<>();
- this.dataViewWidgets = new HashSet<>();
this.dataLakeMeasures = new HashSet<>();
this.dataSources = new HashSet<>();
this.pipelines = new HashSet<>();
@@ -108,18 +104,6 @@ public class StreamPipesApplicationPackage {
this.dashboards.add(dashboard);
}
- public Set<String> getDashboardWidgets() {
- return dashboardWidgets;
- }
-
- public void setDashboardWidgets(Set<String> dashboardWidgets) {
- this.dashboardWidgets = dashboardWidgets;
- }
-
- public void addDashboardWidget(String dashboardWidget) {
- this.dashboardWidgets.add(dashboardWidget);
- }
-
public Set<String> getDataViews() {
return dataViews;
}
@@ -132,18 +116,6 @@ public class StreamPipesApplicationPackage {
this.dataViews.add(dataView);
}
- public Set<String> getDataViewWidgets() {
- return dataViewWidgets;
- }
-
- public void setDataViewWidgets(Set<String> dataViewWidgets) {
- this.dataViewWidgets = dataViewWidgets;
- }
-
- public void addDataViewWidget(String dataViewWidget) {
- this.dataViewWidgets.add(dataViewWidget);
- }
-
public Set<String> getDataLakeMeasures() {
return dataLakeMeasures;
}