Refactor Llama request classes to use pattern matching for secret settings

Jan-Kazlouski-elastic · Jan-Kazlouski-elastic · commit ad009c69dd23 · 2025-07-10T21:49:38.000+03:00
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/request/completion/LlamaChatCompletionRequest.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/request/completion/LlamaChatCompletionRequest.java
@@ -60,8 +60,7 @@ public HttpRequest createHttpRequest() {
         httpPost.setEntity(byteEntity);
 
         httpPost.setHeader(HttpHeaders.CONTENT_TYPE, XContentType.JSON.mediaTypeWithoutParameters());
-        if (model.getSecretSettings() instanceof DefaultSecretSettings) {
-            var secretSettings = (DefaultSecretSettings) model.getSecretSettings();
+        if (model.getSecretSettings() instanceof DefaultSecretSettings secretSettings) {
             httpPost.setHeader(createAuthBearerHeader(secretSettings.apiKey()));
         }
 
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/request/embeddings/LlamaEmbeddingsRequest.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/request/embeddings/LlamaEmbeddingsRequest.java
@@ -66,8 +66,7 @@ public HttpRequest createHttpRequest() {
         httpPost.setEntity(byteEntity);
 
         httpPost.setHeader(HttpHeaders.CONTENT_TYPE, XContentType.JSON.mediaTypeWithoutParameters());
-        if (model.getSecretSettings() instanceof DefaultSecretSettings) {
-            var secretSettings = (DefaultSecretSettings) model.getSecretSettings();
+        if (model.getSecretSettings() instanceof DefaultSecretSettings secretSettings) {
             httpPost.setHeader(createAuthBearerHeader(secretSettings.apiKey()));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,7 @@ public HttpRequest createHttpRequest() {`
`60`	`60`	`httpPost.setEntity(byteEntity);`
`61`	`61`
`62`	`62`	`httpPost.setHeader(HttpHeaders.CONTENT_TYPE, XContentType.JSON.mediaTypeWithoutParameters());`
`63`		`- if (model.getSecretSettings() instanceof DefaultSecretSettings) {`
`64`		`- var secretSettings = (DefaultSecretSettings) model.getSecretSettings();`
	`63`	`+ if (model.getSecretSettings() instanceof DefaultSecretSettings secretSettings) {`
`65`	`64`	`httpPost.setHeader(createAuthBearerHeader(secretSettings.apiKey()));`
`66`	`65`	`}`
`67`	`66`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,7 @@ public HttpRequest createHttpRequest() {`
`66`	`66`	`httpPost.setEntity(byteEntity);`
`67`	`67`
`68`	`68`	`httpPost.setHeader(HttpHeaders.CONTENT_TYPE, XContentType.JSON.mediaTypeWithoutParameters());`
`69`		`- if (model.getSecretSettings() instanceof DefaultSecretSettings) {`
`70`		`- var secretSettings = (DefaultSecretSettings) model.getSecretSettings();`
	`69`	`+ if (model.getSecretSettings() instanceof DefaultSecretSettings secretSettings) {`
`71`	`70`	`httpPost.setHeader(createAuthBearerHeader(secretSettings.apiKey()));`
`72`	`71`	`}`
`73`	`72`