From ed39b552dedbae2596c6ca4af0a3d1a9c5ba31fa Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Tue, 15 Oct 2019 23:54:20 +0100 Subject: [PATCH] updated sbt version and increased mime types flexibility --- project/build.properties | 2 +- .../net/woggioni/jpacrepo/service/PacmanWebService.scala | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/project/build.properties b/project/build.properties index 7b6213b..ea6d47b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.0.1 +sbt.version=1.3.1 diff --git a/src/main/scala/net/woggioni/jpacrepo/service/PacmanWebService.scala b/src/main/scala/net/woggioni/jpacrepo/service/PacmanWebService.scala index 810f3cd..3be14e2 100644 --- a/src/main/scala/net/woggioni/jpacrepo/service/PacmanWebService.scala +++ b/src/main/scala/net/woggioni/jpacrepo/service/PacmanWebService.scala @@ -252,7 +252,8 @@ class PacmanWebService { @GET @Path("download/{filename}") - @Produces(Array(MediaType.APPLICATION_OCTET_STREAM)) def downloadPackage(@PathParam("filename") fileName: String): Response = { + @Produces(Array(MediaType.APPLICATION_OCTET_STREAM)) + def downloadPackage(@PathParam("filename") fileName: String): Response = { val em = emf.createEntityManager() val fnquery = em.createQuery(PacmanWebService.fileNameQuery, classOf[PkgData]) fnquery.setParameter("fileName", fileName) @@ -300,7 +301,7 @@ class PacmanWebService { @POST @Path("/upload") @TransactionAttribute(TransactionAttributeType.REQUIRED) - @Consumes(Array(MediaType.APPLICATION_OCTET_STREAM)) + @Consumes(Array("application/x-xz", "application/gzip", "application/x-tar", MediaType.APPLICATION_OCTET_STREAM)) def createPackage(input: InputStream, @MatrixParam("filename") filename: String): Response = { val em = emf.createEntityManager() if (filename == null) throw new BadRequestException