Merge branch 'ml-ccm-api-settings' of github.com:jonathan-buttner/elasticsearch into ml-ccm-api-settings

Author: jonathan-buttner

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/BaseCCMIT.java

@@ -37,7 +37,9 @@ public abstract class BaseCCMIT extends ESSingleNodeTestCase {
 
     public interface Provider {
         void store(CCMModel ccmModel, ActionListener<Void> listener);
+
         void get(ActionListener<CCMModel> listener);
+
         void delete(ActionListener<Void> listener);
     }
 
@@ -77,7 +79,8 @@ public void testStore_OverwritesConfiguration_WhenItAlreadyExists() {
 
         var results = client().prepareSearch(CCMIndex.INDEX_PATTERN)
             .setQuery(QueryBuilders.idsQuery().addIds(CCM_DOC_ID))
-            .execute().actionGet(TimeValue.THIRTY_SECONDS);
+            .execute()
+            .actionGet(TimeValue.THIRTY_SECONDS);
 
         assertThat(results.getHits().getHits().length, is(1));
     }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ccm/CCMService.java

@@ -24,17 +24,14 @@ public CCMService(CCMPersistentStorageService ccmPersistentStorageService) {
 
     public void isEnabled(ActionListener<Boolean> listener) {
         // TODO use cache or cluster state to determine if CCM is enabled
-        var ccmModelListener = ActionListener.<CCMModel>wrap(
-            ignored -> listener.onResponse(true),
-            e -> {
-                if (e instanceof ResourceNotFoundException) {
-                    listener.onResponse(false);
-                    return;
-                }
-
-                listener.onFailure(e);
+        var ccmModelListener = ActionListener.<CCMModel>wrap(ignored -> listener.onResponse(true), e -> {
+            if (e instanceof ResourceNotFoundException) {
+                listener.onResponse(false);
+                return;
             }
-        );
+
+            listener.onFailure(e);
+        });
 
         ccmPersistentStorageService.get(ccmModelListener);
     }