Fix refresh for delete synonym rule

Author: carlosdelest

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

@@ -354,7 +354,7 @@ public void putSynonymsSet(
                         ? UpdateSynonymsResultStatus.CREATED
                         : UpdateSynonymsResultStatus.UPDATED;
 
-                    maybeReloadAnalyzers(synonymSetId, refresh, false, updateSynonymsResultStatus, bulkInsertResponseListener);
+                    checkIndexSearchableAndReloadAnalyzers(synonymSetId, refresh, false, updateSynonymsResultStatus, bulkInsertResponseListener);
                 })
             );
         }));
@@ -424,7 +424,7 @@ private void indexSynonymRule(
                 ? UpdateSynonymsResultStatus.CREATED
                 : UpdateSynonymsResultStatus.UPDATED;
 
-            maybeReloadAnalyzers(synonymsSetId, refresh, false, updateStatus, l2);
+            checkIndexSearchableAndReloadAnalyzers(synonymsSetId, refresh, false, updateStatus, l2);
         }));
     }
 
@@ -468,7 +468,11 @@ public void deleteSynonymRule(
                     return;
                 }
 
-                maybeReloadAnalyzers(synonymsSetId, refresh, false, UpdateSynonymsResultStatus.DELETED, listener);
+                if (refresh) {
+                    reloadAnalyzers(synonymsSetId, false, UpdateSynonymsResultStatus.DELETED, listener);
+                } else {
+                    listener.onResponse(new SynonymsReloadResult(UpdateSynonymsResultStatus.DELETED, null));
+                }
             }));
     }
 
@@ -526,7 +530,7 @@ private void deleteSynonymsSetObjects(String synonymSetId, ActionListener<BulkBy
     public void deleteSynonymsSet(String synonymSetId, ActionListener<AcknowledgedResponse> listener) {
 
         // Previews reloading the resource to understand its usage on indices
-        maybeReloadAnalyzers(synonymSetId, true, true, null, listener.delegateFailure((reloadListener, reloadResult) -> {
+        reloadAnalyzers(synonymSetId, true, null, listener.delegateFailure((reloadListener, reloadResult) -> {
             Map<String, ReloadAnalyzersResponse.ReloadDetails> reloadDetails = reloadResult.reloadAnalyzersResponse.getReloadDetails();
             if (reloadDetails.isEmpty() == false) {
                 Set<String> indices = reloadDetails.entrySet()
@@ -566,7 +570,7 @@ public void deleteSynonymsSet(String synonymSetId, ActionListener<AcknowledgedRe
         }));
     }
 
-    private <T> void maybeReloadAnalyzers(
+    private <T> void checkIndexSearchableAndReloadAnalyzers(
         String synonymSetId,
         boolean refresh,
         boolean preview,
@@ -596,16 +600,20 @@ private <T> void maybeReloadAnalyzers(
                 return;
             }
 
-            // auto-reload all reloadable analyzers (currently only those that use updateable synonym or keyword_marker filters)
-            ReloadAnalyzersRequest reloadAnalyzersRequest = new ReloadAnalyzersRequest(synonymSetId, preview, "*");
-            client.execute(
-                TransportReloadAnalyzersAction.TYPE,
-                reloadAnalyzersRequest,
-                listener.safeMap(reloadResponse -> new SynonymsReloadResult(synonymsOperationResult, reloadResponse))
-            );
+            reloadAnalyzers(synonymSetId, preview, synonymsOperationResult, listener);
         }));
     }
 
+    private void reloadAnalyzers(String synonymSetId, boolean preview, UpdateSynonymsResultStatus synonymsOperationResult, ActionListener<SynonymsReloadResult> listener) {
+        // auto-reload all reloadable analyzers (currently only those that use updateable synonym or keyword_marker filters)
+        ReloadAnalyzersRequest reloadAnalyzersRequest = new ReloadAnalyzersRequest(synonymSetId, preview, "*");
+        client.execute(
+            TransportReloadAnalyzersAction.TYPE,
+            reloadAnalyzersRequest,
+            listener.safeMap(reloadResponse -> new SynonymsReloadResult(synonymsOperationResult, reloadResponse))
+        );
+    }
+
     // Allows checking failures in tests
     void checkSynonymsIndexHealth(ActionListener<ClusterHealthResponse> listener) {
         ClusterHealthRequest healthRequest = new ClusterHealthRequest(