move validation to service

Author: moesterheld

graylog2-server/src/main/java/org/graylog2/indexer/indices/OutdatedIndexService.java

@@ -22,6 +22,7 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.NotFoundException;
 import org.graylog2.indexer.ElasticsearchException;
 import org.graylog2.indexer.cluster.Cluster;
 import org.graylog2.indexer.indexset.registry.IndexSetRegistry;
@@ -67,7 +68,11 @@ public List<OutdatedIndex> getOutdatedIndices() {
     }
 
     public void reindex(String index, boolean withReplicas) {
-        HealthStatus sourceStatus = indicesAdapter.waitForRecovery(index, 2);
+        OutdatedIndex outdatedIndex = getOutdatedIndices().stream()
+                .filter(OutdatedIndex::isSystemIndex)
+                .filter(i -> i.indexName().equals(index))
+                .findAny().orElseThrow(() -> new NotFoundException("Index " + index + " not found or is no system index"));
+        HealthStatus sourceStatus = indicesAdapter.waitForRecovery(outdatedIndex.indexName(), 2);
         if (sourceStatus != HealthStatus.Green) {
             throw new IllegalStateException("Index " + index + " state is not healthy: " + sourceStatus);
         }
@@ -151,6 +156,10 @@ private Map<String, Object> cleanIndexSettings(Map<String, Object> settings, boo
     }
 
     public void delete(@NotNull String index) {
-        indicesAdapter.delete(index);
+        OutdatedIndex outdatedIndex = getOutdatedIndices().stream()
+                .filter(i -> !i.managedIndex())
+                .filter(i -> i.indexName().equals(index))
+                .findAny().orElseThrow(() -> new NotFoundException("Index " + index + " not found or is an index managed by Graylog"));
+        indicesAdapter.delete(outdatedIndex.indexName());
     }
 }

graylog2-server/src/main/java/org/graylog2/rest/resources/system/indexer/IndicesResource.java

@@ -332,10 +332,6 @@ public List<OutdatedIndex> getOutdatedIndices() {
     @AuditEvent(type = AuditEventTypes.ES_INDEX_REINDEX)
     public void reindex(@Parameter(name = "index") @PathParam("index") @NotNull String index,
                         @Parameter(name = "withReplication") @QueryParam("withReplication") @DefaultValue("true") boolean withReplication) {
-        outdatedIndexService.getOutdatedIndices().stream()
-                .filter(OutdatedIndex::isSystemIndex)
-                .filter(i -> i.indexName().equals(index))
-                .findAny().orElseThrow(() -> new NotFoundException("Index " + index + " not found or is no system index"));
         outdatedIndexService.reindex(index, withReplication);
     }
 
@@ -346,10 +342,6 @@ public void reindex(@Parameter(name = "index") @PathParam("index") @NotNull Stri
     @Produces(MediaType.APPLICATION_JSON)
     @AuditEvent(type = AuditEventTypes.ES_INDEX_DELETE)
     public void deleteOutdated(@Parameter(name = "index") @PathParam("index") @NotNull String index) {
-        outdatedIndexService.getOutdatedIndices().stream()
-                .filter(i -> !i.managedIndex())
-                .filter(i -> i.indexName().equals(index))
-                .findAny().orElseThrow(() -> new NotFoundException("Index " + index + " not found or is an index managed by Graylog"));
         outdatedIndexService.delete(index);
     }