From a41ed64412b165b993bd9c190bbd4bece4f23116 Mon Sep 17 00:00:00 2001
From: Kai Hudalla <kai.hudalla@bosch.io>
Date: Wed, 12 May 2021 13:48:22 +0200
Subject: [PATCH] [#2654] Support persisting data to local file system

The Infinispan class implementing the file based data store has been
added to the native image build's reflection configuration so that it
will be included in the resulting native image.

The integration test's cache configuration has been changed to use file
system persistence in order to verify the embedded cache configuration
when running the tests with native images.

Fixes #2654

Conflicts:
	site/homepage/content/release-notes.md

Signed-off-by: Kai Hudalla <kai.hudalla@bosch.io>
---
 .../reflection-config.json                       |  9 +++++++++
 site/homepage/content/release-notes.md           |  7 +++++++
 .../resources/commandrouter/cache-config.xml     | 16 ++++++++++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/client-device-connection-infinispan-quarkus/src/main/resources/META-INF/native-image/org.eclipse.hono/client-device-connection-infinispan-quarkus/reflection-config.json b/client-device-connection-infinispan-quarkus/src/main/resources/META-INF/native-image/org.eclipse.hono/client-device-connection-infinispan-quarkus/reflection-config.json
index 593dd255d2..b5c2fbdf01 100644
--- a/client-device-connection-infinispan-quarkus/src/main/resources/META-INF/native-image/org.eclipse.hono/client-device-connection-infinispan-quarkus/reflection-config.json
+++ b/client-device-connection-infinispan-quarkus/src/main/resources/META-INF/native-image/org.eclipse.hono/client-device-connection-infinispan-quarkus/reflection-config.json
@@ -29,6 +29,15 @@
       { "name": "<init>", "parameterTypes": [] }
     ]
   },
+  {
+    "name" : "org.infinispan.persistence.file.SingleFileStore",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "allDeclaredFields" : true,
+    "allPublicFields" : true
+  },
   {
     "name" : "java.util.Arrays$ArrayList",
     "allDeclaredConstructors" : true,
diff --git a/site/homepage/content/release-notes.md b/site/homepage/content/release-notes.md
index 66087ed7a6..925dd54ce5 100644
--- a/site/homepage/content/release-notes.md
+++ b/site/homepage/content/release-notes.md
@@ -4,6 +4,13 @@ title = "What is new & noteworthy in Hono?"
 description = "Information about changes in recent Hono releases. Includes new features, fixes, enhancements and API changes."
 +++
 
+## 1.7.2 (not released yet)
+
+### Fixes & Enhancements
+
+* The Quarkus based Command Router native image failed to start an embedded cache that was configured to persist data
+  to the local file system. This has been fixed.
+
 ## 1.7.1
 
 ### Fixes & Enhancements
diff --git a/tests/src/test/resources/commandrouter/cache-config.xml b/tests/src/test/resources/commandrouter/cache-config.xml
index fc8c1544a1..e59d44ebaa 100644
--- a/tests/src/test/resources/commandrouter/cache-config.xml
+++ b/tests/src/test/resources/commandrouter/cache-config.xml
@@ -13,8 +13,20 @@
  -->
 <infinispan>
   <cache-container default-cache="command-router">
-    <local-cache name="command-router" simple-cache="true">
-      <memory max-count="200" when-full="REMOVE"/>
+    <global-state>
+      <persistent-location path="/var/lib/hono"/>
+    </global-state>
+    <local-cache name="command-router">
+      <persistence passivation="false">
+        <file-store
+            shared="false"
+            preload="true"
+            fetch-state="false"
+            read-only="false"
+            purge="false"
+            path="command-router">
+        </file-store>
+      </persistence>
     </local-cache>
   </cache-container>
 </infinispan>