fix conflicts

Author: karanh37

openmetadata-integration-tests/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>platform</artifactId>
     <groupId>org.open-metadata</groupId>
-    <version>1.13.0</version>
+    <version>1.12.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openmetadata-integration-tests</artifactId>

openmetadata-integration-tests/src/test/java/org/openmetadata/it/bootstrap/TestSuiteBootstrap.java

@@ -348,7 +348,6 @@ private void startFuseki() {
             .withExposedPorts(FUSEKI_PORT)
             .withEnv("ADMIN_PASSWORD", FUSEKI_ADMIN_PASSWORD)
             .withEnv("FUSEKI_DATASET_1", FUSEKI_DATASET)
-            .withTmpFs(java.util.Map.of("/fuseki/databases", "rw,size=256m,uid=100,gid=101"))
             .waitingFor(
                 Wait.forHttp("/$/ping")
                     .forPort(FUSEKI_PORT)
@@ -925,6 +924,13 @@ public static Jdbi getJdbi() {
     return jdbi;
   }
 
+  /**
+   * Returns true if Fuseki was started for this test session.
+   */
+  public static boolean isFusekiEnabled() {
+    return fusekiEndpoint != null;
+  }
+
   /**
    * Returns the Fuseki SPARQL endpoint URL for RDF operations.
    */

openmetadata-integration-tests/src/test/java/org/openmetadata/it/factories/GlossaryTermTestFactory.java

@@ -0,0 +1,112 @@
+package org.openmetadata.it.factories;
+
+import java.util.List;
+import org.openmetadata.it.util.TestNamespace;
+import org.openmetadata.schema.entity.data.Glossary;
+import org.openmetadata.schema.entity.data.GlossaryTerm;
+import org.openmetadata.sdk.fluent.GlossaryTerms;
+
+/**
+ * Factory for creating GlossaryTerm entities in integration tests using fluent API.
+ *
+ * <p>Uses the static fluent API from {@link GlossaryTerms}. Ensure {@code
+ * GlossaryTerms.setDefaultClient(client)} is called before using these methods (handled by
+ * SdkClients.initializeFluentAPIs).
+ */
+public class GlossaryTermTestFactory {
+
+  /**
+   * Create a glossary term with default settings using fluent API.
+   */
+  public static GlossaryTerm createSimple(TestNamespace ns, Glossary glossary) {
+    return GlossaryTerms.create()
+        .name(ns.prefix("term"))
+        .in(glossary.getFullyQualifiedName())
+        .withDescription("Test term")
+        .execute();
+  }
+
+  /**
+   * Create glossary term with custom name using fluent API.
+   */
+  public static GlossaryTerm createWithName(TestNamespace ns, Glossary glossary, String baseName) {
+    return GlossaryTerms.create()
+        .name(ns.prefix(baseName))
+        .in(glossary.getFullyQualifiedName())
+        .withDescription("Test term: " + baseName)
+        .execute();
+  }
+
+  /**
+   * Create glossary term with description using fluent API.
+   */
+  public static GlossaryTerm createWithDescription(
+      TestNamespace ns, Glossary glossary, String description) {
+    return GlossaryTerms.create()
+        .name(ns.prefix("term"))
+        .in(glossary.getFullyQualifiedName())
+        .withDescription(description)
+        .execute();
+  }
+
+  /**
+   * Create glossary term under a parent term using fluent API.
+   */
+  public static GlossaryTerm createChild(
+      TestNamespace ns, Glossary glossary, GlossaryTerm parent, String baseName) {
+    return GlossaryTerms.create()
+        .name(ns.prefix(baseName))
+        .in(glossary.getFullyQualifiedName())
+        .under(parent.getFullyQualifiedName())
+        .withDescription("Child term of " + parent.getName())
+        .execute();
+  }
+
+  /**
+   * Create glossary term with synonyms using fluent API.
+   */
+  public static GlossaryTerm createWithSynonyms(
+      TestNamespace ns, Glossary glossary, String baseName, List<String> synonyms) {
+    return GlossaryTerms.create()
+        .name(ns.prefix(baseName))
+        .in(glossary.getFullyQualifiedName())
+        .withDescription("Term with synonyms")
+        .withSynonyms(synonyms)
+        .execute();
+  }
+
+  /**
+   * Create glossary term with related terms using fluent API.
+   *
+   * @param relatedTermFqns List of fully qualified names of related terms
+   */
+  public static GlossaryTerm createWithRelatedTerms(
+      TestNamespace ns, Glossary glossary, String baseName, List<String> relatedTermFqns) {
+    return GlossaryTerms.create()
+        .name(ns.prefix(baseName))
+        .in(glossary.getFullyQualifiedName())
+        .withDescription("Term with related terms")
+        .withRelatedTerms(relatedTermFqns)
+        .execute();
+  }
+
+  /**
+   * Create glossary term with display name using fluent API.
+   */
+  public static GlossaryTerm createWithDisplayName(
+      TestNamespace ns, Glossary glossary, String baseName, String displayName) {
+    return GlossaryTerms.create()
+        .name(ns.prefix(baseName))
+        .in(glossary.getFullyQualifiedName())
+        .withDisplayName(displayName)
+        .withDescription("Term with display name")
+        .execute();
+  }
+
+  /**
+   * Delete a glossary term by ID (hard delete with recursive).
+   */
+  public static void delete(GlossaryTerm term) {
+    GlossaryTerms.find(term.getId()).delete().recursively().permanently().confirm();
+  }
+}

openmetadata-integration-tests/src/test/java/org/openmetadata/it/factories/GlossaryTestFactory.java

@@ -0,0 +1,61 @@
+package org.openmetadata.it.factories;
+
+import org.openmetadata.it.util.TestNamespace;
+import org.openmetadata.schema.entity.data.Glossary;
+import org.openmetadata.sdk.fluent.Glossaries;
+
+/**
+ * Factory for creating Glossary entities in integration tests using fluent API.
+ *
+ * <p>Uses the static fluent API from {@link Glossaries}. Ensure {@code
+ * Glossaries.setDefaultClient(client)} is called before using these methods (handled by
+ * SdkClients.initializeFluentAPIs).
+ */
+public class GlossaryTestFactory {
+
+  /**
+   * Create a glossary with default settings using fluent API.
+   */
+  public static Glossary createSimple(TestNamespace ns) {
+    return Glossaries.create()
+        .name(ns.prefix("glossary"))
+        .withDescription("Test glossary")
+        .execute();
+  }
+
+  /**
+   * Create glossary with custom name using fluent API.
+   */
+  public static Glossary createWithName(TestNamespace ns, String baseName) {
+    return Glossaries.create()
+        .name(ns.prefix(baseName))
+        .withDescription("Test glossary: " + baseName)
+        .execute();
+  }
+
+  /**
+   * Create glossary with description using fluent API.
+   */
+  public static Glossary createWithDescription(TestNamespace ns, String description) {
+    return Glossaries.create().name(ns.prefix("glossary")).withDescription(description).execute();
+  }
+
+  /**
+   * Create glossary with display name using fluent API.
+   */
+  public static Glossary createWithDisplayName(
+      TestNamespace ns, String baseName, String displayName) {
+    return Glossaries.create()
+        .name(ns.prefix(baseName))
+        .withDisplayName(displayName)
+        .withDescription("Test glossary with display name")
+        .execute();
+  }
+
+  /**
+   * Delete a glossary by ID (hard delete with recursive).
+   */
+  public static void delete(Glossary glossary) {
+    Glossaries.find(glossary.getId()).delete().recursively().permanently().confirm();
+  }
+}