Fix DefaultObjectMapper imports and TestRestClient instantiations

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

Author: DarshitChanpura

src/integrationTest/java/org/opensearch/test/framework/cluster/OpenSearchClientProvider.java

@@ -225,11 +225,18 @@ default TestRestClient createGenericClientRestClient(
         CertificateData useCertificateData,
         InetAddress sourceInetAddress
     ) {
-        return new TestRestClient(getHttpAddress(), headers, getSSLContext(useCertificateData), sourceInetAddress);
+        return new TestRestClient(getHttpAddress(), headers, getSSLContext(useCertificateData), sourceInetAddress, true, false);
     }
 
     default TestRestClient createGenericClientRestClient(TestRestClientConfiguration configuration) {
-        return new TestRestClient(getHttpAddress(), configuration.getHeaders(), getSSLContext(), configuration.getSourceInetAddress());
+        return new TestRestClient(
+            getHttpAddress(),
+            configuration.getHeaders(),
+            getSSLContext(),
+            configuration.getSourceInetAddress(),
+            true,
+            false
+        );
     }
 
     private SSLContext getSSLContext() {

src/main/java/org/opensearch/security/support/ConfigHelper.java

@@ -49,6 +49,7 @@
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.engine.VersionConflictEngineException;
+import org.opensearch.security.DefaultObjectMapper;
 import org.opensearch.security.securityconf.impl.CType;
 import org.opensearch.security.securityconf.impl.Meta;
 import org.opensearch.security.securityconf.impl.SecurityDynamicConfiguration;

src/main/java/org/opensearch/security/support/SecurityIndexHandler.java

@@ -40,6 +40,7 @@
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.security.DefaultObjectMapper;
 import org.opensearch.security.configuration.ConfigurationMap;
 import org.opensearch.security.securityconf.impl.CType;
 import org.opensearch.security.securityconf.impl.SecurityDynamicConfiguration;

src/main/java/org/opensearch/security/support/SecurityJsonNode.java

@@ -25,6 +25,8 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
 
+import org.opensearch.security.DefaultObjectMapper;
+
 public final class SecurityJsonNode {
 
     private final JsonNode node;

src/main/java/org/opensearch/security/support/YamlConfigReader.java

@@ -25,6 +25,7 @@
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.security.DefaultObjectMapper;
 import org.opensearch.security.securityconf.impl.CType;
 import org.opensearch.security.securityconf.impl.Meta;
 import org.opensearch.security.securityconf.impl.SecurityDynamicConfiguration;

src/test/java/org/opensearch/security/support/ConfigReaderTest.java

@@ -18,6 +18,7 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import org.opensearch.security.DefaultObjectMapper;
 import org.opensearch.security.securityconf.impl.CType;
 
 import static org.hamcrest.MatcherAssert.assertThat;

src/test/java/org/opensearch/security/support/SecurityIndexHandlerTest.java

@@ -43,6 +43,7 @@
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.index.get.GetResult;
+import org.opensearch.security.DefaultObjectMapper;
 import org.opensearch.security.configuration.ConfigurationMap;
 import org.opensearch.security.securityconf.impl.CType;
 import org.opensearch.security.state.SecurityConfig;