Merge branch 'feature/multi_tenancy' into multi_tenancy_2

Signed-off-by: arjunkumargiri <142054468+arjunkumargiri@users.noreply.github.com>
arjunkumargiri · Jul 8, 2024 · 052aac4 · 052aac4
2 parents c332aa5 + 18e8048
commit 052aac4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/plugin/src/main/java/org/opensearch/ml/model/MLModelManager.java b/plugin/src/main/java/org/opensearch/ml/model/MLModelManager.java
@@ -390,7 +390,8 @@ public void registerMLRemoteModel(
                                 */
                                 modelGroupSourceMap.put(MLModelGroup.LATEST_VERSION_FIELD, updatedVersion);
                                 modelGroupSourceMap.put(MLModelGroup.LAST_UPDATED_TIME_FIELD, Instant.now().toEpochMilli());
-                                UpdateDataObjectRequest updateDataObjectRequest = new UpdateDataObjectRequest.Builder()
+                                UpdateDataObjectRequest updateDataObjectRequest = UpdateDataObjectRequest
+                                    .builder()
                                     .index(ML_MODEL_GROUP_INDEX)
                                     .id(modelGroupId)
                                     .tenantId(mlRegisterModelInput.getTenantId())
@@ -584,7 +585,8 @@ private void indexRemoteModel(
                     .tenantId(registerModelInput.getTenantId())
                     .build();
 
-                PutDataObjectRequest putModelMetaRequest = new PutDataObjectRequest.Builder()
+                PutDataObjectRequest putModelMetaRequest = PutDataObjectRequest
+                    .builder()
                     .index(ML_MODEL_INDEX)
                     .id(Boolean.TRUE.equals(registerModelInput.getIsHidden()) ? modelName : null)
                     .tenantId(registerModelInput.getTenantId())

diff --git a/plugin/src/main/java/org/opensearch/ml/plugin/MachineLearningPlugin.java b/plugin/src/main/java/org/opensearch/ml/plugin/MachineLearningPlugin.java
@@ -470,7 +470,6 @@ public Collection<Object> createComponents(
 
         // Get the injected SdkClient instance from the injector
         SdkClient sdkClient = injector.getInstance(SdkClient.class);
-
         mlIndicesHandler = new MLIndicesHandler(clusterService, client);
         encryptor = new EncryptorImpl(clusterService, client, mlIndicesHandler);
 

diff --git a/plugin/src/main/java/org/opensearch/ml/sdkclient/DDBOpenSearchClient.java b/plugin/src/main/java/org/opensearch/ml/sdkclient/DDBOpenSearchClient.java
@@ -163,7 +163,7 @@ public CompletionStage<GetDataObjectResponse> getDataObjectAsync(GetDataObjectRe
                             .createParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, simulatedGetResponse)
                     )
                     .getSourceAsMap();
-                return new GetDataObjectResponse.Builder().id(request.id()).parser(parser).source(sourceAsMap).build();
+                return GetDataObjectResponse.builder().id(request.id()).parser(parser).source(sourceAsMap).build();
             } catch (IOException e) {
                 // Rethrow unchecked exception on XContent parsing error
                 throw new OpenSearchStatusException("Failed to parse response", RestStatus.INTERNAL_SERVER_ERROR);
@@ -207,7 +207,7 @@ public CompletionStage<UpdateDataObjectResponse> updateDataObjectAsync(UpdateDat
                 dynamoDbClient.updateItem(updateItemRequest);
 
                 String simulatedUpdateResponse = simulateOpenSearchResponse(request.index(), request.id(), source, Map.of("found", true));
-                return new UpdateDataObjectResponse.Builder().id(request.id()).parser(createParser(simulatedUpdateResponse)).build();
+                return UpdateDataObjectResponse.builder().id(request.id()).parser(createParser(simulatedUpdateResponse)).build();
             } catch (IOException e) {
                 log.error("Error updating {} in {}: {}", request.id(), request.index(), e.getMessage(), e);
                 // Rethrow unchecked exception on update IOException
@@ -246,7 +246,7 @@ public CompletionStage<DeleteDataObjectResponse> deleteDataObjectAsync(DeleteDat
                     null,
                     Map.of("result", "deleted")
                 );
-                return new DeleteDataObjectResponse.Builder().id(request.id()).parser(createParser(simulatedDeleteResponse)).build();
+                return DeleteDataObjectResponse.builder().id(request.id()).parser(createParser(simulatedDeleteResponse)).build();
             } catch (IOException e) {
                 // Rethrow unchecked exception on XContent parsing error
                 throw new OpenSearchStatusException("Failed to parse response", RestStatus.INTERNAL_SERVER_ERROR);

diff --git a/plugin/src/main/java/org/opensearch/ml/sdkclient/LocalClusterIndicesClient.java b/plugin/src/main/java/org/opensearch/ml/sdkclient/LocalClusterIndicesClient.java
@@ -87,7 +87,7 @@ public CompletionStage<PutDataObjectResponse> putDataObjectAsync(PutDataObjectRe
                     )
                     .actionGet();
                 log.info("Creation status for id {}: {}", indexResponse.getId(), indexResponse.getResult());
-                return new PutDataObjectResponse.Builder().id(indexResponse.getId()).parser(createParser(indexResponse)).build();
+                return PutDataObjectResponse.builder().id(indexResponse.getId()).parser(createParser(indexResponse)).build();
             } catch (IOException e) {
                 // Rethrow unchecked exception on XContent parsing error
                 throw new OpenSearchStatusException(
@@ -135,10 +135,10 @@ public CompletionStage<UpdateDataObjectResponse> updateDataObjectAsync(UpdateDat
                     .actionGet();
                 if (updateResponse == null) {
                     log.info("Null UpdateResponse");
-                    return new UpdateDataObjectResponse.Builder().id(request.id()).parser(null).build();
+                    return UpdateDataObjectResponse.builder().id(request.id()).parser(null).build();
                 }
                 log.info("Update status for id {}: {}", updateResponse.getId(), updateResponse.getResult());
-                return new UpdateDataObjectResponse.Builder().id(updateResponse.getId()).parser(createParser(updateResponse)).build();
+                return UpdateDataObjectResponse.builder().id(updateResponse.getId()).parser(createParser(updateResponse)).build();
             } catch (IOException e) {
                 // Rethrow unchecked exception on XContent parsing error
                 throw new OpenSearchStatusException(
@@ -156,7 +156,7 @@ public CompletionStage<DeleteDataObjectResponse> deleteDataObjectAsync(DeleteDat
                 log.info("Deleting {} from {}", request.id(), request.index());
                 DeleteResponse deleteResponse = client.delete(new DeleteRequest(request.index(), request.id())).actionGet();
                 log.info("Deletion status for id {}: {}", deleteResponse.getId(), deleteResponse.getResult());
-                return new DeleteDataObjectResponse.Builder().id(deleteResponse.getId()).parser(createParser(deleteResponse)).build();
+                return DeleteDataObjectResponse.builder().id(deleteResponse.getId()).parser(createParser(deleteResponse)).build();
             } catch (IOException e) {
                 // Rethrow unchecked exception on XContent parsing error
                 throw new OpenSearchStatusException(
@@ -174,7 +174,7 @@ public CompletionStage<SearchDataObjectResponse> searchDataObjectAsync(SearchDat
             SearchResponse searchResponse = client.search(new SearchRequest(request.indices(), request.searchSourceBuilder())).actionGet();
             log.info("Search returned {} hits", searchResponse.getHits().getTotalHits());
             try {
-                return new SearchDataObjectResponse.Builder().parser(createParser(searchResponse)).build();
+                return SearchDataObjectResponse.builder().parser(createParser(searchResponse)).build();
             } catch (IOException e) {
                 // Rethrow unchecked exception on XContent parsing error
                 throw new OpenSearchStatusException(