Skip to content

Commit 4327237

Browse files
committed
PR feedback pass
Signed-off-by: Peter Nied <petern@amazon.com>
1 parent 65fa8e7 commit 4327237

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

server/src/main/java/org/opensearch/action/admin/indices/view/ViewService.java

+7-10
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.opensearch.common.annotation.ExperimentalApi;
2424
import org.opensearch.core.action.ActionListener;
2525

26+
import java.util.ArrayList;
2627
import java.util.List;
2728
import java.util.Map;
2829
import java.util.Optional;
@@ -36,7 +37,7 @@ public class ViewService {
3637
private final static Logger LOG = LogManager.getLogger(ViewService.class);
3738
private final ClusterService clusterService;
3839
private final NodeClient client;
39-
private LongSupplier timeProvider;
40+
private final LongSupplier timeProvider;
4041

4142
public ViewService(final ClusterService clusterService, final NodeClient client, final LongSupplier timeProvider) {
4243
this.clusterService = clusterService;
@@ -69,7 +70,6 @@ public void updateView(final CreateViewAction.Request request, final ActionListe
6970
createOrUpdateView(Operation.UpdateView, updatedView, listener);
7071
}
7172

72-
@SuppressWarnings("deprecation")
7373
public void deleteView(final DeleteViewAction.Request request, final ActionListener<AcknowledgedResponse> listener) {
7474
getViewOrThrowException(request.getName());
7575

@@ -101,14 +101,12 @@ public void getView(final GetViewAction.Request request, final ActionListener<Ge
101101
}
102102

103103
public void listViewNames(final ActionListener<ListViewNamesAction.Response> listener) {
104-
final List<String> viewNames = Optional.ofNullable(clusterService)
104+
final List<String> viewNames = new ArrayList<>(Optional.ofNullable(clusterService)
105105
.map(ClusterService::state)
106106
.map(ClusterState::metadata)
107107
.map(Metadata::views)
108108
.map(Map::keySet)
109-
.orElseThrow()
110-
.stream()
111-
.collect(Collectors.toList());
109+
.orElseThrow());
112110

113111
listener.onResponse(new ListViewNamesAction.Response(viewNames));
114112
}
@@ -119,8 +117,7 @@ public void searchView(final SearchViewAction.Request request, final ActionListe
119117
final String[] indices = view.getTargets()
120118
.stream()
121119
.map(View.Target::getIndexPattern)
122-
.collect(Collectors.toList())
123-
.toArray(new String[0]);
120+
.toArray(String[]::new);
124121
request.indices(indices);
125122

126123
client.executeLocally(SearchAction.INSTANCE, request, listener);
@@ -130,7 +127,7 @@ View getViewOrThrowException(final String viewName) {
130127
return Optional.ofNullable(clusterService)
131128
.map(ClusterService::state)
132129
.map(ClusterState::metadata)
133-
.map(m -> m.views())
130+
.map(Metadata::views)
134131
.map(views -> views.get(viewName))
135132
.orElseThrow(() -> new ResourceNotFoundException("View [" + viewName + "] does not exist"));
136133
}
@@ -141,7 +138,7 @@ private enum Operation {
141138

142139
private final String name;
143140

144-
private Operation(final String name) {
141+
Operation(final String name) {
145142
this.name = name;
146143
}
147144
}

server/src/main/java/org/opensearch/cluster/metadata/View.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public View(final String name, final String description, final Long createdAt, f
4343
}
4444

4545
public View(final StreamInput in) throws IOException {
46-
this(in.readString(), in.readOptionalString(), in.readVLong(), in.readVLong(), in.readList(Target::new));
46+
this(in.readString(), in.readOptionalString(), in.readZLong(), in.readZLong(), in.readList(Target::new));
4747
}
4848

4949
public String getName() {
@@ -186,8 +186,8 @@ public XContentBuilder toXContent(final XContentBuilder builder, final Params pa
186186
public void writeTo(final StreamOutput out) throws IOException {
187187
out.writeString(name);
188188
out.writeOptionalString(description);
189-
out.writeVLong(createdAt);
190-
out.writeVLong(modifiedAt);
189+
out.writeZLong(createdAt);
190+
out.writeZLong(modifiedAt);
191191
out.writeList(targets);
192192
}
193193
}

0 commit comments

Comments
 (0)