remove set method

pgomulka · Jul 10, 2024 · b3c16bc · b3c16bc
1 parent e84c4dc
commit b3c16bc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 23 deletions.
diff --git a/...sterTest/java/org/elasticsearch/plugins/internal/DocumentSizeObserverWithPipelinesIT.java b/...sterTest/java/org/elasticsearch/plugins/internal/DocumentSizeObserverWithPipelinesIT.java
@@ -138,10 +138,6 @@ public long normalisedBytesParsed() {
             return mapCounter;
         }
 
-        @Override
-        public void setNormalisedBytesParsedOn(IndexRequest indexRequest) {
-            indexRequest.setNormalisedBytesParsed(mapCounter);
-        }
     }
 
 }
diff --git a/...c/internalClusterTest/java/org/elasticsearch/plugins/internal/DocumentSizeObserverIT.java b/...c/internalClusterTest/java/org/elasticsearch/plugins/internal/DocumentSizeObserverIT.java
@@ -181,9 +181,5 @@ public long normalisedBytesParsed() {
             return counter;
         }
 
-        @Override
-        public void setNormalisedBytesParsedOn(IndexRequest indexRequest) {
-            indexRequest.setNormalisedBytesParsed(counter);
-        }
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java
@@ -225,8 +225,8 @@ Result prepareUpdateIndexRequest(ShardId shardId, UpdateRequest request, GetResu
                 .setIfPrimaryTerm(getResult.getPrimaryTerm())
                 .waitForActiveShards(request.waitForActiveShards())
                 .timeout(request.timeout())
-                .setRefreshPolicy(request.getRefreshPolicy());
-            documentSizeObserver.setNormalisedBytesParsedOn(finalIndexRequest);
+                .setRefreshPolicy(request.getRefreshPolicy())
+                .setNormalisedBytesParsed(documentSizeObserver.normalisedBytesParsed());
 
             return new Result(finalIndexRequest, DocWriteResponse.Result.UPDATED, updatedSourceAsMap, updateSourceContentType);
         }

diff --git a/server/src/main/java/org/elasticsearch/ingest/IngestService.java b/server/src/main/java/org/elasticsearch/ingest/IngestService.java
@@ -787,7 +787,7 @@ public void onFailure(Exception e) {
                         );
 
                         executePipelines(pipelines, indexRequest, ingestDocument, shouldStoreFailure, documentListener);
-                        documentSizeObserver.setNormalisedBytesParsedOn(indexRequest);
+                        indexRequest.setNormalisedBytesParsed(documentSizeObserver.normalisedBytesParsed());
                         assert actionRequest.index() != null;
 
                         i++;

diff --git a/server/src/main/java/org/elasticsearch/plugins/internal/DocumentSizeObserver.java b/server/src/main/java/org/elasticsearch/plugins/internal/DocumentSizeObserver.java
@@ -8,7 +8,6 @@
 
 package org.elasticsearch.plugins.internal;
 
-import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.xcontent.XContentParser;
 
 /**
@@ -30,8 +29,6 @@ public long normalisedBytesParsed() {
             return 0;
         }
 
-        @Override
-        public void setNormalisedBytesParsedOn(IndexRequest indexRequest) {}
     };
 
     /**
@@ -50,11 +47,10 @@ public void setNormalisedBytesParsedOn(IndexRequest indexRequest) {}
     long normalisedBytesParsed();
 
     /**
-     * Enriches the index request with the number of bytes observed when parsing a document
-     * @param indexRequest
+     * Indicates if an observer was used on an update request with script
+     *
+     * @return true if update was done by script, false otherwise
      */
-    void setNormalisedBytesParsedOn(IndexRequest indexRequest);
-
     default boolean isUpdateByScript() {
         return false;
     }

diff --git a/server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java b/server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java
@@ -1188,11 +1188,6 @@ public long normalisedBytesParsed() {
                         return 0;
                     }
 
-                    @Override
-                    public void setNormalisedBytesParsedOn(IndexRequest indexRequest) {
-                        parsedValueWasUsed.incrementAndGet();
-                        indexRequest.setNormalisedBytesParsed(0L);
-                    }
                 };
             }
         };