Merge branch 'develop'

wcm-io · Mar 13, 2024 · f2fbced · f2fbced
2 parents 30f5c00 + b364032
commit f2fbced
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 21 deletions.
diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -25,7 +25,7 @@ jobs:
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 11

diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.0-2.23.2</version>
+    <version>2.0.2-2.23.2</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components</artifactId>
-  <version>2.0.0-2.23.2</version>
+  <version>2.0.2-2.23.2</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components</name>

diff --git a/bundles/core/src/main/java/io/wcm/wcm/core/components/impl/models/v1/DownloadV1V2Impl.java b/bundles/core/src/main/java/io/wcm/wcm/core/components/impl/models/v1/DownloadV1V2Impl.java
@@ -130,7 +130,7 @@ private void initPropertiesFromMedia() {
     if (rendition != null) {
       filename = rendition.getFileName();
       format = rendition.getMimeType();
-      size = FileUtils.byteCountToDisplaySize(rendition.getFileSize());
+      size = toDisplayFileSize(rendition.getFileSize());
       extension = rendition.getFileExtension();
     }
 
@@ -151,6 +151,13 @@ private void initPropertiesFromMedia() {
     }
   }
 
+  private static String toDisplayFileSize(long fileSize) {
+    if (fileSize > 0) {
+      return FileUtils.byteCountToDisplaySize(fileSize);
+    }
+    return null;
+  }
+
   @Override
   @NotNull
   public Media getMediaObject() {

diff --git a/...es/core/src/test/java/io/wcm/wcm/core/components/impl/models/v1/DownloadV1V2ImplTest.java b/...es/core/src/test/java/io/wcm/wcm/core/components/impl/models/v1/DownloadV1V2ImplTest.java
@@ -48,6 +48,8 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.io.ByteArrayInputStream;
+
 import org.apache.sling.api.resource.Resource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -172,6 +174,26 @@ void testAssetReference_Inline(String resourceType) {
     String expectedMediaUrl = "/content/dam/sample/file1.pdf/_jcr_content/renditions/original./file1.pdf";
 
     assertEquals(expectedMediaUrl, underTest.getUrl());
+    assertEquals("15 KB", underTest.getSize());
+
+    assertValidMedia(underTest, expectedMediaUrl);
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = { RESOURCE_TYPE_V1, RESOURCE_TYPE_V2 })
+  void testAssetReference_Inline_0size(String resourceType) {
+    Asset asset = context.create().asset(DAM_ROOT + "/file1.pdf", new ByteArrayInputStream(new byte[0]), ContentType.PDF);
+
+    context.currentResource(context.create().resource(page, "download",
+        PROPERTY_RESOURCE_TYPE, resourceType,
+        PN_MEDIA_REF_STANDARD, asset.getPath(),
+        PN_INLINE, true));
+    Download underTest = AdaptTo.notNull(context.request(), Download.class);
+
+    String expectedMediaUrl = "/content/dam/sample/file1.pdf/_jcr_content/renditions/original./file1.pdf";
+
+    assertEquals(expectedMediaUrl, underTest.getUrl());
+    assertNull(underTest.getSize());
 
     assertValidMedia(underTest, expectedMediaUrl);
   }

diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="2.0.2-2.23.2" date="2024-03-13">
+      <action type="fix" dev="sseifert" issue="20">
+        Download (v1/v2): Don't display file size if it is not available.
+      </action>
+    </release>
+
     <release version="2.0.0-2.23.2" date="2024-01-26">
       <action type="update" dev="sseifert"><![CDATA[
         Version 2.0.0-2.23.2 requires Handler 2.x, See <a href=https://wcm-io.atlassian.net/wiki/x/AYBxsw">Migrate from wcm.io Handler 1.x to 2.x</a> for details.

diff --git a/examples/bundles/examples-core/pom.xml b/examples/bundles/examples-core/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.0-2.23.2</version>
+    <version>2.0.2-2.23.2</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
-  <version>2.0.0-2.23.2</version>
+  <version>2.0.2-2.23.2</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components Examples Core</name>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.core.components</artifactId>
-      <version>2.0.0-2.23.2</version>
+      <version>2.0.2-2.23.2</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/examples/content-packages/examples-libs/pom.xml b/examples/content-packages/examples-libs/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.0-2.23.2</version>
+    <version>2.0.2-2.23.2</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples-libs</artifactId>
-  <version>2.0.0-2.23.2</version>
+  <version>2.0.2-2.23.2</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples wcm.io Libraries</name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.core.components</artifactId>
-      <version>2.0.0-2.23.2</version>
+      <version>2.0.2-2.23.2</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/examples/content-packages/examples-sample-content/pom.xml b/examples/content-packages/examples-sample-content/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.0-2.23.2</version>
+    <version>2.0.2-2.23.2</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples-sample-content</artifactId>
-  <version>2.0.0-2.23.2</version>
+  <version>2.0.2-2.23.2</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples Content</name>

diff --git a/examples/content-packages/examples/pom.xml b/examples/content-packages/examples/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.0-2.23.2</version>
+    <version>2.0.2-2.23.2</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples</artifactId>
-  <version>2.0.0-2.23.2</version>
+  <version>2.0.2-2.23.2</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples</name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm.samples</groupId>  
       <artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
-      <version>2.0.0-2.23.2</version>
+      <version>2.0.2-2.23.2</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.0-2.23.2</version>
+    <version>2.0.2-2.23.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.wcm.core.components.examples.root</artifactId>
-  <version>2.0.0-2.23.2</version>
+  <version>2.0.2-2.23.2</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-  <version>2.0.0-2.23.2</version>
+  <version>2.0.2-2.23.2</version>
   <packaging>pom</packaging>
 
   <name>WCM Core Components</name>
@@ -54,7 +54,7 @@
     <sling.publish.url>http://localhost:4503</sling.publish.url>
 
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2024-01-26T20:12:08Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-03-13T09:40:21Z</project.build.outputTimestamp>
   </properties>
 
   <dependencyManagement>

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.0-2.23.2</version>
+    <version>2.0.2-2.23.2</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components.root</artifactId>
-  <version>2.0.0-2.23.2</version>
+  <version>2.0.2-2.23.2</version>
   <packaging>pom</packaging>
   <url>${site.url}/${site.url.module.prefix}/</url>