OAK-11722: Donot read compatibility system property in VectorQuery for each query

Author: tihom88

oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/VectorQuery.java

@@ -29,8 +29,9 @@ public class VectorQuery {
     private static final String DEFAULT_INFERENCE_QUERY_CONFIG_PREFIX = "?";
     public static final String INFERENCE_QUERY_CONFIG_PREFIX_KEY = "org.apache.jackrabbit.oak.search.inference.query.prefix";
     public static final String INFERENCE_QUERY_CONFIG_PREFIX = System.getProperty(
-            INFERENCE_QUERY_CONFIG_PREFIX_KEY, DEFAULT_INFERENCE_QUERY_CONFIG_PREFIX);
+        INFERENCE_QUERY_CONFIG_PREFIX_KEY, DEFAULT_INFERENCE_QUERY_CONFIG_PREFIX);
     public static final String EXPERIMENTAL_COMPATIBILITY_MODE_KEY = "oak.inference.experimental.compatibility";
+    private static boolean isCompatibilityModeEnabled = Boolean.getBoolean(EXPERIMENTAL_COMPATIBILITY_MODE_KEY);
 
     private final String queryInferenceConfig;
     private final String queryText;
@@ -80,8 +81,7 @@ private String[] parseText(String inputText) {
                     // we return "{}" to be compatible with experimental inference queries
                     jsonPart = "{}";
                     queryTextPart = text;
-                }
-                else {
+                } else {
                     jsonPart = "";
                     queryTextPart = inputText;
                 }
@@ -102,7 +102,12 @@ public String getQueryText() {
         return queryText;
     }
 
+    // to be used in tests.
+    protected static void reInitializeCompatibilityMode() {
+        isCompatibilityModeEnabled = Boolean.getBoolean(EXPERIMENTAL_COMPATIBILITY_MODE_KEY);
+    }
+
     private boolean isCompatibilityModeEnabled() {
-        return Boolean.getBoolean(EXPERIMENTAL_COMPATIBILITY_MODE_KEY);
+        return isCompatibilityModeEnabled;
     }
 }

oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/fulltext/VectorQueryCompatibilityModeTest.java

@@ -28,15 +28,16 @@ public class VectorQueryCompatibilityModeTest {
 
     @Before
     public void setUp() {
-        // Set up any necessary system properties or configurations
+        // Ensure compatibility mode is enabled for these tests
         System.setProperty(VectorQuery.EXPERIMENTAL_COMPATIBILITY_MODE_KEY, "true");
+        VectorQuery.reInitializeCompatibilityMode();
     }
 
     @After
     public void tearDown() {
         // Clean up any system properties set during the tests
         System.clearProperty(VectorQuery.EXPERIMENTAL_COMPATIBILITY_MODE_KEY);
-        System.clearProperty(VectorQuery.INFERENCE_QUERY_CONFIG_PREFIX_KEY);
+        VectorQuery.reInitializeCompatibilityMode();
     }
 
     @Test

oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/fulltext/VectorQueryTest.java

@@ -30,12 +30,14 @@ public class VectorQueryTest {
     public void setUp() {
         // Ensure compatibility mode is disabled for these tests
         System.setProperty(VectorQuery.EXPERIMENTAL_COMPATIBILITY_MODE_KEY, "false");
+        VectorQuery.reInitializeCompatibilityMode();
     }
 
     @After
     public void tearDown() {
-        // Clean up all system properties set during the tests
+        // Clean up any system properties set during the tests
         System.clearProperty(VectorQuery.EXPERIMENTAL_COMPATIBILITY_MODE_KEY);
+        VectorQuery.reInitializeCompatibilityMode();
     }
 
     @Test