From 4944ac928b5b8035e68c91c8193e31d80c46fbd5 Mon Sep 17 00:00:00 2001 From: Oleksandr Kolomiiets Date: Wed, 23 Apr 2025 08:29:32 -0700 Subject: [PATCH] [TEST] Move test data generation out of logsdb namespace (#119994) (cherry picked from commit 5e2b199b9437844ad3bf7f250d4a60272e631587) # Conflicts: # server/src/test/java/org/elasticsearch/index/mapper/blockloader/IpFieldBlockLoaderTests.java # server/src/test/java/org/elasticsearch/index/mapper/blockloader/KeywordFieldBlockLoaderTests.java --- .../ScaledFloatFieldBlockLoaderTests.java | 2 +- .../BooleanFieldBlockLoaderTests.java | 2 +- .../ByteFieldBlockLoaderTests.java | 2 +- .../DateFieldBlockLoaderTests.java | 2 +- .../DoubleFieldBlockLoaderTests.java | 2 +- .../FloatFieldBlockLoaderTests.java | 2 +- .../HalfFloatFieldBlockLoaderTests.java | 2 +- .../IntegerFieldBlockLoaderTests.java | 2 +- .../blockloader/IpFieldBlockLoaderTests.java | 2 +- .../KeywordFieldBlockLoaderTests.java | 2 +- .../LongFieldBlockLoaderTests.java | 2 +- .../ShortFieldBlockLoaderTests.java | 2 +- .../TextFieldBlockLoaderTests.java | 2 +- .../DataGeneratorSpecification.java | 8 ++-- .../datageneration/DocumentGenerator.java | 6 +-- .../datageneration/FieldDataGenerator.java | 2 +- .../datageneration/FieldType.java | 40 +++++++++---------- .../{logsdb => }/datageneration/Mapping.java | 2 +- .../datageneration/MappingGenerator.java | 8 ++-- .../{logsdb => }/datageneration/Template.java | 2 +- .../datageneration/TemplateGenerator.java | 6 +-- .../datageneration/datasource/DataSource.java | 2 +- .../datasource/DataSourceHandler.java | 2 +- .../datasource/DataSourceRequest.java | 6 +-- .../datasource/DataSourceResponse.java | 4 +- .../DefaultFieldDataGeneratorHandler.java | 4 +- .../DefaultMappingParametersHandler.java | 4 +- .../DefaultObjectGenerationHandler.java | 4 +- .../DefaultPrimitiveTypesHandler.java | 2 +- .../datasource/DefaultWrappersHandler.java | 2 +- .../datageneration/fields/DynamicMapping.java | 2 +- .../fields/PredefinedField.java | 8 ++-- .../leaf/BooleanFieldDataGenerator.java | 8 ++-- .../fields/leaf/ByteFieldDataGenerator.java | 8 ++-- .../ConstantKeywordFieldDataGenerator.java | 4 +- .../CountedKeywordFieldDataGenerator.java | 8 ++-- .../fields/leaf/DateFieldDataGenerator.java | 8 ++-- .../fields/leaf/DoubleFieldDataGenerator.java | 8 ++-- .../fields/leaf/FloatFieldDataGenerator.java | 8 ++-- .../leaf/GeoPointFieldDataGenerator.java | 8 ++-- .../leaf/HalfFloatFieldDataGenerator.java | 8 ++-- .../leaf/IntegerFieldDataGenerator.java | 8 ++-- .../fields/leaf/IpFieldDataGenerator.java | 8 ++-- .../leaf/KeywordFieldDataGenerator.java | 8 ++-- .../fields/leaf/LongFieldDataGenerator.java | 8 ++-- .../leaf/ScaledFloatFieldDataGenerator.java | 8 ++-- .../fields/leaf/ShortFieldDataGenerator.java | 8 ++-- .../fields/leaf/TextFieldDataGenerator.java | 8 ++-- .../leaf/UnsignedLongFieldDataGenerator.java | 8 ++-- .../leaf/WildcardFieldDataGenerator.java | 6 +-- .../datageneration/fields/leaf/Wrappers.java | 6 +-- .../matchers/ArrayEqualMatcher.java | 6 +-- .../matchers/GenericEqualsMatcher.java | 4 +- .../matchers/ListEqualMatcher.java | 6 +-- .../datageneration/matchers/MatchResult.java | 2 +- .../datageneration/matchers/Matcher.java | 4 +- .../datageneration/matchers/Messages.java | 2 +- .../matchers/ObjectMatcher.java | 4 +- .../matchers/source/DynamicFieldMatcher.java | 10 ++--- .../matchers/source/FieldSpecificMatcher.java | 8 ++-- .../matchers/source/MappingTransforms.java | 2 +- .../matchers/source/SourceMatcher.java | 10 ++--- .../matchers/source/SourceTransforms.java | 2 +- .../index/mapper/BlockLoaderTestCase.java | 16 ++++---- .../NumberFieldBlockLoaderTestCase.java | 2 +- .../DataGenerationSnapshotTests.java | 11 +++-- .../datageneration/DataGenerationTests.java | 11 +++-- .../DefaultWrappersHandlerTests.java | 4 +- .../logsdb/datageneration/FieldTypeTests.java | 1 + .../datageneration/SourceMatcherTests.java | 2 +- .../TemplateGeneratorTests.java | 3 ++ .../xpack/logsdb/qa/DataGenerationHelper.java | 22 +++++----- ...ardVersusLogsIndexModeChallengeRestIT.java | 4 +- ...gateMetricDoubleFieldBlockLoaderTests.java | 6 +-- ...ggregateMetricDoubleDataSourceHandler.java | 6 +-- ...gregateMetricDoubleFieldDataGenerator.java | 6 +-- .../ConstantKeywordFieldBlockLoaderTests.java | 2 +- .../UnsignedLongFieldBlockLoaderTests.java | 2 +- .../VersionStringDataSourceHandler.java | 6 +-- .../VersionStringFieldDataGenerator.java | 6 +-- .../GeoShapeDataSourceHandler.java | 6 +-- .../GeoShapeFieldDataGenerator.java | 8 ++-- .../PointDataSourceHandler.java | 6 +-- .../PointFieldDataGenerator.java | 8 ++-- .../ShapeDataSourceHandler.java | 6 +-- .../ShapeFieldDataGenerator.java | 8 ++-- .../mapper/WildcardFieldBlockLoaderTests.java | 2 +- 87 files changed, 256 insertions(+), 242 deletions(-) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/DataGeneratorSpecification.java (93%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/DocumentGenerator.java (95%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/FieldDataGenerator.java (93%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/FieldType.java (70%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/Mapping.java (94%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/MappingGenerator.java (96%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/Template.java (95%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/TemplateGenerator.java (94%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/datasource/DataSource.java (97%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/datasource/DataSourceHandler.java (98%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/datasource/DataSourceRequest.java (97%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/datasource/DataSourceResponse.java (95%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/datasource/DefaultFieldDataGeneratorHandler.java (89%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/datasource/DefaultMappingParametersHandler.java (99%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/datasource/DefaultObjectGenerationHandler.java (96%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/datasource/DefaultPrimitiveTypesHandler.java (98%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/datasource/DefaultWrappersHandler.java (98%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/DynamicMapping.java (90%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/PredefinedField.java (79%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/BooleanFieldDataGenerator.java (88%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/ByteFieldDataGenerator.java (84%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/ConstantKeywordFieldDataGenerator.java (88%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/CountedKeywordFieldDataGenerator.java (82%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/DateFieldDataGenerator.java (87%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/DoubleFieldDataGenerator.java (84%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/FloatFieldDataGenerator.java (84%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/GeoPointFieldDataGenerator.java (90%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/HalfFloatFieldDataGenerator.java (84%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/IntegerFieldDataGenerator.java (84%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/IpFieldDataGenerator.java (85%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/KeywordFieldDataGenerator.java (81%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/LongFieldDataGenerator.java (84%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/ScaledFloatFieldDataGenerator.java (84%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/ShortFieldDataGenerator.java (84%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/TextFieldDataGenerator.java (81%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/UnsignedLongFieldDataGenerator.java (84%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/WildcardFieldDataGenerator.java (82%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/fields/leaf/Wrappers.java (88%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/ArrayEqualMatcher.java (93%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/GenericEqualsMatcher.java (96%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/ListEqualMatcher.java (93%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/MatchResult.java (96%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/Matcher.java (97%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/Messages.java (97%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/ObjectMatcher.java (90%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/source/DynamicFieldMatcher.java (90%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/source/FieldSpecificMatcher.java (99%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/source/MappingTransforms.java (98%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/source/SourceMatcher.java (94%) rename test/framework/src/main/java/org/elasticsearch/{logsdb => }/datageneration/matchers/source/SourceTransforms.java (98%) diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldBlockLoaderTests.java b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldBlockLoaderTests.java index 17c64bb3e0eaf..886df693a63ef 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldBlockLoaderTests.java +++ b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldBlockLoaderTests.java @@ -9,8 +9,8 @@ package org.elasticsearch.index.mapper.extras; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import org.elasticsearch.plugins.Plugin; import java.util.Collection; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/BooleanFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/BooleanFieldBlockLoaderTests.java index 241b46171d3be..88c8c89a99cfd 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/BooleanFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/BooleanFieldBlockLoaderTests.java @@ -9,8 +9,8 @@ package org.elasticsearch.index.mapper.blockloader; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.BlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.util.List; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/ByteFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/ByteFieldBlockLoaderTests.java index bdc91ced07ac0..acc2d741ae083 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/ByteFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/ByteFieldBlockLoaderTests.java @@ -9,8 +9,8 @@ package org.elasticsearch.index.mapper.blockloader; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/DateFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/DateFieldBlockLoaderTests.java index 14e2a69bb89fd..35cd68eb5d897 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/DateFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/DateFieldBlockLoaderTests.java @@ -9,9 +9,9 @@ package org.elasticsearch.index.mapper.blockloader; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.BlockLoaderTestCase; import org.elasticsearch.index.mapper.DateFieldMapper; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.time.Instant; import java.time.ZoneId; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/DoubleFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/DoubleFieldBlockLoaderTests.java index c4d427aa97b0b..ace54059baa09 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/DoubleFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/DoubleFieldBlockLoaderTests.java @@ -9,8 +9,8 @@ package org.elasticsearch.index.mapper.blockloader; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/FloatFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/FloatFieldBlockLoaderTests.java index e6fb36aaf711b..b821d6bfb79bc 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/FloatFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/FloatFieldBlockLoaderTests.java @@ -9,8 +9,8 @@ package org.elasticsearch.index.mapper.blockloader; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/HalfFloatFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/HalfFloatFieldBlockLoaderTests.java index 4de768b9b3b4d..5f1827e59c895 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/HalfFloatFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/HalfFloatFieldBlockLoaderTests.java @@ -10,8 +10,8 @@ package org.elasticsearch.index.mapper.blockloader; import org.apache.lucene.sandbox.document.HalfFloatPoint; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/IntegerFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/IntegerFieldBlockLoaderTests.java index 3de1279e61011..d4a3089f6a0a8 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/IntegerFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/IntegerFieldBlockLoaderTests.java @@ -9,8 +9,8 @@ package org.elasticsearch.index.mapper.blockloader; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/IpFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/IpFieldBlockLoaderTests.java index 5d5a8972553e2..9e047b6dbb768 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/IpFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/IpFieldBlockLoaderTests.java @@ -12,8 +12,8 @@ import org.apache.lucene.document.InetAddressPoint; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.network.InetAddresses; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.BlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.util.List; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/KeywordFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/KeywordFieldBlockLoaderTests.java index 6e1b177fb218d..5ffdbcc8d16c8 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/KeywordFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/KeywordFieldBlockLoaderTests.java @@ -10,8 +10,8 @@ package org.elasticsearch.index.mapper.blockloader; import org.apache.lucene.util.BytesRef; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.BlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.util.List; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/LongFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/LongFieldBlockLoaderTests.java index 43a973f96f585..eab0410435e78 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/LongFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/LongFieldBlockLoaderTests.java @@ -9,8 +9,8 @@ package org.elasticsearch.index.mapper.blockloader; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/ShortFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/ShortFieldBlockLoaderTests.java index 6f5008164ebb3..2323ba88ca98d 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/ShortFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/ShortFieldBlockLoaderTests.java @@ -9,8 +9,8 @@ package org.elasticsearch.index.mapper.blockloader; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/TextFieldBlockLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/TextFieldBlockLoaderTests.java index bbe6aeb065279..2f8f83a65a2e0 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/blockloader/TextFieldBlockLoaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/blockloader/TextFieldBlockLoaderTests.java @@ -10,8 +10,8 @@ package org.elasticsearch.index.mapper.blockloader; import org.apache.lucene.util.BytesRef; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.BlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import java.util.ArrayList; import java.util.HashSet; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/DataGeneratorSpecification.java b/test/framework/src/main/java/org/elasticsearch/datageneration/DataGeneratorSpecification.java similarity index 93% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/DataGeneratorSpecification.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/DataGeneratorSpecification.java index f6ff7c521afcc..96ab809ff048c 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/DataGeneratorSpecification.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/DataGeneratorSpecification.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration; +package org.elasticsearch.datageneration; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler; -import org.elasticsearch.logsdb.datageneration.fields.PredefinedField; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceHandler; +import org.elasticsearch.datageneration.fields.PredefinedField; import java.util.ArrayList; import java.util.Collection; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/DocumentGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/DocumentGenerator.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/DocumentGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/DocumentGenerator.java index 67c6c7092b3b2..cb16800fd7e31 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/DocumentGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/DocumentGenerator.java @@ -7,10 +7,10 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration; +package org.elasticsearch.datageneration; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; import java.util.ArrayList; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/FieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/FieldDataGenerator.java similarity index 93% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/FieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/FieldDataGenerator.java index 1d84c5adc4eda..a48a78cfb2a04 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/FieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/FieldDataGenerator.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration; +package org.elasticsearch.datageneration; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/FieldType.java b/test/framework/src/main/java/org/elasticsearch/datageneration/FieldType.java similarity index 70% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/FieldType.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/FieldType.java index 02ed16d22f7ee..eab2149019204 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/FieldType.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/FieldType.java @@ -7,27 +7,27 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration; +package org.elasticsearch.datageneration; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.fields.leaf.BooleanFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.ByteFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.ConstantKeywordFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.CountedKeywordFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.DateFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.DoubleFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.FloatFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.GeoPointFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.HalfFloatFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.IntegerFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.IpFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.KeywordFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.LongFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.ScaledFloatFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.ShortFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.TextFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.UnsignedLongFieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.fields.leaf.WildcardFieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.fields.leaf.BooleanFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.ByteFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.ConstantKeywordFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.CountedKeywordFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.DateFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.DoubleFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.FloatFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.GeoPointFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.HalfFloatFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.IntegerFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.IpFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.KeywordFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.LongFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.ScaledFloatFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.ShortFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.TextFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.UnsignedLongFieldDataGenerator; +import org.elasticsearch.datageneration.fields.leaf.WildcardFieldDataGenerator; /** * Lists all leaf field types that are supported for data generation by default. diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/Mapping.java b/test/framework/src/main/java/org/elasticsearch/datageneration/Mapping.java similarity index 94% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/Mapping.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/Mapping.java index c20c99d7cb0ba..b05168f7e2099 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/Mapping.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/Mapping.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration; +package org.elasticsearch.datageneration; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/MappingGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/MappingGenerator.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/MappingGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/MappingGenerator.java index d5ec1c7f9f36a..4c8e835f6170f 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/MappingGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/MappingGenerator.java @@ -7,12 +7,12 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration; +package org.elasticsearch.datageneration; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; +import org.elasticsearch.datageneration.fields.DynamicMapping; import org.elasticsearch.index.mapper.ObjectMapper; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; -import org.elasticsearch.logsdb.datageneration.fields.DynamicMapping; import java.util.HashSet; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/Template.java b/test/framework/src/main/java/org/elasticsearch/datageneration/Template.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/Template.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/Template.java index 71c8a54e5e0f6..cfcc434514db3 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/Template.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/Template.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration; +package org.elasticsearch.datageneration; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/TemplateGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/TemplateGenerator.java similarity index 94% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/TemplateGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/TemplateGenerator.java index db6abe655caa8..1762c9ac07dd0 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/TemplateGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/TemplateGenerator.java @@ -7,10 +7,10 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration; +package org.elasticsearch.datageneration; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; import java.util.HashMap; import java.util.HashSet; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSource.java b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSource.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSource.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSource.java index cd0b9184ce42c..947a38839b259 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSource.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSource.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.datasource; +package org.elasticsearch.datageneration.datasource; import java.util.ArrayList; import java.util.Collection; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSourceHandler.java b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSourceHandler.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSourceHandler.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSourceHandler.java index bd5969b9aa7d2..a26fcfde6385f 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSourceHandler.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSourceHandler.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.datasource; +package org.elasticsearch.datageneration.datasource; public interface DataSourceHandler { default DataSourceResponse.FieldDataGenerator handle(DataSourceRequest.FieldDataGenerator request) { diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSourceRequest.java b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSourceRequest.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSourceRequest.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSourceRequest.java index 75b0cacecc63e..e5e845eb48585 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSourceRequest.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSourceRequest.java @@ -7,12 +7,12 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.datasource; +package org.elasticsearch.datageneration.datasource; import org.elasticsearch.core.Tuple; +import org.elasticsearch.datageneration.DataGeneratorSpecification; +import org.elasticsearch.datageneration.fields.DynamicMapping; import org.elasticsearch.index.mapper.ObjectMapper; -import org.elasticsearch.logsdb.datageneration.DataGeneratorSpecification; -import org.elasticsearch.logsdb.datageneration.fields.DynamicMapping; import java.util.List; import java.util.Set; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSourceResponse.java b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSourceResponse.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSourceResponse.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSourceResponse.java index 8ea1d49f938fd..f7c8687952eaa 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DataSourceResponse.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DataSourceResponse.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.datasource; +package org.elasticsearch.datageneration.datasource; import org.elasticsearch.geometry.Geometry; @@ -19,7 +19,7 @@ import java.util.function.Supplier; public interface DataSourceResponse { - record FieldDataGenerator(org.elasticsearch.logsdb.datageneration.FieldDataGenerator generator) implements DataSourceResponse {} + record FieldDataGenerator(org.elasticsearch.datageneration.FieldDataGenerator generator) implements DataSourceResponse {} record LongGenerator(Supplier generator) implements DataSourceResponse {} diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultFieldDataGeneratorHandler.java b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultFieldDataGeneratorHandler.java similarity index 89% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultFieldDataGeneratorHandler.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultFieldDataGeneratorHandler.java index 7287c0edd6b69..a4fedc3cc2a69 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultFieldDataGeneratorHandler.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultFieldDataGeneratorHandler.java @@ -7,9 +7,9 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.datasource; +package org.elasticsearch.datageneration.datasource; -import org.elasticsearch.logsdb.datageneration.FieldType; +import org.elasticsearch.datageneration.FieldType; public class DefaultFieldDataGeneratorHandler implements DataSourceHandler { public DataSourceResponse.FieldDataGenerator handle(DataSourceRequest.FieldDataGenerator request) { diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultMappingParametersHandler.java b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultMappingParametersHandler.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultMappingParametersHandler.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultMappingParametersHandler.java index 3d98ffe545f3b..8cc052a379cf6 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultMappingParametersHandler.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultMappingParametersHandler.java @@ -7,14 +7,14 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.datasource; +package org.elasticsearch.datageneration.datasource; import org.elasticsearch.common.network.NetworkAddress; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.geo.GeometryTestUtils; import org.elasticsearch.geometry.utils.WellKnownText; import org.elasticsearch.index.mapper.Mapper; import org.elasticsearch.index.mapper.ObjectMapper; -import org.elasticsearch.logsdb.datageneration.FieldType; import org.elasticsearch.test.ESTestCase; import java.time.Instant; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultObjectGenerationHandler.java b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultObjectGenerationHandler.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultObjectGenerationHandler.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultObjectGenerationHandler.java index 7f225ecfa30f5..c1d0cccda83ea 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultObjectGenerationHandler.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultObjectGenerationHandler.java @@ -7,9 +7,9 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.datasource; +package org.elasticsearch.datageneration.datasource; -import org.elasticsearch.logsdb.datageneration.FieldType; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.test.ESTestCase; import java.util.Optional; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultPrimitiveTypesHandler.java b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultPrimitiveTypesHandler.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultPrimitiveTypesHandler.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultPrimitiveTypesHandler.java index c2443c600eabf..fd55c61f692ca 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultPrimitiveTypesHandler.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultPrimitiveTypesHandler.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.datasource; +package org.elasticsearch.datageneration.datasource; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.geo.RandomGeoGenerator; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultWrappersHandler.java b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultWrappersHandler.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultWrappersHandler.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultWrappersHandler.java index 1df902ebf1305..edfa4d6548328 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultWrappersHandler.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultWrappersHandler.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.datasource; +package org.elasticsearch.datageneration.datasource; import org.elasticsearch.core.Tuple; import org.elasticsearch.test.ESTestCase; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/DynamicMapping.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/DynamicMapping.java similarity index 90% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/DynamicMapping.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/DynamicMapping.java index 443b61ec34ec2..cb9eca6324aec 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/DynamicMapping.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/DynamicMapping.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields; +package org.elasticsearch.datageneration.fields; public enum DynamicMapping { SUPPORTED, diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/PredefinedField.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/PredefinedField.java similarity index 79% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/PredefinedField.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/PredefinedField.java index 948f1cf80b35c..0938c01e9b5d6 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/PredefinedField.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/PredefinedField.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields; +package org.elasticsearch.datageneration.fields; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.FieldType; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.FieldType; +import org.elasticsearch.datageneration.datasource.DataSource; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/BooleanFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/BooleanFieldDataGenerator.java similarity index 88% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/BooleanFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/BooleanFieldDataGenerator.java index 482ed1b1321e5..70502ae1b4285 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/BooleanFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/BooleanFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ByteFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ByteFieldDataGenerator.java similarity index 84% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ByteFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ByteFieldDataGenerator.java index 809354c01e94c..c829da6832169 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ByteFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ByteFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ConstantKeywordFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ConstantKeywordFieldDataGenerator.java similarity index 88% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ConstantKeywordFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ConstantKeywordFieldDataGenerator.java index c93c8942fa477..0691cc8c605c4 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ConstantKeywordFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ConstantKeywordFieldDataGenerator.java @@ -7,9 +7,9 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.FieldDataGenerator; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/CountedKeywordFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/CountedKeywordFieldDataGenerator.java similarity index 82% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/CountedKeywordFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/CountedKeywordFieldDataGenerator.java index b69ad33016096..51816f19e2c46 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/CountedKeywordFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/CountedKeywordFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/DateFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/DateFieldDataGenerator.java similarity index 87% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/DateFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/DateFieldDataGenerator.java index ae267ca7570fc..3246a90722d4c 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/DateFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/DateFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.time.Instant; import java.time.ZoneId; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/DoubleFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/DoubleFieldDataGenerator.java similarity index 84% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/DoubleFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/DoubleFieldDataGenerator.java index 8cd72c93cb6d1..7d0f1eacda126 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/DoubleFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/DoubleFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/FloatFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/FloatFieldDataGenerator.java similarity index 84% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/FloatFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/FloatFieldDataGenerator.java index 651c1e40e4100..8e9db92f49b3a 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/FloatFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/FloatFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/GeoPointFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/GeoPointFieldDataGenerator.java similarity index 90% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/GeoPointFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/GeoPointFieldDataGenerator.java index 076b30e3efe0e..70b76e801f692 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/GeoPointFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/GeoPointFieldDataGenerator.java @@ -7,13 +7,13 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.core.Tuple; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.List; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/HalfFloatFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/HalfFloatFieldDataGenerator.java similarity index 84% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/HalfFloatFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/HalfFloatFieldDataGenerator.java index 35de92b093084..e565930169199 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/HalfFloatFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/HalfFloatFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/IntegerFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/IntegerFieldDataGenerator.java similarity index 84% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/IntegerFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/IntegerFieldDataGenerator.java index 0d7d8194c4001..78613249a9534 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/IntegerFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/IntegerFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/IpFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/IpFieldDataGenerator.java similarity index 85% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/IpFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/IpFieldDataGenerator.java index b1820125c70a8..dc9a68e017487 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/IpFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/IpFieldDataGenerator.java @@ -7,12 +7,12 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; import org.elasticsearch.common.network.NetworkAddress; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.net.InetAddress; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/KeywordFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/KeywordFieldDataGenerator.java similarity index 81% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/KeywordFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/KeywordFieldDataGenerator.java index 1a433f20a9218..2373747a49549 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/KeywordFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/KeywordFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/LongFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/LongFieldDataGenerator.java similarity index 84% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/LongFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/LongFieldDataGenerator.java index bd22d58af16a7..3e0831f7d4b0e 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/LongFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/LongFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ScaledFloatFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ScaledFloatFieldDataGenerator.java similarity index 84% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ScaledFloatFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ScaledFloatFieldDataGenerator.java index 117682e739461..4ac47ac8b0930 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ScaledFloatFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ScaledFloatFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ShortFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ShortFieldDataGenerator.java similarity index 84% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ShortFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ShortFieldDataGenerator.java index a7e50ffc6d0f5..bee795b9b9d98 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/ShortFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/ShortFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/TextFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/TextFieldDataGenerator.java similarity index 81% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/TextFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/TextFieldDataGenerator.java index ba107cd844fe1..08770d684d1b4 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/TextFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/TextFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/UnsignedLongFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/UnsignedLongFieldDataGenerator.java similarity index 84% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/UnsignedLongFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/UnsignedLongFieldDataGenerator.java index 18dd61f0c8ff1..15ec5925d56bb 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/UnsignedLongFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/UnsignedLongFieldDataGenerator.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/WildcardFieldDataGenerator.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/WildcardFieldDataGenerator.java similarity index 82% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/WildcardFieldDataGenerator.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/WildcardFieldDataGenerator.java index b88459bec700a..5fee0e98a93e3 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/WildcardFieldDataGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/WildcardFieldDataGenerator.java @@ -7,10 +7,10 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/Wrappers.java b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/Wrappers.java similarity index 88% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/Wrappers.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/Wrappers.java index 348e8fdad098a..2599694900ead 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/fields/leaf/Wrappers.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/fields/leaf/Wrappers.java @@ -7,10 +7,10 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.fields.leaf; +package org.elasticsearch.datageneration.fields.leaf; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.function.Supplier; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/ArrayEqualMatcher.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/ArrayEqualMatcher.java similarity index 93% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/ArrayEqualMatcher.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/ArrayEqualMatcher.java index 940bb1b7553fc..60ab68935b5d2 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/ArrayEqualMatcher.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/ArrayEqualMatcher.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers; +package org.elasticsearch.datageneration.matchers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.xcontent.XContentBuilder; @@ -15,8 +15,8 @@ import java.util.Arrays; import java.util.List; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.formatErrorMessage; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.prettyPrintArrays; +import static org.elasticsearch.datageneration.matchers.Messages.formatErrorMessage; +import static org.elasticsearch.datageneration.matchers.Messages.prettyPrintArrays; class ArrayEqualMatcher extends GenericEqualsMatcher { ArrayEqualMatcher( diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/GenericEqualsMatcher.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/GenericEqualsMatcher.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/GenericEqualsMatcher.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/GenericEqualsMatcher.java index b409d18709f23..1eecc65aa3047 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/GenericEqualsMatcher.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/GenericEqualsMatcher.java @@ -7,14 +7,14 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers; +package org.elasticsearch.datageneration.matchers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.xcontent.XContentBuilder; import java.util.List; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.formatErrorMessage; +import static org.elasticsearch.datageneration.matchers.Messages.formatErrorMessage; public class GenericEqualsMatcher extends Matcher { protected final XContentBuilder actualMappings; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/ListEqualMatcher.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/ListEqualMatcher.java similarity index 93% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/ListEqualMatcher.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/ListEqualMatcher.java index 093556ea89355..347f989b0dd48 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/ListEqualMatcher.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/ListEqualMatcher.java @@ -7,15 +7,15 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers; +package org.elasticsearch.datageneration.matchers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.xcontent.XContentBuilder; import java.util.List; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.formatErrorMessage; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.prettyPrintCollections; +import static org.elasticsearch.datageneration.matchers.Messages.formatErrorMessage; +import static org.elasticsearch.datageneration.matchers.Messages.prettyPrintCollections; public class ListEqualMatcher extends GenericEqualsMatcher> { public ListEqualMatcher( diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/MatchResult.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/MatchResult.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/MatchResult.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/MatchResult.java index 77b51890ad691..4a5b0e082fe0c 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/MatchResult.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/MatchResult.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers; +package org.elasticsearch.datageneration.matchers; import java.util.Objects; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/Matcher.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/Matcher.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/Matcher.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/Matcher.java index 7fa82dea1a638..4d64d650e1639 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/Matcher.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/Matcher.java @@ -7,10 +7,10 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers; +package org.elasticsearch.datageneration.matchers; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.logsdb.datageneration.matchers.source.SourceMatcher; +import org.elasticsearch.datageneration.matchers.source.SourceMatcher; import org.elasticsearch.xcontent.XContentBuilder; import java.util.List; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/Messages.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/Messages.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/Messages.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/Messages.java index 6f7ccc69c35e1..3a34513c8afd5 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/Messages.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/Messages.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers; +package org.elasticsearch.datageneration.matchers; import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/ObjectMatcher.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/ObjectMatcher.java similarity index 90% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/ObjectMatcher.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/ObjectMatcher.java index f922385fc0190..8d42de28bf645 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/ObjectMatcher.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/ObjectMatcher.java @@ -7,12 +7,12 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers; +package org.elasticsearch.datageneration.matchers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.xcontent.XContentBuilder; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.formatErrorMessage; +import static org.elasticsearch.datageneration.matchers.Messages.formatErrorMessage; public class ObjectMatcher extends GenericEqualsMatcher { ObjectMatcher( diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/DynamicFieldMatcher.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/DynamicFieldMatcher.java similarity index 90% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/DynamicFieldMatcher.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/DynamicFieldMatcher.java index 7957ed1eebe4d..1da503a9b792f 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/DynamicFieldMatcher.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/DynamicFieldMatcher.java @@ -7,11 +7,11 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers.source; +package org.elasticsearch.datageneration.matchers.source; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.logsdb.datageneration.matchers.ListEqualMatcher; -import org.elasticsearch.logsdb.datageneration.matchers.MatchResult; +import org.elasticsearch.datageneration.matchers.ListEqualMatcher; +import org.elasticsearch.datageneration.matchers.MatchResult; import org.elasticsearch.xcontent.XContentBuilder; import java.util.List; @@ -21,8 +21,8 @@ import java.util.function.Function; import java.util.stream.Collectors; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.formatErrorMessage; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.prettyPrintCollections; +import static org.elasticsearch.datageneration.matchers.Messages.formatErrorMessage; +import static org.elasticsearch.datageneration.matchers.Messages.prettyPrintCollections; class DynamicFieldMatcher { private final XContentBuilder actualMappings; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/FieldSpecificMatcher.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/FieldSpecificMatcher.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/FieldSpecificMatcher.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/FieldSpecificMatcher.java index be50691224cd5..e695824973b0d 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/FieldSpecificMatcher.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/FieldSpecificMatcher.java @@ -7,13 +7,13 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers.source; +package org.elasticsearch.datageneration.matchers.source; import org.apache.lucene.sandbox.document.HalfFloatPoint; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.datageneration.matchers.MatchResult; import org.elasticsearch.index.mapper.DateFieldMapper; -import org.elasticsearch.logsdb.datageneration.matchers.MatchResult; import org.elasticsearch.xcontent.XContentBuilder; import java.math.BigInteger; @@ -31,8 +31,8 @@ import java.util.function.Function; import java.util.stream.Collectors; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.formatErrorMessage; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.prettyPrintCollections; +import static org.elasticsearch.datageneration.matchers.Messages.formatErrorMessage; +import static org.elasticsearch.datageneration.matchers.Messages.prettyPrintCollections; interface FieldSpecificMatcher { MatchResult match(List actual, List expected, Map actualMapping, Map expectedMapping); diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/MappingTransforms.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/MappingTransforms.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/MappingTransforms.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/MappingTransforms.java index dcae8ea07993d..e0dd0380a19ff 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/MappingTransforms.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/MappingTransforms.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers.source; +package org.elasticsearch.datageneration.matchers.source; import java.util.ArrayList; import java.util.HashMap; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/SourceMatcher.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/SourceMatcher.java similarity index 94% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/SourceMatcher.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/SourceMatcher.java index 7e5b63e82525b..6583a181dacb5 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/SourceMatcher.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/SourceMatcher.java @@ -7,21 +7,21 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers.source; +package org.elasticsearch.datageneration.matchers.source; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentHelper; -import org.elasticsearch.logsdb.datageneration.matchers.GenericEqualsMatcher; -import org.elasticsearch.logsdb.datageneration.matchers.MatchResult; +import org.elasticsearch.datageneration.matchers.GenericEqualsMatcher; +import org.elasticsearch.datageneration.matchers.MatchResult; import org.elasticsearch.xcontent.XContentBuilder; import java.util.List; import java.util.Map; import java.util.Objects; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.formatErrorMessage; -import static org.elasticsearch.logsdb.datageneration.matchers.Messages.prettyPrintCollections; +import static org.elasticsearch.datageneration.matchers.Messages.formatErrorMessage; +import static org.elasticsearch.datageneration.matchers.Messages.prettyPrintCollections; public class SourceMatcher extends GenericEqualsMatcher>> { private final Map> mappingLookup; diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/SourceTransforms.java b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/SourceTransforms.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/SourceTransforms.java rename to test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/SourceTransforms.java index e3eb80799c416..6a8c77b27fe8b 100644 --- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/SourceTransforms.java +++ b/test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/SourceTransforms.java @@ -7,7 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -package org.elasticsearch.logsdb.datageneration.matchers.source; +package org.elasticsearch.datageneration.matchers.source; import java.util.ArrayList; import java.util.Collections; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/BlockLoaderTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/BlockLoaderTestCase.java index 2bc053291030d..52ac7e981794b 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/BlockLoaderTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/BlockLoaderTestCase.java @@ -16,16 +16,16 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.common.bytes.BytesReference; +import org.elasticsearch.datageneration.DataGeneratorSpecification; +import org.elasticsearch.datageneration.DocumentGenerator; +import org.elasticsearch.datageneration.Mapping; +import org.elasticsearch.datageneration.MappingGenerator; +import org.elasticsearch.datageneration.Template; +import org.elasticsearch.datageneration.datasource.DataSourceHandler; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.fieldvisitor.StoredFieldLoader; -import org.elasticsearch.logsdb.datageneration.DataGeneratorSpecification; -import org.elasticsearch.logsdb.datageneration.DocumentGenerator; -import org.elasticsearch.logsdb.datageneration.Mapping; -import org.elasticsearch.logsdb.datageneration.MappingGenerator; -import org.elasticsearch.logsdb.datageneration.Template; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; import org.elasticsearch.plugins.internal.XContentMeteringParserDecorator; import org.elasticsearch.search.fetch.StoredFieldsSpec; import org.elasticsearch.search.lookup.SearchLookup; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/NumberFieldBlockLoaderTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/NumberFieldBlockLoaderTestCase.java index 1509daf135fe9..3f6810b26e8d4 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/NumberFieldBlockLoaderTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/NumberFieldBlockLoaderTestCase.java @@ -9,7 +9,7 @@ package org.elasticsearch.index.mapper; -import org.elasticsearch.logsdb.datageneration.FieldType; +import org.elasticsearch.datageneration.FieldType; import java.util.List; import java.util.Map; diff --git a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DataGenerationSnapshotTests.java b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DataGenerationSnapshotTests.java index d9f392dabe847..40fada7b6b147 100644 --- a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DataGenerationSnapshotTests.java +++ b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DataGenerationSnapshotTests.java @@ -10,9 +10,14 @@ package org.elasticsearch.logsdb.datageneration; import org.elasticsearch.common.Strings; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; +import org.elasticsearch.datageneration.DataGeneratorSpecification; +import org.elasticsearch.datageneration.DocumentGenerator; +import org.elasticsearch.datageneration.FieldType; +import org.elasticsearch.datageneration.MappingGenerator; +import org.elasticsearch.datageneration.TemplateGenerator; +import org.elasticsearch.datageneration.datasource.DataSourceHandler; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xcontent.XContentType; diff --git a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DataGenerationTests.java b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DataGenerationTests.java index 9b6fad48cb69b..26f130d0c4848 100644 --- a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DataGenerationTests.java +++ b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DataGenerationTests.java @@ -10,12 +10,17 @@ package org.elasticsearch.logsdb.datageneration; import org.elasticsearch.common.bytes.BytesReference; +import org.elasticsearch.datageneration.DataGeneratorSpecification; +import org.elasticsearch.datageneration.DocumentGenerator; +import org.elasticsearch.datageneration.FieldType; +import org.elasticsearch.datageneration.MappingGenerator; +import org.elasticsearch.datageneration.TemplateGenerator; +import org.elasticsearch.datageneration.datasource.DataSourceHandler; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; import org.elasticsearch.index.mapper.MapperServiceTestCase; import org.elasticsearch.index.mapper.SourceToParse; import org.elasticsearch.index.mapper.extras.MapperExtrasPlugin; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xcontent.XContentBuilder; diff --git a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DefaultWrappersHandlerTests.java b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DefaultWrappersHandlerTests.java index 8ad6e93b1d29b..f6c47fdd9eefc 100644 --- a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DefaultWrappersHandlerTests.java +++ b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/DefaultWrappersHandlerTests.java @@ -9,8 +9,8 @@ package org.elasticsearch.logsdb.datageneration; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DefaultWrappersHandler; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DefaultWrappersHandler; import org.elasticsearch.test.ESTestCase; import java.util.List; diff --git a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/FieldTypeTests.java b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/FieldTypeTests.java index 60276333f365f..c3274876717b0 100644 --- a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/FieldTypeTests.java +++ b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/FieldTypeTests.java @@ -9,6 +9,7 @@ package org.elasticsearch.logsdb.datageneration; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.test.ESTestCase; public class FieldTypeTests extends ESTestCase { diff --git a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/SourceMatcherTests.java b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/SourceMatcherTests.java index 342394fe14b86..29c5ffc5a4509 100644 --- a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/SourceMatcherTests.java +++ b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/SourceMatcherTests.java @@ -10,7 +10,7 @@ package org.elasticsearch.logsdb.datageneration; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.logsdb.datageneration.matchers.source.SourceMatcher; +import org.elasticsearch.datageneration.matchers.source.SourceMatcher; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xcontent.XContentType; diff --git a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/TemplateGeneratorTests.java b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/TemplateGeneratorTests.java index 37f51c3edf6a3..89bba68c8b6e5 100644 --- a/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/TemplateGeneratorTests.java +++ b/test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/TemplateGeneratorTests.java @@ -9,6 +9,9 @@ package org.elasticsearch.logsdb.datageneration; +import org.elasticsearch.datageneration.DataGeneratorSpecification; +import org.elasticsearch.datageneration.Template; +import org.elasticsearch.datageneration.TemplateGenerator; import org.elasticsearch.test.ESTestCase; import java.util.Map; diff --git a/x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/qa/DataGenerationHelper.java b/x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/qa/DataGenerationHelper.java index f66188f1ecb1f..01d5fd35320e4 100644 --- a/x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/qa/DataGenerationHelper.java +++ b/x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/qa/DataGenerationHelper.java @@ -8,18 +8,18 @@ package org.elasticsearch.xpack.logsdb.qa; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.datageneration.DataGeneratorSpecification; +import org.elasticsearch.datageneration.DocumentGenerator; +import org.elasticsearch.datageneration.FieldType; +import org.elasticsearch.datageneration.Mapping; +import org.elasticsearch.datageneration.MappingGenerator; +import org.elasticsearch.datageneration.Template; +import org.elasticsearch.datageneration.TemplateGenerator; +import org.elasticsearch.datageneration.datasource.DataSourceHandler; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; +import org.elasticsearch.datageneration.fields.PredefinedField; import org.elasticsearch.index.mapper.Mapper; -import org.elasticsearch.logsdb.datageneration.DataGeneratorSpecification; -import org.elasticsearch.logsdb.datageneration.DocumentGenerator; -import org.elasticsearch.logsdb.datageneration.FieldType; -import org.elasticsearch.logsdb.datageneration.Mapping; -import org.elasticsearch.logsdb.datageneration.MappingGenerator; -import org.elasticsearch.logsdb.datageneration.Template; -import org.elasticsearch.logsdb.datageneration.TemplateGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; -import org.elasticsearch.logsdb.datageneration.fields.PredefinedField; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xpack.spatial.datageneration.GeoShapeDataSourceHandler; diff --git a/x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/qa/StandardVersusLogsIndexModeChallengeRestIT.java b/x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/qa/StandardVersusLogsIndexModeChallengeRestIT.java index 29fe49cffee16..737fe5693215a 100644 --- a/x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/qa/StandardVersusLogsIndexModeChallengeRestIT.java +++ b/x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/qa/StandardVersusLogsIndexModeChallengeRestIT.java @@ -15,9 +15,9 @@ import org.elasticsearch.common.time.DateFormatter; import org.elasticsearch.common.time.FormatNames; import org.elasticsearch.common.xcontent.XContentHelper; +import org.elasticsearch.datageneration.matchers.MatchResult; +import org.elasticsearch.datageneration.matchers.Matcher; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.logsdb.datageneration.matchers.MatchResult; -import org.elasticsearch.logsdb.datageneration.matchers.Matcher; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder; diff --git a/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateMetricDoubleFieldBlockLoaderTests.java b/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateMetricDoubleFieldBlockLoaderTests.java index 828bbc0c49850..283feffa5dfc3 100644 --- a/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateMetricDoubleFieldBlockLoaderTests.java +++ b/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateMetricDoubleFieldBlockLoaderTests.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.aggregatemetric.mapper; +import org.elasticsearch.datageneration.datasource.DataSourceHandler; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; import org.elasticsearch.index.mapper.BlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.xpack.aggregatemetric.AggregateMetricMapperPlugin; import org.elasticsearch.xpack.aggregatemetric.mapper.datageneration.AggregateMetricDoubleDataSourceHandler; diff --git a/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/datageneration/AggregateMetricDoubleDataSourceHandler.java b/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/datageneration/AggregateMetricDoubleDataSourceHandler.java index 094c2e5e40661..08678a3b18850 100644 --- a/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/datageneration/AggregateMetricDoubleDataSourceHandler.java +++ b/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/datageneration/AggregateMetricDoubleDataSourceHandler.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.aggregatemetric.mapper.datageneration; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; +import org.elasticsearch.datageneration.datasource.DataSourceHandler; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.aggregatemetric.mapper.AggregateMetricDoubleFieldMapper; diff --git a/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/datageneration/AggregateMetricDoubleFieldDataGenerator.java b/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/datageneration/AggregateMetricDoubleFieldDataGenerator.java index a641714c3af81..ab6ccc25ef56a 100644 --- a/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/datageneration/AggregateMetricDoubleFieldDataGenerator.java +++ b/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/datageneration/AggregateMetricDoubleFieldDataGenerator.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.aggregatemetric.mapper.datageneration; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.HashMap; import java.util.List; diff --git a/x-pack/plugin/mapper-constant-keyword/src/test/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldBlockLoaderTests.java b/x-pack/plugin/mapper-constant-keyword/src/test/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldBlockLoaderTests.java index 67307d15878ee..471a6a9a69fc3 100644 --- a/x-pack/plugin/mapper-constant-keyword/src/test/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldBlockLoaderTests.java +++ b/x-pack/plugin/mapper-constant-keyword/src/test/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldBlockLoaderTests.java @@ -8,8 +8,8 @@ package org.elasticsearch.xpack.constantkeyword.mapper; import org.apache.lucene.util.BytesRef; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.BlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.xpack.constantkeyword.ConstantKeywordMapperPlugin; diff --git a/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldBlockLoaderTests.java b/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldBlockLoaderTests.java index 98fa464605fdc..14346bff1f695 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldBlockLoaderTests.java +++ b/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldBlockLoaderTests.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.unsignedlong; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.NumberFieldBlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import org.elasticsearch.plugins.Plugin; import java.util.Collection; diff --git a/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/datageneration/VersionStringDataSourceHandler.java b/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/datageneration/VersionStringDataSourceHandler.java index 663389b4ed77f..c00eed5c25e8a 100644 --- a/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/datageneration/VersionStringDataSourceHandler.java +++ b/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/datageneration/VersionStringDataSourceHandler.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.versionfield.datageneration; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; +import org.elasticsearch.datageneration.datasource.DataSourceHandler; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; import org.elasticsearch.xpack.versionfield.VersionStringTestUtils; import java.util.HashMap; diff --git a/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/datageneration/VersionStringFieldDataGenerator.java b/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/datageneration/VersionStringFieldDataGenerator.java index 400c08a6a97be..71ba226a14606 100644 --- a/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/datageneration/VersionStringFieldDataGenerator.java +++ b/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/datageneration/VersionStringFieldDataGenerator.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.versionfield.datageneration; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; import java.util.Map; import java.util.function.Supplier; diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/GeoShapeDataSourceHandler.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/GeoShapeDataSourceHandler.java index 183bb4b22d551..6b9fbdda5f8db 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/GeoShapeDataSourceHandler.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/GeoShapeDataSourceHandler.java @@ -7,12 +7,12 @@ package org.elasticsearch.xpack.spatial.datageneration; +import org.elasticsearch.datageneration.datasource.DataSourceHandler; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; import org.elasticsearch.geo.GeometryTestUtils; import org.elasticsearch.geometry.Geometry; import org.elasticsearch.geometry.ShapeType; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.spatial.util.GeoTestUtils; diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/GeoShapeFieldDataGenerator.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/GeoShapeFieldDataGenerator.java index 7850ee017472d..789965bd6234f 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/GeoShapeFieldDataGenerator.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/GeoShapeFieldDataGenerator.java @@ -8,12 +8,12 @@ package org.elasticsearch.xpack.spatial.datageneration; import org.elasticsearch.common.geo.GeoJson; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.fields.leaf.Wrappers; import org.elasticsearch.geometry.Geometry; import org.elasticsearch.geometry.utils.WellKnownText; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.fields.leaf.Wrappers; import java.util.Map; import java.util.function.Supplier; diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/PointDataSourceHandler.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/PointDataSourceHandler.java index 7df33c4c8de8f..6f2cc2d1cbe12 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/PointDataSourceHandler.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/PointDataSourceHandler.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.spatial.datageneration; +import org.elasticsearch.datageneration.datasource.DataSourceHandler; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; import org.elasticsearch.geo.GeometryTestUtils; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.spatial.common.CartesianPoint; diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/PointFieldDataGenerator.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/PointFieldDataGenerator.java index 305a3a39c774b..03641bd87582c 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/PointFieldDataGenerator.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/PointFieldDataGenerator.java @@ -8,10 +8,10 @@ package org.elasticsearch.xpack.spatial.datageneration; import org.elasticsearch.core.Tuple; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.fields.leaf.Wrappers; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.fields.leaf.Wrappers; import org.elasticsearch.xpack.spatial.common.CartesianPoint; import java.util.List; diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/ShapeDataSourceHandler.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/ShapeDataSourceHandler.java index eb6bb1b9b34e0..4044e9fcf4bc2 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/ShapeDataSourceHandler.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/ShapeDataSourceHandler.java @@ -7,12 +7,12 @@ package org.elasticsearch.xpack.spatial.datageneration; +import org.elasticsearch.datageneration.datasource.DataSourceHandler; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.datasource.DataSourceResponse; import org.elasticsearch.geo.GeometryTestUtils; import org.elasticsearch.geometry.Geometry; import org.elasticsearch.geometry.ShapeType; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.spatial.util.GeoTestUtils; diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/ShapeFieldDataGenerator.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/ShapeFieldDataGenerator.java index 78f1e8ee1745e..03c2a505ee93a 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/ShapeFieldDataGenerator.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/ShapeFieldDataGenerator.java @@ -8,12 +8,12 @@ package org.elasticsearch.xpack.spatial.datageneration; import org.elasticsearch.common.geo.GeoJson; +import org.elasticsearch.datageneration.FieldDataGenerator; +import org.elasticsearch.datageneration.datasource.DataSource; +import org.elasticsearch.datageneration.datasource.DataSourceRequest; +import org.elasticsearch.datageneration.fields.leaf.Wrappers; import org.elasticsearch.geometry.Geometry; import org.elasticsearch.geometry.utils.WellKnownText; -import org.elasticsearch.logsdb.datageneration.FieldDataGenerator; -import org.elasticsearch.logsdb.datageneration.datasource.DataSource; -import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest; -import org.elasticsearch.logsdb.datageneration.fields.leaf.Wrappers; import java.util.Map; import java.util.function.Supplier; diff --git a/x-pack/plugin/wildcard/src/test/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldBlockLoaderTests.java b/x-pack/plugin/wildcard/src/test/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldBlockLoaderTests.java index ca8a147805fb2..bb4c786ff7831 100644 --- a/x-pack/plugin/wildcard/src/test/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldBlockLoaderTests.java +++ b/x-pack/plugin/wildcard/src/test/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldBlockLoaderTests.java @@ -8,8 +8,8 @@ package org.elasticsearch.xpack.wildcard.mapper; import org.apache.lucene.util.BytesRef; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.index.mapper.BlockLoaderTestCase; -import org.elasticsearch.logsdb.datageneration.FieldType; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.xpack.wildcard.Wildcard;