fix to ensure a build-time link to the modify timestamp of resource download

Author: andponlin

haikudepotserver-core/pom.xml

@@ -12,6 +12,11 @@
     <artifactId>haikudepotserver-core</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <!-- https://stackoverflow.com/questions/13228472/how-to-access-maven-build-timestamp-for-resource-filtering -->
+        <hds.build.timestamp>${maven.build.timestamp}</hds.build.timestamp>
+    </properties>
+
     <dependencies>
 
         <dependency>

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/reference/job/ReferenceDumpExportJobRunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Andrew Lindesay
+ * Copyright 2018-2020, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -101,11 +101,21 @@ private void writeData(
         objectMapper.writeValue(jsonGenerator, dumpExportReference.getPkgCategories());
     }
 
-    private ArchiveInfo createArchiveInfo(ObjectContext context) {
+    public static Date getModifyTimestamp(ObjectContext context, RuntimeInformationService runtimeInformationService) {
         Date modifyTimestamp = GeneralQueryHelper.getLastModifyTimestampSecondAccuracy(
                 context,
                 Country.class, NaturalLanguage.class, PkgCategory.class);
-        return new ArchiveInfo(modifyTimestamp, runtimeInformationService.getProjectVersion());
+        Date buildTimestamp = new Date(runtimeInformationService.getBuildTimestamp().toEpochMilli());
+        if (buildTimestamp.getTime() > modifyTimestamp.getTime()) {
+            return buildTimestamp;
+        }
+        return modifyTimestamp;
+    }
+
+    private ArchiveInfo createArchiveInfo(ObjectContext context) {
+        return new ArchiveInfo(
+                getModifyTimestamp(context, runtimeInformationService),
+                runtimeInformationService.getProjectVersion());
     }
 
     private DumpExportReference createDumpExportReference(ReferenceDumpExportJobSpecification specification) {

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/support/RuntimeInformationService.java

@@ -1,14 +1,18 @@
 /*
- * Copyright 2018, Andrew Lindesay
+ * Copyright 2018-2020, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
 package org.haiku.haikudepotserver.support;
 
 import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.util.Optional;
 import java.util.Properties;
 
 /**
@@ -49,6 +53,16 @@ public String getProjectVersion() {
         return versionOrPlaceholder(getBuildProperties().getProperty("project.version"));
     }
 
+    public Instant getBuildTimestamp() {
+        return Optional.of(getBuildProperties().getProperty("build.timestamp"))
+                .filter(StringUtils::isNotBlank)
+                .filter(s -> !StringUtils.startsWith(s, "${"))
+                // ^^ if the variable is not substituted in the build process
+                .map(DateTimeFormatter.ISO_INSTANT::parse)
+                .map(Instant::from)
+                .orElseGet(() -> Instant.ofEpochMilli(0L));
+    }
+
     public String getJavaVersion() {
         return versionOrPlaceholder(System.getProperty("java.version"));
     }

haikudepotserver-core/src/main/resources/build.properties

@@ -1,2 +1,3 @@
 # Values in this properties file will be replaced as part of the build process.
-project.version=${project.version}
+project.version=${project.version}
+build.timestamp=${hds.build.timestamp}

haikudepotserver-webapp/src/main/java/org/haiku/haikudepotserver/reference/controller/ReferenceController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018, Andrew Lindesay
+ * Copyright 2018-2020, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -8,13 +8,11 @@
 import com.google.common.base.Preconditions;
 import com.google.common.net.HttpHeaders;
 import org.apache.cayenne.configuration.server.ServerRuntime;
-import org.haiku.haikudepotserver.dataobjects.Country;
-import org.haiku.haikudepotserver.dataobjects.NaturalLanguage;
-import org.haiku.haikudepotserver.dataobjects.PkgCategory;
 import org.haiku.haikudepotserver.job.controller.JobController;
 import org.haiku.haikudepotserver.job.model.JobService;
+import org.haiku.haikudepotserver.reference.job.ReferenceDumpExportJobRunner;
 import org.haiku.haikudepotserver.reference.model.ReferenceDumpExportJobSpecification;
-import org.haiku.haikudepotserver.support.cayenne.GeneralQueryHelper;
+import org.haiku.haikudepotserver.support.RuntimeInformationService;
 import org.haiku.haikudepotserver.support.web.AbstractController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -31,10 +29,15 @@ public class ReferenceController extends AbstractController {
 
     private final static String KEY_NATURALLANGUAGECODE = "naturalLanguageCode";
 
+    private final RuntimeInformationService runtimeInformationService;
     private final ServerRuntime serverRuntime;
     private final JobService jobService;
 
-    public ReferenceController(ServerRuntime serverRuntime, JobService jobService) {
+    public ReferenceController(
+            RuntimeInformationService runtimeInformationService,
+            ServerRuntime serverRuntime,
+            JobService jobService) {
+        this.runtimeInformationService = runtimeInformationService;
         this.serverRuntime = Preconditions.checkNotNull(serverRuntime);
         this.jobService = Preconditions.checkNotNull(jobService);
     }
@@ -60,9 +63,10 @@ public void getAllAsJson(
                 response,
                 jobService,
                 ifModifiedSinceHeader,
-                GeneralQueryHelper.getLastModifyTimestampSecondAccuracy(
+                ReferenceDumpExportJobRunner.getModifyTimestamp(
                         serverRuntime.newContext(),
-                        Country.class, NaturalLanguage.class, PkgCategory.class),
+                        runtimeInformationService
+                ),
                 specification);
     }