From 7edac0a4f8561017a5c03efc2843b333e8d826f1 Mon Sep 17 00:00:00 2001
From: Petr Janouch <petr.janouch@neotechnology.com>
Date: Mon, 30 May 2022 08:22:11 +0200
Subject: [PATCH] Changing store version type in apoc.monitor.kernel()

Database format (usually referred to as store version)
used to be identified by 8 byte integer. This is no longer
true from 5.0, so the procedure apoc.monitor.kernel()
that unfortunately exposes this kernel detail has to be
modified accordingly.
---
 core/src/main/java/apoc/result/KernelInfoResult.java     | 4 ++--
 full/src/main/java/apoc/monitor/Kernel.java              | 2 +-
 full/src/test/java/apoc/monitor/KernelProcedureTest.java | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/apoc/result/KernelInfoResult.java b/core/src/main/java/apoc/result/KernelInfoResult.java
index 2ab7e8692e..ff63ced3c0 100644
--- a/core/src/main/java/apoc/result/KernelInfoResult.java
+++ b/core/src/main/java/apoc/result/KernelInfoResult.java
@@ -15,7 +15,7 @@ public class KernelInfoResult {
 
     public String databaseName;
 
-    public long storeLogVersion;
+    public String storeLogVersion;
 
     public String storeCreationDate;
 
@@ -25,7 +25,7 @@ public KernelInfoResult(
             String storeId,
             Date kernelStartTime,
             String databaseName,
-            long storeLogVersion,
+            String storeLogVersion,
             Date storeCreationDate) {
 
         SimpleDateFormat format = new SimpleDateFormat(apoc.date.Date.DEFAULT_FORMAT);
diff --git a/full/src/main/java/apoc/monitor/Kernel.java b/full/src/main/java/apoc/monitor/Kernel.java
index 57b75fb29b..8b369456f3 100644
--- a/full/src/main/java/apoc/monitor/Kernel.java
+++ b/full/src/main/java/apoc/monitor/Kernel.java
@@ -51,7 +51,7 @@ public Stream<KernelInfoResult> kernel() {
                 database.getStoreId().toString(),
                 startDate,
                 graphDatabaseService.databaseName(),
-                database.getLegacyStoreId().getStoreVersion(),
+                database.getStoreId().getStoreVersionUserString(),
                 new Date(database.getStoreId().getCreationTime())
         ));
     }
diff --git a/full/src/test/java/apoc/monitor/KernelProcedureTest.java b/full/src/test/java/apoc/monitor/KernelProcedureTest.java
index 2f9cad6de4..5358dc41b0 100644
--- a/full/src/test/java/apoc/monitor/KernelProcedureTest.java
+++ b/full/src/test/java/apoc/monitor/KernelProcedureTest.java
@@ -1,7 +1,6 @@
 package apoc.monitor;
 
 import apoc.date.Date;
-import apoc.date.DateExpiry;
 import apoc.util.TestUtil;
 import org.junit.Before;
 import org.junit.Rule;