MINOR - Fix RDF CI & repository cleanup

Author: pmbrull

.github/workflows/maven-postgres-rdf-tests-build.yml

@@ -620,7 +620,7 @@ public String executeSparqlQueryWithInference(
           };
 
       if (level == org.openmetadata.service.rdf.reasoning.InferenceEngine.ReasoningLevel.NONE) {
-        return executeSparqlQuery(query, format);
+        return executeSparqlQueryDirect(query, format);
       }
 
       // For inference queries, we need to work with the full model

openmetadata-service/src/main/java/org/openmetadata/service/rdf/RdfRepository.java

@@ -94,6 +94,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public abstract class OpenMetadataApplicationTest {
   protected static Boolean runWithOpensearch = false;
+  protected static Boolean runWithRdf = false;
 
   protected static final String CONFIG_PATH =
       ResourceHelpers.resourceFilePath("openmetadata-secure-test.yaml");
@@ -552,13 +553,10 @@ private static void setupRedisIfEnabled() {
   }
 
   private static void setupRdfIfEnabled() {
-    String enableRdf = System.getProperty("enableRdf");
-    String rdfContainerImage = System.getProperty("rdfContainerImage");
-    if ("true".equals(enableRdf)) {
-      LOG.info("RDF is enabled for tests. Starting Fuseki container...");
-      if (CommonUtil.nullOrEmpty(rdfContainerImage)) {
-        rdfContainerImage = "stain/jena-fuseki:latest";
-      }
+    if (Boolean.TRUE.equals(runWithRdf)) {
+      String rdfContainerImage = System.getProperty("rdfContainerImage", "stain/jena-fuseki:5.0.0");
+      LOG.info(
+          "RDF is enabled for tests. Starting Fuseki container with image: {}", rdfContainerImage);
 
       try {
         RDF_CONTAINER =
@@ -588,6 +586,7 @@ private static void setupRdfIfEnabled() {
         configOverrides.add(ConfigOverride.config("rdf.username", "admin"));
         configOverrides.add(ConfigOverride.config("rdf.password", "test-admin"));
         configOverrides.add(ConfigOverride.config("rdf.baseUri", "https://open-metadata.org/"));
+        configOverrides.add(ConfigOverride.config("rdf.dataset", "openmetadata"));
 
         LOG.info("RDF configuration overrides added");
       } catch (Exception e) {
@@ -596,7 +595,8 @@ private static void setupRdfIfEnabled() {
         configOverrides.add(ConfigOverride.config("rdf.enabled", "false"));
       }
     } else {
-      LOG.info("RDF not enabled for tests (enableRdf={})", enableRdf);
+      LOG.info("RDF not enabled for tests (runWithRdf={})", runWithRdf);
+      configOverrides.add(ConfigOverride.config("rdf.enabled", "false"));
     }
   }
 

openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java

@@ -25,28 +25,25 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class RdfResourceTest extends OpenMetadataApplicationTest {
 
+  static {
+    // Enable RDF for these tests
+    runWithRdf = true;
+  }
+
   // RDF type for Table entities (from RdfUtils.java)
   private static final String TABLE_RDF_TYPE = "dcat:Dataset";
 
   private TableResourceTest tableResourceTest;
 
   @BeforeAll
   public void setup(TestInfo test) throws URISyntaxException, IOException {
-    // Skip setup if RDF is not enabled
-    if (!"true".equals(System.getProperty("enableRdf"))) {
-      return;
-    }
     // Initialize the TableResourceTest helper for creating entities
     tableResourceTest = new TableResourceTest();
     tableResourceTest.setup(test);
   }
 
   @Test
   void testEntityStoredInRdf(TestInfo test) throws Exception {
-    if (!"true".equals(System.getProperty("enableRdf"))) {
-      return; // Skip if RDF is not enabled
-    }
-
     // Create a table
     CreateTable createTable =
         tableResourceTest.createRequest(test.getDisplayName() + "_rdf_storage");
@@ -58,10 +55,6 @@ void testEntityStoredInRdf(TestInfo test) throws Exception {
 
   @Test
   void testMultipleEntitiesStoredInRdf(TestInfo test) throws Exception {
-    if (!"true".equals(System.getProperty("enableRdf"))) {
-      return; // Skip if RDF is not enabled
-    }
-
     // Create multiple tables
     CreateTable createTable1 =
         tableResourceTest.createRequest(test.getDisplayName() + "_rdf_multi1");
@@ -78,10 +71,6 @@ void testMultipleEntitiesStoredInRdf(TestInfo test) throws Exception {
 
   @Test
   void testEntityDeleteFromRdf(TestInfo test) throws Exception {
-    if (!"true".equals(System.getProperty("enableRdf"))) {
-      return; // Skip if RDF is not enabled
-    }
-
     // Create a table
     CreateTable createTable =
         tableResourceTest.createRequest(test.getDisplayName() + "_rdf_delete");

openmetadata-service/src/test/java/org/openmetadata/service/resources/rdf/RdfResourceTest.java

@@ -26,7 +26,8 @@ private RdfTestUtils() {
    * Check if RDF is enabled for the current test run
    */
   public static boolean isRdfEnabled() {
-    return "true".equals(System.getProperty("enableRdf"));
+    RdfRepository repository = RdfRepository.getInstance();
+    return repository != null && repository.isEnabled();
   }
 
   /**