feat: change customTimeBefore type to date only

googleapis · Aug 27, 2020 · bd79392 · bd79392
1 parent 588e23a
commit bd79392
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
@@ -433,7 +433,7 @@ Rule toPb() {
               .setCustomTimeBefore(
                   lifecycleCondition.getCustomTimeBefore() == null
                       ? null
-                      : new DateTime(lifecycleCondition.getCustomTimeBefore().getValue()))
+                      : new DateTime(true, lifecycleCondition.getCustomTimeBefore().getValue(), 0))
               .setDaysSinceCustomTime(lifecycleCondition.getDaysSinceCustomTime());
 
       rule.setCondition(condition);

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java
@@ -2252,6 +2252,8 @@ public void testBucketLifecycleRules() {
                             .setMatchesStorageClass(ImmutableList.of(StorageClass.COLDLINE))
                             .setDaysSinceNoncurrentTime(30)
                             .setNoncurrentTimeBefore(new DateTime(System.currentTimeMillis()))
+                            .setCustomTimeBefore(new DateTime(System.currentTimeMillis()))
+                            .setDaysSinceCustomTime(30)
                             .build())))
             .build();
     EasyMock.expect(
@@ -2268,5 +2270,7 @@ public void testBucketLifecycleRules() {
     assertEquals(1, lifecycleRule.getCondition().getMatchesStorageClass().size());
     assertEquals(30, lifecycleRule.getCondition().getDaysSinceNoncurrentTime().intValue());
     assertNotNull(lifecycleRule.getCondition().getNoncurrentTimeBefore());
+    assertEquals(30, lifecycleRule.getCondition().getDaysSinceCustomTime().intValue());
+    assertNotNull(lifecycleRule.getCondition().getCustomTimeBefore());
   }
 }