capsule result urls in api object

autodoc/src/main/java/com/bakdata/conquery/Constants.java

@@ -16,13 +16,13 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 
-import com.bakdata.conquery.apiv1.ExecutionStatus;
 import com.bakdata.conquery.apiv1.FilterTemplate;
-import com.bakdata.conquery.apiv1.FullExecutionStatus;
 import com.bakdata.conquery.apiv1.IdLabel;
 import com.bakdata.conquery.apiv1.KeyValue;
 import com.bakdata.conquery.apiv1.MetaDataPatch;
-import com.bakdata.conquery.apiv1.OverviewExecutionStatus;
+import com.bakdata.conquery.apiv1.execution.ExecutionStatus;
+import com.bakdata.conquery.apiv1.execution.FullExecutionStatus;
+import com.bakdata.conquery.apiv1.execution.OverviewExecutionStatus;
 import com.bakdata.conquery.apiv1.frontend.FrontendRoot;
 import com.bakdata.conquery.apiv1.frontend.FrontendValue;
 import com.bakdata.conquery.apiv1.query.CQElement;

backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java

@@ -1,6 +1,5 @@
 package com.bakdata.conquery.apiv1;
 
-import java.net.URL;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,6 +20,10 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 
+import com.bakdata.conquery.apiv1.execution.ExecutionStatus;
+import com.bakdata.conquery.apiv1.execution.FullExecutionStatus;
+import com.bakdata.conquery.apiv1.execution.OverviewExecutionStatus;
+import com.bakdata.conquery.apiv1.execution.ResultAsset;
 import com.bakdata.conquery.apiv1.query.CQElement;
 import com.bakdata.conquery.apiv1.query.ConceptQuery;
 import com.bakdata.conquery.apiv1.query.ExternalUpload;
@@ -219,7 +222,7 @@ public Stream<ExecutionStatus> getQueriesFiltered(Dataset datasetId, UriBuilder
 						 .map(mq -> {
 							 OverviewExecutionStatus status = mq.buildStatusOverview(uriBuilder.clone(), subject);
 							 if (mq.isReadyToDownload()) {
-								 status.setResultUrls(getDownloadUrls(config.getResultProviders(), mq, uriBuilder, allProviders));
+								 status.setResultUrls(getResultAssets(config.getResultProviders(), mq, uriBuilder, allProviders));
 							 }
 							 return status;
 						 });
@@ -236,7 +239,7 @@ public Stream<ExecutionStatus> getQueriesFiltered(Dataset datasetId, UriBuilder
 	 * @param allProviders If true, forces {@link ResultRendererProvider} to return an URL if possible.
 	 * @return The modified status
 	 */
-	public static List<URL> getDownloadUrls(List<ResultRendererProvider> renderer, ManagedExecution exec, UriBuilder uriBuilder, boolean allProviders) {
+	public static List<ResultAsset> getResultAssets(List<ResultRendererProvider> renderer, ManagedExecution exec, UriBuilder uriBuilder, boolean allProviders) {
 
 		return renderer.stream()
 					   .map(r -> r.generateResultURLs(exec, uriBuilder.clone(), allProviders))
@@ -349,7 +352,7 @@ public FullExecutionStatus getQueryFullStatus(ManagedExecution query, Subject su
 		final FullExecutionStatus status = query.buildStatusFull(subject);
 
 		if (query.isReadyToDownload() && subject.isPermitted(query.getDataset(), Ability.DOWNLOAD)) {
-			status.setResultUrls(getDownloadUrls(config.getResultProviders(), query, url, allProviders));
+			status.setResultUrls(getResultAssets(config.getResultProviders(), query, url, allProviders));
 		}
 		return status;
 	}
@@ -422,7 +425,7 @@ public FullExecutionStatus getSingleEntityExport(Subject subject, UriBuilder uri
 
 
 		FullExecutionStatus status = execution.buildStatusFull(subject);
-		status.setResultUrls(getDownloadUrls(config.getResultProviders(), execution, uriBuilder, false));
+		status.setResultUrls(getResultAssets(config.getResultProviders(), execution, uriBuilder, false));
 		return status;
 	}
 

backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java → backend/src/main/java/com/bakdata/conquery/apiv1/execution/ExecutionStatus.java

@@ -1,4 +1,9 @@
-package com.bakdata.conquery.apiv1;
+package com.bakdata.conquery.apiv1.execution;
+
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.util.Collections;
+import java.util.List;
 
 import com.bakdata.conquery.models.execution.ExecutionState;
 import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId;
@@ -10,12 +15,6 @@
 import lombok.ToString;
 import lombok.experimental.FieldNameConstants;
 
-import java.net.URL;
-import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
-import java.util.Collections;
-import java.util.List;
-
 @NoArgsConstructor
 @ToString
 @Data
@@ -49,7 +48,7 @@ public abstract class ExecutionStatus {
 	/**
 	 * The urls under from which the result of the execution can be downloaded as soon as it finished successfully.
 	 */
-	private List<URL> resultUrls = Collections.emptyList();
+	private List<ResultAsset> resultUrls = Collections.emptyList();
 
 
 }

backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java → backend/src/main/java/com/bakdata/conquery/apiv1/execution/FullExecutionStatus.java

@@ -1,4 +1,10 @@
-package com.bakdata.conquery.apiv1;
+package com.bakdata.conquery.apiv1.execution;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.Nullable;
 
 import com.bakdata.conquery.apiv1.query.QueryDescription;
 import com.bakdata.conquery.io.jackson.serializer.NsIdRefCollection;
@@ -11,11 +17,6 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.FieldNameConstants;
 
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
 /**
  * This status holds extensive information about the query description and meta data that is computational heavy
  * and can produce a larger payload to requests.

backend/src/main/java/com/bakdata/conquery/apiv1/OverviewExecutionStatus.java → backend/src/main/java/com/bakdata/conquery/apiv1/execution/OverviewExecutionStatus.java

@@ -1,4 +1,4 @@
-package com.bakdata.conquery.apiv1;
+package com.bakdata.conquery.apiv1.execution;
 
 import lombok.NoArgsConstructor;
 

backend/src/main/java/com/bakdata/conquery/apiv1/execution/ResultAsset.java

@@ -0,0 +1,6 @@
+package com.bakdata.conquery.apiv1.execution;
+
+import java.net.URL;
+
+public record ResultAsset(String label, URL url) {
+}

backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java

@@ -19,7 +19,7 @@
 import javax.validation.constraints.NotNull;
 
 import com.bakdata.conquery.ConqueryConstants;
-import com.bakdata.conquery.apiv1.FullExecutionStatus;
+import com.bakdata.conquery.apiv1.execution.FullExecutionStatus;
 import com.bakdata.conquery.apiv1.query.concept.filter.CQTable;
 import com.bakdata.conquery.apiv1.query.concept.specific.CQConcept;
 import com.bakdata.conquery.io.cps.CPSType;

backend/src/main/java/com/bakdata/conquery/io/jersey/RESTServer.java

@@ -7,6 +7,7 @@
 import com.bakdata.conquery.io.jetty.ConqueryErrorExecptionMapper;
 import com.bakdata.conquery.io.jetty.ConqueryJsonExceptionMapper;
 import com.bakdata.conquery.io.jetty.JsonValidationExceptionMapper;
+import com.bakdata.conquery.io.jetty.NoSuchElementExceptionMapper;
 import com.bakdata.conquery.models.auth.entities.Subject;
 import com.bakdata.conquery.models.auth.web.AuthenticationExceptionMapper;
 import com.bakdata.conquery.models.auth.web.AuthorizationExceptionMapper;
@@ -32,6 +33,7 @@ public static void configure(ConqueryConfig config, ResourceConfig jersey) {
 		jersey.register(new AuthenticationExceptionMapper());
 		jersey.register(new AuthorizationExceptionMapper());
 		jersey.register(JsonValidationExceptionMapper.class);
+		jersey.register(NoSuchElementExceptionMapper.class);
 		// default Dropwizard's exception mappers
 		jersey.register(new ConqueryErrorExecptionMapper());
 		jersey.register(ConqueryJsonExceptionMapper.class);

backend/src/main/java/com/bakdata/conquery/io/jetty/NoSuchElementExceptionMapper.java

@@ -0,0 +1,18 @@
+package com.bakdata.conquery.io.jetty;
+
+import java.util.NoSuchElementException;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class NoSuchElementExceptionMapper implements ExceptionMapper<NoSuchElementException> {
+	@Override
+	public Response toResponse(NoSuchElementException exception) {
+		log.trace("Mapping exception:", exception);
+		return Response.status(Response.Status.NOT_FOUND).type(MediaType.APPLICATION_JSON_TYPE).entity(exception.getMessage()).build();
+	}
+}

backend/src/main/java/com/bakdata/conquery/io/result/ResultRender/ResultRendererProvider.java

@@ -1,10 +1,10 @@
 package com.bakdata.conquery.io.result.ResultRender;
 
-import java.net.URL;
 import java.util.Collection;
 
 import javax.ws.rs.core.UriBuilder;
 
+import com.bakdata.conquery.apiv1.execution.ResultAsset;
 import com.bakdata.conquery.commands.ManagerNode;
 import com.bakdata.conquery.io.cps.CPSBase;
 import com.bakdata.conquery.models.execution.ManagedExecution;
@@ -24,7 +24,7 @@ public interface ResultRendererProvider {
 	 * @param allProviders A flag that should override internal "hide-this-url" flags.
 	 * @return An Optional with the url or an empty optional.
 	 */
-	Collection<URL> generateResultURLs(ManagedExecution exec, UriBuilder uriBuilder, boolean allProviders);
+	Collection<ResultAsset> generateResultURLs(ManagedExecution exec, UriBuilder uriBuilder, boolean allProviders);
 
 	void registerResultResource(DropwizardResourceConfig environment, ManagerNode manager);
 }

backend/src/main/java/com/bakdata/conquery/io/result/ResultUtil.java

@@ -35,12 +35,12 @@ String getHeaderValue() {
 	}
 
 
-	public static Response makeResponseWithFileName(Response.ResponseBuilder response, String label, String fileExtension, MediaType mediaType, ContentDispositionOption disposition) {
+	public static Response makeResponseWithFileName(Response.ResponseBuilder response, String filename, MediaType mediaType, ContentDispositionOption disposition) {
 		response.header(HttpHeaders.CONTENT_TYPE, mediaType);
-		if (!(Strings.isNullOrEmpty(label) || label.isBlank())) {
-			// Set filename from label if the label was set, otherwise the browser will name the file according to the request path
+		if (!(Strings.isNullOrEmpty(filename) || filename.isBlank())) {
+			// Set filename from filename if the filename was set, otherwise the browser will name the file according to the request path
 			response.header("Content-Disposition", String.format(
-					"%s; filename=\"%s\"", disposition.getHeaderValue(), FileUtil.makeSafeFileName(label, fileExtension)));
+					"%s; filename=\"%s\"", disposition.getHeaderValue(), FileUtil.makeSafeFileName(filename)));
 		}
 		return response.build();
 	}

backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java

@@ -96,7 +96,7 @@ public static <E extends ManagedExecution & SingleTableResult> Response getArrow
 
 		final Dataset dataset = exec.getDataset();
 
-		log.info("Downloading results for {} on dataset {}", exec, dataset);
+		log.info("Downloading results for {}", exec.getId());
 
 		ResultUtil.authorizeExecutable(subject, exec);
 
@@ -135,7 +135,7 @@ public static <E extends ManagedExecution & SingleTableResult> Response getArrow
 			}
 		};
 
-		return makeResponseWithFileName(Response.ok(out), exec.getLabelWithoutAutoLabelSuffix(), fileExtension, mediaType, ResultUtil.ContentDispositionOption.ATTACHMENT);
+		return makeResponseWithFileName(Response.ok(out), String.join(".", exec.getLabelWithoutAutoLabelSuffix(), fileExtension), mediaType, ResultUtil.ContentDispositionOption.ATTACHMENT);
 	}
 
 

backend/src/main/java/com/bakdata/conquery/io/result/csv/ResultCsvProcessor.java

@@ -25,6 +25,7 @@
 import com.bakdata.conquery.models.query.SingleTableResult;
 import com.bakdata.conquery.models.worker.DatasetRegistry;
 import com.bakdata.conquery.models.worker.Namespace;
+import com.bakdata.conquery.resources.ResourceConstants;
 import com.bakdata.conquery.util.io.ConqueryMDC;
 import com.bakdata.conquery.util.io.IdColumnUtil;
 import lombok.RequiredArgsConstructor;
@@ -45,7 +46,7 @@ public <E extends ManagedExecution & SingleTableResult> Response createResult(Su
 		final Namespace namespace = datasetRegistry.get(dataset.getId());
 
 		ConqueryMDC.setLocation(subject.getName());
-		log.info("Downloading results for {} on dataset {}", exec, dataset);
+		log.info("Downloading results for {}", exec.getId());
 
 		ResultUtil.authorizeExecutable(subject, exec);
 
@@ -74,7 +75,12 @@ public <E extends ManagedExecution & SingleTableResult> Response createResult(Su
 			}
 		};
 
-		return makeResponseWithFileName(Response.ok(out), exec.getLabelWithoutAutoLabelSuffix(), "csv", new MediaType("text", "csv", charset.toString()), ResultUtil.ContentDispositionOption.ATTACHMENT);
+		return makeResponseWithFileName(
+				Response.ok(out),
+				String.join(".", exec.getLabelWithoutAutoLabelSuffix(), ResourceConstants.FILE_EXTENTION_CSV),
+				new MediaType("text", "csv", charset.toString()),
+				ResultUtil.ContentDispositionOption.ATTACHMENT
+		);
 
 	}
 }

backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java

@@ -21,6 +21,7 @@
 import com.bakdata.conquery.models.query.SingleTableResult;
 import com.bakdata.conquery.models.worker.DatasetRegistry;
 import com.bakdata.conquery.models.worker.Namespace;
+import com.bakdata.conquery.resources.ResourceConstants;
 import com.bakdata.conquery.util.io.ConqueryMDC;
 import com.bakdata.conquery.util.io.IdColumnUtil;
 import lombok.RequiredArgsConstructor;
@@ -43,7 +44,7 @@ public <E extends ManagedExecution & SingleTableResult> Response createResult(Su
 
 		final Dataset dataset = exec.getDataset();
 
-		log.info("Downloading results for {} on dataset {}", exec, dataset);
+		log.info("Downloading results for {}", exec.getId());
 
 		ResultUtil.authorizeExecutable(subject, exec);
 
@@ -60,7 +61,7 @@ public <E extends ManagedExecution & SingleTableResult> Response createResult(Su
 			log.trace("FINISHED downloading {}", exec.getId());
 		};
 
-		return makeResponseWithFileName(Response.ok(out), exec.getLabelWithoutAutoLabelSuffix(), "xlsx", MEDIA_TYPE, ResultUtil.ContentDispositionOption.ATTACHMENT);
+		return makeResponseWithFileName(Response.ok(out), String.join(".", exec.getLabelWithoutAutoLabelSuffix(), ResourceConstants.FILE_EXTENTION_XLSX), MEDIA_TYPE, ResultUtil.ContentDispositionOption.ATTACHMENT);
 	}
 
 

backend/src/main/java/com/bakdata/conquery/io/result/parquet/ResultParquetProcessor.java

@@ -1,7 +1,6 @@
 package com.bakdata.conquery.io.result.parquet;
 
 import static com.bakdata.conquery.io.result.ResultUtil.makeResponseWithFileName;
-import static com.bakdata.conquery.resources.ResourceConstants.FILE_EXTENTION_PARQUET;
 
 import java.util.Locale;
 
@@ -21,6 +20,7 @@
 import com.bakdata.conquery.models.query.SingleTableResult;
 import com.bakdata.conquery.models.worker.DatasetRegistry;
 import com.bakdata.conquery.models.worker.Namespace;
+import com.bakdata.conquery.resources.ResourceConstants;
 import com.bakdata.conquery.resources.api.ResultParquetResource;
 import com.bakdata.conquery.util.io.ConqueryMDC;
 import com.bakdata.conquery.util.io.IdColumnUtil;
@@ -41,7 +41,7 @@ public Response createResultFile(Subject subject, ManagedExecution exec, boolean
 
 		final Dataset dataset = exec.getDataset();
 
-		log.info("Downloading results for {} on dataset {}", exec, dataset);
+		log.info("Downloading results for {}", exec.getId());
 
 		ResultUtil.authorizeExecutable(subject, exec);
 
@@ -74,6 +74,6 @@ public Response createResultFile(Subject subject, ManagedExecution exec, boolean
 		};
 
 
-		return makeResponseWithFileName(Response.ok(out), exec.getLabelWithoutAutoLabelSuffix(), FILE_EXTENTION_PARQUET, PARQUET_MEDIA_TYPE, ResultUtil.ContentDispositionOption.ATTACHMENT);
+		return makeResponseWithFileName(Response.ok(out), String.join(".", exec.getLabelWithoutAutoLabelSuffix(), ResourceConstants.FILE_EXTENTION_PARQUET), PARQUET_MEDIA_TYPE, ResultUtil.ContentDispositionOption.ATTACHMENT);
 	}
 }

backend/src/main/java/com/bakdata/conquery/models/config/ArrowResultProvider.java

@@ -1,7 +1,6 @@
 package com.bakdata.conquery.models.config;
 
 import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -10,6 +9,7 @@
 import javax.validation.constraints.NotNull;
 import javax.ws.rs.core.UriBuilder;
 
+import com.bakdata.conquery.apiv1.execution.ResultAsset;
 import com.bakdata.conquery.commands.ManagerNode;
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.io.result.ResultRender.ResultRendererProvider;
@@ -33,7 +33,7 @@ public class ArrowResultProvider implements ResultRendererProvider {
 
 	@Override
 	@SneakyThrows(MalformedURLException.class)
-	public Collection<URL> generateResultURLs(ManagedExecution exec, UriBuilder uriBuilder, boolean allProviders) {
+	public Collection<ResultAsset> generateResultURLs(ManagedExecution exec, UriBuilder uriBuilder, boolean allProviders) {
 		if (!(exec instanceof SingleTableResult)) {
 			return Collections.emptyList();
 		}
@@ -43,8 +43,8 @@ public Collection<URL> generateResultURLs(ManagedExecution exec, UriBuilder uriB
 		}
 
 		return List.of(
-				ResultArrowResource.getFileDownloadURL(uriBuilder.clone(), (ManagedExecution & SingleTableResult) exec),
-				ResultArrowResource.getStreamDownloadURL(uriBuilder.clone(), (ManagedExecution & SingleTableResult) exec)
+				new ResultAsset("Arrow File", ResultArrowResource.getFileDownloadURL(uriBuilder.clone(), (ManagedExecution & SingleTableResult) exec)),
+				new ResultAsset("Arrow Stream", ResultArrowResource.getStreamDownloadURL(uriBuilder.clone(), (ManagedExecution & SingleTableResult) exec))
 		);
 	}
 

backend/src/main/java/com/bakdata/conquery/models/config/CsvResultProvider.java

@@ -1,13 +1,13 @@
 package com.bakdata.conquery.models.config;
 
 import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import javax.ws.rs.core.UriBuilder;
 
+import com.bakdata.conquery.apiv1.execution.ResultAsset;
 import com.bakdata.conquery.commands.ManagerNode;
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.io.result.ResultRender.ResultRendererProvider;
@@ -30,7 +30,7 @@ public class CsvResultProvider implements ResultRendererProvider {
 	private boolean hidden = false;
 
 	@SneakyThrows(MalformedURLException.class)
-	public Collection<URL> generateResultURLs(ManagedExecution exec, UriBuilder uriBuilder, boolean allProviders) {
+	public Collection<ResultAsset> generateResultURLs(ManagedExecution exec, UriBuilder uriBuilder, boolean allProviders) {
 		if (!(exec instanceof SingleTableResult)) {
 			return Collections.emptyList();
 		}
@@ -39,7 +39,7 @@ public Collection<URL> generateResultURLs(ManagedExecution exec, UriBuilder uriB
 			return Collections.emptyList();
 		}
 
-		return List.of(ResultCsvResource.getDownloadURL(uriBuilder, (ManagedExecution & SingleTableResult) exec));
+		return List.of(new ResultAsset("CSV", ResultCsvResource.getDownloadURL(uriBuilder, (ManagedExecution & SingleTableResult) exec)));
 	}
 
 	@Override