Synonyms - Fixes error when no ID is specified (#97426)

Author: carlosdelest

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml

@@ -3,6 +3,28 @@ setup:
       version: " - 8.8.99"
       reason: Introduced in 8.9.0
 
+---
+"Create synonyms with no ID creates ID automatically":
+  - skip:
+      version: " - 8.9.99"
+      reason: Fixed for 8.10.0
+  - do:
+      synonyms.put:
+        synonyms_set: test-update-synonyms
+        body:
+          synonyms_set:
+            - synonyms: "hello, hi"
+            - synonyms: "bye => goodbye"
+
+  - match: { result: "created" }
+
+  - do:
+      synonyms.get:
+        synonyms_set: test-update-synonyms
+
+  - is_true: synonyms_set.0.id
+  - is_true: synonyms_set.1.id
+
 ---
 "Create and Update synonyms set":
   - do:

server/src/main/java/org/elasticsearch/synonyms/SynonymRule.java

@@ -8,6 +8,7 @@
 
 package org.elasticsearch.synonyms;
 
+import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
@@ -43,7 +44,7 @@ public class SynonymRule implements Writeable, ToXContentObject {
     private final String id;
 
     public SynonymRule(@Nullable String id, String synonyms) {
-        this.id = id;
+        this.id = Objects.requireNonNullElse(id, UUIDs.base64UUID());
         this.synonyms = synonyms;
     }
 

server/src/main/java/org/elasticsearch/synonyms/SynonymsManagementAPIService.java

@@ -30,7 +30,6 @@
 import org.elasticsearch.client.internal.OriginSettingClient;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.routing.Preference;
-import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.IndexNotFoundException;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -384,11 +383,7 @@ private <T> void reloadAnalyzers(String resourceName, ActionListener<SynonymsRel
     // Retrieves the internal synonym rule ID to store it in the index. As the same synonym rule ID
     // can be used in different synonym sets, we prefix the ID with the synonym set to avoid collisions
     private static String internalSynonymRuleId(String synonymsSetId, String synonymRuleId) {
-        if (synonymRuleId == null) {
-            synonymRuleId = UUIDs.base64UUID();
-        }
-        final String id = synonymsSetId + SYNONYM_RULE_ID_SEPARATOR + synonymRuleId;
-        return id;
+        return synonymsSetId + SYNONYM_RULE_ID_SEPARATOR + synonymRuleId;
     }
 
     static Settings settings() {