EA-4019 remove inconsistency

europeana · Dec 19, 2024 · bd7a8ea · bd7a8ea
1 parent d1dc297
commit bd7a8ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/api/src/main/java/eu/europeana/fulltext/api/caching/CachingUtils.java b/api/src/main/java/eu/europeana/fulltext/api/caching/CachingUtils.java
@@ -72,21 +72,6 @@ public static String generateETag(ZonedDateTime modified, String version, boolea
         return eTag;
     }
 
-    /**
-     * Generates an eTag surrounded with double quotes - alternate version for the resource
-     *
-     * @param data     concatenated: datasetID + localID + resID + language (2-letter code) of the text resource
-     *                 plus version of this API as defined in the pom.xml
-     * @param weakETag if True, then the eTag will start with W/
-     * @return eTag     generated eTag (String)
-     */
-    public static String generateSimpleETag(String data, boolean weakETag) {
-        String eTag = "\"" + getSHA256Hash(data) + "\"";
-        if (weakETag) {
-            return "W/" + eTag;
-        }
-        return eTag;
-    }
 
     /**
      * Formats the given date according to the RFC 1123 pattern (e.g. Thu, 4 Oct 2018 10:34:20 GMT)

diff --git a/api/src/main/java/eu/europeana/fulltext/api/web/FTRetrievalController.java b/api/src/main/java/eu/europeana/fulltext/api/web/FTRetrievalController.java
@@ -105,7 +105,9 @@ private ResponseEntity<String> getAnnoPageInfo(String datasetId, String localId,
         if (cachingHeadersPresent(request)) {
             ResponseEntity<String> cached = checkCached(request, modified, eTag);
             if (cached != null) {
-                LOG.info("Returning cached object for {}, {}", datasetId, localId);
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("Returning cached object for {}, {}", datasetId, localId);
+                }
                 return cached;
             }
         }
@@ -433,12 +435,7 @@ private ResponseEntity<String> resource(
 
         resource = fts.fetchFTResource(datasetId, localId, pageId, lang);
         ZonedDateTime modified = januarificator();
-        String eTag = generateSimpleETag(datasetId
-            + localId
-            + pageId
-            + resource.getLanguage()
-            + resource.getValue()
-            + fts.getSettings().getAppVersion(), true);
+        String eTag = generateETag(modified, fts.getSettings().getAppVersion(), true);
 
         if (cachingHeadersPresent(request)) {
             ResponseEntity<String> cached = checkCached(request, modified, eTag);