Skip to content

Commit 015b334

Browse files
atrisatris
committed
Fix spotlessApply issues
Signed-off-by: Atri Sharma <atri.jiit@gmail.com>
1 parent c8a153f commit 015b334

File tree

5 files changed

+46
-66
lines changed

5 files changed

+46
-66
lines changed

‎server/src/internalClusterTest/java/org/opensearch/update/UpdateIT.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -901,21 +901,22 @@ private void waitForOutstandingRequests(TimeValue timeOut, Semaphore requestsOut
901901

902902
public void testUpdateRetryOnConflictDoesNotRefreshOnFailedAttempts() throws Exception {
903903
assertAcked(prepareCreate("test"));
904-
905-
client().prepareIndex("test").setId("1")
904+
905+
client().prepareIndex("test")
906+
.setId("1")
906907
.setSource(XContentFactory.jsonBuilder().startObject().field("field", "value1").endObject())
907908
.get();
908-
909+
909910
client().prepareUpdate("test", "1")
910911
.setDoc(XContentFactory.jsonBuilder().startObject().field("field", "value2").endObject())
911912
.setRetryOnConflict(3)
912913
.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
913914
.get();
914-
915+
915916
GetResponse getResponse = client().prepareGet("test", "1").get();
916917
assertTrue(getResponse.isExists());
917918
assertEquals("value2", getResponse.getSourceAsMap().get("field"));
918-
919+
919920
UpdateRequest updateRequest = new UpdateRequest("test", "1");
920921
assertFalse(updateRequest.isRetryAttempt());
921922
updateRequest.markAsRetryAttempt();

‎server/src/main/java/org/opensearch/action/update/UpdateHelper.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,7 @@ Result prepareUpsert(ShardId shardId, UpdateRequest request, final GetResult get
181181

182182
indexRequest.index(request.index())
183183
.id(request.id())
184-
.setRefreshPolicy(request.isRetryAttempt() ?
185-
WriteRequest.RefreshPolicy.NONE :
186-
request.getRefreshPolicy())
184+
.setRefreshPolicy(request.isRetryAttempt() ? WriteRequest.RefreshPolicy.NONE : request.getRefreshPolicy())
187185
.routing(request.routing())
188186
.timeout(request.timeout())
189187
.waitForActiveShards(request.waitForActiveShards())
@@ -258,9 +256,7 @@ Result prepareUpdateIndexRequest(ShardId shardId, UpdateRequest request, GetResu
258256
.setIfPrimaryTerm(getResult.getPrimaryTerm())
259257
.waitForActiveShards(request.waitForActiveShards())
260258
.timeout(request.timeout())
261-
.setRefreshPolicy(request.isRetryAttempt() ?
262-
WriteRequest.RefreshPolicy.NONE :
263-
request.getRefreshPolicy());
259+
.setRefreshPolicy(request.isRetryAttempt() ? WriteRequest.RefreshPolicy.NONE : request.getRefreshPolicy());
264260
return new Result(finalIndexRequest, DocWriteResponse.Result.UPDATED, updatedSourceAsMap, updateSourceContentType);
265261
}
266262
}
@@ -303,9 +299,7 @@ Result prepareUpdateScriptRequest(ShardId shardId, UpdateRequest request, GetRes
303299
.setIfPrimaryTerm(getResult.getPrimaryTerm())
304300
.waitForActiveShards(request.waitForActiveShards())
305301
.timeout(request.timeout())
306-
.setRefreshPolicy(request.isRetryAttempt() ?
307-
WriteRequest.RefreshPolicy.NONE :
308-
request.getRefreshPolicy());
302+
.setRefreshPolicy(request.isRetryAttempt() ? WriteRequest.RefreshPolicy.NONE : request.getRefreshPolicy());
309303
return new Result(indexRequest, DocWriteResponse.Result.UPDATED, updatedSourceAsMap, updateSourceContentType);
310304
case DELETE:
311305
DeleteRequest deleteRequest = Requests.deleteRequest(request.index())
@@ -315,9 +309,7 @@ Result prepareUpdateScriptRequest(ShardId shardId, UpdateRequest request, GetRes
315309
.setIfPrimaryTerm(getResult.getPrimaryTerm())
316310
.waitForActiveShards(request.waitForActiveShards())
317311
.timeout(request.timeout())
318-
.setRefreshPolicy(request.isRetryAttempt() ?
319-
WriteRequest.RefreshPolicy.NONE :
320-
request.getRefreshPolicy());
312+
.setRefreshPolicy(request.isRetryAttempt() ? WriteRequest.RefreshPolicy.NONE : request.getRefreshPolicy());
321313
return new Result(deleteRequest, DocWriteResponse.Result.DELETED, updatedSourceAsMap, updateSourceContentType);
322314
default:
323315
// If it was neither an INDEX or DELETE operation, treat it as a noop

‎server/src/main/java/org/opensearch/action/update/UpdateRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,12 +617,12 @@ public UpdateRequest setRefreshPolicy(RefreshPolicy refreshPolicy) {
617617
public RefreshPolicy getRefreshPolicy() {
618618
return refreshPolicy;
619619
}
620-
620+
621621
public UpdateRequest markAsRetryAttempt() {
622622
this.isRetryAttempt = true;
623623
return this;
624624
}
625-
625+
626626
public boolean isRetryAttempt() {
627627
return this.isRetryAttempt;
628628
}

‎server/src/test/java/org/opensearch/action/update/UpdateRefreshPolicyTests.java‎

Lines changed: 32 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -22,113 +22,100 @@ public void testRefreshPolicySuppression() {
2222
// Normal request should preserve refresh policy
2323
UpdateRequest normalRequest = new UpdateRequest("test", "1");
2424
normalRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
25-
25+
2626
IndexRequest normalIndexRequest = new IndexRequest("test");
2727
normalIndexRequest.setRefreshPolicy(
28-
normalRequest.isRetryAttempt() ?
29-
WriteRequest.RefreshPolicy.NONE :
30-
normalRequest.getRefreshPolicy()
28+
normalRequest.isRetryAttempt() ? WriteRequest.RefreshPolicy.NONE : normalRequest.getRefreshPolicy()
3129
);
32-
30+
3331
assertEquals(
3432
"Normal request should preserve IMMEDIATE refresh policy",
3533
WriteRequest.RefreshPolicy.IMMEDIATE,
3634
normalIndexRequest.getRefreshPolicy()
3735
);
38-
36+
3937
// Retry request should suppress refresh policy
4038
UpdateRequest retryRequest = new UpdateRequest("test", "1");
4139
retryRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
4240
retryRequest.markAsRetryAttempt();
43-
41+
4442
IndexRequest retryIndexRequest = new IndexRequest("test");
4543
retryIndexRequest.setRefreshPolicy(
46-
retryRequest.isRetryAttempt() ?
47-
WriteRequest.RefreshPolicy.NONE :
48-
retryRequest.getRefreshPolicy()
44+
retryRequest.isRetryAttempt() ? WriteRequest.RefreshPolicy.NONE : retryRequest.getRefreshPolicy()
4945
);
50-
46+
5147
assertEquals(
5248
"Retry request should suppress refresh policy to NONE",
5349
WriteRequest.RefreshPolicy.NONE,
5450
retryIndexRequest.getRefreshPolicy()
5551
);
5652
}
57-
53+
5854
public void testRefreshPolicySuppressionForDeleteRequest() {
5955
// Normal delete should preserve refresh policy
6056
UpdateRequest normalRequest = new UpdateRequest("test", "1");
6157
normalRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.WAIT_UNTIL);
62-
58+
6359
DeleteRequest normalDeleteRequest = new DeleteRequest("test", "1");
6460
normalDeleteRequest.setRefreshPolicy(
65-
normalRequest.isRetryAttempt() ?
66-
WriteRequest.RefreshPolicy.NONE :
67-
normalRequest.getRefreshPolicy()
61+
normalRequest.isRetryAttempt() ? WriteRequest.RefreshPolicy.NONE : normalRequest.getRefreshPolicy()
6862
);
69-
63+
7064
assertEquals(
7165
"Normal delete request should preserve WAIT_UNTIL refresh policy",
7266
WriteRequest.RefreshPolicy.WAIT_UNTIL,
7367
normalDeleteRequest.getRefreshPolicy()
7468
);
75-
69+
7670
// Retry delete should suppress refresh policy
7771
UpdateRequest retryRequest = new UpdateRequest("test", "1");
7872
retryRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.WAIT_UNTIL);
7973
retryRequest.markAsRetryAttempt();
80-
74+
8175
DeleteRequest retryDeleteRequest = new DeleteRequest("test", "1");
8276
retryDeleteRequest.setRefreshPolicy(
83-
retryRequest.isRetryAttempt() ?
84-
WriteRequest.RefreshPolicy.NONE :
85-
retryRequest.getRefreshPolicy()
77+
retryRequest.isRetryAttempt() ? WriteRequest.RefreshPolicy.NONE : retryRequest.getRefreshPolicy()
8678
);
87-
79+
8880
assertEquals(
8981
"Retry delete request should suppress refresh policy to NONE",
9082
WriteRequest.RefreshPolicy.NONE,
9183
retryDeleteRequest.getRefreshPolicy()
9284
);
9385
}
94-
86+
9587
public void testAllRefreshPolicyValues() {
9688
WriteRequest.RefreshPolicy[] allPolicies = {
9789
WriteRequest.RefreshPolicy.IMMEDIATE,
9890
WriteRequest.RefreshPolicy.WAIT_UNTIL,
99-
WriteRequest.RefreshPolicy.NONE
100-
};
101-
91+
WriteRequest.RefreshPolicy.NONE };
92+
10293
for (WriteRequest.RefreshPolicy originalPolicy : allPolicies) {
10394
// Normal request - should preserve original policy
10495
UpdateRequest normalRequest = new UpdateRequest("test", "1");
10596
normalRequest.setRefreshPolicy(originalPolicy);
106-
107-
WriteRequest.RefreshPolicy normalResultPolicy = normalRequest.isRetryAttempt() ?
108-
WriteRequest.RefreshPolicy.NONE :
109-
normalRequest.getRefreshPolicy();
110-
111-
assertEquals(
112-
"Normal request should preserve original policy: " + originalPolicy,
113-
originalPolicy,
114-
normalResultPolicy
115-
);
116-
97+
98+
WriteRequest.RefreshPolicy normalResultPolicy = normalRequest.isRetryAttempt()
99+
? WriteRequest.RefreshPolicy.NONE
100+
: normalRequest.getRefreshPolicy();
101+
102+
assertEquals("Normal request should preserve original policy: " + originalPolicy, originalPolicy, normalResultPolicy);
103+
117104
// Retry request - should always be NONE regardless of original policy
118105
UpdateRequest retryRequest = new UpdateRequest("test", "1");
119106
retryRequest.setRefreshPolicy(originalPolicy);
120107
retryRequest.markAsRetryAttempt();
121-
122-
WriteRequest.RefreshPolicy retryResultPolicy = retryRequest.isRetryAttempt() ?
123-
WriteRequest.RefreshPolicy.NONE :
124-
retryRequest.getRefreshPolicy();
125-
108+
109+
WriteRequest.RefreshPolicy retryResultPolicy = retryRequest.isRetryAttempt()
110+
? WriteRequest.RefreshPolicy.NONE
111+
: retryRequest.getRefreshPolicy();
112+
126113
assertEquals(
127114
"Retry request should always suppress to NONE, original was: " + originalPolicy,
128115
WriteRequest.RefreshPolicy.NONE,
129116
retryResultPolicy
130117
);
131118
}
132119
}
133-
134-
}
120+
121+
}

‎server/src/test/java/org/opensearch/action/update/UpdateRequestTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,11 +713,11 @@ public void testGetChildIndexRequests() {
713713
public void testRetryAttemptMarking() {
714714
UpdateRequest request = new UpdateRequest("test", "1");
715715
assertFalse(request.isRetryAttempt());
716-
716+
717717
UpdateRequest returnedRequest = request.markAsRetryAttempt();
718718
assertSame(request, returnedRequest);
719719
assertTrue(request.isRetryAttempt());
720-
720+
721721
UpdateRequest newRequest = new UpdateRequest("test", "1");
722722
newRequest.markAsRetryAttempt();
723723
assertTrue(newRequest.isRetryAttempt());

0 commit comments

Comments
 (0)