From 940ef11e7f477148d754903b39b3555265a0c7e3 Mon Sep 17 00:00:00 2001
From: Sarat Vemulapalli <vemulapallisarat@gmail.com>
Date: Wed, 1 Feb 2023 11:51:44 -0800
Subject: [PATCH] Adding spotless

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
---
 .../opensearch/extensions/ExtensionsManager.java    | 13 ++++++++++---
 .../extensions/ExtensionsManagerTests.java          |  5 -----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
index e1c733aef7cea..8118760cd1bb2 100644
--- a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
+++ b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
@@ -567,10 +567,17 @@ private ExtensionsSettings readFromExtensionsYml(Path filePath) throws IOExcepti
             for (HashMap<String, ?> extensionMap : unreadExtensions) {
                 // Parse extension dependencies
                 List<ExtensionDependency> extensionDependencyList = new ArrayList<ExtensionDependency>();
-                if(extensionMap.get("dependencies") != null) {
-                    List<HashMap<String, ?>> extensionDependencies = new ArrayList<>((Collection<HashMap<String, ?>>) extensionMap.get("dependencies"));
+                if (extensionMap.get("dependencies") != null) {
+                    List<HashMap<String, ?>> extensionDependencies = new ArrayList<>(
+                        (Collection<HashMap<String, ?>>) extensionMap.get("dependencies")
+                    );
                     for (HashMap<String, ?> dependency : extensionDependencies) {
-                        extensionDependencyList.add(new ExtensionDependency(dependency.get("uniqueId").toString(), Version.fromString(dependency.get("version").toString())));
+                        extensionDependencyList.add(
+                            new ExtensionDependency(
+                                dependency.get("uniqueId").toString(),
+                                Version.fromString(dependency.get("version").toString())
+                            )
+                        );
                     }
                 }
                 // Create extension read from yml config
diff --git a/server/src/test/java/org/opensearch/extensions/ExtensionsManagerTests.java b/server/src/test/java/org/opensearch/extensions/ExtensionsManagerTests.java
index b564247c52792..05ff119cbe082 100644
--- a/server/src/test/java/org/opensearch/extensions/ExtensionsManagerTests.java
+++ b/server/src/test/java/org/opensearch/extensions/ExtensionsManagerTests.java
@@ -236,12 +236,7 @@ public void testDiscover() throws Exception {
             assertEquals(extension.getAttributes(), initializedExtension.getAttributes());
             assertEquals(extension.getVersion(), initializedExtension.getVersion());
             assertEquals(extension.getMinimumCompatibleVersion(), initializedExtension.getMinimumCompatibleVersion());
-            // TODO: Will fail due to bug : https://github.com/opensearch-project/OpenSearch/issues/6115
-<<<<<<< HEAD
             assertEquals(extension.getDependencies(), initializedExtension.getDependencies());
-=======
-            // assertEquals(extension.getDependencies(), initializedExtension.getDependencies());
->>>>>>> main
         }
     }