Skip to content

Commit 6970795

Browse files
Updating code to use date object directly instead of parsing
1 parent b6f72e4 commit 6970795

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import org.hisp.dhis.common.cache.CacheStrategy;
4949
import org.hisp.dhis.user.User;
5050
import org.hisp.dhis.user.UserDetails;
51-
import org.hisp.dhis.util.DateUtils;
5251
import org.hisp.dhis.webapi.service.WebCache;
5352
import org.springframework.http.CacheControl;
5453
import org.springframework.http.HttpHeaders;
@@ -318,8 +317,7 @@ public static String getEtag(Date lastModified, UserDetails user) {
318317
return null;
319318
}
320319

321-
String value =
322-
String.format("%d-%s", lastModified.getTime(), user.getUid());
320+
String value = String.format("%d-%s", lastModified.getTime(), user.getUid());
323321

324322
return HashUtils.hashMD5(value.getBytes());
325323
}

dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/utils/ContextUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void testGetEtag() {
4646
user.setUid("kYt56BgfED2");
4747

4848
assertEquals(
49-
"ebcaa46bf9de4d04ea69cafcb3bd5caf", ContextUtils.getEtag(date, UserDetails.fromUser(user)));
49+
"db5face9ed0cc9ffdd5e67e3c43a40aa", ContextUtils.getEtag(date, UserDetails.fromUser(user)));
5050
}
5151

5252
@Test

0 commit comments

Comments
 (0)