Moving data stream DTOs from storage module to core. (#18274)

Graylog2 · Feb 16, 2024 · 0cb4ae7 · 0cb4ae7
1 parent d1dc060
commit 0cb4ae7
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 30 deletions.
diff --git a/data-node/src/main/java/org/graylog/datanode/metrics/ClusterStatMetrics.java b/data-node/src/main/java/org/graylog/datanode/metrics/ClusterStatMetrics.java
@@ -16,7 +16,7 @@
  */
 package org.graylog.datanode.metrics;
 
-import org.graylog.storage.opensearch2.ism.policy.actions.RollupAction;
+import org.graylog2.indexer.datastream.policy.actions.RollupAction;
 
 import java.util.Locale;
 

diff --git a/data-node/src/main/java/org/graylog/datanode/metrics/ConfigureMetricsIndexSettings.java b/data-node/src/main/java/org/graylog/datanode/metrics/ConfigureMetricsIndexSettings.java
@@ -28,14 +28,14 @@
 import org.graylog.datanode.process.StateMachineTracer;
 import org.graylog.storage.opensearch2.DataStreamAdapterOS2;
 import org.graylog.storage.opensearch2.ism.IsmApi;
-import org.graylog.storage.opensearch2.ism.policy.IsmPolicy;
-import org.graylog.storage.opensearch2.ism.policy.Policy;
-import org.graylog.storage.opensearch2.ism.policy.actions.Action;
-import org.graylog.storage.opensearch2.ism.policy.actions.DeleteAction;
-import org.graylog.storage.opensearch2.ism.policy.actions.RolloverAction;
-import org.graylog.storage.opensearch2.ism.policy.actions.RollupAction;
 import org.graylog2.indexer.datastream.DataStreamService;
 import org.graylog2.indexer.datastream.DataStreamServiceImpl;
+import org.graylog2.indexer.datastream.policy.IsmPolicy;
+import org.graylog2.indexer.datastream.policy.Policy;
+import org.graylog2.indexer.datastream.policy.actions.Action;
+import org.graylog2.indexer.datastream.policy.actions.DeleteAction;
+import org.graylog2.indexer.datastream.policy.actions.RolloverAction;
+import org.graylog2.indexer.datastream.policy.actions.RollupAction;
 import org.graylog2.indexer.fieldtypes.IndexFieldTypesService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/data-node/src/main/java/org/graylog/datanode/metrics/NodeStatMetrics.java b/data-node/src/main/java/org/graylog/datanode/metrics/NodeStatMetrics.java
@@ -16,7 +16,7 @@
  */
 package org.graylog.datanode.metrics;
 
-import org.graylog.storage.opensearch2.ism.policy.actions.RollupAction;
+import org.graylog2.indexer.datastream.policy.actions.RollupAction;
 
 import java.util.Locale;
 import java.util.Objects;

diff --git a/...orage-opensearch2/src/main/java/org/graylog/storage/opensearch2/DataStreamAdapterOS2.java b/...orage-opensearch2/src/main/java/org/graylog/storage/opensearch2/DataStreamAdapterOS2.java
@@ -17,6 +17,7 @@
 package org.graylog.storage.opensearch2;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.inject.Inject;
 import org.graylog.shaded.opensearch2.org.opensearch.action.support.master.AcknowledgedResponse;
 import org.graylog.shaded.opensearch2.org.opensearch.client.indices.CreateDataStreamRequest;
 import org.graylog.shaded.opensearch2.org.opensearch.client.indices.DeleteComposableIndexTemplateRequest;
@@ -28,16 +29,15 @@
 import org.graylog.shaded.opensearch2.org.opensearch.cluster.metadata.DataStream;
 import org.graylog.shaded.opensearch2.org.opensearch.common.compress.CompressedXContent;
 import org.graylog.storage.opensearch2.ism.IsmApi;
-import org.graylog.storage.opensearch2.ism.policy.IsmPolicy;
 import org.graylog2.indexer.IndexNotFoundException;
 import org.graylog2.indexer.datastream.DataStreamAdapter;
 import org.graylog2.indexer.datastream.Policy;
+import org.graylog2.indexer.datastream.policy.IsmPolicy;
 import org.graylog2.indexer.indices.Template;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnull;
-import jakarta.inject.Inject;
 import java.io.IOException;
 import java.util.List;
 import java.util.Objects;

diff --git a/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ism/IsmApi.java b/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ism/IsmApi.java
@@ -25,7 +25,7 @@
 import org.graylog.shaded.opensearch2.org.opensearch.client.Response;
 import org.graylog.shaded.opensearch2.org.opensearch.client.ResponseException;
 import org.graylog.storage.opensearch2.OpenSearchClient;
-import org.graylog.storage.opensearch2.ism.policy.IsmPolicy;
+import org.graylog2.indexer.datastream.policy.IsmPolicy;
 
 import java.io.IOException;
 import java.util.Objects;

diff --git a/...age-opensearch2/src/test/java/org/graylog/storage/opensearch2/DataStreamAdapterOS2IT.java b/...age-opensearch2/src/test/java/org/graylog/storage/opensearch2/DataStreamAdapterOS2IT.java
@@ -19,9 +19,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.graylog.shaded.opensearch2.org.opensearch.client.indices.DataStream;
 import org.graylog.storage.opensearch2.ism.IsmApi;
-import org.graylog.storage.opensearch2.ism.policy.IsmPolicy;
-import org.graylog.storage.opensearch2.ism.policy.IsmPolicyTest;
 import org.graylog.storage.opensearch2.testing.OpenSearchInstance;
+import org.graylog2.indexer.datastream.policy.IsmPolicy;
+import org.graylog2.indexer.datastream.policy.IsmPolicyTest;
 import org.graylog2.indexer.indices.Template;
 import org.graylog2.shared.bindings.providers.ObjectMapperProvider;
 import org.junit.Rule;

diff --git a/graylog-storage-opensearch2/src/test/java/org/graylog/storage/opensearch2/ism/IsmApiIT.java b/graylog-storage-opensearch2/src/test/java/org/graylog/storage/opensearch2/ism/IsmApiIT.java
@@ -16,9 +16,9 @@
  */
 package org.graylog.storage.opensearch2.ism;
 
-import org.graylog.storage.opensearch2.ism.policy.IsmPolicy;
-import org.graylog.storage.opensearch2.ism.policy.IsmPolicyTest;
 import org.graylog.storage.opensearch2.testing.OpenSearchInstance;
+import org.graylog2.indexer.datastream.policy.IsmPolicy;
+import org.graylog2.indexer.datastream.policy.IsmPolicyTest;
 import org.graylog2.shared.bindings.providers.ObjectMapperProvider;
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/...age/opensearch2/ism/policy/IsmPolicy.java → .../indexer/datastream/policy/IsmPolicy.java b/...age/opensearch2/ism/policy/IsmPolicy.java → .../indexer/datastream/policy/IsmPolicy.java
@@ -14,7 +14,7 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-package org.graylog.storage.opensearch2.ism.policy;
+package org.graylog2.indexer.datastream.policy;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...torage/opensearch2/ism/policy/Policy.java → ...og2/indexer/datastream/policy/Policy.java b/...torage/opensearch2/ism/policy/Policy.java → ...og2/indexer/datastream/policy/Policy.java
@@ -14,11 +14,11 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-package org.graylog.storage.opensearch2.ism.policy;
+package org.graylog2.indexer.datastream.policy;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import org.graylog.storage.opensearch2.ism.policy.actions.Action;
+import org.graylog2.indexer.datastream.policy.actions.Action;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/...pensearch2/ism/policy/actions/Action.java → ...xer/datastream/policy/actions/Action.java b/...pensearch2/ism/policy/actions/Action.java → ...xer/datastream/policy/actions/Action.java
@@ -14,7 +14,7 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-package org.graylog.storage.opensearch2.ism.policy.actions;
+package org.graylog2.indexer.datastream.policy.actions;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

diff --git a/...sm/policy/actions/ActionDeserializer.java → ...am/policy/actions/ActionDeserializer.java b/...sm/policy/actions/ActionDeserializer.java → ...am/policy/actions/ActionDeserializer.java
@@ -14,7 +14,7 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-package org.graylog.storage.opensearch2.ism.policy.actions;
+package org.graylog2.indexer.datastream.policy.actions;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;

diff --git a/.../ism/policy/actions/ActionSerializer.java → ...ream/policy/actions/ActionSerializer.java b/.../ism/policy/actions/ActionSerializer.java → ...ream/policy/actions/ActionSerializer.java
@@ -14,7 +14,7 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-package org.graylog.storage.opensearch2.ism.policy.actions;
+package org.graylog2.indexer.datastream.policy.actions;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;

diff --git a/...rch2/ism/policy/actions/DeleteAction.java → ...tastream/policy/actions/DeleteAction.java b/...rch2/ism/policy/actions/DeleteAction.java → ...tastream/policy/actions/DeleteAction.java
@@ -14,7 +14,7 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-package org.graylog.storage.opensearch2.ism.policy.actions;
+package org.graylog2.indexer.datastream.policy.actions;
 
 public record DeleteAction() implements WrappedAction {
 

diff --git a/...opensearch2/ism/policy/actions/Retry.java → ...exer/datastream/policy/actions/Retry.java b/...opensearch2/ism/policy/actions/Retry.java → ...exer/datastream/policy/actions/Retry.java
@@ -14,7 +14,7 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-package org.graylog.storage.opensearch2.ism.policy.actions;
+package org.graylog2.indexer.datastream.policy.actions;
 
 public record Retry(int count, String backoff, String delay) {
 }
diff --git a/...h2/ism/policy/actions/RolloverAction.java → ...stream/policy/actions/RolloverAction.java b/...h2/ism/policy/actions/RolloverAction.java → ...stream/policy/actions/RolloverAction.java
@@ -14,7 +14,7 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-package org.graylog.storage.opensearch2.ism.policy.actions;
+package org.graylog2.indexer.datastream.policy.actions;
 
 import javax.annotation.Nonnull;
 

diff --git a/...rch2/ism/policy/actions/RollupAction.java → ...tastream/policy/actions/RollupAction.java b/...rch2/ism/policy/actions/RollupAction.java → ...tastream/policy/actions/RollupAction.java
@@ -14,7 +14,7 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-package org.graylog.storage.opensearch2.ism.policy.actions;
+package org.graylog2.indexer.datastream.policy.actions;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/...ch2/ism/policy/actions/WrappedAction.java → ...astream/policy/actions/WrappedAction.java b/...ch2/ism/policy/actions/WrappedAction.java → ...astream/policy/actions/WrappedAction.java
@@ -14,7 +14,7 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-package org.graylog.storage.opensearch2.ism.policy.actions;
+package org.graylog2.indexer.datastream.policy.actions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

diff --git a/...opensearch2/ism/policy/IsmPolicyTest.java → ...exer/datastream/policy/IsmPolicyTest.java b/...opensearch2/ism/policy/IsmPolicyTest.java → ...exer/datastream/policy/IsmPolicyTest.java
@@ -14,14 +14,14 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-package org.graylog.storage.opensearch2.ism.policy;
+package org.graylog2.indexer.datastream.policy;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
-import org.graylog.storage.opensearch2.ism.policy.actions.Action;
-import org.graylog.storage.opensearch2.ism.policy.actions.DeleteAction;
-import org.graylog.storage.opensearch2.ism.policy.actions.Retry;
+import org.graylog2.indexer.datastream.policy.actions.Action;
+import org.graylog2.indexer.datastream.policy.actions.DeleteAction;
+import org.graylog2.indexer.datastream.policy.actions.Retry;
 import org.graylog2.shared.bindings.providers.ObjectMapperProvider;
 import org.junit.Test;