Cache image endpoint

#470
metasfresh · Jun 22, 2017 · faa1405 · faa1405
1 parent 6fa6d63
commit faa1405
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 20 deletions.
diff --git a/src/main/java/de/metas/ui/web/cache/ETag.java b/src/main/java/de/metas/ui/web/cache/ETag.java
@@ -39,17 +39,17 @@ public static final ETag of(final int version)
 		return new ETag(version, ImmutableMap.of());
 	}
 
-	public static final ETag of(final int version, final Map<String, String> attributes)
+	public static final ETag of(final long version, final Map<String, String> attributes)
 	{
 		return new ETag(version, ImmutableMap.copyOf(attributes));
 	}
 
-	private final int version;
+	private final long version;
 	private final ImmutableMap<String, String> attributes;
 
 	private transient volatile String _etagString = null; // lazy
 
-	private ETag(final int version, final ImmutableMap<String, String> attributes)
+	private ETag(final long version, final ImmutableMap<String, String> attributes)
 	{
 		this.version = version;
 		this.attributes = attributes;

diff --git a/src/main/java/de/metas/ui/web/cache/ETagResponseEntityBuilder.java b/src/main/java/de/metas/ui/web/cache/ETagResponseEntityBuilder.java
@@ -117,6 +117,11 @@ private ETag getETag()
 	}
 
 	public <JSONType> ResponseEntity<JSONType> toJson(final BiFunction<R, JSONOptions, JSONType> toJsonMapper)
+	{
+		return toResponseEntity((responseBuilder, result) -> responseBuilder.body(toJsonMapper.apply(result, getJSONOptions())));
+	}
+
+	public <BodyType> ResponseEntity<BodyType> toResponseEntity(final BiFunction<ResponseEntity.BodyBuilder, R, ResponseEntity<BodyType>> toJsonMapper)
 	{
 		// Check ETag
 		final String etag = getETag().toETagString();
@@ -128,12 +133,9 @@ public <JSONType> ResponseEntity<JSONType> toJson(final BiFunction<R, JSONOption
 
 		// Get the result and convert it to JSON
 		final R result = this.result.get();
-		final JSONOptions jsonOptions = getJSONOptions();
-		final JSONType json = toJsonMapper.apply(result, jsonOptions);
 
-		// Response: 200 OK
-		return newResponse(HttpStatus.OK, etag)
-				.body(json);
+		final ResponseEntity.BodyBuilder newResponse = newResponse(HttpStatus.OK, etag);
+		return toJsonMapper.apply(newResponse, result);
 	}
 
 	private final ResponseEntity.BodyBuilder newResponse(final HttpStatus status, final String etag)

diff --git a/src/main/java/de/metas/ui/web/upload/ImageRestController.java b/src/main/java/de/metas/ui/web/upload/ImageRestController.java
@@ -12,7 +12,6 @@
 import org.compiere.util.MimeType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,12 +21,20 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.google.common.collect.ImmutableMap;
+
 import de.metas.printing.esb.base.util.Check;
+import de.metas.ui.web.cache.ETag;
+import de.metas.ui.web.cache.ETagAware;
+import de.metas.ui.web.cache.ETagResponseEntityBuilder;
 import de.metas.ui.web.config.WebConfig;
 import de.metas.ui.web.exceptions.EntityNotFoundException;
 import de.metas.ui.web.session.UserSession;
+import de.metas.ui.web.window.datatypes.json.JSONOptions;
+import lombok.NonNull;
 
 /*
  * #%L
@@ -62,6 +69,11 @@ public class ImageRestController
 	@Autowired
 	private UserSession userSession;
 
+	private JSONOptions newJSONOptions()
+	{
+		return JSONOptions.builder(userSession).build();
+	}
+
 	@PostMapping
 	public int uploadImage(@RequestParam("file") final MultipartFile file) throws IOException
 	{
@@ -103,11 +115,24 @@ private static final String normalizeUploadFilename(final String name, final Str
 	@GetMapping("/{imageId}")
 	@ResponseBody
 	public ResponseEntity<byte[]> getImage(@PathVariable final int imageId,
-			@RequestParam(name = "maxWidth", required = false, defaultValue = "-1") int maxWidth,
-			@RequestParam(name = "maxHeight", required = false, defaultValue = "-1") int maxHeight)
+			@RequestParam(name = "maxWidth", required = false, defaultValue = "-1") final int maxWidth,
+			@RequestParam(name = "maxHeight", required = false, defaultValue = "-1") final int maxHeight,
+			final WebRequest request)
 	{
 		userSession.assertLoggedIn();
 
+		return ETagResponseEntityBuilder.ofETagAware(request, getWebuiImage(imageId, maxWidth, maxHeight))
+				.includeLanguageInETag()
+				.cacheMaxAge(userSession.getHttpCacheMaxAge())
+				.jsonOptions(() -> newJSONOptions())
+				.toResponseEntity((responseBuilder, webuiImage) -> responseBuilder
+						.contentType(MediaType.parseMediaType(webuiImage.getContentType()))
+						.header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + webuiImage.getImageName() + "\"")
+						.body(webuiImage.getImageData()));
+	}
+
+	private WebuiImage getWebuiImage(final int imageId, final int maxWidth, final int maxHeight)
+	{
 		if (imageId <= 0)
 		{
 			throw new IllegalArgumentException("Invalid image id");
@@ -125,16 +150,54 @@ public ResponseEntity<byte[]> getImage(@PathVariable final int imageId,
 			throw new EntityNotFoundException("Image id not found: " + imageId);
 		}
 
-		final String imageName = adImage.getName();
-		final String contentType = adImage.getContentType();
-		final byte[] imageData = adImage.getScaledImageData(maxWidth, maxHeight);
+		return WebuiImage.of(adImage, maxWidth, maxHeight);
+	}
 
-		final HttpHeaders headers = new HttpHeaders();
-		headers.setContentType(MediaType.parseMediaType(contentType));
-		headers.set(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + imageName + "\"");
-		headers.setCacheControl("must-revalidate, post-check=0, pre-check=0");
-		final ResponseEntity<byte[]> response = new ResponseEntity<byte[]>(imageData, headers, HttpStatus.OK);
-		return response;
+	private static final class WebuiImage implements ETagAware
+	{
+		public static final WebuiImage of(final MImage adImage, final int maxWidth, final int maxHeight)
+		{
+			return new WebuiImage(adImage, maxWidth, maxHeight);
+		}
+
+		private final MImage adImage;
+		private final int maxWidth;
+		private final int maxHeight;
+		private final ETag etag;
+
+		private WebuiImage(@NonNull final MImage adImage, final int maxWidth, final int maxHeight)
+		{
+			this.adImage = adImage;
+			this.maxWidth = maxWidth > 0 ? maxWidth : 0;
+			this.maxHeight = maxHeight > 0 ? maxHeight : 0;
+
+			etag = ETag.of(adImage.getUpdated().getTime(), ImmutableMap.<String, String> builder()
+					.put("maxWidth", String.valueOf(maxWidth))
+					.put("maxHeight", String.valueOf(maxHeight))
+					.put("imageId", String.valueOf(adImage.getAD_Image_ID()))
+					.build());
+		}
+
+		@Override
+		public ETag getETag()
+		{
+			return etag;
+		}
+
+		public String getImageName()
+		{
+			return adImage.getName();
+		}
+
+		public String getContentType()
+		{
+			return adImage.getContentType();
+		}
+
+		public byte[] getImageData()
+		{
+			return adImage.getScaledImageData(maxWidth, maxHeight);
+		}
 	}
 
 }