Skip to content

Commit 36468c2

Browse files
committed
fix: Use the original object id instead of the sanitized one from the export manifest
1 parent 1b8aba2 commit 36468c2

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

streampipes-data-export/src/main/java/org/apache/streampipes/export/dataimport/PerformImportGenerator.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.apache.streampipes.export.resolver.PipelineResolver;
3131
import org.apache.streampipes.manager.file.FileHandler;
3232
import org.apache.streampipes.model.SpDataStream;
33-
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
3433
import org.apache.streampipes.model.dashboard.DashboardModel;
3534
import org.apache.streampipes.model.datalake.DataExplorerWidgetModel;
3635
import org.apache.streampipes.model.datalake.DataLakeMeasure;
@@ -81,31 +80,34 @@ protected void handleAsset(Map<String, byte[]> previewFiles, String assetId) thr
8180
protected void handleAdapter(String document, String adapterId) throws JsonProcessingException {
8281
if (shouldStore(adapterId, config.getAdapters())) {
8382
writeDocument(document, new AdapterResolver());
84-
permissionsToStore.add(new PermissionInfo(adapterId, AdapterDescription.class));
83+
// adapters do not have permissions associated
8584
}
8685
}
8786

8887
@Override
8988
protected void handleChart(String document, String chartId) throws JsonProcessingException {
9089
if (shouldStore(chartId, config.getDataViews())) {
9190
writeDocument(document, new ChartResolver());
92-
permissionsToStore.add(new PermissionInfo(chartId, DataExplorerWidgetModel.class));
91+
var chart = new ChartResolver().deserializeDocument(document);
92+
permissionsToStore.add(new PermissionInfo(chart.getElementId(), DataExplorerWidgetModel.class));
9393
}
9494
}
9595

9696
@Override
9797
protected void handleDashboard(String document, String dashboardId) throws JsonProcessingException {
9898
if (shouldStore(dashboardId, config.getDashboards())) {
9999
writeDocument(document, new DashboardResolver());
100-
permissionsToStore.add(new PermissionInfo(dashboardId, DashboardModel.class));
100+
var dashboard = new DashboardResolver().deserializeDocument(document);
101+
permissionsToStore.add(new PermissionInfo(dashboard.getElementId(), DashboardModel.class));
101102
}
102103
}
103104

104105
@Override
105106
protected void handleDataSource(String document, String dataSourceId) throws JsonProcessingException {
106107
if (shouldStore(dataSourceId, config.getDataSources())) {
107108
writeDocument(document, new DataSourceResolver());
108-
permissionsToStore.add(new PermissionInfo(dataSourceId, SpDataStream.class));
109+
var dataStream = new DataSourceResolver().deserializeDocument(document);
110+
permissionsToStore.add(new PermissionInfo(dataStream.getElementId(), SpDataStream.class));
109111
}
110112
}
111113

0 commit comments

Comments
 (0)