Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(#3441): Remove deprecated live dashboard #3442

Merged
merged 1 commit into from
Jan 27, 2025
Merged

feat(#3441): Remove deprecated live dashboard #3442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions streampipes-data-export/src/main/java/org/apache/streampipes/export/AssetLinkResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import org.apache.streampipes.export.constants.ResolvableAssetLinks;
import org.apache.streampipes.export.resolver.AdapterResolver;
import org.apache.streampipes.export.resolver.DashboardResolver;
import org.apache.streampipes.export.resolver.DataSourceResolver;
import org.apache.streampipes.export.resolver.DataViewResolver;
import org.apache.streampipes.export.resolver.FileResolver;
Expand Down Expand Up @@ -58,7 +57,6 @@ public AssetExportConfiguration resolveResources() {
exportConfig.setAssetId(this.assetId);
exportConfig.setAssetName(asset.getAssetName());
exportConfig.setAdapters(new AdapterResolver().resolve(getLinks(assetLinks, ResolvableAssetLinks.ADAPTER)));
exportConfig.setDashboards(new DashboardResolver().resolve(getLinks(assetLinks, ResolvableAssetLinks.DASHBOARD)));
exportConfig.setDataViews(new DataViewResolver().resolve(getLinks(assetLinks, ResolvableAssetLinks.DATA_VIEW)));
exportConfig.setDataSources(
new DataSourceResolver().resolve(getLinks(assetLinks, ResolvableAssetLinks.DATA_SOURCE)));
Expand Down
21 changes: 0 additions & 21 deletions ...s-data-export/src/main/java/org/apache/streampipes/export/dataimport/ImportGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@ public T generate(InputStream inputStream) throws IOException {
}
}

for (String dashboardId : manifest.getDashboards()) {
try {
handleDashboard(asString(previewFiles.get(dashboardId)), dashboardId);
} catch (DocumentConflictException e) {
LOG.warn("Skipping import of dashboard {} (already present with the same id)", dashboardId);
}
}

for (String dataViewId : manifest.getDataViews()) {
try {
handleDataView(asString(previewFiles.get(dataViewId)), dataViewId);
Expand Down Expand Up @@ -107,14 +99,6 @@ public T generate(InputStream inputStream) throws IOException {
}
}

for (String dashboardWidgetId : manifest.getDashboardWidgets()) {
try {
handleDashboardWidget(asString(previewFiles.get(dashboardWidgetId)), dashboardWidgetId);
} catch (DocumentConflictException e) {
LOG.warn("Skipping import of dashboard widget {} (already present with the same id)", dashboardWidgetId);
}
}

for (String dataViewWidgetId : manifest.getDataViewWidgets()) {
try {
handleDataViewWidget(asString(previewFiles.get(dataViewWidgetId)), dataViewWidgetId);
Expand Down Expand Up @@ -149,8 +133,6 @@ private StreamPipesApplicationPackage getManifest(Map<String, byte[]> previewFil

protected abstract void handleAdapter(String document, String adapterId) throws JsonProcessingException;

protected abstract void handleDashboard(String document, String dashboardId) throws JsonProcessingException;

protected abstract void handleDataView(String document, String dataViewId) throws JsonProcessingException;

protected abstract void handleDataSource(String document, String dataSourceId) throws JsonProcessingException;
Expand All @@ -160,9 +142,6 @@ private StreamPipesApplicationPackage getManifest(Map<String, byte[]> previewFil
protected abstract void handleDataLakeMeasure(String document, String dataLakeMeasureId)
throws JsonProcessingException;

protected abstract void handleDashboardWidget(String document, String dashboardWidgetId)
throws JsonProcessingException;

protected abstract void handleDataViewWidget(String document, String dataViewWidgetId) throws JsonProcessingException;

protected abstract void handleFile(String document, String fileMetadataId, Map<String, byte[]> zipContent)
Expand Down
15 changes: 0 additions & 15 deletions ...export/src/main/java/org/apache/streampipes/export/dataimport/PerformImportGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

import org.apache.streampipes.export.model.PermissionInfo;
import org.apache.streampipes.export.resolver.AdapterResolver;
import org.apache.streampipes.export.resolver.DashboardResolver;
import org.apache.streampipes.export.resolver.DashboardWidgetResolver;
import org.apache.streampipes.export.resolver.DataSourceResolver;
import org.apache.streampipes.export.resolver.DataViewResolver;
import org.apache.streampipes.export.resolver.DataViewWidgetResolver;
Expand Down Expand Up @@ -77,14 +75,6 @@ protected void handleAdapter(String document, String adapterId) throws JsonProce
}
}

@Override
protected void handleDashboard(String document, String dashboardId) throws JsonProcessingException {
if (shouldStore(dashboardId, config.getDashboards())) {
new DashboardResolver().writeDocument(document);
permissionsToStore.add(new PermissionInfo(dashboardId, DashboardModel.class));
}
}

@Override
protected void handleDataView(String document, String dataViewId) throws JsonProcessingException {
if (shouldStore(dataViewId, config.getDataViews())) {
Expand Down Expand Up @@ -117,11 +107,6 @@ protected void handleDataLakeMeasure(String document, String dataLakeMeasureId)
}
}

@Override
protected void handleDashboardWidget(String document, String dashboardWidgetId) throws JsonProcessingException {
new DashboardWidgetResolver().writeDocument(document);
}

@Override
protected void handleDataViewWidget(String document, String dataViewWidget) throws JsonProcessingException {
new DataViewWidgetResolver().writeDocument(document);
Expand Down
11 changes: 0 additions & 11 deletions ...export/src/main/java/org/apache/streampipes/export/dataimport/PreviewImportGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@


import org.apache.streampipes.export.resolver.AdapterResolver;
import org.apache.streampipes.export.resolver.DashboardResolver;
import org.apache.streampipes.export.resolver.DataSourceResolver;
import org.apache.streampipes.export.resolver.DataViewResolver;
import org.apache.streampipes.export.resolver.FileResolver;
Expand Down Expand Up @@ -76,11 +75,6 @@ protected void handleAdapter(String document,
}
}

@Override
protected void handleDashboard(String document, String dashboardId) throws JsonProcessingException {
addExportItem(dashboardId, new DashboardResolver().readDocument(document).getName(), importConfig::addDashboard);
}

@Override
protected void handleDataView(String document, String dataViewId) throws JsonProcessingException {
addExportItem(dataViewId, new DataViewResolver().readDocument(document).getName(), importConfig::addDataView);
Expand All @@ -102,11 +96,6 @@ protected void handleDataLakeMeasure(String document, String measurementId) thro
importConfig::addDataLakeMeasure);
}

@Override
protected void handleDashboardWidget(String document, String dashboardWidgetId) {

}

@Override
protected void handleDataViewWidget(String document, String dataViewWidget) {

Expand Down
16 changes: 0 additions & 16 deletions ...-export/src/main/java/org/apache/streampipes/export/generator/ExportPackageGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import org.apache.streampipes.commons.exceptions.ElementNotFoundException;
import org.apache.streampipes.export.resolver.AbstractResolver;
import org.apache.streampipes.export.resolver.AdapterResolver;
import org.apache.streampipes.export.resolver.DashboardResolver;
import org.apache.streampipes.export.resolver.DashboardWidgetResolver;
import org.apache.streampipes.export.resolver.DataSourceResolver;
import org.apache.streampipes.export.resolver.DataViewResolver;
import org.apache.streampipes.export.resolver.DataViewWidgetResolver;
Expand Down Expand Up @@ -55,12 +53,10 @@ public class ExportPackageGenerator {

private final ExportConfiguration exportConfiguration;
private ObjectMapper defaultMapper;
private ObjectMapper spMapper;

public ExportPackageGenerator(ExportConfiguration exportConfiguration) {
this.exportConfiguration = exportConfiguration;
this.defaultMapper = SerializationUtils.getDefaultObjectMapper();
this.spMapper = SerializationUtils.getSpObjectMapper();
}

public byte[] generateExportPackage() throws IOException {
Expand All @@ -80,18 +76,6 @@ public byte[] generateExportPackage() throws IOException {
new AdapterResolver(),
manifest::addAdapter));

config.getDashboards().forEach(item -> {
var resolver = new DashboardResolver();
addDoc(builder,
item,
resolver,
manifest::addDashboard);

var widgets = resolver.getWidgets(item.getResourceId());
var widgetResolver = new DashboardWidgetResolver();
widgets.forEach(widgetId -> addDoc(builder, widgetId, widgetResolver, manifest::addDashboardWidget));
});

config.getDataSources().forEach(item -> addDoc(builder,
item,
new DataSourceResolver(),
Expand Down
74 changes: 0 additions & 74 deletions ...s-data-export/src/main/java/org/apache/streampipes/export/resolver/DashboardResolver.java
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions ...-export/src/main/java/org/apache/streampipes/export/resolver/DashboardWidgetResolver.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import com.google.gson.annotations.SerializedName;

@JsonSubTypes({
@JsonSubTypes.Type(DashboardWidgetModel.class),
@JsonSubTypes.Type(DataExplorerWidgetModel.class)
})
public abstract class DashboardEntity implements Storable {
Expand Down
78 changes: 0 additions & 78 deletions ...ipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardWidgetModel.java
View file
Open in desktop

This file was deleted.

Loading
Loading