addressed comments

Author: patelraj0602

document-store/src/main/java/org/hypertrace/core/documentstore/model/config/ConnectionConfig.java

@@ -71,7 +71,7 @@ public static class ConnectionConfigBuilder {
     String replicaSet;
     Map<String, String> customParameters = new HashMap<>();
 
-    public ConnectionConfigBuilder customParameters(String key, String value) {
+    public ConnectionConfigBuilder customParameter(String key, String value) {
       this.customParameters.put(key, value);
       return this;
     }

document-store/src/main/java/org/hypertrace/core/documentstore/model/config/TypesafeConfigDatastoreConfigExtractor.java

@@ -184,7 +184,7 @@ public TypesafeConfigDatastoreConfigExtractor customParametersKey(@NonNull final
             .entrySet()
             .forEach(
                 entry -> {
-                  connectionConfigBuilder.customParameters(
+                  connectionConfigBuilder.customParameter(
                       entry.getKey(), paramConfig.getString(entry.getKey()));
                 });
       } catch (Exception e) {

document-store/src/main/java/org/hypertrace/core/documentstore/postgres/PostgresCollection.java

@@ -1295,7 +1295,7 @@ protected Document prepareDocument() throws SQLException, IOException {
       }
 
       // Remove document ID if needed
-      if (removeDocumentId) {
+      if (shouldRemoveDocumentId()) {
         jsonNode.remove(DOCUMENT_ID);
       }
 
@@ -1386,7 +1386,7 @@ static class PostgresResultIterator implements CloseableIterator<Document> {
 
     protected final ObjectMapper MAPPER = new ObjectMapper();
     protected ResultSet resultSet;
-    final boolean removeDocumentId;
+    private final boolean removeDocumentId;
     protected boolean cursorMovedForward = false;
     protected boolean hasNext = false;
 
@@ -1438,7 +1438,7 @@ protected Document prepareDocument() throws SQLException, IOException {
       String documentString = resultSet.getString(DOCUMENT);
       ObjectNode jsonNode = (ObjectNode) MAPPER.readTree(documentString);
       // internal iterators may need document id
-      if (removeDocumentId) {
+      if (shouldRemoveDocumentId()) {
         jsonNode.remove(DOCUMENT_ID);
       }
       // Add Timestamps to Document
@@ -1464,6 +1464,10 @@ protected void closeResultSet() {
     public void close() {
       closeResultSet();
     }
+
+    protected boolean shouldRemoveDocumentId() {
+      return removeDocumentId;
+    }
   }
 
   static class PostgresResultIteratorWithMetaData extends PostgresResultIterator {

document-store/src/main/java/org/hypertrace/core/documentstore/postgres/query/v1/PostgresQueryParser.java

@@ -28,7 +28,7 @@ public class PostgresQueryParser {
 
   @Getter private final PostgresTableIdentifier tableIdentifier;
   @Getter private final Query query;
-  @Getter private final Optional<String> flatStructureCollectionName;
+  @Getter private final String flatStructureCollectionName;
 
   @Setter String finalTableName;
   @Getter private final Builder paramsBuilder = Params.newBuilder();
@@ -49,7 +49,7 @@ public PostgresQueryParser(
       PostgresTableIdentifier tableIdentifier, Query query, String flatStructureCollectionName) {
     this.tableIdentifier = tableIdentifier;
     this.query = query;
-    this.flatStructureCollectionName = Optional.ofNullable(flatStructureCollectionName);
+    this.flatStructureCollectionName = flatStructureCollectionName;
     this.finalTableName = tableIdentifier.toString();
     toPgColumnTransformer = new FieldToPgColumnTransformer(this);
   }

document-store/src/main/java/org/hypertrace/core/documentstore/postgres/query/v1/parser/filter/PostgresNotContainsRelationalFilterParser.java

@@ -14,11 +14,10 @@ public String parse(
       final RelationalExpression expression, final PostgresRelationalFilterContext context) {
     final String parsedLhs = expression.getLhs().accept(context.lhsParser());
 
+    String flatStructureCollection = context.getFlatStructureCollectionName();
     boolean isFirstClassField =
-        context
-            .getFlatStructureCollectionName()
-            .map(name -> name.equals(context.getTableIdentifier().getTableName()))
-            .orElse(false);
+        flatStructureCollection != null
+            && flatStructureCollection.equals(context.getTableIdentifier().getTableName());
 
     if (isFirstClassField) {
       // Use the non-JSON logic for first-class fields

document-store/src/main/java/org/hypertrace/core/documentstore/postgres/query/v1/parser/filter/PostgresNotInRelationalFilterParser.java

@@ -22,11 +22,10 @@ public String parse(
 
   private PostgresInRelationalFilterParserInterface getInFilterParser(
       PostgresRelationalFilterContext context) {
+    String flatStructureCollection = context.getFlatStructureCollectionName();
     boolean isFirstClassField =
-        context
-            .getFlatStructureCollectionName()
-            .map(name -> name.equals(context.getTableIdentifier().getTableName()))
-            .orElse(false);
+        flatStructureCollection != null
+            && flatStructureCollection.equals(context.getTableIdentifier().getTableName());
 
     return isFirstClassField ? nonJsonFieldInFilterParser : jsonFieldInFilterParser;
   }

document-store/src/main/java/org/hypertrace/core/documentstore/postgres/query/v1/parser/filter/PostgresRelationalFilterParserFactoryImpl.java

@@ -51,11 +51,11 @@ public class PostgresRelationalFilterParserFactoryImpl
   public PostgresRelationalFilterParser parser(
       final RelationalExpression expression, final PostgresQueryParser postgresQueryParser) {
 
+    String flatStructureCollection = postgresQueryParser.getFlatStructureCollectionName();
     boolean isFirstClassField =
-        postgresQueryParser
-            .getFlatStructureCollectionName()
-            .map(name -> name.equals(postgresQueryParser.getTableIdentifier().getTableName()))
-            .orElse(false);
+        flatStructureCollection != null
+            && flatStructureCollection.equals(
+                postgresQueryParser.getTableIdentifier().getTableName());
 
     if (expression.getOperator() == CONTAINS) {
       return isFirstClassField ? nonJsonFieldContainsParser : jsonFieldContainsParser;

document-store/src/main/java/org/hypertrace/core/documentstore/postgres/query/v1/transformer/FieldToPgColumnTransformer.java

@@ -17,10 +17,10 @@ public FieldToPgColumnTransformer(PostgresQueryParser postgresQueryParser) {
 
   public FieldToPgColumn transform(String orgFieldName) {
     // TODO: Forcing to map to the first class fields
-    if (postgresQueryParser
-        .getFlatStructureCollectionName()
-        .map(name -> name.equals(postgresQueryParser.getTableIdentifier().getTableName()))
-        .orElse(false)) {
+    String flatStructureCollection = postgresQueryParser.getFlatStructureCollectionName();
+    if (flatStructureCollection != null
+        && flatStructureCollection.equals(
+            postgresQueryParser.getTableIdentifier().getTableName())) {
       return new FieldToPgColumn(null, PostgresUtils.wrapFieldNamesWithDoubleQuotes(orgFieldName));
     }
     Optional<String> parentField =