eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 21:30:57 +00:00
Code Activity

Merge branch 'master' into bug1018

Browse Source
This commit is contained in:
Axel Uhl committed 2015-05-07 09:26:04 +02:00
2 parents 85e7b143e4 4ad561fda8
commit ece7378c4f
885 files changed
+28791 -679
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CompetitorsResource.java
+11 -3
View File
@@ -1,5 +1,7 @@
package com.sap.sailing.server.gateway.jaxrs.api;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
@@ -18,6 +20,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.commons.fileupload.util.Streams;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.Competitor;
@@ -117,8 +120,7 @@ public class CompetitorsResource extends AbstractSailingServerResource {
@Path("{competitor-id}/team/image")
@Produces("application/json;charset=UTF-8")
public String setTeamImage(@PathParam("competitor-id") String competitorId, InputStream uploadedInputStream,
@HeaderParam("Content-Type") String fileType, @HeaderParam("Content-Length") long sizeInBytes) {
@HeaderParam("Content-Type") String fileType, @HeaderParam("Content-Length") long sizeInBytes) throws IOException {
RacingEventService service = getService();
CompetitorStore store = service.getCompetitorStore();
Competitor competitor = store.getExistingCompetitorByIdAsString(competitorId);
@@ -134,7 +136,13 @@ public class CompetitorsResource extends AbstractSailingServerResource {
} else if (fileType.equals("image/png")) {
fileExtension = ".png";
}
if (sizeInBytes <= 0) {
// size not provided; read the stream and determine length locally:
ByteArrayOutputStream bos = new ByteArrayOutputStream();
Streams.copy(uploadedInputStream, bos, /* close output stream */ true);
sizeInBytes = bos.size();
uploadedInputStream = new ByteArrayInputStream(bos.toByteArray());
}
URI imageUri;
try {
if (sizeInBytes > 1024 * 1024 * MAX_SIZE_IN_MB) {