Skip to content

Commit eab3684

Browse files
stevanbzstevanbz
committed
496: Reformated changed files
1 parent 896233f commit eab3684

4 files changed

Lines changed: 103 additions & 22 deletions

File tree

‎server/src/main/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverService.java‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,38 @@ static List<AliasAction> rolloverAliasToNewIndex(
315315
if (explicitWriteIndex) {
316316
return Collections.unmodifiableList(
317317
Arrays.asList(
318-
new AliasAction.Add(newIndex, alias, aliasMetada.getFilterAsString(), aliasMetada.getIndexRouting(), aliasMetada.getSearchRouting(), true, aliasMetada.isHidden()),
319-
new AliasAction.Add(oldIndex, alias, aliasMetada.getFilterAsString(), aliasMetada.getIndexRouting(), aliasMetada.getSearchRouting(), false, aliasMetada.isHidden())
318+
new AliasAction.Add(
319+
newIndex,
320+
alias,
321+
aliasMetada.getFilterAsString(),
322+
aliasMetada.getIndexRouting(),
323+
aliasMetada.getSearchRouting(),
324+
true,
325+
aliasMetada.isHidden()
326+
),
327+
new AliasAction.Add(
328+
oldIndex,
329+
alias,
330+
aliasMetada.getFilterAsString(),
331+
aliasMetada.getIndexRouting(),
332+
aliasMetada.getSearchRouting(),
333+
false,
334+
aliasMetada.isHidden()
335+
)
320336
)
321337
);
322338
} else {
323339
return Collections.unmodifiableList(
324340
Arrays.asList(
325-
new AliasAction.Add(newIndex, alias, aliasMetada.getFilterAsString(), aliasMetada.getIndexRouting(), aliasMetada.getSearchRouting(), null, aliasMetada.isHidden()),
341+
new AliasAction.Add(
342+
newIndex,
343+
alias,
344+
aliasMetada.getFilterAsString(),
345+
aliasMetada.getIndexRouting(),
346+
aliasMetada.getSearchRouting(),
347+
null,
348+
aliasMetada.isHidden()
349+
),
326350
new AliasAction.Remove(oldIndex, alias, null)
327351
)
328352
);
@@ -385,8 +409,8 @@ static void validate(Metadata metadata, String rolloverTarget, String newIndexNa
385409
+ indexAbstraction.getType().getDisplayName()
386410
+ "] but one of ["
387411
+ Strings.collectionToCommaDelimitedString(
388-
VALID_ROLLOVER_TARGETS.stream().map(IndexAbstraction.Type::getDisplayName).collect(Collectors.toList())
389-
)
412+
VALID_ROLLOVER_TARGETS.stream().map(IndexAbstraction.Type::getDisplayName).collect(Collectors.toList())
413+
)
390414
+ "] was expected"
391415
);
392416
}

‎server/src/main/java/org/opensearch/cluster/metadata/AliasAction.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,17 @@ public String getAlias() {
138138
return alias;
139139
}
140140

141-
public String getFilter(){ return filter; }
141+
public String getFilter() {
142+
return filter;
143+
}
142144

143-
public String getSearchRouting() { return searchRouting; }
145+
public String getSearchRouting() {
146+
return searchRouting;
147+
}
144148

145-
public String getIndexRouting() { return indexRouting; }
149+
public String getIndexRouting() {
150+
return indexRouting;
151+
}
146152

147153
public Boolean writeIndex() {
148154
return writeIndex;

‎server/src/main/java/org/opensearch/cluster/metadata/AliasMetadata.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public CompressedXContent getFilter() {
130130
}
131131

132132
public String getFilterAsString() {
133-
if(filter == null){
133+
if (filter == null) {
134134
return null;
135135
}
136136
return filter.string();

‎server/src/test/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java‎

Lines changed: 64 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.opensearch.cluster.DataStreamTestHelper;
4444
import org.opensearch.cluster.metadata.AliasAction;
4545
import org.opensearch.cluster.metadata.AliasMetadata;
46-
import org.opensearch.cluster.metadata.AliasMetadata.Builder;
4746
import org.opensearch.cluster.metadata.AliasValidator;
4847
import org.opensearch.cluster.metadata.ComponentTemplate;
4948
import org.opensearch.cluster.metadata.ComposableIndexTemplate;
@@ -101,7 +100,6 @@
101100
import java.util.Map;
102101

103102
import static java.util.Collections.emptyMap;
104-
import static org.hamcrest.Matchers.in;
105103
import static org.opensearch.cluster.DataStreamTestHelper.generateMapping;
106104
import static org.hamcrest.Matchers.containsString;
107105
import static org.hamcrest.Matchers.equalTo;
@@ -128,7 +126,13 @@ public void testRolloverAliasActions() {
128126
String sourceIndex = randomAlphaOfLength(10);
129127
String targetIndex = randomAlphaOfLength(10);
130128

131-
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(sourceIndex, targetIndex, false, createDefaultAliasMetadata(sourceAlias, null), sourceAlias);
129+
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(
130+
sourceIndex,
131+
targetIndex,
132+
false,
133+
createDefaultAliasMetadata(sourceAlias, null),
134+
sourceAlias
135+
);
132136
assertThat(actions, hasSize(2));
133137
boolean foundAdd = false;
134138
boolean foundRemove = false;
@@ -151,7 +155,13 @@ public void testRolloverAliasActionsWithExplicitWriteIndex() {
151155
String sourceAlias = randomAlphaOfLength(10);
152156
String sourceIndex = randomAlphaOfLength(10);
153157
String targetIndex = randomAlphaOfLength(10);
154-
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(sourceIndex, targetIndex, true, createDefaultAliasMetadata(sourceAlias, null), sourceAlias);
158+
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(
159+
sourceIndex,
160+
targetIndex,
161+
true,
162+
createDefaultAliasMetadata(sourceAlias, null),
163+
sourceAlias
164+
);
155165

156166
assertThat(actions, hasSize(2));
157167
boolean foundAddWrite = false;
@@ -180,9 +190,21 @@ public void testRolloverAliasActionsWithFilterAndExplicitWriteIndex() {
180190
String targetIndex = randomAlphaOfLength(10);
181191
String indexRouting = randomAlphaOfLength(10);
182192
String sourceRouting = randomAlphaOfLength(10);
183-
AliasMetadata aliasMetadata = createAliasMetadata(sourceAlias, Collections.singletonMap(randomAlphaOfLength(2), randomAlphaOfLength(2)), indexRouting, sourceRouting, true);
193+
AliasMetadata aliasMetadata = createAliasMetadata(
194+
sourceAlias,
195+
Collections.singletonMap(randomAlphaOfLength(2), randomAlphaOfLength(2)),
196+
indexRouting,
197+
sourceRouting,
198+
true
199+
);
184200

185-
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(sourceIndex, targetIndex, true, aliasMetadata, sourceAlias);
201+
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(
202+
sourceIndex,
203+
targetIndex,
204+
true,
205+
aliasMetadata,
206+
sourceAlias
207+
);
186208

187209
assertThat(actions, hasSize(2));
188210
boolean foundAddWrite = false;
@@ -213,7 +235,13 @@ public void testRolloverAliasActionsWithHiddenAliasAndExplicitWriteIndex() {
213235
String sourceAlias = randomAlphaOfLength(10);
214236
String sourceIndex = randomAlphaOfLength(10);
215237
String targetIndex = randomAlphaOfLength(10);
216-
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(sourceIndex, targetIndex, true, createDefaultAliasMetadata(sourceAlias,true), sourceAlias);
238+
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(
239+
sourceIndex,
240+
targetIndex,
241+
true,
242+
createDefaultAliasMetadata(sourceAlias, true),
243+
sourceAlias
244+
);
217245

218246
assertThat(actions, hasSize(2));
219247
boolean foundAddWrite = false;
@@ -245,9 +273,21 @@ public void testRolloverAliasActionsWithFilterAndHiddenAliasAndImplicitWriteInde
245273
String targetIndex = randomAlphaOfLength(10);
246274
String indexRouting = randomAlphaOfLength(10);
247275
String sourceRouting = randomAlphaOfLength(10);
248-
AliasMetadata aliasMetadata = createAliasMetadata(sourceAlias, Collections.singletonMap(randomAlphaOfLength(2), randomAlphaOfLength(2)), indexRouting, sourceRouting, true);
276+
AliasMetadata aliasMetadata = createAliasMetadata(
277+
sourceAlias,
278+
Collections.singletonMap(randomAlphaOfLength(2), randomAlphaOfLength(2)),
279+
indexRouting,
280+
sourceRouting,
281+
true
282+
);
249283

250-
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(sourceIndex, targetIndex, false, aliasMetadata, sourceAlias);
284+
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(
285+
sourceIndex,
286+
targetIndex,
287+
false,
288+
aliasMetadata,
289+
sourceAlias
290+
);
251291

252292
assertThat(actions, hasSize(2));
253293
boolean foundAddWrite = false;
@@ -280,7 +320,13 @@ public void testRolloverAliasActionsWithHiddenAliasAndImplicitWriteIndex() {
280320
String sourceAlias = randomAlphaOfLength(10);
281321
String sourceIndex = randomAlphaOfLength(10);
282322
String targetIndex = randomAlphaOfLength(10);
283-
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(sourceIndex, targetIndex, false, createDefaultAliasMetadata(sourceAlias,true), sourceAlias);
323+
List<AliasAction> actions = MetadataRolloverService.rolloverAliasToNewIndex(
324+
sourceIndex,
325+
targetIndex,
326+
false,
327+
createDefaultAliasMetadata(sourceAlias, true),
328+
sourceAlias
329+
);
284330

285331
assertThat(actions, hasSize(2));
286332
boolean foundAddWrite = false;
@@ -1089,9 +1135,14 @@ private static AliasMetadata createDefaultAliasMetadata(String alias, Boolean is
10891135
return AliasMetadata.builder(alias).isHidden(isHidden).build();
10901136
}
10911137

1092-
private static AliasMetadata createAliasMetadata(String alias, Map filter, String indexRouting, String searchRouting, Boolean isHidden) {
1093-
return AliasMetadata
1094-
.builder(alias)
1138+
private static AliasMetadata createAliasMetadata(
1139+
String alias,
1140+
Map filter,
1141+
String indexRouting,
1142+
String searchRouting,
1143+
Boolean isHidden
1144+
) {
1145+
return AliasMetadata.builder(alias)
10951146
.isHidden(isHidden)
10961147
.filter(filter)
10971148
.indexRouting(indexRouting)

0 commit comments

Comments
 (0)