This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3891 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 5fbcdd60daba351d3177fa1f3427f4e4b9b9d547 Author: Dan Haywood <[email protected]> AuthorDate: Mon May 26 13:33:41 2025 +0100 CAUSEWAY-3891: adds noCache flag as an experiment --- .../extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java | 7 ++++--- .../viewer/wicket/ui/actionresponse/_DownloadHandler.java | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java index 167f10c0d1f..98f2b1781d5 100644 --- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java +++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java @@ -186,13 +186,14 @@ protected MarkupContainer createRegularFrame() { val regularFrame = new WebMarkupContainer(ID_SCALAR_IF_REGULAR); + CharSequence documentUrl = urlFor( + new ListenerRequestHandler( + new PageAndComponentProvider(getPage(), this))) + "&noCache=" + System.currentTimeMillis(); val pdfJsConfig = scalarModel.getMetaModel().lookupFacet(PdfJsViewerFacet.class) .map(pdfJsViewerFacet->pdfJsViewerFacet.configFor(buildKey())) .orElseGet(PdfJsConfig::new) - .withDocumentUrl(urlFor( - new ListenerRequestHandler( - new PageAndComponentProvider(getPage(), this)))); + .withDocumentUrl(documentUrl); val pdfJsPanel = new PdfJsPanel(ID_SCALAR_VALUE, pdfJsConfig); diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/_DownloadHandler.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/_DownloadHandler.java index 5e3a1ae1506..dc658b70bba 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/_DownloadHandler.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/_DownloadHandler.java @@ -104,9 +104,11 @@ private static IRequestHandler enforceNoCacheOnClientSide(final IRequestHandler if(downloadHandler==null) { return downloadHandler; } - if(downloadHandler instanceof ResourceStreamRequestHandler) - ((ResourceStreamRequestHandler) downloadHandler) - .setCacheDuration(Duration.ZERO); + if(downloadHandler instanceof ResourceStreamRequestHandler) { + final var requestHandler = (ResourceStreamRequestHandler) downloadHandler; + requestHandler.setCacheDuration(Duration.ZERO); + return requestHandler; + } return downloadHandler; }
