simplify streamin output creation

ingef · Aug 17, 2021 · cddbe19 · cddbe19
1 parent 077a4a9
commit cddbe19
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java
@@ -80,21 +80,14 @@ public static <E extends ManagedExecution<?> & SingleTableResult> Response getAr
 				(EntityResult cer) -> ResultUtil.createId(namespace, cer, config.getIdMapping(), mappingState));
 
 
-		StreamingOutput out = new StreamingOutput() {
-
-			@Override
-			public void write(OutputStream output) throws IOException, WebApplicationException {
-				renderToStream(writerProducer.apply(output),
-						settings,
-						config.getArrow().getBatchSize(),
-						idMappingConf.getPrintIdFields(),
-						exec.getResultInfo(),
-						exec.streamResults());
-
-			}
-		};
-
-		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), fileExtension, mediaType, ResultUtil.ContentDispositionOption.attachment);
+		StreamingOutput out = output -> renderToStream(writerProducer.apply(output),
+				settings,
+				config.getArrow().getBatchSize(),
+				idMappingConf.getPrintIdFields(),
+				exec.getResultInfo(),
+				exec.streamResults());
+
+		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), fileExtension, mediaType, ResultUtil.ContentDispositionOption.ATTACHMENT);
 	}
 
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/csv/ResultCsvProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/csv/ResultCsvProcessor.java
@@ -75,7 +75,7 @@ public <E extends ManagedExecution<?> & SingleTableResult> Response getResult(Us
 				throw new WebApplicationException("Failed to load result", e);
 			}
 		};
-		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), "csv", new MediaType("text", "csv", charset.toString()), ResultUtil.ContentDispositionOption.attachment);
+		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), "csv", new MediaType("text", "csv", charset.toString()), ResultUtil.ContentDispositionOption.ATTACHMENT);
 	}
 
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java
@@ -60,7 +60,7 @@ public <E extends ManagedExecution<?> & SingleTableResult> Response getExcelResu
 				output
 		);
 
-		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), "xlsx", MEDIA_TYPE, ResultUtil.ContentDispositionOption.attachment);
+		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), "xlsx", MEDIA_TYPE, ResultUtil.ContentDispositionOption.ATTACHMENT);
 	}
 
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     				output
     		);
-    		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), "xlsx", MEDIA_TYPE, ResultUtil.ContentDispositionOption.attachment);
+    		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), "xlsx", MEDIA_TYPE, ResultUtil.ContentDispositionOption.ATTACHMENT);
     	}
     }