commit a5abdd46ba12a08bf30cc2191849ed9ddb3bd9db
author David Åkerman <davidak@axis.com> Wed Jul 06 10:25:39 2022 +0200
committer David Åkerman <davidak@axis.com> Wed Jul 06 10:31:47 2022 +0200
tree 54734e5807b028976877f6406d481759566ca951
parent 3d50061b7abe1d90da78996c19c1d7e32daaf6f3

Adapt events-eiffel for stable-3.6

* TimeStamp has been deprecated, replace it with Instant instead.
* Add call to get because BranchResource::getRevision return Optional
now.

Solves: Jira GER-1926
Change-Id: I2579e79cc963c1635b19277aaad6993a3d57bcff

src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EiffelEventMapper.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EiffelEventMapper.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EiffelEventMapper.java
index 09af40f..b5e4a35 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EiffelEventMapper.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EiffelEventMapper.java
@@ -125,7 +125,7 @@
             cd.change().getDest().branch(),
             cd.notes().getCurrentPatchSet().commitId().getName(),
             cd.change().getId().get(),
-            cd.notes().getCurrentPatchSet().createdOn().getTime(),
+            cd.notes().getCurrentPatchSet().createdOn().toEpochMilli(),
             parentEventIds);
   }
 
@@ -222,7 +222,7 @@
             accountResolver.resolve(String.valueOf(approval.get().accountId())).asUniqueUser();
 
         si.submitter = toPersonInfo(submittingUser);
-        si.submittedAt = approval.get().granted().getTime();
+        si.submittedAt = approval.get().granted().toEpochMilli();
         return si;
       } catch (ConfigInvalidException | IOException | UnresolvableAccountException e) {
         logger.atWarning().withCause(e).log(

src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/PatchsetCreationData.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/PatchsetCreationData.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/PatchsetCreationData.java
index c0ebb7e..d93ff6c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/PatchsetCreationData.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/PatchsetCreationData.java
@@ -39,6 +39,6 @@
             .collect(Collectors.toList());
     this.changeNumber = event.getChange()._number;
     this.patchsetNumber = event.getRevision()._number;
-    this.createdAt = event.getWhen().getTime();
+    this.createdAt = event.getWhen().toEpochMilli();
   }
 }

src/main/java/com/googlesource/gerrit/plugins/eventseiffel/rest/CreateSccs.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/rest/CreateSccs.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/rest/CreateSccs.java
index 1f4416e..eee7d68 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/rest/CreateSccs.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/rest/CreateSccs.java
@@ -60,7 +60,8 @@
               .findFirst()
               .map(c -> c.change().getDest().branch());
       if (targetBranch.isPresent()) {
-        queue.scheduleSccCreation(resource.getName(), targetBranch.get(), resource.getRevision());
+        queue.scheduleSccCreation(
+            resource.getName(), targetBranch.get(), resource.getRevision().get());
         return EventCreationResponse.scc(resource, targetBranch.get());
       }
       throw new BadRequestException(

src/test/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EventMappingIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EventMappingIT.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EventMappingIT.java
index 94301f7..47dbec9 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EventMappingIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EventMappingIT.java
@@ -50,7 +50,6 @@
 import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
 import com.googlesource.gerrit.plugins.eventseiffel.parsing.PatchsetCreationData;
 import java.net.URLEncoder;
-import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.List;
 import java.util.UUID;
@@ -147,7 +146,7 @@
         project.get(),
         res.getCommit().getName());
     assertSccMeta(
-        event.meta, Long.valueOf(res.getChange().currentPatchSet().createdOn().getTime()));
+        event.meta, Long.valueOf(res.getChange().currentPatchSet().createdOn().toEpochMilli()));
     assertSccLinks(event.links);
   }
 
@@ -166,7 +165,7 @@
         project.get(),
         res.getCommit().getName());
     assertSccMeta(
-        event.meta, Long.valueOf(res.getChange().currentPatchSet().createdOn().getTime()));
+        event.meta, Long.valueOf(res.getChange().currentPatchSet().createdOn().toEpochMilli()));
     assertSccLinks(event.links);
   }
 
@@ -365,8 +364,8 @@
     }
 
     @Override
-    public Timestamp getWhen() {
-      return Timestamp.from(Instant.ofEpochMilli(EPOCH_MILLIS));
+    public Instant getWhen() {
+      return Instant.ofEpochMilli(EPOCH_MILLIS);
     }
 
     @Override